2207 files changed, 92709 insertions, 0 deletions

diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
new file mode 100644
index 000000000000..16fa303a164b
--- /dev/null
+++ b/net-misc/adjtimex/Manifest
@@ -0,0 +1,8 @@
+AUX adjtimex-1.29-r1-gentoo-utc.patch 1053 SHA256 4a22aa2b368530fb8bbbc4f00b4d5050e454004522b2978e4e6c992781433fec SHA512 d9d47fc4648b51969b50545b8925848601f373ba89908cdcb95e37b6ec4489b0e338bed4debed9a5fc1fbb3fff6a87c27583a25a89028bdf69dc09602c67d728 WHIRLPOOL 6e6c3ac9e6eeaba65b9aedecd09b3e5f0639a6fe4b93101ad1a89dad15a5f9ca6d73daf922a72c57a287e921558a7ece698a51e9daefcd4655840720c1ebf0f3
+AUX adjtimex.init 638 SHA256 bd8dbdd7bd4fc03466a46dbf1744c6c9010ca265b03ab1b9b828af08b8eeda98 SHA512 4d8caa72076ac8ba2c0f6cabb31a28254e609d2215cc8f830921e729013144fc10cb6a8796fff80ecc4bf1dc611652e81830e46e59c1726d3147cc1680017041 WHIRLPOOL c5d704a7c6c864ff63a2fb403b4b770e5e8b28b742c28f17ea0482bcf53ac83006041cbd6c734bfb9e56b5e8e3adde99e1ed1fde0bf5f58aaabef300f5f1fe5e
+DIST adjtimex_1.29-2.diff.gz 51735 SHA256 54293c8aff704a8077b4d0ec31e8a21cf8de93e145e0e8644ec91e132da6e577 SHA512 cc78cf9fd93cb243019952f877cb9730a5755d87336fc1a956162e957fd579de3770cb6bbba58ac9b6d350ee631ed294303360d0aa4153b12a31eb1bb4e35924 WHIRLPOOL 24f5a37ffa2b7b81b0d2f0d4755bd26e07e6bc32896858d574a96bb02c8df3d71f8acbeba9363c0ee37fdca59dba0a8a83f33014b562f85bd5b7abbdb99100d3
+DIST adjtimex_1.29.orig.tar.gz 85551 SHA256 04b9e8b66e77276ed07e78de89af37fd1aa12725923de853480827c4fafd176a SHA512 5a48cdc538866c06562f62e369c08d60978c791ed91565262c0179c6fa25dd343963992d00e10f32475fdc00b458f81cf9c61adbfa9e1b7a8d4981ebeeff5649 WHIRLPOOL f22f4ba2f0945ca53f4967094b10df1a741d705b07f86ae3e024ebb3624acc6cfd56d12414c2a00b1f0747a07c80d65fa0e7471816879cb3c159b5b079228112
+EBUILD adjtimex-1.29-r1.ebuild 1433 SHA256 0546b4b9e7e18c737caa816163fa532565e327aacd7b197de2d60588974911cc SHA512 a2b56c1667fb329513638ed10d99e04ae14f6e374646b9802899f4094da2fe21e8d45e0d61cb422fb12f61cb40b9542d9ebe3ab6429504cd1a710408b9db6b6e WHIRLPOOL d2a4cabaf6105d880d92c9a48833a3764ee3299ced7f61b416121977b1ac92896ca7c25145e031c146d01c71a5ca417f66cdd0feca8dd8fc3c6303fc18dfe83f
+MISC ChangeLog 2379 SHA256 a3fa68d4b40f8ed346746b9b3b0b2605dffeca6d8b33626ddca007f9f71629e4 SHA512 b71aa1f43d1fb76edfcf9810c6c9ddef724d921b29679e24429868a450dc4d11a82caa291f85c57ee9c88987695a3d8c284941a9dcc481cffb0ecd61b307b44c WHIRLPOOL a499ff4f180bf8f4410ee35fed97c5fbe43e038cff32af85cfaa18aced07ab4c42a905adf0ffb916c2c90213314b11f7c187e464f9c00e1bd903eadf14659ac8
+MISC ChangeLog-2015 4815 SHA256 3f8e25346b12d37124eec86fde29d06b01357e1cdca887630533bb0e6a57ef4f SHA512 95aecef82356362ec09766a41e67c5528a7bf54a314672862cceeac81e5ea5ac33277c8dde5406a1390b69323e926e41201ad1338c4abb75a80307e078aa2fb1 WHIRLPOOL 968a59f86e7821fe18766a5431395bb8157c2ac86b95a471605b2b51f5dd4f9dce9959d814165c66c68a26f6190aa618fcdc2a20371d115ade41f89fb9679637
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
diff --git a/net-misc/adjtimex/adjtimex-1.29-r1.ebuild b/net-misc/adjtimex/adjtimex-1.29-r1.ebuild
new file mode 100644
index 000000000000..9f8febb49e45
--- /dev/null
+++ b/net-misc/adjtimex/adjtimex-1.29-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils fixheadtails toolchain-funcs
+
+DEBIAN_PV="2"
+MY_P="${P/-/_}"
+DEBIAN_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
+DEBIAN_PATCH="${MY_P}-${DEBIAN_PV}.diff.gz"
+DEBIAN_SRC="${MY_P}.orig.tar.gz"
+DESCRIPTION="display or set the kernel time variables"
+HOMEPAGE="http://www.ibiblio.org/linsearch/lsms/adjtimex.html"
+SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH}
+	${DEBIAN_URI}/${DEBIAN_SRC}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${DISTDIR}"/${DEBIAN_PATCH}
+	cd "${S}"
+	for i in debian/adjtimexconfig debian/adjtimexconfig.8 ; do
+		sed -e 's|/etc/default/adjtimex|/etc/conf.d/adjtimex|' \
+			-i.orig ${i}
+		sed -e 's|^/sbin/adjtimex |/usr/sbin/adjtimex |' \
+			-i.orig ${i}
+	done
+	epatch "${FILESDIR}"/${PN}-1.29-r1-gentoo-utc.patch
+	ht_fix_file debian/adjtimexconfig
+	sed -i \
+		-e '/CFLAGS = -Wall -t/,/endif/d' \
+		-e '/$(CC).* -o/s|$(CFLAGS)|& $(LDFLAGS)|g' \
+		Makefile.in || die "sed Makefile.in"
+}
+
+src_configure() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	dodoc README* ChangeLog
+	doman adjtimex.8 debian/adjtimexconfig.8
+	dosbin adjtimex debian/adjtimexconfig
+	newinitd "${FILESDIR}"/adjtimex.init adjtimex
+}
+
+pkg_postinst() {
+	einfo "Please run adjtimexconfig to create the configuration file"
+}
diff --git a/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch b/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch
new file mode 100644
index 000000000000..ac8730d1ee7d
--- /dev/null
+++ b/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch
@@ -0,0 +1,30 @@
+--- adjtimex-1.29-debian/debian/adjtimexconfig	2011-12-23 21:29:32.962449759 +0100
++++ adjtimex-1.29/debian/adjtimexconfig	2011-12-23 21:30:00.610638657 +0100
+@@ -3,6 +3,18 @@
+ conffile=/etc/default/adjtimex
+ startfile=/etc/init.d/adjtimex
+ 
++# Get UTC setting
++params=''
++if [ -f /etc/conf.d/clock ]; then
++    #baselayout-1
++    source /etc/conf.d/clock
++    [ "$CLOCK" == "UTC" ] && params='--utc'
++elif [ -f /etc/conf.d/hwclock ]; then
++    #baselayout-2
++    source /etc/conf.d/hwclock
++    [ "$clock" == "UTC" ] && params='--utc'
++fi
++
+ echo -n "Comparing clocks (this will take 70 sec)..."
+ 
+ # Get the parameters
+@@ -11,7 +23,7 @@
+ baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust`
+ hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust`
+ /usr/sbin/adjtimex  --tick $baseline  --frequency 0
+-/usr/sbin/adjtimex  --adjust --force-adjust >/etc/adj.adjust
++/usr/sbin/adjtimex  ${params} --adjust --force-adjust >/etc/adj.adjust
+ echo "done."
+ ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'`
+ freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'`
diff --git a/net-misc/adjtimex/files/adjtimex.init b/net-misc/adjtimex/files/adjtimex.init
new file mode 100644
index 000000000000..ef46890bf3c9
--- /dev/null
+++ b/net-misc/adjtimex/files/adjtimex.init
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=adjtimex
+OPTS="--tick ${TICK} --frequency ${FREQ}"
+CONFD="/etc/conf.d/${DAEMON}"
+
+depend() {
+	before ntp-client ntpd
+	need localmount
+}
+
+checkconfig() {
+    if [ ! -f "${CONFD}" ]; then
+        eerror "Configuration file not found!"
+        eerror "You must run adjtimexconfig to create it."
+        return 1
+    fi
+}
+
+
+start() {
+    checkconfig || return 1
+	ebegin "Regulating system clock with ${DAEMON}..."
+	/usr/sbin/${DAEMON} ${OPTS}
+	eend $?
+}
+
+stop() {
+    :
+}
+
+# vim: ts=4 sw=4 ft=gentoo-init-d:
diff --git a/net-misc/adjtimex/metadata.xml b/net-misc/adjtimex/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/net-misc/adjtimex/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 type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/aget/Manifest b/net-misc/aget/Manifest
new file mode 100644
index 000000000000..e44307113276
--- /dev/null
+++ b/net-misc/aget/Manifest
@@ -0,0 +1,6 @@
+AUX aget-0.4.1-r1.patch 2423 SHA256 e0db4c7d975177f1981941dabba6f39ceccf33a5e43d72c33150f08b98000c54 SHA512 b4c1765634f6f14c19e992fa090b7ed1ec11a5d62fe874602f18466d3ced9c0a2ec255fdb8dcb732f0fbd9be9831fe080509992c86fa7b8f11f40366a523ae28 WHIRLPOOL 207ec1bf93d24e6c04c9886a262d9365562735fa4a5a91cf2393678824b923913be2274a2da1dee91a079ba9e0d2dc5032f30ede8425e51cbcc80c9acfd18541
+DIST aget-0.4.1.tar.gz 12783 SHA256 d17393c7f44aab38028ae71f14b572ba1839b6e085fb2092b6ebe68bc931df4d SHA512 23fd4a7786b905bb10fb8de62dea294e014e0c2ad276614c642ebd3865b262eb88e08308df9a68f418de19a984ad138561d82c67e0226dfb5f56520e8ed15ad7 WHIRLPOOL 17e8f672a11405415fd6e84e0e1303564a238977370bee7082c72ab18e62eed8df332fc51e3bb02c8f07f2c6185b73d7a0f3dea9c7cbb6e1fc3def176e5c7378
+EBUILD aget-0.4.1-r1.ebuild 615 SHA256 197f2c9eaa1205df6d843502f9db58f3cdedcbdafa278124c38b6ebe8d41a36f SHA512 f4899a197b8fdc02e8101b858adda89ba2b29b067d680fe97cfaf88272a24caae5bebd261d87ca7c1151a866da7fbf55833fa615d2b1a2d2f4a90b58efab6814 WHIRLPOOL ad39b4f4ca94909bc6f43b20c1432431f9638355ee6f134f16f66329a60460b3f6f8d2222b8835ab38eeae49a612a1be72b5c25a31e60043c87213290af669a7
+MISC ChangeLog 2300 SHA256 8fc332a9a70c6c43999da27c3190ba696ab01d5f88ffe93df9bec41d72a70456 SHA512 bbf7c36bca0f91d4a714515af951f6b5e1288d04b3f877d0a9186f1ca4a3850bd7eafd5be140d5dafc6160523cd4a5738b7fdad9cfdd00fe42a191a06a6aa937 WHIRLPOOL d2e54786dfe918940012e5b158233d2d270b7b0fe4c187d73fa5fbc64fe13bbd102b318d36e60b963fec6b1ec49ab1b538ba2be185af1b81ae8a4ae2288bce87
+MISC ChangeLog-2015 2767 SHA256 a804de0ba2f3ea8b4f5dd95dde60fe4a8e375452c908548d922100e262d3974a SHA512 4d846a9fa7b34b7e4d35d8e1ee268b357aa61b78af6f6ece41a68d7af4fd4edf1d17b31ec69f20f9419d586496add9757f8b2c931fb9c9952da40ed2ac26415b WHIRLPOOL 6299a375494261e41383aa14c4abaddea5d1a644f311dc6adaf4482433bd8709f7e37e33ef672f50af168c2a169a5fe05b3d71b7ac90506df4bfa1852ed0923c
+MISC metadata.xml 759 SHA256 673f3347843edf8fa4c881ec27adb96ef99b80c7e60ad8d44ee511e6b138f615 SHA512 c65b54fcd23ae72aabafd4259831f9bbe19c0e9ea65efeb49fbd703f900ae8b21d565cf1ea508f83064b05bd5df212a9e03991c6c652c9459648e77fdc7e98ec WHIRLPOOL 5798d00850738683dc27ca30a62e5ba6bb5c56c5df93809f497695aa1d0f5a7d96a1d41b713919d74390beb7cf5c0df0e205292aa9541147b1003c1d1034cba2
diff --git a/net-misc/aget/aget-0.4.1-r1.ebuild b/net-misc/aget/aget-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..98a946337d3f
--- /dev/null
+++ b/net-misc/aget/aget-0.4.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="multithreaded HTTP download accelerator"
+HOMEPAGE="http://www.enderunix.org/aget/"
+SRC_URI="http://www.enderunix.org/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+	dodoc AUTHORS ChangeLog README* THANKS TODO || die
+}
diff --git a/net-misc/aget/files/aget-0.4.1-r1.patch b/net-misc/aget/files/aget-0.4.1-r1.patch
new file mode 100644
index 000000000000..fe804901528c
--- /dev/null
+++ b/net-misc/aget/files/aget-0.4.1-r1.patch
@@ -0,0 +1,88 @@
+
+Subsequent snprintf calls treat the buffer as having size GETREQSIZ, so
+drop the subtraction. Fix for http://bugs.gentoo.org/337874 by Kevin Pyle 
+
+--- aget-0.4.1/Aget.c
++++ aget-0.4.1/Aget.c
+@@ -86,7 +86,7 @@
+ 	}
+ 
+ 	/* Get the starting time, prepare GET format string, and start the threads */
+-	fmt = (char *)calloc(GETREQSIZ - 2, sizeof(char));
++	fmt = (char *)calloc(GETREQSIZ, sizeof(char));
+ 	time(&t_start);
+ 	for (i = 0; i < nthreads; i++) {
+ 		soffset = calc_offset(req->clength, i, nthreads);
+@@ -139,7 +139,7 @@
+ 
+ 	nthreads = h->nthreads;
+ 
+-	fmt = (char *)calloc(GETREQSIZ - 2, sizeof(char));
++	fmt = (char *)calloc(GETREQSIZ, sizeof(char));
+ 
+ 	wthread = (struct thread_data *)malloc(nthreads * sizeof(struct thread_data));
+ 	memcpy(req, &h->req, sizeof(struct request));
+
+Fix useless memset that set 0 bytes to the value of GETRECVSIZ, rather
+than setting GETRECVSIZ bytes to the value of 0. By Kevin Pyle.
+
+--- aget-0.4.1/Download.c
++++ aget-0.4.1/Download.c
+@@ -107,7 +107,7 @@
+ 	pthread_mutex_unlock(&bwritten_mutex);
+ 
+ 	while (td->offset < foffset) {
+-		memset(rbuf, GETRECVSIZ, 0);
++		memset(rbuf, 0, GETRECVSIZ);
+ 		dr = recv(sd, rbuf, GETRECVSIZ, 0);
+ 		if ((td->offset + dr) > foffset)
+ 			dw = pwrite(td->fd, rbuf, foffset - td->offset, td->offset);
+--- aget-0.4.1/Head.c	2010-09-20 03:41:27.236019179 +0200
++++ aget-0.4.1/Head.c	2010-09-20 03:43:00.087098655 +0200
+@@ -1,5 +1,4 @@
+ #ifndef SOLARIS
+-#define _XOPEN_SOURCE 500
+ #endif
+ 
+ 
+--- aget-0.4.1/Misc.c
++++ aget-0.4.1/Misc.c
+@@ -129,7 +129,7 @@
+ 	fprintf(stderr, "\t\t-h this screen\n");
+ 	fprintf(stderr, "\t\t-v version info\n");
+ 	fprintf(stderr, "\n");
+-	fprintf(stderr, "http//www.enderunix.org/aget/\n");
++	fprintf(stderr, "http://www.enderunix.org/aget/\n");
+ }
+ 
+ /* reverse a given string	*/
+--- aget-0.4.1/Makefile
++++ aget-0.4.1/Makefile
+@@ -2,20 +2,21 @@
+ # http://www.enderunix.org/aget/
+ 
+ OBJS = main.o Aget.o Misc.o Head.o Signal.o Download.o Resume.o
+-CFLAGS = -g -W
+-LDFLAGS = -pthread
++CFLAGS += 
++LDFLAGS += -pthread
+ CC = gcc
+ STRIP = strip
+ 
+-all: $(OBJS)
+-	$(CC) -o aget $(OBJS) $(LDFLAGS)
++all: aget
++aget: $(OBJS)
++	$(LINK.o) $^ $(OUTPUT_OPTION)
+ 
+ strip: $(all)
+ 	$(STRIP) aget
+ 	
+ install:
+-	cp -f aget /usr/local/bin/aget
+-	cp -f aget.1 /usr/share/man/man1/
++	install -m 0755 -D aget $(DESTDIR)/usr/bin/aget
++	install -m 0644 -D aget.1 $(DESTDIR)/usr/share/man/man1/aget.1
+ 
+ clean: 
+ 	rm -f aget *.o core.* *~
diff --git a/net-misc/aget/metadata.xml b/net-misc/aget/metadata.xml
new file mode 100644
index 000000000000..8fa258745ec4
--- /dev/null
+++ b/net-misc/aget/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+</maintainer>
+<longdescription>Aget fetches HTTP URLs in a manner similar to wget, but segments the retrieval into multiple parts to increase download speed. It can be many times as fast as wget in some circumstances.</longdescription>
+<longdescription lang="ja">
+Aget は wget 風の振舞いで URL 上から HTTP 経由で取り寄せますが、異なる点としてはダウンロードのスピードアップのため対象を分割します。分割しても wget と変わらない場合もあります。
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/aggregate-flim/Manifest b/net-misc/aggregate-flim/Manifest
new file mode 100644
index 000000000000..eb95b182bf28
--- /dev/null
+++ b/net-misc/aggregate-flim/Manifest
@@ -0,0 +1,5 @@
+DIST aggregate-1.0.2.tar.gz 51074 SHA256 019dc17498515f470015a427891f8e70f4ec424ab9960e10cdfb6462bec607c0 SHA512 1d85f4457402e6cdcf9f68d58cf66401f6f9530930d3bba3005e1ae82e6c8283c720d2c1d88da906b83fccae47cb9128ae6b8f4781388d651ee206cea887e14e WHIRLPOOL 1a64c02f499277cf968659428f032f132bb7c11e8cc7b13c9ef71e2d9dcf14c8144ea2041d886fb533abe9680513593a4f5714fe390ecfb26509d7cfa57e4117
+EBUILD aggregate-flim-1.0.2.ebuild 604 SHA256 d391bfe6470eb496713d415806a8e4326900ef5f6b0be6ad97f99df4e640fe15 SHA512 3ee65316be7697bfaf17af92bb45b579928b37dbd4c7fbcdf12240010adbffbb2ccde3066c89473539cb8f0c59801cf9c1e678097ec98d80bc60d30e501d3142 WHIRLPOOL 0f8df7e221d11e80d0c631c1219358d99bd5dc1e38d16717cca2796008a0c35dc0c8d3c71e62704e4489e77171cec2cbd2ed3204536dd63a3a6d3fdf9e201cd0
+MISC ChangeLog 2197 SHA256 9fec5ed9a91fe4d527408d3c7027c7eba0067d3eb5ae878ba1406b1ec6a65102 SHA512 0d1efc458f8f6c7bc6a24fa0fff90d45f45aad0c2a7a0a70a0f628b5073b0441ec107e44a1a7869698c258a252609a3dc06739c5b2ea1a5bf84973c372446bdb WHIRLPOOL 50f1b99a88ac7ec04e0db0d47df463c219ff768a5f2d4a866bac7cab9512b9de2037cb4246679b0c721ca6c324f3e67db193c9ed3b54b8fd2a1c9042baabe821
+MISC ChangeLog-2015 1495 SHA256 a51134d879e942e3cac161f91181400fde1bf1a7f5898788503c069daf70db62 SHA512 8f66396ec15c9fff8eb3c5a04a031b1d140c01215a2d1040f8059dde7821e70939846e4cbf520eedeac1c50783a5aed73258f7adbd62857704e56bf0a8773086 WHIRLPOOL 5dbda8e8599eefdee5855729f1beeadd3b681c519245ac61b2c2262ee0eacbb6c8ba9e81df6ec44e4f82deb1dc46f4614d5d5b860057a1668302afd64d1fe12a
+MISC metadata.xml 568 SHA256 54506a57a8c563963cacaf69b2c50b3ec30d553b2bb82b6b9e817c0166376f27 SHA512 ad6ad45f4bb48fdec0354105bf4ff3f1034c71e39d9ca98638249b69dc9e8c5105f6099494aff1e1214a506a75251b6123c5aa9744afec1936506f2c0b21268d WHIRLPOOL 9fa750795ad38d2f4163f9af4a3524fc3e0d2c7338e98eb31cbbda9d8adb159b591b673633a0e52b2e846136f8f010db8bc96f055fa8f937b1ad732a6f554890
diff --git a/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild b/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild
new file mode 100644
index 000000000000..067062caa719
--- /dev/null
+++ b/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MY_PN="${PN/-flim}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="aggregate is a tool for aggregating CIDR networks"
+HOMEPAGE="http://www.vergenet.net/linux/aggregate-flim/"
+SRC_URI="http://www.vergenet.net/linux/aggregate-flim/download/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+DEPEND="dev-libs/vanessa-logger"
+#RDEPEND=""
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	newbin aggregate aggregate-flim
+	newman aggregate.8 aggregate-flim.8
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+}
diff --git a/net-misc/aggregate-flim/metadata.xml b/net-misc/aggregate-flim/metadata.xml
new file mode 100644
index 000000000000..92c124322a5d
--- /dev/null
+++ b/net-misc/aggregate-flim/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+</maintainer>
+<longdescription>aggregate is a tool for aggregating CIDR networks. Input is read from stdin and output is written to stdout. It undestands IPv4 networks represented as network/prefix, network/netmask and start_address - end_addres. It is able to read input in any one of these formats and output in the same or a different format.</longdescription>
+</pkgmetadata>
diff --git a/net-misc/aggregate/Manifest b/net-misc/aggregate/Manifest
new file mode 100644
index 000000000000..12d0f9071755
--- /dev/null
+++ b/net-misc/aggregate/Manifest
@@ -0,0 +1,6 @@
+AUX aggregate-1.6-build-fixup.patch 362 SHA256 18c1858d07b1ae3117ae844e800bb63c5398df1cc971dec0b76450f6cc52d0d9 SHA512 15fbcd2681187543ff0475cf08ff33ff3cf0cb74653229424209d931adf70f3b67c30434b62ae5a395252e579b45dcd51c68a80fcf5dc7ec4c1420370d246340 WHIRLPOOL 5994fbd7908d052e5e7bf9228093cf96153a8f93bc094e32cbcf78da7df115115968c976361756235eefc9ca10668e42209be26842a0afaf88108e6e1d08d785
+DIST aggregate-1.6.tar.gz 20566 SHA256 166503005cd8722c730e530cc90652ddfa198a25624914c65dffc3eb87ba5482 SHA512 b6c48540a6905c5b0c2195c91c6b19fa537f1a746adb7e173642c3f0bd894cbbd8f4ab7203f1c6b904538c4b0f1ce13138c5e00e6f05567992bfc51b8b459f84 WHIRLPOOL b3fd2d9b04d3c274295f69af3227e87162f2930ed1c559ac73545d43b7b18b0ec5e36fe801881e70fbe37706bcabad1346ad363aacc461cfb8c493d308f6fa8b
+EBUILD aggregate-1.6.ebuild 651 SHA256 998e9c8a09711fc7fc5b86f348429957389598f1eb7a9f5ac37ab5b372f6bc08 SHA512 5862c00f51063af12cb5b4a1b68c5b4e032c5f71223ea8c75c8ae64f31bd1113ae5d58dd62d70a5ad2bb75a098a8b325ca8bed00fa867b3150aa744c8b4970dd WHIRLPOOL 0b41ba26a3c0b47ce4ba05f5429ad4ba120f3bd107ddb054d0e500a7927dbff44e7c2990cfb83ec62491cc556aa1361dedc341dc92c0c533b211c94a696faff7
+MISC ChangeLog 2218 SHA256 7b7a79db0ef751528f313d1aa37f5fa4ce0b4d2da796d9dbf98cb76b8ea24970 SHA512 b36a759c69a5bd38c4dfd9212f057cc4f349255128b320618456073c5aaba10a18f796508c65dd9413cc69e40a1b2bfa0dd7609a628adf3de56bc110fdfdde2d WHIRLPOOL e6ab223df98034a63b34fe616959d6266d5a56703bdc43e0dff387415947d14339f623a77f9115fb1acfb3f56b82d938ca4a83bdcca1d864cbbd99a237cca30b
+MISC ChangeLog-2015 2256 SHA256 9b63c6fe86f922ac5385b3ddda9e1af848a8a36d9cb278b897b5d4616241f9bc SHA512 d7ffd804980a507b350b5015bacd508967d003ca3bbaaaff10a81d9550038540b04f4820645438dd7824374168529485778ebf467c927ef86d4e1172200e560e WHIRLPOOL 24f6516f6bdbb95cfeb5fdae6e531371c0a41db2ef4b41d7261c640363e9e8e76a31e1b73431d8201d1bd57b681ed084b9da170d19b49dd3dd558862cf5aec04
+MISC metadata.xml 975 SHA256 91d65720e25bfec9298c7877aaad91df8fe9c90882d44df88795964640db3efa SHA512 f192380066542eb7a770edc78e4804f06b41bdc65dcd70a9a69618789220c220c7d97e9ba979e3cebb2d9813bf26664bfb7536d4c51e01071964561d72dac054 WHIRLPOOL ad113480f1070fb7bca241ed9552e75f1420c660ee6e3b3cd21169a1fccd68734c145aa97e0b00db11ce2f6993b68f8be5693bc32b121ed325a8a9d33a40226e
diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild
new file mode 100644
index 000000000000..a8700cfabbd5
--- /dev/null
+++ b/net-misc/aggregate/aggregate-1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Take a list of prefixes and perform two optimisations to reduce the length of the prefix list"
+HOMEPAGE="http://dist.automagic.org/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build-fixup.patch
+}
+
+src_configure() {
+	tc-export CC
+	econf
+}
+
+src_install() {
+	dobin aggregate aggregate-ios || die
+	doman aggregate{,-ios}.1
+	dodoc HISTORY
+}
diff --git a/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
new file mode 100644
index 000000000000..51c9f9f96128
--- /dev/null
+++ b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
@@ -0,0 +1,14 @@
+diff -Nuar aggregate-1.6.orig/Makefile.in aggregate-1.6/Makefile.in
+--- aggregate-1.6.orig/Makefile.in	2002-03-06 08:59:37.000000000 -0800
++++ aggregate-1.6/Makefile.in	2008-10-10 01:31:42.613937925 -0700
+@@ -25,8 +25,8 @@
+ INSTALL = @INSTALL@
+ DEFS = @DEFS@
+ LIBS = @LIBS@
+-CFLAGS = -O
+-LDFLAGS = -s
++CFLAGS +=
++LDFLAGS +=
+ prefix = @prefix@
+ 
+ SHELL = /bin/sh
diff --git a/net-misc/aggregate/metadata.xml b/net-misc/aggregate/metadata.xml
new file mode 100644
index 000000000000..fa0367d8f9ea
--- /dev/null
+++ b/net-misc/aggregate/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+</maintainer>
+<longdescription>aggregate is a tool for aggregating CIDR networks. Input is read from stdin and output is written to stdout. It understands IPv4 networks represented as network/prefix, network/netmask and start_address - end_address. It is able to read input in any one of these formats and output in the same or a different format.</longdescription>
+<longdescription lang="ja">
+Aggregate は CIDR ネットワークをアグリゲートするツールです。
+stdin を入力とし、stdoutを出力とします。IPv4 を network/prefix または
+network/netmask 、start_address - end_address の記述形式で理解します。
+それ等記述形式の入力を読み込み、同じ形式又は異なる形式で出力します。
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
new file mode 100644
index 000000000000..434f16d3f66e
--- /dev/null
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -0,0 +1,10 @@
+AUX confd 90 SHA256 cabcc9da711514913e5136c82842c750bab8a9658aeeb88da5a266e0d69b29a1 SHA512 14412f717ad334e6ce5cf65b9b0968fc3ab27e93f3d3ce52d39e0b646694e8e7d7905ede25feeabad6ef3301b5644677f30e27b867ff32f665ab6c4e2cd0a662 WHIRLPOOL b6e2a87ef590b806a128bc7198b2d278fede6bdd6b5326f3dd1bcbda193e8c56248a997e01e624e4c7468b9f459c8d18fc3c9631263dd560ff0601bf5dde3598
+AUX cron.daily 459 SHA256 6ec7ceeead17ef5a84d5ec5472d38810d9e1478213643da5f3fd9863dde40094 SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a WHIRLPOOL e9c69a8d21a38435522f02fd7ac4b2924ad641e2058a9bc3ae051f155eee500e33d116cf868328a665d082c616c42ba3e5de751437ba24eef193541975e792db
+AUX initd 725 SHA256 68038952d9c31889adb3716f9b54725d2f0cbd9872b2e4b0ed94e5018ab92858 SHA512 de8dbff432540d3b725556bb9189e14cf06afc876ec636a9ae2a00ee6158f791a9306c2630cfbf11de80b81ffadb45f39bae235c5d9ee76b5245c0599a387b0a WHIRLPOOL 36bd21736879f143f1657f92c78a9ed202c74962ce86f8736797f6e40f5d92ea273d55c23ab850a655e45b25fba52c39655372123314a79faf327bfb97020314
+AUX initd-r1 906 SHA256 161f65213c87f5baf594c390e81194969c5724b0555e6ef58ac42ac6ed23b77f SHA512 c4aa04ea30734f00c617684ea014c632bf0d43580ae7b7c6e9ae58e2c947d15177f93e7b92fd9f7b79d1898d0c6a386de1da7fa038dace6381cd72907845e57c WHIRLPOOL 8e791c5c3b23f0b1c75fb8be26ea4d3644315860e22f53770ded7d35af41c92288ce9ccf7367ba67c2fc8d4e776ac65b9b950f28b2b3b820fdc7b0b4ec8a851e
+AUX logrotate 377 SHA256 6f1624d655383452a6d56d69327d41b80379cc667ad2d481ca94f8ea78f7a65b SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885 WHIRLPOOL 80037bc359ffb860ce19e2493d10597f81e02138368ad2bce002da8f4a725cdeee61662478efff4755f0f8a0c9f376263fd6b56505eddddd5c18c1a33f7d22b8
+DIST apt-cacher-ng_3.orig.tar.xz 319996 SHA256 e5b435007ec13fafcebeef65a3a8ec4210853e339efeb98ea79d1a3557f63611 SHA512 4eb520d724c1397b9deefe8dc1b0af81f2151e50d1cabfc2480f040233ae1ee95434d0dcf2b4db8aec918204ae676a49e19e3c885674c7fb389972c2da64c3d4 WHIRLPOOL 261ae398d476498d74b22af91bf9e824b5b51f597eb010677d962e2f8a6327d9c0b3fa71211d293e6d98c8b11dcdb1edae91c97618679cfb185c87a2c63f5982
+EBUILD apt-cacher-ng-3.ebuild 2490 SHA256 2f844ac94e62b9a4bd5a7db5df1298a62d75d18ccf642071dbb079d9c9d792b6 SHA512 1b40a054f5a67e5ae802570a191691fa97d8fa275d11789a210b2d9c8e6c6c625fdcb46d6aa09736ede0c0133e77b873a033d18a414cc79c99152656c28573f6 WHIRLPOOL 28dbe09b4984b57825ca53d8073e6d657b6c9bfa3718259da822aca1f3d795a7cf5c4ae71be6c623bf38d04568010dfa0f68796df2d5e8d2ee443eece5066814
+MISC ChangeLog 6829 SHA256 4fb15eb419baf69aeaa3edaff5d71137d2aeb1db33d8ffe8cf4810a4e07c0baa SHA512 1b830ebb48b2d0d1affe4aca7054da4288f33c01af0d6744191c2b01cc7205f0b2ae86e5e34e5da5b4bbc9cef5f467cb4f4812810adf2b7c2ea3cefe62969eb0 WHIRLPOOL b811e766109df1b92766c4b2a9af25157e6f1446b0eca45a2dc65c1da89d62c1d75564221071edc594337993f3bd6be3a44d7f68612ed36391d6de67b2719546
+MISC ChangeLog-2015 9341 SHA256 c10b997bb9e9411ec5df0198de9378a0864e37b68c07f51e227ea0e8e41a981e SHA512 5cb7c0b12a2831793269495da72eef8527863468f3351e76ad035ba17c4b8c3912c169d044e4f226183953611fd691d3254c58000b0db1cc90db8dbf9b44ef04 WHIRLPOOL 909700ebb5d0a465fc12984a5cb73f72ff8bf3eb0e8d99598a203da32e5357f79d4040c9b9e2921a11c380d09a42775a018c02bb257bbbad0f6cff94e02b3226
+MISC metadata.xml 493 SHA256 8d3bd73dbbd84f8b52225d902d6e90f3202e3c217aa19d099217a20d3da237a7 SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6 WHIRLPOOL 4dc7dda8b2cab7b62049a4ee12a83b699e3689bcb1c77f112192124688f492e719c0ed7b4b217cda3ab37177c7d854b8b64d1683737b48b4789a27d0ebe3b802
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.ebuild
new file mode 100644
index 000000000000..092180f5b76f
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-utils eutils toolchain-funcs user
+
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
+HOMEPAGE="
+	https://www.unix-ag.uni-kl.de/~bloch/acng/
+	https://packages.qa.debian.org/a/apt-cacher-ng.html
+"
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/openssl:*
+	sys-libs/zlib
+	systemd? (
+		sys-apps/systemd
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/cmake
+	>sys-devel/gcc-4.8
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+	fuse? ( sys-fs/fuse )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+S=${WORKDIR}/${P/_}
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	fi
+}
+
+pkg_setup() {
+	# add new user & group for daemon
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_configure(){
+	mycmakeargs=( "-DCMAKE_INSTALL_PREFIX=/usr" )
+	if use fuse; then
+		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
+	else
+		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
+	fi
+	if use tcpd; then
+		mycmakeargs=( "-DHAVE_LIBWRAP=yes" )
+	else
+		mycmakeargs=( "-DHAVE_LIBWRAP=no" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd ${CMAKE_BUILD_DIR}
+	dosbin ${PN}
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd
+
+	newinitd "${FILESDIR}"/initd-r1 ${PN}
+	newconfd "${FILESDIR}"/confd ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate ${PN}
+
+	doman doc/man/${PN}*
+	if use fuse; then
+		doman doc/man/acngfs*
+	fi
+
+	# Documentation
+	dodoc doc/README TODO VERSION INSTALL ChangeLog
+	if use doc; then
+		dodoc doc/*.pdf
+		dohtml doc/html/*
+		docinto examples/conf
+		dodoc conf/*
+	fi
+
+	# perl daily cron script
+	dosbin scripts/expire-caller.pl
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/cron.daily ${PN}
+
+	# default configuration
+	insinto /etc/${PN}
+	newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf
+	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
+
+	keepdir /var/log/${PN}
+	# Some directories must exists
+	keepdir /var/log/${PN}
+	fowners -R ${PN}:${PN} \
+		/etc/${PN} \
+		/var/log/${PN}
+}
diff --git a/net-misc/apt-cacher-ng/files/confd b/net-misc/apt-cacher-ng/files/confd
new file mode 100644
index 000000000000..72e76de133d1
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/confd
@@ -0,0 +1,2 @@
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=" -c /etc/apt-cacher-ng "
diff --git a/net-misc/apt-cacher-ng/files/cron.daily b/net-misc/apt-cacher-ng/files/cron.daily
new file mode 100644
index 000000000000..b5ea1436709c
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/cron.daily
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Run the expire function of apt-cacher-ng non-interactively (unless errors 
+# are detected).
+
+# optional, specify hostname to appear in error messages and links
+# HOSTNAME=externallyVisibleHostName
+# export HOSTNAME
+
+# optional, specify IP address to connect to
+# ACNGIP=10.0.1.3
+# export ACNGIP
+
+if test -r /usr/sbin/expire-caller.pl ; then
+   perl /usr/sbin/expire-caller.pl || echo Check error messages in /var/log/apt-cacher-ng/maint_*.log 
+fi
diff --git a/net-misc/apt-cacher-ng/files/initd b/net-misc/apt-cacher-ng/files/initd
new file mode 100644
index 000000000000..d054b4de76bd
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+NAME="apt-cacher-ng"
+DAEMON="/usr/sbin/$NAME"
+RUNDIR="/var/run/$NAME"
+PIDFILE="$RUNDIR/$NAME.pid"
+SOCKETFILE="$RUNDIR/$NAME.socket"
+DAEMON_OPTS="$DAEMON_OPTS pidfile=$PIDFILE SocketPath=$SOCKETFILE foreground=0"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $NAME"
+	checkpath -d -m 0755 -o ${NAME}:${NAME} ${RUNDIR}
+	start-stop-daemon --start --exec $DAEMON \
+	    --user $NAME --group $NAME \
+	    --pidfile $PIDFILE \
+	    -- $DAEMON_OPTS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $NAME"
+	start-stop-daemon --stop --retry 15 --exec $DAEMON \
+	    --pidfile $PIDFILE
+	rm -f $PIDFILE
+	eend $?
+}
diff --git a/net-misc/apt-cacher-ng/files/initd-r1 b/net-misc/apt-cacher-ng/files/initd-r1
new file mode 100644
index 000000000000..2e401dcd25a0
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/initd-r1
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON="/usr/sbin/${RC_SVCNAME}"
+RUNDIR="/var/run/${RC_SVCNAME}"
+CACHEDIR="var/cache/${RC_SVCNAME}"
+PIDFILE="${RUNDIR}/${RC_SVCNAME}.pid"
+SOCKETFILE="${RUNDIR}/${RC_SVCNAME}.socket"
+DAEMON_OPTS="${DAEMON_OPTS} pidfile=${PIDFILE} SocketPath=${SOCKETFILE} foreground=0"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting ${RC_SVCNAME}"
+	checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${RUNDIR}"
+	checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${CACHEDIR}"
+	start-stop-daemon --start --exec ${DAEMON} \
+	    --user ${RC_SVCNAME} --group ${RC_SVCNAME} \
+	    --pidfile ${PIDFILE} \
+	    -- ${DAEMON_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${RC_SVCNAME}"
+	start-stop-daemon --stop --retry 15 --exec ${DAEMON} \
+	    --pidfile ${PIDFILE}
+	rm -f ${PIDFILE}
+	eend $?
+}
diff --git a/net-misc/apt-cacher-ng/files/logrotate b/net-misc/apt-cacher-ng/files/logrotate
new file mode 100644
index 000000000000..330f2b6b6616
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/logrotate
@@ -0,0 +1,15 @@
+/var/log/apt-cacher-ng/*.log {
+        size 10M
+        missingok
+        rotate 12
+        compress
+        delaycompress
+        notifempty
+        create
+        postrotate
+                if [ -s /var/run/apt-cacher-ng/apt-cacher-ng.pid ] ; then
+                        kill -s USR1 "$(cat /var/run/apt-cacher-ng/apt-cacher-ng.pid)"
+                fi
+        endscript
+}
+
diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
new file mode 100644
index 000000000000..88aef1304357
--- /dev/null
+++ b/net-misc/apt-cacher-ng/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+<maintainer type="project">
+<email>deb-tools@gentoo.org</email>
+<name>Gentoo Debian Tools Project</name>
+</maintainer>
+<use>
+<flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
new file mode 100644
index 000000000000..8af281fb23e9
--- /dev/null
+++ b/net-misc/aria2/Manifest
@@ -0,0 +1,9 @@
+DIST aria2-1.30.0.tar.xz 1497124 SHA256 bf6c5366d11d2a6038c8e19f01f9b874041793aaf317e0206120e3e8c9c431f6 SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38 WHIRLPOOL c3613212226c1fe6db20b45dce021441fceaf26970e8773064ef254e3a1272550c9c8e69d2fa677d249a70c853d6ba65c91fa1a42c33009127177b496fcbda0a
+DIST aria2-1.31.0.tar.xz 1501388 SHA256 7b85619048b23406f241e38a5b1b8b0bc2cae9e80fd117810c2a71ecca813f8c SHA512 a0a1312522324dc0bc24cf1a5cceaef49d40445668ed0bd98dc3cdd5e2edb428552e97504c8c072f5d1180d6bbd252de01d290ef5c94d1803b8ade330bc2710f WHIRLPOOL 0b5af6d2f9f7e62a2620003a0aa44e842517cb33be00a7e1b0f7ac2720823c5d32deafd91ae096d8ef028f89885c08f459a03955ee349fd6d21dade190895596
+DIST aria2-1.32.0.tar.xz 1502192 SHA256 546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50 SHA512 7c14c395fab3024191145b5c965c6c89211cd36ce405cafeef350aa6df9850bee9de65e756eab7d0bdeccb9409b829ea21552b9aac0166f50dcc17501b3dca8b WHIRLPOOL 763188033573b5928c7935229505cd82f39009952aa78b7871c1c1579dde54b46185a0d378e3d7241230d0611ba1b7d96c04ed4c09049d38d89b6b550391a0aa
+EBUILD aria2-1.30.0.ebuild 4270 SHA256 c26cc95a0ef219c28d79c6e2405c668be7263e2e871feb481b42ee4aac836a69 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a WHIRLPOOL 92e31ad36a7af8f948b30af0c1db18b35a1be0e4e6305abd83e6a14279aab2bed0197d8cdd59673fc3a795a2afddbc060a52182333743dbe3c1ab096b50d5cd4
+EBUILD aria2-1.31.0.ebuild 4272 SHA256 a2378044f2e76f0f484d5b8f456126a74c95eaf57bd18df642e4e726700683e5 SHA512 bf640ec2df8a7949ae45e02f9ae6902e2e1580b02806c47e6aebb68d4042c5babe077e3f0e77d7afcac411afcfc09c5990840b04a9606fde7205630352d41620 WHIRLPOOL 72baf026f1d7afaf5529e82fa332d8d928169ce3abea7ae6f7350e030a49c3f034a534e707fa3469d9becb49f614baa92396ef4344478462e7725f674c0c3c0e
+EBUILD aria2-1.32.0.ebuild 4272 SHA256 9924dfc61b067bea5276b1f7d0e301504ab6c1c532e117825c70c22ae8680a1a SHA512 4f73b5e35ddfea0db6a6c2dde96fa0515081035d85b4de94e1c9e422b5809ebd794c3a43ab4ec92598a5d87245784a85573b476b6c289a6f47c0f3ce8d4f2de0 WHIRLPOOL 80eaeadca7709ff684b7ffdf9a5f7cdd07cb5c4790b6a7d1ea69c2f72a9b2094e563fdaeb1401ec6443ce53981199015d5a50553f4b9390a42bd62c022d98d11
+MISC ChangeLog 5344 SHA256 c768182e71fa27648d3dff3921210b94d54b15435675050d5c86a9dcdc6ad4c9 SHA512 e4e44765fb208e2d2f738313734ff1752fdbf81c1c3aedcc86f80cd4d1ad861b150d47f637514c4f2756ec9a0e457b68178dfd2c5edc0dfdc7ed18d7992f37de WHIRLPOOL adfb7b2929474b829b2c344ceb562e2b28b177dcca36517d9da58db6a28b8cb389106879eb2bd11169cb629292dedc451bc7144c6280ae3f7c14755ae39e709f
+MISC ChangeLog-2015 18690 SHA256 49174891fb6733e8b06fec8157a893c7bd2cf8fd721a9b344594dec4505cca8e SHA512 d2150927738c9569ee1ed4ab061dda15869a89cfdef3d06c9daa800415841c9d870a27382676b850e56f7ca08c8625d9e0a7158e592128598876323b25d21f1a WHIRLPOOL 1ea59e84acacc1887ff564e33913771e628355cb46034b87d3f40b0169153ee127ce5381c500ce2e2176f1ceb56cfd3ab2a59b3dd62a4ba04622c6f154273a6e
+MISC metadata.xml 1325 SHA256 43d4f4b9ab0bd9c69920bec643be53e2ffa5a67199e076052163874a93528261 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f WHIRLPOOL 872b42cf7a92d97ac4defa4583f705bde77f8165ef8cbf6657961d816ab14081d5e282d24f05ba3bd00a5531429a952ed0f0b5f3f7870b743ec73de9a822eb11
diff --git a/net-misc/aria2/aria2-1.30.0.ebuild b/net-misc/aria2/aria2-1.30.0.ebuild
new file mode 100644
index 000000000000..fd1ac628d47b
--- /dev/null
+++ b/net-misc/aria2/aria2-1.30.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit bash-completion-r1
+
+DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
+HOMEPAGE="https://aria2.github.io/"
+SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
+
+CDEPEND="sys-libs/zlib:0=
+	ssl? (
+		app-misc/ca-certificates
+		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
+		!gnutls? ( dev-libs/openssl:0= ) )
+	adns? ( >=net-dns/c-ares-1.5.0:0= )
+	bittorrent? (
+		ssl? (
+			gnutls? (
+				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
+				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
+		!ssl? (
+			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
+	jemalloc? ( dev-libs/jemalloc )
+	libuv? ( dev-libs/libuv:0= )
+	metalink? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )
+	sqlite? ( dev-db/sqlite:3= )
+	ssh? ( net-libs/libssh2:= )
+	tcmalloc? ( dev-util/google-perftools )
+	xmlrpc? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )"
+
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-util/cppunit-1.12.0:0 )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libiconv virtual/libintl )
+	scripts? ( dev-lang/ruby )"
+
+# xmlrpc has no explicit switch, it's turned out by any XML library
+# so metalink implicitly forces it on
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	metalink? ( xmlrpc )"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	if use scripts && ! use xmlrpc; then
+		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
+		ewarn "and aria2mon scripts against the local aria2."
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# threads, epoll: check for best portability
+
+		# do not try to compile and run a test LIBXML program
+		--disable-xmltest
+		# enable the shared library
+		--enable-libaria2
+		# zlib should always be available anyway
+		--with-libz
+		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+
+		# optional features
+		$(use_enable bittorrent)
+		$(use_enable metalink)
+		$(use_enable nls)
+		$(use_with adns libcares)
+		$(use_with jemalloc)
+		$(use_with libuv)
+		$(use_with sqlite sqlite3)
+		$(use_with ssh libssh2)
+		$(use_with tcmalloc)
+	)
+
+	# SSL := gnutls / openssl
+	# USE=ssl
+	#  + USE=gnutls -> gnutls
+	#  + USE=-gnutls -> openssl
+
+	if use ssl; then
+		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
+	else
+		myconf+=( --without-gnutls --without-openssl )
+	fi
+
+	# message-digest := nettle / gcrypt / openssl
+	# bignum := nettle+gmp / gcrypt / openssl
+	# bittorrent := message-digest + bignum
+	# USE=bittorrent
+	#  + USE=(ssl -gnutls) -> openssl
+	#  + USE=nettle -> nettle+gmp
+	#  + USE=-nettle -> gcrypt
+
+	if use !bittorrent || use ssl && use !gnutls; then
+		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
+	else
+		myconf+=( $(use_with !nettle libgcrypt)
+			$(use_with nettle libnettle) $(use_with nettle libgmp) )
+	fi
+
+	# metalink+xmlrpc := libxml2 / expat
+	# USE=(metalink || xmlrpc)
+	#  + USE=libxml2 -> libxml2
+	#  + USE=-libxml2 -> expat
+
+	if use metalink || use xmlrpc; then
+		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
+	else
+		myconf+=( --without-libexpat --without-libxml2 )
+	fi
+
+	# Note:
+	# - always enable gzip/http compression since zlib should always be available anyway
+	# - always enable epoll since we can assume kernel 2.6.x
+	# - other options for threads: solaris, pth, win32
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${D}"/usr/share/doc/aria2 \
+		"${D}"/usr/share/doc/${PF}/README{,.html}
+
+	dobashcomp doc/bash_completion/aria2c
+	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
+}
+
+pkg_postinst() {
+	if use xmlrpc; then
+		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
+		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
+	fi
+}
diff --git a/net-misc/aria2/aria2-1.31.0.ebuild b/net-misc/aria2/aria2-1.31.0.ebuild
new file mode 100644
index 000000000000..b0c010ec8637
--- /dev/null
+++ b/net-misc/aria2/aria2-1.31.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit bash-completion-r1
+
+DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
+HOMEPAGE="https://aria2.github.io/"
+SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
+
+CDEPEND="sys-libs/zlib:0=
+	ssl? (
+		app-misc/ca-certificates
+		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
+		!gnutls? ( dev-libs/openssl:0= ) )
+	adns? ( >=net-dns/c-ares-1.5.0:0= )
+	bittorrent? (
+		ssl? (
+			gnutls? (
+				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
+				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
+		!ssl? (
+			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
+	jemalloc? ( dev-libs/jemalloc )
+	libuv? ( dev-libs/libuv:0= )
+	metalink? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )
+	sqlite? ( dev-db/sqlite:3= )
+	ssh? ( net-libs/libssh2:= )
+	tcmalloc? ( dev-util/google-perftools )
+	xmlrpc? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )"
+
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-util/cppunit-1.12.0:0 )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libiconv virtual/libintl )
+	scripts? ( dev-lang/ruby )"
+
+# xmlrpc has no explicit switch, it's turned out by any XML library
+# so metalink implicitly forces it on
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	metalink? ( xmlrpc )"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	if use scripts && ! use xmlrpc; then
+		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
+		ewarn "and aria2mon scripts against the local aria2."
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# threads, epoll: check for best portability
+
+		# do not try to compile and run a test LIBXML program
+		--disable-xmltest
+		# enable the shared library
+		--enable-libaria2
+		# zlib should always be available anyway
+		--with-libz
+		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+
+		# optional features
+		$(use_enable bittorrent)
+		$(use_enable metalink)
+		$(use_enable nls)
+		$(use_with adns libcares)
+		$(use_with jemalloc)
+		$(use_with libuv)
+		$(use_with sqlite sqlite3)
+		$(use_with ssh libssh2)
+		$(use_with tcmalloc)
+	)
+
+	# SSL := gnutls / openssl
+	# USE=ssl
+	#  + USE=gnutls -> gnutls
+	#  + USE=-gnutls -> openssl
+
+	if use ssl; then
+		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
+	else
+		myconf+=( --without-gnutls --without-openssl )
+	fi
+
+	# message-digest := nettle / gcrypt / openssl
+	# bignum := nettle+gmp / gcrypt / openssl
+	# bittorrent := message-digest + bignum
+	# USE=bittorrent
+	#  + USE=(ssl -gnutls) -> openssl
+	#  + USE=nettle -> nettle+gmp
+	#  + USE=-nettle -> gcrypt
+
+	if use !bittorrent || use ssl && use !gnutls; then
+		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
+	else
+		myconf+=( $(use_with !nettle libgcrypt)
+			$(use_with nettle libnettle) $(use_with nettle libgmp) )
+	fi
+
+	# metalink+xmlrpc := libxml2 / expat
+	# USE=(metalink || xmlrpc)
+	#  + USE=libxml2 -> libxml2
+	#  + USE=-libxml2 -> expat
+
+	if use metalink || use xmlrpc; then
+		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
+	else
+		myconf+=( --without-libexpat --without-libxml2 )
+	fi
+
+	# Note:
+	# - always enable gzip/http compression since zlib should always be available anyway
+	# - always enable epoll since we can assume kernel 2.6.x
+	# - other options for threads: solaris, pth, win32
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${D}"/usr/share/doc/aria2 \
+		"${D}"/usr/share/doc/${PF}/README{,.html}
+
+	dobashcomp doc/bash_completion/aria2c
+	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
+}
+
+pkg_postinst() {
+	if use xmlrpc; then
+		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
+		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
+	fi
+}
diff --git a/net-misc/aria2/aria2-1.32.0.ebuild b/net-misc/aria2/aria2-1.32.0.ebuild
new file mode 100644
index 000000000000..de956e8d1695
--- /dev/null
+++ b/net-misc/aria2/aria2-1.32.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit bash-completion-r1
+
+DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
+HOMEPAGE="https://aria2.github.io/"
+SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
+
+CDEPEND="sys-libs/zlib:0=
+	ssl? (
+		app-misc/ca-certificates
+		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
+		!gnutls? ( dev-libs/openssl:0= ) )
+	adns? ( >=net-dns/c-ares-1.5.0:0= )
+	bittorrent? (
+		ssl? (
+			gnutls? (
+				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
+				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
+		!ssl? (
+			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
+	jemalloc? ( dev-libs/jemalloc )
+	libuv? ( dev-libs/libuv:0= )
+	metalink? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )
+	sqlite? ( dev-db/sqlite:3= )
+	ssh? ( net-libs/libssh2:= )
+	tcmalloc? ( dev-util/google-perftools )
+	xmlrpc? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )"
+
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-util/cppunit-1.12.0:0 )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libiconv virtual/libintl )
+	scripts? ( dev-lang/ruby )"
+
+# xmlrpc has no explicit switch, it's turned out by any XML library
+# so metalink implicitly forces it on
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	metalink? ( xmlrpc )"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	if use scripts && ! use xmlrpc; then
+		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
+		ewarn "and aria2mon scripts against the local aria2."
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# threads, epoll: check for best portability
+
+		# do not try to compile and run a test LIBXML program
+		--disable-xmltest
+		# enable the shared library
+		--enable-libaria2
+		# zlib should always be available anyway
+		--with-libz
+		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+
+		# optional features
+		$(use_enable bittorrent)
+		$(use_enable metalink)
+		$(use_enable nls)
+		$(use_with adns libcares)
+		$(use_with jemalloc)
+		$(use_with libuv)
+		$(use_with sqlite sqlite3)
+		$(use_with ssh libssh2)
+		$(use_with tcmalloc)
+	)
+
+	# SSL := gnutls / openssl
+	# USE=ssl
+	#  + USE=gnutls -> gnutls
+	#  + USE=-gnutls -> openssl
+
+	if use ssl; then
+		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
+	else
+		myconf+=( --without-gnutls --without-openssl )
+	fi
+
+	# message-digest := nettle / gcrypt / openssl
+	# bignum := nettle+gmp / gcrypt / openssl
+	# bittorrent := message-digest + bignum
+	# USE=bittorrent
+	#  + USE=(ssl -gnutls) -> openssl
+	#  + USE=nettle -> nettle+gmp
+	#  + USE=-nettle -> gcrypt
+
+	if use !bittorrent || use ssl && use !gnutls; then
+		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
+	else
+		myconf+=( $(use_with !nettle libgcrypt)
+			$(use_with nettle libnettle) $(use_with nettle libgmp) )
+	fi
+
+	# metalink+xmlrpc := libxml2 / expat
+	# USE=(metalink || xmlrpc)
+	#  + USE=libxml2 -> libxml2
+	#  + USE=-libxml2 -> expat
+
+	if use metalink || use xmlrpc; then
+		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
+	else
+		myconf+=( --without-libexpat --without-libxml2 )
+	fi
+
+	# Note:
+	# - always enable gzip/http compression since zlib should always be available anyway
+	# - always enable epoll since we can assume kernel 2.6.x
+	# - other options for threads: solaris, pth, win32
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${D}"/usr/share/doc/aria2 \
+		"${D}"/usr/share/doc/${PF}/README{,.html}
+
+	dobashcomp doc/bash_completion/aria2c
+	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
+}
+
+pkg_postinst() {
+	if use xmlrpc; then
+		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
+		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
+	fi
+}
diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml
new file mode 100644
index 000000000000..18fb229e976f
--- /dev/null
+++ b/net-misc/aria2/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="bittorrent">Enable support for the bittorrent protocol.</flag>
+		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> to replace the malloc() implementation with a possibly faster one</flag>
+		<flag name="libuv">Use <pkg>dev-libs/libuv</pkg> backend.</flag>
+		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of <pkg>dev-libs/expat</pkg>.</flag>
+		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> and <pkg>dev-libs/gmp</pkg> for bittorrent/metalink crypto instead of <pkg>dev-libs/libgcrypt</pkg> (when <pkg>dev-libs/openssl</pkg> is not being used).</flag>
+		<flag name="metalink">Enable support for metalink.</flag>
+		<flag name="scripts">Install additional scripts which use aria2's xmlrpc functionality.</flag>
+		<flag name="ssh">Enable SFTP support.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">aria2</remote-id>
+		<remote-id type="github">tatsuhiro-t/aria2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/arm/Manifest b/net-misc/arm/Manifest
new file mode 100644
index 000000000000..d2d3069cf3c7
--- /dev/null
+++ b/net-misc/arm/Manifest
@@ -0,0 +1,7 @@
+DIST arm-1.4.5.0.tar.bz2 303760 SHA256 fc0e771585dde3803873b4807578060f0556cf1cac6c38840a714ffada3b28fa SHA512 60560761ba55f39c5b1ddafec9e67dc0cd052804224bf40a229d1a8c8ce87635465147933686078d02584b8681710c99ec169490550d33b7fab5212ac6933519 WHIRLPOOL 12c4aef7a9bb15fe8defc112d98def6a7f0d120588c9831a22aca49fb1bd5a76f7ce1f8eff9d675e682464c31f7335a340c6427ad57cb6545b497941eac86fad
+DIST arm-1.4.5.0_p20140714.tar.gz 185569 SHA256 08c81a781dbffbad7f1a76a6211edece03a2721f6f6327352b4a9b952dda4286 SHA512 65145796958a71385f5b8bf0a0a05cd123f5481718480d65d8d48dc3a4cc4fd198158cfe8e5b2a4dbe98818d3d93642694bed18ca6f9ca4bf7f668eb769aee9f WHIRLPOOL 23df21a1c62634a96b201cdc60e165118f80d702b974fd795a58020f1f5a7c191e8977872c31b71ba72f2a18deefcbcd16e74041218fe97d2bf39fe0bc7398b7
+EBUILD arm-1.4.5.0-r2.ebuild 1252 SHA256 50e40ad4782d855efeaa44a00d5724adf6bddac05324868085355734acbffb98 SHA512 e18e83e529a146e671de966412c215da4d559502d614230fbb37b0f8fbf414fac247c83a2a0b840337005e386e3f380992a29bcf196e13b6c0d896945a17950d WHIRLPOOL cd768f6820115c58394dc8d462598ac31ba1017ba19749fedb3bc7f00ad5f25d53fb49915dd985971e66b63c48725dbf690887e9e982f848e3b68c2fe96719c3
+EBUILD arm-1.4.5.0_p20140714-r2.ebuild 1838 SHA256 ef394545ddd95b4409d1f71bddbb29d417db155289ea1b9dc5b976a0c72ea66e SHA512 3d8c3d0d6345cd4ab5758ce2d472520cc78774199b2eb9e5b7552b33a7c559ebe69a287fb7ddb83180a2f0942d191c8c5e0a40eea8ec7e146f52374779475eed WHIRLPOOL 272f9b75faed49163368f7d923d9b299f67aba46f06434872d27f09d922e397351b074df4fca5e046730e62480467842cf9773b7a1d09d6f3ca2e2e697ebf0f8
+MISC ChangeLog 2499 SHA256 c7da1643a1f6d4220dfdf8f12e2186a0fc1b28e3b6543fa321da393478efb6ce SHA512 95565cabe9b76e2cb1c71faa000db6d173c6c97d7c23372342a80d6a930ad234f465b94c42038884b7c13d217865c1d0fb996dcc7132fdf59c28b3b60725e9b4 WHIRLPOOL a9df85d7f84152f1d64002902796b6f1e3ddf44c8d4ce68864fc2adbfe4a73aa2e640cd53b6a1037f4012e29fc6a3f872e3b8de7d644a8790021fb5f827f44e5
+MISC ChangeLog-2015 5236 SHA256 5a7f949d40f0bf02074f2d99a1d220993f5eda1208021cba57eeb04409084977 SHA512 1a53ff6a9e33ec0098495b9cc4437b1f57186c10c96a5fc680425ac8ed29be721b4cc6f36aaaeed95de190883af5065a06946613748654f84f5faa48f7b040a2 WHIRLPOOL ecacc9f68396d293c5c821c16b2527758963ab5e4368807ec6a03b173452fcffcd76fff9e48ac32ad73a8b65099d44c7b589443688d8127f1caba651c5012b54
+MISC metadata.xml 498 SHA256 fd4a183f2df1dd72681d01fe251dd4399c47284f52b87161d307e6d1533126e2 SHA512 8033a634a646f2211cda2d22a54a238d3b86b68c575f955848b39d1aa6e5985641d1e2ac2c64e48da28cb861431bd0ad199164c58e9730ceef5c04593ec3afee WHIRLPOOL dd6221a18bb734aff5c65d0c222448bc0d92b7a64386ab9dca12ab51dc906c29a8110e71a70f91be6a6aa7164918cec9fd2964a104e78cea13bc43b4c4221292
diff --git a/net-misc/arm/arm-1.4.5.0-r2.ebuild b/net-misc/arm/arm-1.4.5.0-r2.ebuild
new file mode 100644
index 000000000000..69b319c282dc
--- /dev/null
+++ b/net-misc/arm/arm-1.4.5.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses'
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A ncurses-based status monitor for Tor relays"
+HOMEPAGE="http://www.atagar.com/arm/"
+SRC_URI="http://www.atagar.com/arm/resources/static/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+# Note: While we depend on net-vpn/tor, we strictly speaking
+# don't have to because it could run on a different machine.
+RDEPEND="
+	>=net-vpn/tor-0.2.1.27
+	app-admin/sudo
+	sys-process/lsof
+	net-dns/bind-tools
+	virtual/man"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	python_fix_shebang .
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--docPath "${EPREFIX}/usr/share/doc/${PF}"
+
+	sed -i -e "s:python:${EPYTHON}:" "${ED}"usr/bin/arm || die
+}
+
+pkg_postinst() {
+	elog "Some graphing data issues have been noted in testing"
+	elog "when run as root. It is not recommended to run arm as"
+	elog "root until those issues have been isolated and fixed."
+	elog
+	elog "Trouble with graphs under app-misc/screen? Try:"
+	elog 'TERM="rxvt-unicode" arm'
+}
diff --git a/net-misc/arm/arm-1.4.5.0_p20140714-r2.ebuild b/net-misc/arm/arm-1.4.5.0_p20140714-r2.ebuild
new file mode 100644
index 000000000000..2a05500a0067
--- /dev/null
+++ b/net-misc/arm/arm-1.4.5.0_p20140714-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ncurses"
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="A ncurses-based status monitor for Tor relays"
+HOMEPAGE="http://www.atagar.com/arm/"
+COMMIT_ID="ac7923e31f52d3cf51b538ddf799162d67c04ecc"
+SRC_URI="https://gitweb.torproject.org/arm.git/snapshot/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=net-libs/stem-1.2.2_p20140718[${PYTHON_USEDEP}]
+	net-vpn/tor"
+
+python_prepare_all() {
+	sed -i -e "s/.version import VERSION/ import __version__ as VERSION/"\
+		-e "s/, 'arm.cli'//"\
+		-e "s/arm.cli/arm/g"\
+		-e "s/'arm.stem'//"\
+		-e "/gui/d"\
+		-e "s/\"arm\/settings.cfg\",//"\
+		-e "/install-purelib/d"\
+		-e "/eggPath/d" setup.py || die
+	sed -i -e "s/1.4.6_dev/${PV}/" arm/__init__.py || die
+	sed -i -e "s/line.replace(/line.replace(u/" arm/util/ui_tools.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install --docPath "${EPREFIX}"/usr/share/doc/${PF}
+	# Workaround until setup.py is fixed upstream
+	python_moduleinto arm
+	python_domodule arm/config
+	python_replicate_script "${ED}"/usr/bin/run_arm
+}
+python_install_all() {
+	distutils-r1_python_install_all --docPath "${EPREFIX}"/usr/share/doc/${PF}
+}
+
+python_test() {
+	${PYTHON} run_tests.py || die
+}
+
+pkg_postinst() {
+	elog "Some graphing data issues have been noted in testing"
+	elog "when run as root. It is not recommended to run arm as"
+	elog "root until those issues have been isolated and fixed."
+	elog
+	elog "Trouble with graphs under app-misc/screen? Try:"
+	elog 'TERM="rxvt-unicode" arm'
+}
diff --git a/net-misc/arm/metadata.xml b/net-misc/arm/metadata.xml
new file mode 100644
index 000000000000..f1dcc5dbf220
--- /dev/null
+++ b/net-misc/arm/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>jesse@boldandbusted.com</email>
+    <name>Jesse Adelman</name>
+  </maintainer>
+<maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/arpd/Manifest b/net-misc/arpd/Manifest
new file mode 100644
index 000000000000..c6e634229e31
--- /dev/null
+++ b/net-misc/arpd/Manifest
@@ -0,0 +1,8 @@
+AUX arpd-0.2-buildsystem-libevent-test.patch 446 SHA256 121094275b09266409ba29efda150c9acd0e8d840c0d099ba0cdd8390ed98d8a SHA512 391ad8f47d4f921d65eca692e70706c08804c1af65d779946bae8a520b6165921c0c3bd5e95a19ed078ffc7771f1b7247fce8d9e229834de2a0920853dbd0874 WHIRLPOOL fcbe5cce8c176b801a915c019a04ea3979470b114ef60e5ed117384cc00de55427f757832de1741a1ad07a5771e2e4ca7c57ebf86d9a1bf91ccaaa63fa113453
+AUX arpd-0.2-libevent.patch 506 SHA256 bb8baa1df8f6bf4b019875e27fc6f8e9f0599f0bbfb37ba7749503b3dd897187 SHA512 2b67af23366ed32a7354db84d372f1491571171b9b017d6c4eb3c52bc465fa9b5c1763327a5b99b69d89c46efab42590fcfc928442bd142485853cb0bbea7091 WHIRLPOOL 3883b6a8330423f4c05239492545ed1482f78474fa22e2bd7795eb29e071e6b6965d9b5b50a4d63522d5d440f1767da4720cac3f1548935b3ac5db4a3d308bed
+AUX arpd.c.patch 1477 SHA256 d193c5216b3c39741d6c00180d641471be9c80c68cc6a2100412671ae5e8627a SHA512 04ef9a49ddeca1543a8098b499c26cfea4ba470d488a92d33ccaded9dcfe0a2e1f01de2596ae0fe1e220f73ceed54fbcea20024152ce886d65af560234bb21a4 WHIRLPOOL 9952f837a9ef7ce79e25ddf4a74dcbf6158711ad4bbe1d2cf9744860fa46ec42be4125ee5c26ea08352db91111efa1ee35273fef6d29f7cb9b85fe0f990360e6
+DIST arpd-0.2.tar.gz 49437 SHA256 21d55de1506b3dbbfddb1b57e782a5fbf7140d299fbb08f4a8e48daaaa8489e7 SHA512 24bd4626188d74e172a46312790f8453619af2ac634c23379d1922c789ed97ef5db8a73ae13fccd98c94457da79682d6a1d7ccc3236c787f9d2eb15f64716ea2 WHIRLPOOL af0e590c0033daaf086bc70cb25129d69798ffd056fedd47707d0fc058f980a068b3ac682cbfcf7db4616872a0310b9ee8df7dc26ef5e6747f1def06bf673324
+EBUILD arpd-0.2-r1.ebuild 940 SHA256 a2bda7aa18776cc02a490dcb79fd7842650e41a69f11a1675ed6bf7ebeeff9fb SHA512 3d3315ad473ed88f20b788b290c2e04f142dc317489142db4cd35ad4b75efd034c6cc6617e234a97d09e1dfb86099a8313a329471efabe3f9440cc755891c327 WHIRLPOOL 6b0497dd7852edfb5164c8151aa80a3d2428ab52b3dd5f3190b67789e06657e0284c4231a38b04a61ca9e09c2c9566bbc55d8a8a18895586e284af234096c8e4
+MISC ChangeLog 2273 SHA256 c2f69c705ea8648a6c57979a08ff88b06838876d2065b51e24a5a8cfdc64bf38 SHA512 edd54ab93df396cb88ba694750f040aaa2e5131d9f88cbc29e85d6637df9e4fe6f053f333a596433a093de4c996fe1f2e8135f5cd3569d128b2eb654a1a51f76 WHIRLPOOL 2520ac5dc3a2ddaf2296a69f2c73e803c39127a1f002ec113c73b4426956fc361b63a3dc925cc86b2dc20d64e43a3bc4dc09ebfe33af56e140eacd4cbd28717e
+MISC ChangeLog-2015 2587 SHA256 a2945295dfa14c931200ad2a05df66cae11fdbf16f50030614e9548c1d31db61 SHA512 a57aa207d0eaf45ca51862bb09d731d1f71d8a8e2b83e9b30d9a5e490286d3caa324bf4f307653cb72c84dec63a9e66314b7e1a41d50b9f418b4093033d0e0a2 WHIRLPOOL d31fffbada20e72cf860740bab0f0f8ee32b96d6898e81c9132f93f1d32e8b53755d9dcc02dba8f1c858d5826a185e15bf1bcbed089495239fd598c617432360
+MISC metadata.xml 243 SHA256 ea7c9e5f065da7aa5425675f3750400b765c0eff02f0593783bb069401f73564 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b WHIRLPOOL 4028c4779286eb8eece0b9834f1f83ea8bd212c5255dbfb60605cabb7559ede33da53884a1788100998b2dcf26abed2cf82468a3275cabac58f9eceb1e596757
diff --git a/net-misc/arpd/arpd-0.2-r1.ebuild b/net-misc/arpd/arpd-0.2-r1.ebuild
new file mode 100644
index 000000000000..788d227dc629
--- /dev/null
+++ b/net-misc/arpd/arpd-0.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit autotools eutils
+
+DESCRIPTION="ARP server which claims all unassigned addresses (for network monitoring or simulation)"
+HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/"
+SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/libdnet-1.4
+	>=dev-libs/libevent-0.6
+	net-libs/libpcap
+	!sys-apps/iproute2"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/arpd.c.patch
+	epatch "${FILESDIR}"/${P}-libevent.patch
+
+	#fix bug 337481, replace test on libevent.a with libevent.so
+	epatch "${FILESDIR}"/${P}-buildsystem-libevent-test.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-libdnet="${EPREFIX}"/usr --with-libevent="${EPREFIX}"/usr
+}
+
+src_install() {
+	dosbin arpd || die
+	doman arpd.8 || die
+}
diff --git a/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch
new file mode 100644
index 000000000000..c0c0f47712a8
--- /dev/null
+++ b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2003-02-09 19:30:33.000000000 +0100
++++ configure.in	2010-09-17 00:33:36.138294836 +0200
+@@ -62,7 +62,7 @@
+      ;;
+   *)
+      AC_MSG_RESULT($withval)
+-     if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then
++     if test -f $withval/include/event.h -a -f $withval/lib/libevent.so; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+         EVENTINC="-I$withval/include"
diff --git a/net-misc/arpd/files/arpd-0.2-libevent.patch b/net-misc/arpd/files/arpd-0.2-libevent.patch
new file mode 100644
index 000000000000..2d5998f8c8d3
--- /dev/null
+++ b/net-misc/arpd/files/arpd-0.2-libevent.patch
@@ -0,0 +1,28 @@
+--- arpd.orig/arpd.c	2010-02-03 20:03:07.098748175 +0100
++++ arpd/arpd.c	2010-02-03 20:06:24.469749941 +0100
+@@ -445,9 +445,6 @@
+ void
+ terminate_handler(int sig)
+ {
+-	extern int event_gotsig;
+-
+-	event_gotsig = 1;
+ 	arpd_sig = sig;
+ }
+ 
+@@ -464,7 +461,6 @@
+ main(int argc, char *argv[])
+ {
+ 	struct event recv_ev;
+-	extern int (*event_sigcb)(void);
+ 	char *dev;
+ 	int c, debug;
+ 	FILE *fp;
+@@ -524,7 +520,6 @@
+ 		perror("signal");
+ 		return (-1);
+ 	}
+-	event_sigcb = arpd_signal;
+ 	
+ 	event_dispatch();
+ 
diff --git a/net-misc/arpd/files/arpd.c.patch b/net-misc/arpd/files/arpd.c.patch
new file mode 100644
index 000000000000..732ed16c92d7
--- /dev/null
+++ b/net-misc/arpd/files/arpd.c.patch
@@ -0,0 +1,42 @@
+--- arpd.c.orig	2005-03-30 15:13:37.136590624 -0700
++++ arpd.c	2005-03-30 15:23:50.295231384 -0700
+@@ -265,7 +265,7 @@
+ 	    spa->addr_ip, tha->addr_eth, tpa->addr_ip);
+ 	
+ 	if (op == ARP_OP_REQUEST) {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s",
++		syslog(LOG_DEBUG, __FUNCTION__, ": who-has %s tell %s", 
+ 		    addr_ntoa(tpa), addr_ntoa(spa));
+ 	} else if (op == ARP_OP_REPLY) {
+ 		syslog(LOG_INFO, "arp reply %s is-at %s",
+@@ -282,7 +282,7 @@
+ 	int error;
+ 
+ 	if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
++		syslog(LOG_DEBUG, __FUNCTION__, ": %s at %s",
+ 		    addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr));
+ 		return (0);
+ 	}
+@@ -291,10 +291,10 @@
+ 	error = arp_get(arpd_arp, &arpent);
+ 	
+ 	if (error == -1) {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s",
++		syslog(LOG_DEBUG, __FUNCTION__, ": no entry for %s",
+ 		    addr_ntoa(addr));
+ 	} else {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
++		syslog(LOG_DEBUG, __FUNCTION__, ": %s at %s",
+ 		    addr_ntoa(addr), addr_ntoa(&arpent.arp_ha));
+ 	}
+ 	return (error);
+@@ -423,7 +423,7 @@
+ 		if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) {
+ 			addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS,
+ 			    ethip->ar_sha, ETH_ADDR_LEN);
+-			syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
++			syslog(LOG_DEBUG, __FUNCTION__, ": %s at %s",
+ 			    addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
+ 			
+ 			/* This address is claimed */
diff --git a/net-misc/arpd/metadata.xml b/net-misc/arpd/metadata.xml
new file mode 100644
index 000000000000..3c3d5ced6412
--- /dev/null
+++ b/net-misc/arpd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/arpsponge/Manifest b/net-misc/arpsponge/Manifest
new file mode 100644
index 000000000000..9e61b2361ac3
--- /dev/null
+++ b/net-misc/arpsponge/Manifest
@@ -0,0 +1,7 @@
+AUX arpsponge.confd 285 SHA256 565d481e07329fbab7acb2398982661d697a674e316936813cb016450e8d1b12 SHA512 fc42640e5e5bfa155050ad289587a9e36909ab1043df210393d90437c22f7e1ecb72cdd7b9e61b1fc13e36f62c2ddac7677b57516b945352af08325090f8c0ca WHIRLPOOL f97c85a24c145652b208d9b64bf11e37da112170098fb1078a61b70636a1fde8ce45c37579c44f2eed0a597bbc6cabe9b60b201d46ff67555f514350be85c685
+AUX arpsponge.initd 396 SHA256 b7264c902d8ea2473b8bdabcbe5699e1c0831b4769507305334234513ac017b3 SHA512 cbb775b632ca7e351322edcd1e3258cc45f5f617e3afa7797696756050aa5dc7a7a9abdb58a054f64c5fb3016f2792c017af838ab26462b8ade6c81c5fb40e17 WHIRLPOOL 4f58ffff41860db69633b3448f80aae82ae26170dd9999abf16f31dea2b84cbbab6f6b54c46ca1637e79d5de2419452a6aa4b8f331bf6d46c29777d3e979759d
+DIST arpsponge-3.12.2.tar.gz 105507 SHA256 1b0f5062eb9c6c11cdafd5cc26b35275e71c5305bb91b827bab2f21f578a64cc SHA512 49106e03c03080b45f8c27f483dc2b95d588d156685966acc4e5c28d068a503c98aa3ef16fbdb8a8da6bae5dbe378b92dc82c932201cf5ce48cda4d006245a5b WHIRLPOOL d0877b052837d3d2dd15f74e925a9138be6ed1d7b18817937b4d513bdc140a7c2220ceb253d99cac69b81396dd3ea8d30bc78c2327ed354a1dbb95f0429ee529
+EBUILD arpsponge-3.12.2.ebuild 1512 SHA256 671206dc369c7b6bc7f7c0b0e436b2d98ecc5fabbeb84fb1e1ea9b7ab41eec98 SHA512 2539f848ab7aca49d2d0e0d4b2b05750e6d06ebfc0b0399cb584999cb9b60bccfa59008557768aceb2d1237474f4d536b5e82a3cd3ff2f68f223bf2935ceaac2 WHIRLPOOL 2b4ee9f0f26ca555daa65c2d8ec58d18c079a6461739d41f923f543a6277f5acca8d11d0cff0160439c9509b37f595ac15007470f81a975bd9c7e0c4886ce5b6
+MISC ChangeLog 2488 SHA256 98c5dc1390397acda85988b4998085406bfde1d0b64b1225ded4e717700c6516 SHA512 0637c46dfb9fb8739b8d4fa182afd997a5192bb0b6fdb0b1e24c10097d3e07d29a8e6548750c841fe6bdbaacbc1edef62a0aa79bbde5c0186f4073d903d1c7f4 WHIRLPOOL 87812dcdbb40739fbfa59d34b5870ce8146311ef9f0e32fa2346de3a386baddec1e1bae1b03ee06d6ffe276aac6b00216d20d049d07c5b193572eb1844cff127
+MISC ChangeLog-2015 593 SHA256 7d90bfb0d2718f0c06db90ee6e85079df4f834addbc65f2373a72b9e850944df SHA512 a6db5354c5c601fbee7013150ad43f490a79c9de9df56a62ed405720e306bc28deb71256a3ab6cd5cee2f86666e949be5dca15c0c10f95d38386a6f72926f116 WHIRLPOOL fe76befb70fc9c7a55a9e7dd2a3b85917d5059ad06e13248d01d0227ee0adb71c23dead95f8d939250ac495e950e13450f33f8f6eb878da8c29686f1a434d852
+MISC metadata.xml 251 SHA256 f6ff468128d9aa804b47d9a184c761b4123b908d302eec0953226acd00fc80df SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd WHIRLPOOL 1610f6ab9cfa21736bbc4643fec692b621f8889a5888b4189847af4aa6f5719829cfaba363c480483fe7e8fb2c40d417e986964b52cb21d564940c4b51f8554d
diff --git a/net-misc/arpsponge/arpsponge-3.12.2.ebuild b/net-misc/arpsponge/arpsponge-3.12.2.ebuild
new file mode 100644
index 000000000000..a96713244ae9
--- /dev/null
+++ b/net-misc/arpsponge/arpsponge-3.12.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit perl-module
+
+DESCRIPTION="Sweeps up stray ARP queries from a peering LAN"
+HOMEPAGE="https://www.ams-ix.net/downloads/arpsponge/"
+SRC_URI="https://www.ams-ix.net/downloads/${PN}/${PV}/${P}.tar.gz"
+LICENSE="|| ( GPL-1+ Artistic )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/IO-String
+	dev-perl/NetAddr-IP
+	dev-perl/NetPacket
+	dev-perl/Net-ARP
+	dev-perl/Net-Pcap
+	dev-perl/Readonly
+	dev-perl/TermReadKey
+	dev-perl/Term-ReadLine-Gnu
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Path
+	virtual/perl-Getopt-Long
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/make
+"
+
+src_install() {
+	perl_set_version
+	insinto ${VENDOR_LIB}/M6
+	doins lib/M6/ReadLine.pm
+
+	insinto ${VENDOR_LIB}/M6/ARP
+	doins lib/M6/ARP/Base.pm
+	doins lib/M6/ARP/Const.pm
+	doins lib/M6/ARP/Control.pm
+	doins lib/M6/ARP/Log.pm
+	doins lib/M6/ARP/NetPacket.pm
+	doins lib/M6/ARP/Sponge.pm
+	doins lib/M6/ARP/Table.pm
+	doins lib/M6/ARP/Util.pm
+	doins lib/M6/ARP/Queue.pm
+
+	insinto ${VENDOR_LIB}/M6/ARP/Control
+	doins lib/M6/ARP/Control/Base.pm
+	doins lib/M6/ARP/Control/Client.pm
+	doins lib/M6/ARP/Control/Server.pm
+
+	newinitd "${FILESDIR}/arpsponge.initd" arpsponge
+	newconfd "${FILESDIR}/arpsponge.confd" arpsponge
+	dosbin sbin/asctl sbin/arpsponge sbin/aslogtail
+	doman man/asctl.8 man/arpsponge.8 man/aslogtail.8
+	dodoc doc/command_mapping.txt doc/arpsponge_architecture.txt
+}
diff --git a/net-misc/arpsponge/files/arpsponge.confd b/net-misc/arpsponge/files/arpsponge.confd
new file mode 100644
index 000000000000..164ecfd591c6
--- /dev/null
+++ b/net-misc/arpsponge/files/arpsponge.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Mandatory arguments: IPADDR/PREFIXLEN dev IFNAME
+# 	Example: 192.168.0.0/24 dev eth0
+# For further information see "perldoc arpsponge" or "man arpsponge". 
+
+ARPSPONGE_OPTS=""
diff --git a/net-misc/arpsponge/files/arpsponge.initd b/net-misc/arpsponge/files/arpsponge.initd
new file mode 100644
index 000000000000..ccb911ca6968
--- /dev/null
+++ b/net-misc/arpsponge/files/arpsponge.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ARP sponge"
+	start-stop-daemon --start --quiet --exec /usr/sbin/arpsponge \
+		-- --daemon ${ARPSPONGE_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ARP sponge"
+	start-stop-daemon --stop --quiet -n arpsponge
+	eend $?
+}
diff --git a/net-misc/arpsponge/metadata.xml b/net-misc/arpsponge/metadata.xml
new file mode 100644
index 000000000000..5087760546f6
--- /dev/null
+++ b/net-misc/arpsponge/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest
new file mode 100644
index 000000000000..90dccabc3eaf
--- /dev/null
+++ b/net-misc/asterisk-core-sounds/Manifest
@@ -0,0 +1,77 @@
+DIST asterisk-core-sounds-en-alaw-1.4.21.tar.gz 7542917 SHA256 c1b2841a48cc21e0bb1645e065c9a58142f5dd1bfe4069f9712927438089ac61 SHA512 9cb9f5a7ff538223f7ade7c107d8c43ac36aa90eb2c53bd61e3189e81e4cde2e3aeee2ac1a77aa2bce1afa529e3f940f3518da2a5247b30f34ac1e779a7c33d0 WHIRLPOOL 4aaa819a0a8ec0514c9008a496d48935c8a826fcfb7c77779ad0e0376aff6d9bd3cce8ab6001eb855b814b75cef74c9ddc1c5d8d223af9b1e4591ee7cf5e4d38
+DIST asterisk-core-sounds-en-alaw-1.4.22.tar.gz 8533300 SHA256 396fe6bb150fb76bd69a26d9aabe5d56a95de347194d84dd80aaa2bbab8ae8ac SHA512 d2d57775115d29ece8cc08f90971c34efc6f30e77a9b1241c093ba99ec841459338c8589ab01aa4d4736848ad5c42c3b9d47587ca75f9fdb128cfbeea1d79a04 WHIRLPOOL 27198c977be6c2622d9a387db0952ef940e1311bc879993a52699f8d41c17c779b7b1ea6a830abbc5185bf98bd06409b4ee23383a11d2cfb657c1b3105553b63
+DIST asterisk-core-sounds-en-g722-1.4.21.tar.gz 8048225 SHA256 d066cdefc66f0bea90723973bc383a19ba5fb371684abc0b6ac6216cf7f3965a SHA512 4291b3343462ee7f701239e3a20e86e81ba71044d5c711e96c3524277eda60bdc5005ec1cfcfa26db7d09d90a9f29764cb2060e0b8edd0ef2c5af2aa0dc28e63 WHIRLPOOL 2e57561ce74a681aece16a259a0ebf3cbcee8f469e2c7f8b2410022e3fbf8d7641b283d73d29543b26299e2698d44fe913f462d187440f6f6a248787793fc48b
+DIST asterisk-core-sounds-en-g722-1.4.22.tar.gz 9058583 SHA256 5cbc97a98a29ca75d6a6b0e84eaa10e8c3057aff27b33685cace5591e68dc230 SHA512 2f0a01a5ef24b5b64de998be5a4a572b8a7871de01b2c46cc78e0e35988d3571343858c666ba59ca1f0cd6aaf35a46a2adaaad0afe10b453587422d337662651 WHIRLPOOL c4e9b7c0fa16bb706eb6e74d8a07e3eb7d780734845170c1e47bb9cf414c63921a427ab9510637ed8fc23c2043e9319916733d34329257d924cb542e4b3596cc
+DIST asterisk-core-sounds-en-g729-1.4.21.tar.gz 1116090 SHA256 303a37fffbcfe143c27d8d82babd5506b1b2d3ed7c25b4f5c9d04ea021c1a294 SHA512 ce9d64a97183b094069c5d90ceeafeb78a4cbc512b1c40396f5ac6caf285b961cb6dac5165a4a95e94523910701f80be5d27179c875776c5747f49423e112132 WHIRLPOOL 9288c6b31114b48d2060632bea76a22af1219e137a78f2d3137c3c4e334d6963992d16b6b2389a20b8c0896423e8a9f6e163263d8aed4449ad173b32bf5cb479
+DIST asterisk-core-sounds-en-g729-1.4.22.tar.gz 1281828 SHA256 ecefc211f44503a707bd93110673ecfa8bee59b0af6056875fdf8fda4c37d536 SHA512 62b96851cc2ef8e2801b81ca6e6f289a7ff44f6477b39a4bfb1af3f81feb5ccc429cbbd8ff6902910af067b981764f808f2ea16bc0c9eb8ba1138f72aacf29a8 WHIRLPOOL 97660e82aa2176d62cc66341e50aa9c396345ead9eb9305923bb2677c7d688222160c985bc90bf67048e397e987b501b4098885e3949f7a0fa38f8d2af7f80cc
+DIST asterisk-core-sounds-en-gsm-1.4.21.tar.gz 1785758 SHA256 8a77918aa34a9a88056683908d7eece62fd3ed8f577e56f69bba6860d5280314 SHA512 0c5590dc7b7b6a926319f653a0ae2e66f86494e22bee5f793fc40eb93b6e0f60b82b4988c3409411ad8458119b6706f4f164a9322621b0f9efae504ffd07a099 WHIRLPOOL 55f625350c5e317031743c299805caedb6de51e928c0560ba0688b53ba0c7ec9efc36946ae2fdb5b7ab77df2bcda954d03967620741219209ef95a6e6afdb1f7
+DIST asterisk-core-sounds-en-gsm-1.4.22.tar.gz 2042362 SHA256 79175197a651c25bb62988e721023e9bb711c7eef28aca2ecba291d43ee3e667 SHA512 d2755beb8d5be64129d84fc28faad61719599176a87cd17145be68c051bf19741419bc943531804de92ae8e098620f003c6401c1888711a0eb7dc4766c8e824f WHIRLPOOL ff2a3f38ff0de35e92c28d9987456f697adf8e9044c1d433da62d42be6b45189422e18def07389dda4d5af017f7403d008082db30a78efefa991ab6ad01f5796
+DIST asterisk-core-sounds-en-siren14-1.4.21.tar.gz 6800650 SHA256 56807beed9b776376888e9e17981eddcfa61f89e3f56a198f1fc05cd23decaf2 SHA512 935f0342e9255fb73d8c6bc6c2b802e341aeddb7b38323fdeeb8b11044eee57046f6783466729ff3f8a8ec6323b879eaaef1a24f674fce8e4322f7903cdec857 WHIRLPOOL 7f679d2aaaf8e1db7f920c45dc056907c55d28292403c1e0af6a83f47d99927e31ff72b7296e678c84573bf91f2036b89b95b7c7998bc4b731c88fab0b0b1e2e
+DIST asterisk-core-sounds-en-siren14-1.4.22.tar.gz 7777912 SHA256 ebe0654f4d4c54f70a495f3e49dc842320d07cbb21fe2df5e046265bb4e5aa29 SHA512 0a591dcde5362f89b7e022ec84505d85f0ca9d5be302f27be83b0143a02985c94249161aed332847f9e75015b9593bfde031fd0370a9cf5e8549df729031a3e5 WHIRLPOOL eba7f3c5da0c97d63b03afcae0ce42b5d25ea8b549d3ac3dda025b2b95550dac985c2e59641b1be2f84d35ec1581ad15059af8355fe0f11744dece9df73c3a2f
+DIST asterisk-core-sounds-en-siren7-1.4.21.tar.gz 4297051 SHA256 85df26eaa6ea4c6d5320e4d60b06a02f94023cda05f9035bb0278924154125c6 SHA512 5991c869b1064b50f58cdddc92dda29dfc5566225ebdb5127f2bf659b01aa093af7f319c13ff440937a937d4489d67966d7984feec1c3c2bb0d50bb07c81b68b WHIRLPOOL 571143aa7ec4af53e4dee912ea12dab4e8470233c75ecb274142d2d026c7aa455290dc08e9f42a20d2972b223042ca389040d1f957bddcca0f841ea7512fd148
+DIST asterisk-core-sounds-en-siren7-1.4.22.tar.gz 4939217 SHA256 7f10b52116953cb25ad9ba53adb921e13996a33084d23e05f82aec9806fcb102 SHA512 6b782ab64725aead51a35fa773f834c1ff423d21a9f521e231a40c6f995cb4a05b1a393e0a0892cd199cf96309eb8552030b02749cf169943bd4de68e60c6593 WHIRLPOOL 41f1444716d0bda7af0be1d70d9ef3c267ca42489cd0f4030331fd1de37c064a518f448ae91bee4aef4168fd5f4435dacb8aba6be97b42f06bc68875a7901d1b
+DIST asterisk-core-sounds-en-sln16-1.4.21.tar.gz 31127736 SHA256 d557515ebe16f2438447f8900ebc4bf5e9270a91f4b3a93a12053c2b3552809b SHA512 013572c9f9c80b26f85e92117d4bd853660634b66b4e52c2bf34b5658b92b871b765e457d4866f35af596658c9600ecd8df00d5b725755e3e8924483e30837a4 WHIRLPOOL 896855aa5925704ff3576b2a2ed655aa484f1cc14f86a992242c3e8eb722b894813a08fc9186f62679fb6d7882b5fff5950ffee8c16ab0a77ea26cb77a5dab84
+DIST asterisk-core-sounds-en-sln16-1.4.22.tar.gz 35390902 SHA256 2c88f0be490fc3a1ad50e791064cc4603cae739b2493e8fac7cbd90de1915dd4 SHA512 cdbf5d13843f5be6db8423627579b181b1619f543c32b51f90dc40ee8f0cc9047441a0436e9f7fa3e9f12b54e05689b356da06a7068e9590963b72ae4512e983 WHIRLPOOL 4b57458b5d8d7943aa2c1f194208ff8f347d7567757192ea8b3479a5fbf08499304271f8969681f627724fc2736109ac3da645592e812da060ac4bbfe24a4c1b
+DIST asterisk-core-sounds-en-ulaw-1.4.21.tar.gz 7663285 SHA256 8f9ee4e9f23eace060581219dded55124baed6dafcbe67c56dba2be979ba2ee8 SHA512 bee290403b91e9c9b5e2e6e9b83d97a0b2f654e6e1567290eeae28e81db7d24d9315f82b402f1f1de567ddb5ee9de5870be8b165026e5423cc5408d1901fcef0 WHIRLPOOL 0c60ce282b75087c26f5ac4a9e729a22de4b0fc6282288ee0b7c0b75004bd6b7a3fd0d03b8f23a9e1cee27b7a73ef2f0f691c22043fb6aae2720c3b9e0a07ad9
+DIST asterisk-core-sounds-en-ulaw-1.4.22.tar.gz 8683123 SHA256 21ffd22e98eb35dc56bb69a076dffde534192116525ccd358b46cf8a663b1a72 SHA512 171724100401582bdf4e506f60b67d3bc6b84c26bc641eb8fcf1d2317aadb2751e3238056863ef5ce470494c930e8984dce41513169e980cc2199d3290301193 WHIRLPOOL 33f83c8174ba04b5da7c175f4b83e0c709a84a30fbafafd07062d4fef9334b4005435b80365109dd8aaab12f4804cbb8d10a0bbc5a4ecfa5e1f00b989055fb33
+DIST asterisk-core-sounds-en-wav-1.4.21.tar.gz 15317471 SHA256 8246c60c359e9f508ada5e06b54d1c502846cdfc5047ebf2e8030f551bfcb105 SHA512 020265d6d7e98707e7604a6401de1e71e59aaff888fba2db7c624982d1c5c0d717ef1b2e23f36f88a2a85a0c78666c7a77be6aa79c7f0cb57665d026c389ec71 WHIRLPOOL 291f2252634e04b532dce8dde21b91a2478650ab468f3f52c24ecb72261c37b79725cf5abb1241ac3dfb66f4b6925e46c2e27145d595ce6c461806c4245f81b2
+DIST asterisk-core-sounds-en-wav-1.4.22.tar.gz 17394370 SHA256 04cd727e8a01e02e9cb1de27eea5f6c060ccc60be9ad77b6a39b7bc15a169f1c SHA512 ecfa10b1bbd771caef9722c2f9bd48050d8ec53617617aa566e4ca082c46de44fd26cfe683ea1a330f343ec9249126b59f6de4aa7a31caeb2e7fdeac7b55af97 WHIRLPOOL 11ce8b94d38e67db3578a474ddf8a91b8d18af8ac9c98572122306075c197b637a707428c326691dc4813c4ad2e45cf2e25de89639767c38b6879c27e972d3da
+DIST asterisk-core-sounds-es-alaw-1.4.21.tar.gz 10665934 SHA256 376ce92d63bfcbcc35af338831c21098b509468c8000ddd310cc7365952868ae SHA512 b0220ac2ca3e43649ecdd573b6c264fbbacef2a7007b8feb535dd8d46fecc60f735f2cd57a905f511b0eac90cd119c7dbc30ff506556c4d679de62eed1fc3089 WHIRLPOOL 7179f4d06f207992e31ad6e751e81bb48d59eb55b17fd57ddb0948987d6169693f9e5778487ad90ddc6c6598a018baa811535f3f95ee25d1d7f72baf2e9d3c98
+DIST asterisk-core-sounds-es-alaw-1.4.22.tar.gz 12153981 SHA256 dfd3d07dd89ea09fc6ea15e998674e62ad0067d4118f0877c705529b93bc5b75 SHA512 ca7a3bbd4f4700e8e6fa058c6ce75f30ea823e2e9a27a06bc00a53e779a4ed5378af09d7cb508473cc0bd6e9f17e0ff90840a277aadf39a958573cbed2743251 WHIRLPOOL 311249b547ae9f3b6807965036f235dfe8a8687547ecd059986e9c9f7e5c95c0ac6a86dea3c193367a691ea978dc6cc2ec36b497b375c7d8e9ec42cd69dfab20
+DIST asterisk-core-sounds-es-g722-1.4.21.tar.gz 11104818 SHA256 87847917b6a63d00891adff53a1da3fa225b4a6790eeea6941df36dd6ebcd920 SHA512 25b1d63bfccf757ee273023637d8d9adfe5454a46fe6633fa806e0fd87aef1b148cbe24ee393da0411091ae17dd039215fb509eb2e92150aac2c1d82a6e2fd07 WHIRLPOOL 4a490b0c2a6ac41a9f214f21747bfba63fae72af9ec48a70bbf3adb6bc8c6b7e24a7b928134cc91f7a2929a61300d11a690e6414ac68da8fbf7363087e286f26
+DIST asterisk-core-sounds-es-g722-1.4.22.tar.gz 12519197 SHA256 d3d1e14b14c3c1f026b28256d6f67ecc9f8951a655646d62ae884dc624363645 SHA512 917b609de4214554c1a6db0d60403bd3f3c7e161bc75e9366eb8ba74f835a6b547a07552e56b283481dd71d30f3a7d502ddc3de43b6a61cef354f2bfa6690861 WHIRLPOOL 3c58074f43ce8163098880917a50a764924a7f02023004a572616c2e6ac462ebfdca689b225d8928e59b1c9f85733401edf5babfe08942a10dc12ba3124bd004
+DIST asterisk-core-sounds-es-g729-1.4.21.tar.gz 1541057 SHA256 ad224c6f768f7cf6a9584649de6e9975a981e9e8a2eb936ba6d0d6dec8cdcf91 SHA512 0988fd48d3cdb38e188ec47d52dbc3c67efde6b3ed0f12b7d0cd2b367a4f3914c8befedfd52739d493de75d82a40a41871014e990f767bc79055d2cdb1b4c46f WHIRLPOOL ecc9c3c1d9f64ab348f68bc4e16c93c4176c0cf6f037501aa3d53a05f7caa89e4ff48140badacf69ad5c7c644c7d30c96e4ef0970da0d84fdf2745d0d9c8dcf6
+DIST asterisk-core-sounds-es-g729-1.4.22.tar.gz 1771355 SHA256 afac894ec8a59830b45e0502a0a0bf7e1da50b9413cd3cb3b21918d153f78b70 SHA512 9b8f311aa06233ab0d93cf1883f627bd59f44d4fc9afa9bf8a6209035dbd2194fe7d7b3ce2ce2ba5185c9356b0adacc569543dfec9939d3cb7fb3ceebb5c8ff8 WHIRLPOOL 3cee2f753eda4aacf5dcf460ee6ecc0dd6b6f985d1b37773408fba3820fd502512bf75c3a9dbc23266980bffa2ad15f3e9247f5061b595907990cd30c2dc7e8a
+DIST asterisk-core-sounds-es-gsm-1.4.21.tar.gz 2479262 SHA256 a4df63cfa37809478d659588fc85564f5fca9311434968f3875c2a3840c87dad SHA512 dd92f479e7726de0d093c51563cc3a98bce2d0d396714fb69fc4de16b0aafdcf09ae4387bf8cc5c080ab63fdd9790c23eec263da6f221455170ce99f38b4dac2 WHIRLPOOL bc1747e32ecf3ea2804ce4fb934f16b598ac8ed6e3fb1283afc63f50ec46c023ee661e1b17f5297a3e91b37f52234da1a6cbc6ee55665c7dc2f48a131ee1709b
+DIST asterisk-core-sounds-es-gsm-1.4.22.tar.gz 2846711 SHA256 f4cf1b25c081c6941024d7991d3fedac120ae433a0f9960bb3663c58f0331f47 SHA512 39dc66b2b38b706eee002d4ffed57f1225c50c14ba037ab8979b49cc53810955cda4ccaf298871cc33348cde7a5579ce5190164cdb72aa5cc1cd25b534ff447d WHIRLPOOL f6205095c28d40253c8539453fe7e2be049c1e6ca4a9124a6623095fd96b6f6482ff9d5856886424bdf40580d5d498240dbf12a3fad23f0896c80702e24f2507
+DIST asterisk-core-sounds-es-siren14-1.4.21.tar.gz 9300088 SHA256 de1f2e45deef4061b0f12c4545f6a9a299e5cdaaf86d231a81a0f7437bd08d4b SHA512 4fc4775bda935f0330eccbec3f46737309faf591ac179f3ebe70cfe0d9478675fb3d6b5b6ef95d6ebf6612b52c17146f2406fdfceb0df62e73546b0305217a26 WHIRLPOOL c0c8083cc291f1e647e064fe6723e25a53cef9159e22365e119a88b0e4054c651bd84a9b1b2fc4ef5df885e635e73633a46aac6f37ef3ee997a43cb86ea23a67
+DIST asterisk-core-sounds-es-siren14-1.4.22.tar.gz 10668439 SHA256 78237ce85e4c8962afe0b4b3f7ea35eed3511f571a806614c5e77fbc0124c80f SHA512 3dabb27e239a657858b73004501d8d4c19f176f361ee65cae9cfd0d49bd8f88ed40e752372c434eff9be5581096a4d1edf4de087368369c0c7f59af23d42c4c5 WHIRLPOOL 4e900d55358f172d4eb06d791b759a18cd1d920bf42fa68118ec7fbf073a75a118f7881c0ee8b397873f47897a12d5d7142a4f5f272241b6b34c39b4ffb6dc06
+DIST asterisk-core-sounds-es-siren7-1.4.21.tar.gz 5953949 SHA256 48c710b24e2ac60251a861db273771b6600480ea489dae43bed4dbf2fd3970ae SHA512 4e508719f9e233b196609334212d023b43d5bca8054d378351e4599f06f6acb0251969bfd2ddad932ade6dbdddaf3cafcf2d4fbd15b7ec1cf7a8771c47fe02d2 WHIRLPOOL 5bee69c5de235ff0cb27829e83741b4cfcc49b42b66d48c0eda849219acfe957173de1d3bdec038c76ca669203e1a16761f237fced14e9845704178ccef3ba2c
+DIST asterisk-core-sounds-es-siren7-1.4.22.tar.gz 6856025 SHA256 da30c63b2a4332fb5d5671f8ecf89744cc57ed914046cf0e540fa59a14ad4401 SHA512 d179a17553958f8ccced6431e642885aed6cdee534d6b86e3087d1b8464c44862d40be8e27843dea21a7e556b91e8e475b50ff6737c281a961bb6eb352f2e65b WHIRLPOOL cd807cb40412428b8cbda9d60d53c8fc57c5bdf43cd34bf5957f78125fc56c81e7c7ebee41bc1aa5b4d33be80f06f68c4753b3e9d35e32762d9758b613d5e4dd
+DIST asterisk-core-sounds-es-sln16-1.4.21.tar.gz 43767861 SHA256 1c85fd4de3e42a3e22fa6ce07cb2ade75b863baa351fb0d1cc6b8b1b14bca8cf SHA512 27fffc9ce4a5f1ca245e697d5eb9548580b280816d13ed6e23d9ebb971ffb502b3a5a0afcf93324e6b5ae8a8d7fdcf8d3eaeac12d0e602f3f3ec20e464cd760d WHIRLPOOL a870a08c681ab7bd63e25d1f568cedebc939abe217fc1ea7892894387581787a890c4597a9bf43a0c22607c50edc8dbab0d96daba5b530c5e1ad4b99ef15d45c
+DIST asterisk-core-sounds-es-sln16-1.4.22.tar.gz 50127209 SHA256 32662a9815e7b3c735aaa0d570fb904a9473ca10b3e783de5e1c55aa42fd76f5 SHA512 5598d04c2f3db13c67473112445000808a427ff1720cdfa223063d349a6256acb945cc724ccb4ff8f0bd1f35e271209700acd3f62890d78c2ce578b03bfe27df WHIRLPOOL ed1b62408fd98b603cb51ebe64bad133025b17e84db765b9dd8552f0d80f12841b29054c0ec68821b0e288b5d7f250f0c862480122a7cb98086943ef2aeae543
+DIST asterisk-core-sounds-es-ulaw-1.4.21.tar.gz 10802067 SHA256 ccc286e392f99b6ecd1daf1f97d682475be59383b075dc0e06eacb9026c233e8 SHA512 a4c9b61c69a4d075cb10ca557e4cc26792db4a464e94240eac809b4ddc31e050dc3de312577f1ca28a3b37a9fbd7120dcb13aa19f722d6b56e91572b59594bb4 WHIRLPOOL ab236350c8c799ec4745ea65fea329c62c9190a9049bcfb9f3fd398b6dd935e1c3235ff249ea527e1d5fe964c2f46744bd32498cb2020ce751af4425a06963e3
+DIST asterisk-core-sounds-es-ulaw-1.4.22.tar.gz 12340977 SHA256 c89961b5b67b4ad4a139200a9fad50000512e5d000a46b277183216c3e94f02a SHA512 1abee9bca61a3f52660a966ec815ca1dccbd1c89ccaba070af82109a1e2c2e7fd75de28c48b569d017d35a1d2eff215a677b1bb03d86b8e7c5814db18363ad5f WHIRLPOOL 2adeb523b8e7a90c541057e548ea7a3fe9af39889021b3533551b6b98062421981b0021a32accf1f8b78108fc3e55ea3e0711bcd2c9c82980362883a4a48fd3b
+DIST asterisk-core-sounds-es-wav-1.4.21.tar.gz 21594568 SHA256 9b4bcd1be5ba010f506750e963b879807696cf709513ab04b4f8d6f74276ed57 SHA512 b7747f3025496b124da8f496a663f2b5d6361987165927bb2eea9b6af623d8c2941cae627a5a8d7d8fa376a51f6693eb4000db0e98dea3c99cf1eed03735b280 WHIRLPOOL d5a11786d6781d451fd2fad3defa574e3d535229b99f20747b2c468142c7f360fc2cce3a76647ebe18c8ad87d40da670c93a1244e04dc38221c85bbe2a91bd48
+DIST asterisk-core-sounds-es-wav-1.4.22.tar.gz 24712090 SHA256 e167f56fa8ebbbd7754ef191ee155e629442b688a20aa457c36b55e7f6800cc7 SHA512 78278a7b5edf86992c9e98e2d8f94a55514172d58cbc3358351746d26aafcfb365321b537c167e0f102e1c52409245dfd932a7a749233d0af709724ac8ab8f28 WHIRLPOOL 768cf5c6c4986a0a551e7367a70a201968ff426388b8c3efe5ac9aa68ccd8b848b6c2a83d0b4c3d45f044289c97aeb4cbb6a5c760d8534309b2ecf9cdb7bc74c
+DIST asterisk-core-sounds-fr-alaw-1.4.21.tar.gz 7802733 SHA256 19f5faaecfcd7c839675de221637fb28a9d882597ab06c16563c268e4f9b130d SHA512 af3415a0aad10ab011b193f0ee620340138f766e7c6a85bbcc705239400e044b98e1ff62648e877d961918029f92a21468eafe04f92343b2889698b275c01322 WHIRLPOOL c16ecdf8018ecdcf7bfff39bb6435c5a86febcda1fefaabeabba5e4845890e111b683c916ffab00d434f14bf5c0b4b0f47c6f2a909b64df50fc943f1940b9dd4
+DIST asterisk-core-sounds-fr-alaw-1.4.22.tar.gz 8813861 SHA256 baeb52211812f6b77ddc83962ed67240af434e333c2757523a46165289f14d69 SHA512 312d30ba4ad56af3c3ea832d4d28b83a41f340ab14953e504fcf464ef95aef51b399961dd52ac3161675c2a02ca055f696f709a180982bc669b339ee4ba58e73 WHIRLPOOL 6d2b43f27b65190f48f78340af9145accb76385c3b27c9984a1cb53ff1b5022add973369b964e2c1aae2c68e00f0c96328ba07e39add6a656d155a569ef25802
+DIST asterisk-core-sounds-fr-g722-1.4.21.tar.gz 8576649 SHA256 b01bdf6c72aaa1c50a8d2fbb8cd491dafe4b60d99e80ddfa2e9bbf6362be6c3a SHA512 e42d58d0033385c06d75add961261ec9db107ff89c9324bf7d0c2b46bae10c6ce16f3d7b37af19602851baa1cb05dc5e89e17ec8ba7f87a4eb48d253b18afe98 WHIRLPOOL f2153b46a023950927eaeb21d599c2ca5835aaae5383deae2198d59432d42a1d2c0528169316c95f0513dbae4494b5a571d48d77cf164bd1b99d87a3c6dd6d57
+DIST asterisk-core-sounds-fr-g722-1.4.22.tar.gz 9467644 SHA256 9d52de05ada8ec7fe1626e9a41c50af6cb0a2d8fb09ed7d11e02b9d9d3a69174 SHA512 5d28505e50c02687a8938bdc7df57b263f59bb9b7f196dd0820545fc104938f276bb5446805e766f230ad882576e98bee936d1fa03e6e3bf8cf2b67fff55297c WHIRLPOOL 34f5843c5da18683879bd6e9a5d06fac340a933c89cc09576bfbd820ded1024f3045723fde9394dfe0767d9875487074bb9651f982df52024d357e913c6f287c
+DIST asterisk-core-sounds-fr-g729-1.4.21.tar.gz 1201891 SHA256 7796dafefd67567ddbf18caa633671b17a67cd36ed21ea919f78eeca7c092283 SHA512 61dfc376d0b5883d5f585b1988f55ce5dd3638919ccc706079148600699fce55b82b90ad59e00561701891f5132661add2093c464f8db6aadaca04ec2965c5fb WHIRLPOOL 2b032236fcd6b3d907ef279783bcc77fb348836b96e59aea3741e2f828a81b1aed6b1d42c7c67c5db6ea928d3972030e6c57fa76d66a96a3e6cbfbf55656153d
+DIST asterisk-core-sounds-fr-g729-1.4.22.tar.gz 1344791 SHA256 68983b61a0d535ed739ab59da20e82164e8856ae048ae4c3cf05e895ce83c32f SHA512 3bc498ac44995170c11ecb80d90ff3d871e3dd27974cbcf604d2eb6a3c59a5b560d48726880fa3999339c3a4be5b1324f3c4abda9f991fe28e3c683126aa30c5 WHIRLPOOL 24e3ca1357b344477ffdfcf537c721de364d36654e5c61991977db5ed2e6cbed445f6c14837ed673e99f7e2c88fdc47441e36d953220183357759ec1dc231c65
+DIST asterisk-core-sounds-fr-gsm-1.4.21.tar.gz 1897139 SHA256 e3f55c1024b68a464a8a738f0e34e049d6ea35dd2b39be77d400ec1c7e56e5e6 SHA512 84d7b50fe6e215e1120193602c1fd54b94f4d9b7ef7262e5f5045912510d9e92e76c174de04d46b3545cee4c0225008ef05bfe52c08aa64eb71728fd84144a45 WHIRLPOOL 024e0771a34fb893c0f0547fb27d79fed83b65d65f3fd467998547b36d7fb4b38d4872bc2590dda894cfc6ffc373d8280e2e09ae0506d0f9cd15f8a29a03a84b
+DIST asterisk-core-sounds-fr-gsm-1.4.22.tar.gz 2128144 SHA256 c0cb2a84ad2d82fbb04434f8de20fcdfb8e5dc7bb07cf18ec07e99c0d7ef7aac SHA512 1b96b5b8c25e57b0402af5267449579694283617a1c3ed6da9b6e12e30081577a1a79412dc7aca387097e1e57a17afb5246431b930587612bc50147c72e66f31 WHIRLPOOL e898392ae1479f76c9acc38f5bb518f254ac64f929af245f47eaa90f111fccaa3ebbed0f0e1e39d792ad6c3472d77ae3fa47341fcbf807012866721a7085e4fb
+DIST asterisk-core-sounds-fr-siren14-1.4.21.tar.gz 7282008 SHA256 92088d0dfa3a8320da98bb4ebc21e2fb147c99f2f555ff117b0b90aea7dc4bf6 SHA512 73e85e6174fca61190fea725926028da9e58bab2d2b6aba6a8e9039882ab7d8fdb3bfa7cf7d59039ec306c1ac85ede5695b7ac7f52e2274e46a4735fb0b88679 WHIRLPOOL 54565614e885773ea8c9c1b4b234d5226d409e449989ce7875b9dec661defbbb4b8bf9db5188abd7e2b4f4d0834357e5ec6b58b7d6c3c4877af55576e38a77f9
+DIST asterisk-core-sounds-fr-siren14-1.4.22.tar.gz 8140068 SHA256 165f890d522f91fc2721f6fc6f63708b6793a7033fc6c0017e0d84b5c119213b SHA512 e3c788acd43ddb95a07d607d7b5db024193575e78a188bd2a2b8e95f64814142686d3561c03d29114957cbbfb241d9cffc855477dc6153c3e9d13d6a912ebc76 WHIRLPOOL 1aed53ad6d1ea5c69a94f2c59d72ed7bcf2bc975dc1b746220d1299aff8ba05b19cc27ef611d5e7e78d109880c02795eca2828cefbe5b442c6700d5dd0d11520
+DIST asterisk-core-sounds-fr-siren7-1.4.21.tar.gz 4598263 SHA256 1524cf8dccdd886c3d5ad16e5eb09642004d5572b35b5ea82eaaf7dcd9da4ac1 SHA512 3a7d7a9da2f0b15e6afe2621aa903a59726b9617cc56ca11748b2eeef65e6210b27adc45918d9f1690468efe4e0fadd04c2b6ab754cd2798c40603f02727fda3 WHIRLPOOL c8ac03d931a274894f14124b1cad74cba6d1c83b03eb252e0a0119eb80bcc8663e7619098176633f7fcf4c0089e02125e3d73a2d9501870e031143b3177bfabb
+DIST asterisk-core-sounds-fr-siren7-1.4.22.tar.gz 5162570 SHA256 9fd1781f573c12877d011f50282cf2b8a70e7c3dd183a3a1801300f626de252c SHA512 3e460810efbce735031ba50653a095ff5e69647f9d08776d7d30ec4f3e7e9169105413619693fb5136903e68a488683cb23e51bf725d507d8c5cbdef046df61f WHIRLPOOL ae6d56939f3bacf78b1a1ef4940228016e32eccf6be6905a11dd75b4fcbd4d4105572710593a00b19917eebfb96039c4e18eb4b9df34b48c40a5642d5f412c07
+DIST asterisk-core-sounds-fr-sln16-1.4.21.tar.gz 32346434 SHA256 705b00c01e8e573b925ef40f784806cc9ff7b69f89d43eca119af8a61f715cc0 SHA512 53c0276347fd48b5fdc990909ef3db6f348bae7b88cc6f3f316f512304f8df5bbfd895e2188de8fa60f5519aaf1035460d8a1308a04a280f0031f14b292fdc30 WHIRLPOOL 85df8bb49294bccdb180787dcce4bafedb29f0ef8f83ad58ecfd412714b73d61850c76e94fedcb6819f662f09a37603ca6b9faa7e4553b3b455e8eaa223951f0
+DIST asterisk-core-sounds-fr-sln16-1.4.22.tar.gz 36567733 SHA256 c9662b5c8c2a59bb0fd036f6f79fe7e399a970017965cfb501a2972fca3a2ec0 SHA512 65f1422a8a120a2a14f549f5ebba8624f28decac3d1fb8a91a77988e4be021f542b53e785d30c79840cd89e48f97c45721c259198b89a87ca93455ed9e2ce212 WHIRLPOOL 7ade99e482b142499779600329c9cedae2880c502e7c147b938a71de7e62722cefd8c71158babdfcdc128df765e193ebc496a140fae5f34b50f74ef395f3435c
+DIST asterisk-core-sounds-fr-ulaw-1.4.21.tar.gz 7995267 SHA256 f5967aa8660eb2162f4bdae2622f334b2e78396b53f5a3f103423a913fb3be38 SHA512 261c968742c003274701296fe756256daed749c506d08afd82b72590a7df04641f4e20714f0c200500d0a3bf5724545197579faf954f554b2b902064e7ab3a36 WHIRLPOOL 6c1fbbe69b68bb2f11779bcf08ad72fb346b2e8c0c10f861bc566d587ab452c0b2ddb7612e7256b850b6903981b404ffc6cfe9b639dfb2a0fe893e29105138a6
+DIST asterisk-core-sounds-fr-ulaw-1.4.22.tar.gz 9027425 SHA256 0bbd24f702de48f8ec11e91a24a1559eedcf472afa5c2a169f343e99508df191 SHA512 4d8b0c79cb950a84bd4b31184513a011d3bce6e4e80cdcd92775cd6b525bd8b51d309ed30106f8f128e8d076585485bbb9dcce770829daba060c1359e391455c WHIRLPOOL f82b64ac66d531862b5fd3a3fb3175beb2dd7d72419b1c78f4bd05b6db9f97ac5bae858ff6b03958d260c70bb3305f157abef56f68e5ed5e20238701d82a9fa1
+DIST asterisk-core-sounds-fr-wav-1.4.21.tar.gz 15858675 SHA256 957725f14ad09161c841ef7b02a9f5b505ddd0ea5ed28cbdbee9f98472832b94 SHA512 85d7a4b47525112352b620a05077fed2c84ad19f0e5046e4c05a292e0bf416c31dc10089c33588ac5b9f205b6efcc6bffe5c12250524e01219e9c576e0a9adf1 WHIRLPOOL cc15daa7e6c1e33959166802a855692d73a4e956ef744114e98da8ba1e1fe6752f25a0a0db5d339845428c6ef70987dee079ced948651c25b39c2e06618c03f9
+DIST asterisk-core-sounds-fr-wav-1.4.22.tar.gz 17944749 SHA256 260a18bdf46df29badf922bb80d3f9db901faaa000f188712d41c0b4d1b8ab11 SHA512 ef954682f030ff186f9a006ff2af4ab699635184642af91a971a6bf162b79faa180c1ecab9fe3edcd8c987972b150b4cd35db8e631d4028ccda33025da9f636f WHIRLPOOL 99a99cbb908404ad2dacac805198d4c54bdd71d7b10c65ba533c8bd5db392464e35d8351ce35260b9d11af5bc222086d3d89e8f24f2f4b2536723ad523b838b9
+DIST asterisk-core-sounds-ru-alaw-1.4.21.tar.gz 8064249 SHA256 f62809f304bf066aa84d34a8010145523e1739d95217e9bca01b5180cd66ac2b SHA512 dbe53282d9c7498a6c310de8177e6354ad6ca92d6c105740a9cd938ff7c72a7e39ea6ada43ea9b271abd4815f5fe12b65ba60ded3f4cac6b75b383ad1ac3ee63 WHIRLPOOL 5219037177f3a14b7cb998b4f181f6ae3a47e2693fa55aeec49f18b47ef6dd6b804e1404d159efb208801f888163631472cfa4cc2404de3f06bf1bb6923a2bc5
+DIST asterisk-core-sounds-ru-alaw-1.4.22.tar.gz 8152975 SHA256 60ef0b8d1471d45620ae87b35bd97822513a4b379c872a897c80c84a03521f82 SHA512 5d728d7b2d96e05479662c6517ae3314a3edc7a3aa0e24835a8f1c9da3d371ded61b0fdb663cc281b59b03c14eee193948bf653a9336baff386045e7694d451e WHIRLPOOL 9c03e680a2b2074c3705a9e7a530c3bf7008ba633ccbabc635806741e71abda9817f85c7e911b8b0701c42963690ee907b6cfb5d88d37fa363bed5440e2da02a
+DIST asterisk-core-sounds-ru-g722-1.4.21.tar.gz 8595025 SHA256 79c724f85a09d190e14b3e3f1b6f7fcad2af897af9a613d0024e8c5891a416b1 SHA512 f4c6b686e9bd377698cfca0f65a39d60c422f76672e275dc059912eebf9bb4d3e2cd8247360dcb1927726ba54e84c37d8c2b1d5cd82f660fd9a983f64052fb12 WHIRLPOOL adc33346c3cb1bf141a53052c3aaf3bcb1729e19262838a8bdedd9cc3cb976e9b3bcfba45bf27ed072219e0a007ed2eae4346faac9746b9555e194cc789ca2a6
+DIST asterisk-core-sounds-ru-g722-1.4.22.tar.gz 8674954 SHA256 25368981f01486818cc8851841b72d48f4fe8ef7dea68b73638e988520235520 SHA512 847d017656f676ddbbb603b32f3313e9e1f284d533a56850bed6ef3cd55c55383a9c11687f7af2294cce69f8126ea9b41f7b4a33d703f3b44ad5e119e47f125a WHIRLPOOL dc30653092e39c9161cd62ac07f34655d1d09d83f8c5f0babbe90ca8cc23b7038de76f5d9f83151e98127464ad7b2838354cbd2b13cd1c1b1ac1a5659f0be6b8
+DIST asterisk-core-sounds-ru-g729-1.4.21.tar.gz 1213557 SHA256 627bc3f0c283b0f7046cf04394b9a5bc979e8e4a16b2dd696cdff8457feb537c SHA512 b2849e947d6263c9c756c8139a28fd70884ea70ac1e1ac90743ed83a3ac033ba829fd8d49fc5cd178d9742dab3493d1c98cfe6a259f2963358c0ff44fd05e41b WHIRLPOOL 821c9e655b9362c3e80636e348fbd74f8fe8d0c70d34a4c65bb4227bb5a048d1c94fb4461ccd5af55e62c5e8c456186d1a4f13d32213236f97812ce10c267be0
+DIST asterisk-core-sounds-ru-g729-1.4.22.tar.gz 1284150 SHA256 25d777e101172d1530342f376656b06b64998628b4d39d8b2eb41afc8fb7749e SHA512 0403f670c8a2138aa99671eba2e9ada956947f12661266d5c1ca25235caa03f7237c275d330e87cc23b55fd58a4bb2bb5a9a8bac4f56b2b514223e00164fb84b WHIRLPOOL 6cf25507c7584bab9f77f74d5cd509ad3f5af07e3e7b68a6215a60a87ab340c7654f68b1d2e3f767d98c1603d03b49b8818fcc6194484a9839838325ca8aa1f3
+DIST asterisk-core-sounds-ru-gsm-1.4.21.tar.gz 1940666 SHA256 781706fc1d4b7aa8f0a4d6f24d51af17b46b7e8743f97bbe1dd3ebaa888093de SHA512 788c06ce334c7647acd4e7e46f7823c96631778eb7ac45481c103006e85dedd6f6c8df3a0fcef59449d1c8cddd44ddfe2c70ce671147be681b8d91cc91398f2c WHIRLPOOL 1790cdc314f6346b85e0328b239a43ccbe51372ea0ffce0fbfb7b40754aca65d9e3978266bade18931306e2b797353986578dd8895bcf09d8e2d4a4ea8a96db2
+DIST asterisk-core-sounds-ru-gsm-1.4.22.tar.gz 2037430 SHA256 5f2eeb24bedb44245f230dbe2f9bbe78f66297ec6af4111d93a705bb03431136 SHA512 397dd7442fa5416e177da520a366a30d8adcbaf0d2fe4c4d4a9540138a09a49b023ead609539d38889666f0e2a47bdfbf6bed26e4e1605ba9bec45bf6a073a13 WHIRLPOOL 8321e78e5f4ebab087623d7dc18cbc891d40fc45c899c302edc18fe6a10298793d8157e8d616dee745916885cfb67880a84be5dbbf4a5b542d8bfde7bf838219
+DIST asterisk-core-sounds-ru-siren14-1.4.21.tar.gz 6958245 SHA256 f8233bdd3e858b691de58e3f00b7bbadb2b201f0ce29d18c1e6145b759a1e865 SHA512 e1adf1e25b63b4cc75f5b9d26544fbaf92cb32c16bd8506a24227cbe61bb8cc1e00269c3859b2659f7cc85a996983520b64d069dcbfcb35871877d11d74ecb53 WHIRLPOOL 64da7352ca6c09b5862fa00b540c63b5c4b3a60277c60f1b788243ff06e32019f17d6030fb2008df17260b3bf70ce98d4310b64c26babea2e124ec2564adece6
+DIST asterisk-core-sounds-ru-siren14-1.4.22.tar.gz 7294734 SHA256 3c65d91d4cdb7865751872d2fbb4ea40ffda62e059107fe691325bc9d105e0b6 SHA512 23717a75f41231ca86d49cb558f78c17de516c0c7ed921645b8991b0ca4a29607ea18a2af89fac351824caa081ee130c5595f8a704451e911025349d9c19abcf WHIRLPOOL 8d0956e8abd0d71b5c0fd67965c215caa9f9b496f8b4442594db92c279cc194e8c939913ff5d47d6fa6dbbf6182a528703a62896c7e13f0b266e9a3e550614c6
+DIST asterisk-core-sounds-ru-siren7-1.4.21.tar.gz 4717552 SHA256 a7fc878f1ffc49f856f35ada7f1d439935471ee01e34875b0d446cc5597b5d02 SHA512 94e431c0c6385cf53922fa403f30b48fdd0988dadfc9175dd57ff7959f75c59e5a377006e43a687b01a18d547d39eebe542898d53f694077aa12c4d5329440e0 WHIRLPOOL 0217d8fe4eaef8dda1d7d97a70b4fdf59dfdd5db91feff62da448e5c9037505be528cfaf3699bb61d01c274e59079806a3b120277645d3bca622b1c31a5c7396
+DIST asterisk-core-sounds-ru-siren7-1.4.22.tar.gz 4965841 SHA256 81187002139d3494a1f059a1f4228d65c5539dcedc79d128b337ee7697666b85 SHA512 dd086a8f71fdbab134d8eb759f60dd0d46ea3df0df15a02a53be16206aee55f406107308af12565755d1bc2f33dcbc6b213f4a41a21b5c40ea0e1d3d34d71e40 WHIRLPOOL 6ec3dc31fc6a3ca10b43854f7cdabf6d30d89ffdb3550be62833e47626fb57827d0a347344e1dd2141bc665f5ef9963cab0331ca9833dfb025ddf886a551639e
+DIST asterisk-core-sounds-ru-sln16-1.4.21.tar.gz 33125360 SHA256 fe9595725021eb47a67e0cd610c8be426b150dd88de0b99a8b05361380e2d19d SHA512 aeb3cfe6427db34e385d5b9033c73f8bd072c4bf37cd77bf871c3a1db199dbf1f4315a580bcce09bd511e2ed6da3c8f1073c88b5f9b11707ef54a56cf68e3051 WHIRLPOOL 3fa62020a3b769c115c2fc7e0aa8a99e46a4825a6f9c539c98d878202b5436c066601967fde2932d76a18e436ea6932866a11a125c43e6d676f4526f8bfa9955
+DIST asterisk-core-sounds-ru-sln16-1.4.22.tar.gz 33592783 SHA256 3ffa1e5181b8e5775865a4ecd4e34fdb76bd4e8dd825839fb10323751afc9283 SHA512 edc22cad80be0de9aa2cbf1ac4e8281b359d53c0d51d4fbe4de09ad04457d7b489ed01f249e9de8018932d5de454405c71afb0b7801deedb24cc46d1fa717b9c WHIRLPOOL e0f2158337d9188fb3250c79c29c1f1a3e54d8a57eb6f020741ae588cc12ae8fa7347a347685675cdac96d767982084edadc6e3535de8e742634abfa2ef16fa6
+DIST asterisk-core-sounds-ru-ulaw-1.4.21.tar.gz 8299885 SHA256 09319bb1726b5f0b3e1b08e97c966a1440f596736b59977cfb4cfdd93fcc29a6 SHA512 badc09410ed34f61e067246956ace20fcef76f55ce1735f0343e5d43fdfe523d58d7217cb1f09fd793350fb33a7d10d00147c8fcaa405e45a27c2ce2575bb3e9 WHIRLPOOL 0b1ddc253dfd3961014f14517d677e526e17a744446522e37af7a80d3c19112b00b21ff15c2c8313844c68f47059c8ab674b919ba4d1f02268e2ae9b4da8a9e1
+DIST asterisk-core-sounds-ru-ulaw-1.4.22.tar.gz 8460881 SHA256 cb2f50ce8a62ddc69b2884af21e5d8c942b294366d0174e9b3ee4ace2d2693fa SHA512 f563a50512e43a9b8eeb926588638698fbebfb7799afd33c6218f42c424cbe0a983b4e7fd466624e5ea43dc24519bc770beeb64fe74c06f2891cb8f39776de2a WHIRLPOOL a03c8d2ccfb2ad13c34e4e894902a9f8699a7cecdbfdbcdf356ad92eac6475655a595d53383c7f924295c6deab0c3af5313961ad08f1eedc43bb5a206eadd678
+DIST asterisk-core-sounds-ru-wav-1.4.21.tar.gz 16446330 SHA256 e6be4623b0b404618f91ba2d9ae75230dc7c804d960666211a5ce2c059020156 SHA512 951a7b156cf7f92e9640f6704bd12013d73d688aaaff8ab18d15ea0c99f10fa0386e12b65c086a02536d8cd68c372c686e4485cff3afc4f40933d14bdb41e109 WHIRLPOOL 56fcce32d1822c3d243790fa84b6135e5e6d92254822a3f62049a731ce0cb936d7f3513fa59f43d9ceab873d0be7ef2fc8bed67dedc0ff892663ce7e4d6f0ad2
+DIST asterisk-core-sounds-ru-wav-1.4.22.tar.gz 16591836 SHA256 eea2cf8ff81d1c32bb6375b1f4629ad6914871ba433867ff842c13519087985d SHA512 1f8484da7975bd91b38d8354ec84110892c42b44d2a0cbcd9a2d5a3756e56e0446d388e0e9343be8c3561c4a02cf55cd135d86051db5b4d232575ae4c4b60d1b WHIRLPOOL 02660bd4addabe4e2184ec4197170b74a89b10f99ec2c316421eeccc6a06df7954e244c48ef29e3153bf89c0e8d6c248baa035d8c8092528479a94103546946f
+EBUILD asterisk-core-sounds-1.4.21-r1.ebuild 1860 SHA256 0202a5b6c1420e06215892bf462a61700a5ad7a772ecceac3a4f69c39819305b SHA512 c43c5e602a6f3595e54694a409c755e4c1bf5ba454f453d03367a05fa635724241ad35b13ffcac5942784bfeb553c834847cdb2d55ea2aaa279088e47225d42c WHIRLPOOL 3b59d6b65a480422431d642cbaa81b386c32eca2c30efa7877bb5200c16a9f3d458a4596fdc8d49fe5aebcdf442091b5e146bb9818807a73942e53511cb49fd0
+EBUILD asterisk-core-sounds-1.4.22.ebuild 1872 SHA256 893bacd32976cceb8d79e0528ef07e43dc3eb77a1b360d5eff0c8839ec1ff420 SHA512 d3f2a30dedf14a37fcc24f9b0abde3b3c1c66ffd9b97c78d1c326e150e2d653b868264ba414f453916092c13282a07cb92f65ba679dd9c11cae7cd0c15efbe28 WHIRLPOOL 8a3456fb79efddd1832ea815929f4ac68cecd46b00a749a27557c6da50e552651df7780b15ad3061d83d4caec950cfa1e6d3fe7f48d3572766088442a678c47e
+MISC ChangeLog 2305 SHA256 d2ff3edc06c2df971470d1dc167448ff32850bfaaf901650537ec4e59f8d97fe SHA512 1dad7b9afe2afb6053e18278b6fedbb1455bb1ff5035bfdfbf5dafb9d63219673c381160343ca184dfdfa3064d20db11a8f3aeb472f663edeaa82241eb48f325 WHIRLPOOL c8269ea2027177ead6d0a1c6c626a5989e4e86e45795aa49f0d86a59cf310fa203eaeec8a6570a575d2ab530e923bc01a454a9ebb4570f4c87871c1674ef24f7
+MISC ChangeLog-2015 2612 SHA256 467f2fc4ac67f850716969b0eb98b3ed2adee24e80499c09acd0efa7f9e2c1f9 SHA512 9d72443f1c62dd4041ca389142152abbecc2d89b992a15ea0115f335f3d5e0052a456ffbf61c2589142c4155c01d41e5d3627e22ce851b38cb868991c26fe6ac WHIRLPOOL 5222f34aea37fbf617e29a00256d7d765de98daa30793f148a8859c0332b8d92af79a11145f44a0a5361ca4fea0b51908033234984e5fee812ef098f602a6961
+MISC metadata.xml 846 SHA256 6c33da313d588d1e1444cf4ea88616eac4ab5b35880f673431a5e11ed5bcb104 SHA512 d09b435f10066acf15bb1b6c2454e4a207e7604eae199958bfc9de6f130f4f3380af5b3d95d686cc20dfabe38b58f9c3dc308517b63f8ff6675779b97ef471d2 WHIRLPOOL 3a92cba7b0d6912eb5d5350e5f3541e74cb0575cd6d9445bab1066f1214a090bff1c18a4d65da599f2c08c7f3ad4f37f72ef578a2e002a46e48a91b382a83af5
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21-r1.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21-r1.ebuild
new file mode 100644
index 000000000000..975f4c9cc506
--- /dev/null
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="Core sounds for asterisk"
+HOMEPAGE="http://www.asterisk.org/"
+LINGUAS="^en fr es ru" # ^ is used to indicate to the loops below to NOT set this as an optional
+CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
+
+SRC_URI=""
+IUSE=""
+for c in ${CODECS}; do
+	[[ "${c}" != +* ]] && IUSE+=" ${c}"
+done
+for l in ${LINGUAS}; do
+	[[ "${l}" != ^* ]] && IUSE+=" linguas_${l}" && SRC_URI+=" linguas_${l}? ("
+	for c in ${CODECS}; do
+		[[ "${c}" != +* ]] &&
+		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )" ||
+		SRC_URI+=" http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz"
+	done
+	[[ "${l}" = ^* ]] || SRC_URI+=" )"
+done
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=net-misc/asterisk-1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	local ar
+
+	for ar in ${A}; do
+		l="${ar#${PN}-}"
+		l=${l%%-*}
+		c="${ar#${PN}-*-}"
+		c=${c%%-*}
+		ebegin "Unpacking ${c} audio files for \"${l}\""
+			[ -d "${WORKDIR}/${l}" ] || mkdir "${WORKDIR}/${l}" || die "Error creating unpack directory"
+			tar xf "${DISTDIR}/${ar}" -C "${WORKDIR}/${l}" || die "Error unpacking ${ar}"
+		eend $?
+	done
+}
+
+src_install() {
+	for l in ${LINGUAS}; do
+		if [[ "${l}" = ^* ]] || use linguas_${l}; then
+			l="${l#^}"
+			ebegin "Installing documentation for \"${l}\""
+				dodoc ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
+				rm ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
+			eend $?
+		fi
+	done
+
+	diropts -m 0770 -o asterisk -g asterisk
+	insopts -m 0660 -o asterisk -g asterisk
+
+	ebegin "Installing audio files"
+		dodir /var/lib/asterisk/sounds
+		insinto /var/lib/asterisk/sounds
+		doins -r .
+	eend $?
+}
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
new file mode 100644
index 000000000000..23d28f91884a
--- /dev/null
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="Core sounds for asterisk"
+HOMEPAGE="http://www.asterisk.org/"
+LINGUAS="^en fr es ru" # ^ is used to indicate to the loops below to NOT set this as an optional
+CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
+
+SRC_URI=""
+IUSE=""
+for c in ${CODECS}; do
+	[[ "${c}" != +* ]] && IUSE+=" ${c}"
+done
+for l in ${LINGUAS}; do
+	[[ "${l}" != ^* ]] && IUSE+=" linguas_${l}" && SRC_URI+=" linguas_${l}? ("
+	for c in ${CODECS}; do
+		[[ "${c}" != +* ]] &&
+		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )" ||
+		SRC_URI+=" http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz"
+	done
+	[[ "${l}" = ^* ]] || SRC_URI+=" )"
+done
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
+DEPEND=">=net-misc/asterisk-1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	local ar
+
+	for ar in ${A}; do
+		l="${ar#${PN}-}"
+		l=${l%%-*}
+		c="${ar#${PN}-*-}"
+		c=${c%%-*}
+		ebegin "Unpacking ${c} audio files for \"${l}\""
+			[ -d "${WORKDIR}/${l}" ] || mkdir "${WORKDIR}/${l}" || die "Error creating unpack directory"
+			tar xf "${DISTDIR}/${ar}" -C "${WORKDIR}/${l}" || die "Error unpacking ${ar}"
+		eend $?
+	done
+}
+
+src_install() {
+	for l in ${LINGUAS}; do
+		if [[ "${l}" = ^* ]] || use linguas_${l}; then
+			l="${l#^}"
+			ebegin "Installing documentation for \"${l}\""
+				dodoc ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
+				rm ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
+			eend $?
+		fi
+	done
+
+	diropts -m 0770 -o asterisk -g asterisk
+	insopts -m 0660 -o asterisk -g asterisk
+
+	ebegin "Installing audio files"
+		dodir /var/lib/asterisk/sounds
+		insinto /var/lib/asterisk/sounds
+		doins -r .
+	eend $?
+}
diff --git a/net-misc/asterisk-core-sounds/metadata.xml b/net-misc/asterisk-core-sounds/metadata.xml
new file mode 100644
index 000000000000..bfadac6d6ff8
--- /dev/null
+++ b/net-misc/asterisk-core-sounds/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<use>
+		<flag name="alaw">Install the sounds files for the alaw codec.</flag>
+		<flag name="g722">Install the sounds files for the g722 codec.</flag>
+		<flag name="g729">Install the sounds files for the g729 codec.</flag>
+		<flag name="siren7">Install the sounds files for the siren7 codec.</flag>
+		<flag name="siren14">Install the sounds files for the siren14 codec.</flag>
+		<flag name="sln16">Install the sounds files for the sln16 codec.</flag>
+		<flag name="ulaw">Install the sounds files for the ulaw codec.</flag>
+		<flag name="wav">Install the sounds files for the wav codec.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
new file mode 100644
index 000000000000..37defd12e11a
--- /dev/null
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -0,0 +1,22 @@
+DIST asterisk-extra-sounds-en-alaw-1.4.11.tar.gz 13870284 SHA256 ab9e91747f9ad424b14e8f5508018eeaf06a854e4f5b1234b60a712f7ba451bd SHA512 485a265d1e28cbf03e57fb02dc517b1004806c8ff9f13aa24ca6f6e17a8101871e4b81a52c1691ac16af7e8b33d58795bf12a9516177ae67dad9f14cf73615ee WHIRLPOOL 36363f3e030e142e8c4b2b056475d7ce310f6122ccf9ea5bc173558ad2ee18fdf738d441dba1b9f8bb302d450259b6bd18eb2e4e06408483a685f88db04e6315
+DIST asterisk-extra-sounds-en-g722-1.4.11.tar.gz 14184931 SHA256 cc302da7156a134e1c11bd960e4aef088ee403b443e67aaa10c780e3d75957ed SHA512 0306f024142712d56aada332d10a45222e49feed0701d65b3a214681b10074ae7dd9d68f952fa826f9e80f35a6bf67b5f1206c49394c9c530588eefe28e590cb WHIRLPOOL c2a4f92e440b6dcd79f621b79a8ebc859188b8509ef57db64feff178a8dff7b0af1eddf158a36bd93871c5f6259c7e53d0e82858ab680a3ec60a9cd3f9ed27e5
+DIST asterisk-extra-sounds-en-g729-1.4.11.tar.gz 2102012 SHA256 e8589bf4f88c6ba75315be8c55f2bfde7086b62050d5815f4b41cb43b8e1fbb0 SHA512 32de0ddc94db5a25000038b44b4f475e69350934319ddf3762f26f096a700a8369ee3a5fd888645af3ab3b5198850aa9776e0378daae6a91a1850f33a7a4d8f0 WHIRLPOOL e0531cc8778703e15152cbb29daa2437ccc790a5a21fed054f5980b6b28d4f48f17ec5e2119fdb11e4ff07df3fe3ea9cf64358d60d000e9e2ee4d73b63b8dba9
+DIST asterisk-extra-sounds-en-gsm-1.4.11.tar.gz 3349898 SHA256 d5f031cc31ebebec99ce3fcf44ff947bd7b27b5e9565a7b3a6185c2d1bda094c SHA512 fa65d47f2946194791671cb35aa604e2d17da9f24b04e99e0385bf076131c59d76f44fe42e54febdb14bb430e961a734a56146d1b54cc89747ab68f290d3d633 WHIRLPOOL 931f3c1a9a58e3880ad536b28d18e507ff5fdede367ac209db97688740fa0fae5b7827c291e75c56afb5016379f57f4bda07809b491f05d16b8b1a4c46062c61
+DIST asterisk-extra-sounds-en-siren14-1.4.11.tar.gz 11770392 SHA256 cd62cc292ce506d7ce1acf37caed07c986eb96eb795073deae289cbf0fe324fc SHA512 dbff3cc3ad8d8ba5c1db7b19fe843198ff398f049fadf4d5ae93d79ef3cf5a24c3b3f68117197800e23f8d80fe85fc300d5cc5d6d33ab9d78b533c623ccfa88a WHIRLPOOL c776aaaed12f023bcf93eaa6dc2428f5abe4f5b6c43cc4791d9b3c436db0da541b46ab621d1b1307b011a08c74e770269c808fd0ba2727e546eb9ba8713b5b16
+DIST asterisk-extra-sounds-en-siren7-1.4.11.tar.gz 8001319 SHA256 2af1ebba33566f47593eb0ccdc99d6a20865c6338ffa81e1fae1c2237c28d576 SHA512 430c8c4db2409cf173ab2677446f2603d92beb0b480aa41adedfcf0cbdffc96654b82026c0ed50787b71b8e9736440539d476b7c62bea81cfd11cb94e5af1e7e WHIRLPOOL 0db6c4273ff60eb6ff9059cd6f9f8cc23255ad2afbbfb1c80b91e4bc4ddafa27afe8f2f343e09cb0987c26619cb49e1c64963705ca714ef9e9a990d4fa41fe49
+DIST asterisk-extra-sounds-en-sln16-1.4.11.tar.gz 56596426 SHA256 5d3836e512cfcb06feff7f6e64229a5f7ca5d4186b21c079a7b998109c242d68 SHA512 29bd4d2761fca204e645db2bf103a9839a4e7ab610d77eb19f437a3ee31111de80d6d99ccc46232977f230271da78b4aa9d635aeb11a6770b9cdd6a7cd6da056 WHIRLPOOL 1a2474ccfc762d10771177b965365fa061956fc03660e52b8fe64ca96c1912a4f81068f8bcef2771a69fb5d5c921ee5b4c819005355f15fab9633acb71c7eddb
+DIST asterisk-extra-sounds-en-ulaw-1.4.11.tar.gz 14277966 SHA256 22dd692dde962683601599926efa9281624fce469776bccbd6f5c6b727e77a4a SHA512 bf64aaa2e59aac112a30b5797cf9feda09ad81aa95b8f800381c4276b9138fe826cec0aa562ad458bea6876801d0163e680035c935e756bf951d6d5edf4f87d1 WHIRLPOOL 254ff3648a6d62377b565a79fed3f176f7996966c4bc3df34dc3dd5a7cdcb2379243a12d9aa7aa5a463f9d7ac1d0f44fa5d7d00818904e3a8183ba09633a544f
+DIST asterisk-extra-sounds-en-wav-1.4.11.tar.gz 27948533 SHA256 34cefb8aa31021e947c77033b99ced9d62f9d8785b45a04bd12675a0eddd9ed5 SHA512 163d7acb06ae8216c27293351768b658e61ecf928c5e13edcbf25014107b763d92e3e31424ba36703a7d92b617a78d9491bff86fce5046fb8ecabc3327f364b3 WHIRLPOOL a5838fe7c5211c45d446a9a2204f50ad3f2db5a77b30c933b66fb69d8ebf0dcd5b56d46b8f253380789bfd41c98312de913f19e2e6510c2d05d1b24cb6f4969c
+DIST asterisk-extra-sounds-fr-alaw-1.4.11.tar.gz 11474936 SHA256 2f042b94474000d15d373c727c9ad9dd4151ce6100b7cc7486748babc3879836 SHA512 c5922db421e168e350785f837b8007540438cdd9e5a8fef0260120c23f0d6df5ad83d18f11545e23cb24b68fd35b0454594091fc8a75176d1604bdd5b08290da WHIRLPOOL 2d538abef6e6b2cd0d778ca957da1b726ce704d212cdbdf3a3e3cc6dc751d966fe25efffb80ef8cf1668153cde60d5fba0ed925a8c2ed40ec4ae30f53dd5c17a
+DIST asterisk-extra-sounds-fr-g722-1.4.11.tar.gz 12976829 SHA256 0bc0f9fe98d528625db827d474cd619f79abbb9d1495936e41f86b69d63f3f2d SHA512 834a4baf05512e299be5cf5eaf7b100dfc8c77175515fb53885b9393cc7edba5e582780a8e3b689eed9c6b0828d3a989c39e96c601b49a2353bbf8487a7fa52a WHIRLPOOL ced997b6affa36e643dd026ed887b8844236c6b70e5e7e590550436e2e9c036a1963345bbd1358abc2c03afa2e4e3c1c717b7c6e711015a7114f6c96e5a29c26
+DIST asterisk-extra-sounds-fr-g729-1.4.11.tar.gz 1868622 SHA256 687b6e2f7632372a125acb97ead9b597819ec02c4b77cd6e62fd070b34fd9b26 SHA512 2cc5fe3cb600b4f08cda0b67f63f92a0675b7d88bef193eef02b2d76c1a1357221ddf21a7ae3e64bf9741528241969083c7374a9dd9bc8fa94213912362ba009 WHIRLPOOL 89768e213c3138eeae08ae928254ca56d53c2b65e3023470644692a3d46355da2482fe40a0bb3a8da859130bd078a374242c2a4eba75ee795b0e83d049106a87
+DIST asterisk-extra-sounds-fr-gsm-1.4.11.tar.gz 2930043 SHA256 1608776dbad3a97aad525eb4087d5c9944d7856ff8e015afeb353c5e97b38746 SHA512 f9df81f89c679f1f28da7932c544e5d8da7c60fe06dbb1b11978b02e881eeae134dc298a4a971812f836c49e3c0491e983286ac45e5640c23e62fb069315aae6 WHIRLPOOL 54ffea6c6ea4d90b273971e5b25693cafff7aced37ae861988d5f276203d488347d8a9abcf76461179598025c8d703cefe84c82d131d039e13b66f66ffabfcff
+DIST asterisk-extra-sounds-fr-siren14-1.4.11.tar.gz 10811820 SHA256 bcf7b3528c2e8a37badd9d5fa4aeac6357bd113974288345ca9e56fcdb1080e3 SHA512 5af35a5d5c5e800c372a00eeb30b0f942d9b6b3876f3290c92f2c24607527901edbcab29a72d1464ad5e9a5e3a65694a3e09362162bbb19e977fead694b08ce6 WHIRLPOOL a4c056dfbb68074e18bc30406c53112ee136297ae1d020dd5b93676cc9371c8f9d92fd76c4559a7240ecdc77929813a8f362e2ffe23f8041f342b22a33c48ba4
+DIST asterisk-extra-sounds-fr-siren7-1.4.11.tar.gz 7128320 SHA256 a02d8d554ec365dd32a747845457323e649928dce1ac0cfffd6910b622130981 SHA512 e583beae9a7878e9b5975ad4556ea9469f327f145e6ba6c4775c4023b6b8536931ae884aab0c2af1d3e1bb2d4b92600082337f6e6520e8982b1da7a6b5646962 WHIRLPOOL b7266046ebec57959a6e16991600d0c4cfa43d4e446c180f0f2075a027d4564798f1fdd52bdb7c001a5d685740147c585ef58d5ac1ef803f75f9496124e3d3f6
+DIST asterisk-extra-sounds-fr-sln16-1.4.11.tar.gz 48517491 SHA256 d130ca16550dbc85ccba3ce791a4b1aadbde6e88b84579cc0446af3e6e4870a6 SHA512 f8b0a1eebd93fdda707846dc73d30418462a07572962cbe822eb11ed5c2ce7741b185b0e4abd05c47d0c2c53e817c47b3c493d94e92e50848c7a270e87e9a586 WHIRLPOOL 55fc1cce39a48aed5bb33546675b8f27760986a49258c9f05d872c7b6144880b782a0a1b7fa15277b8e9708a7813008c6eddb591c356b86b763b3b5cb9b0eb2d
+DIST asterisk-extra-sounds-fr-ulaw-1.4.11.tar.gz 11818928 SHA256 7a20535f45ed4415e7adf6f2e19dcb6419bee8262ac11611778ed8e6eabbf0cf SHA512 34ba851729186250a3fc459b685c0a4d475e32820e4a49b3a1b2c038e0252a71a0637e1bfd67e0bd4960cb90ec24f8cb28435a049fcc91f7b3ed4f0f1009b0ab WHIRLPOOL bdb91645d1c6a58a8b5df9ddf21725be504796a6c386f411014b5600a2badbc2811353325f477c41165f35976e22003cf010ec9c2e1f1a1503541814da232a0e
+DIST asterisk-extra-sounds-fr-wav-1.4.11.tar.gz 23829634 SHA256 d3891730151e0a76c0a811499040379535d3ab7b63ee10f3a2e12b5c083887c0 SHA512 4482f7a95fcd5b43ead86e877e4df88d017ea003bbe56c4813fe6814956fb015d4359bd1257513b34c3d80ac171472c0749e534ede6ab9aecf42a589ad76c0ba WHIRLPOOL 74f4f402715b44c97de6800a88f7b75dbc9c2412457f6cbaae16d4d642377a74a37787320caa4600fd7515fcf7cae7cf3a3117d690a9d4587675b15cae2f9654
+EBUILD asterisk-extra-sounds-1.4.11.ebuild 1795 SHA256 66d04db6af4bae076f5c51e6024b512994b3faab3006cac08c7a5bd2a82e95c9 SHA512 050fd1b23dd1873529a871327dd88f77a8d8fcd3f49145878d90ec82f2e1326de930a704708b0ab38c38c052605448382ad65e707db5fe68459b176df34e8b62 WHIRLPOOL ded6e89afaa4bf02d7b1fa0d80f551ce5b7649c6a597a8272d6252b99dc896b4be4a35997c606757962fcb4c182633afffafaece839b34c5604663714f062954
+MISC ChangeLog 2220 SHA256 6169d18149a507e6827db353e52d11d460ca45b9cd26c7d2364404a71f519f96 SHA512 598b3428aa331be6b99a97966741cf6d7b89e89563279109814b6a0b3b275b8288f26c0343c290f44934050fb6d0158c8210b2c85b7ec9c6fedc57d9bcc7a736 WHIRLPOOL 58dc57986e2944a1db54edfabaa825db8d8e500a105bf4182b7f5c410c692d9524bf5e69983a3e272973c5c7728282891752268bae1c73bc0d7672d1f6d2447a
+MISC ChangeLog-2015 1146 SHA256 17ce5b935017ad02d6cb3408cb74179afa08aaeaaba7973080bed7741d755736 SHA512 674a52e37c8aa2f33669bfdf830725e7eeefd1413cd01bc79990225f608f776cb9af6a7a279ed890f0da4a75ffbaf92cdb8d67f2653b7093dd9549168a00022f WHIRLPOOL 4d28581b3b38891f21fda424edc93141946e07ca8244be38af24df6c6e016f6fd85b761f73e36d92165c2c20b8f3d74f3a524987e49ba96bb2d127fc5a00ddd4
+MISC metadata.xml 917 SHA256 c12ec8e21f4f708b69162bb190dce24f798f421d6aec9e0608c371c527452ba1 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a WHIRLPOOL 7b9e22c021fe8c9d6c14e838b0c693ee5ce28400d42d8fe293c3b9a043fd9bb4b7d78090378e4b7280695932339caf0060b2d88b8cb0c0561844f79ff99b6156
diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
new file mode 100644
index 000000000000..8ca668e30853
--- /dev/null
+++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="Extra sounds for asterisk"
+HOMEPAGE="http://www.asterisk.org/"
+LINGUAS="^en fr" # ^ is used to indicate to the loops below to NOT set this as an optional
+CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
+
+SRC_URI=""
+IUSE="${CODECS}"
+for l in ${LINGUAS}; do
+	[[ "${l}" != ^* ]] && IUSE+=" linguas_${l}" && SRC_URI+=" linguas_${l}? ("
+	for c in ${CODECS}; do
+		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )"
+	done
+	[[ "${l}" = ^* ]] || SRC_URI+=" )"
+done
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
+DEPEND=">=net-misc/asterisk-1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	local ar
+
+	for ar in ${A}; do
+		l="${ar#${PN}-}"
+		l=${l%%-*}
+		echo ">>> Unpacking $ar to ${WORKDIR}/${l}"
+		[ -d "${WORKDIR}/${l}" ] || mkdir "${WORKDIR}/${l}" || die "Error creating unpack directory"
+		tar xf "${DISTDIR}/${ar}" -C "${WORKDIR}/${l}" || die "Error unpacking ${ar}"
+	done
+}
+
+src_install() {
+	for l in ${LINGUAS}; do
+		if [[ "${l}" = ^* ]] || use linguas_${l}; then
+			l="${l#^}"
+			dodoc ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
+			rm ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
+		fi
+	done
+
+	diropts -m 0770 -o asterisk -g asterisk
+	insopts -m 0660 -o asterisk -g asterisk
+
+	dodir /var/lib/asterisk/sounds
+	insinto /var/lib/asterisk/sounds
+	doins -r .
+}
+
+pkg_postinst() {
+	local c has_once_codec=
+
+	for c in ${CODECS}; do
+			use ${c#+} && has_one_codec=1
+	done
+
+	[ -n "${has_one_codec}" ] || ewarn "You have none of the codec use flags (${CODECS}) set.  You need to have at least one set in order for this package to be useful."
+}
diff --git a/net-misc/asterisk-extra-sounds/metadata.xml b/net-misc/asterisk-extra-sounds/metadata.xml
new file mode 100644
index 000000000000..7413756723d5
--- /dev/null
+++ b/net-misc/asterisk-extra-sounds/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<use>
+		<flag name="alaw">Install the sounds files for the alaw codec.</flag>
+		<flag name="g722">Install the sounds files for the g722 codec.</flag>
+		<flag name="g729">Install the sounds files for the g729 codec.</flag>
+		<flag name="gsm">Install the sounds files for the +gsm codec.</flag>
+		<flag name="siren7">Install the sounds files for the siren7 codec.</flag>
+		<flag name="siren14">Install the sounds files for the siren14 codec.</flag>
+		<flag name="sln16">Install the sounds files for the sln16 codec.</flag>
+		<flag name="ulaw">Install the sounds files for the ulaw codec.</flag>
+		<flag name="wav">Install the sounds files for the wav codec.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest
new file mode 100644
index 000000000000..f8b0d83355b6
--- /dev/null
+++ b/net-misc/asterisk-g729/Manifest
@@ -0,0 +1,56 @@
+DIST asthostid-x86_32 1166416 SHA256 c6a208e4842a8137cd0efe86d0b4b82fe995bfb443d935e9a6fa6c69e3c191f8 SHA512 ce1ca53281af99f15b74ea8034d8ea7db1cebbf4d35274381d03f4c7e28293be64c81a6188c5a9d168ce9af208820db235b1c5c9c9f8fcd11a14045e05cbc647 WHIRLPOOL ba83aa3bdcb3552ab35dfa1d536860a6dcaa50fcbf91bad1e7af8e7caae3af4812e2a169d9520dd9c6ddf376ff32afa7aaf9eaa3d485ff1d68e293498cc5ee34
+DIST asthostid-x86_64 1166416 SHA256 c6a208e4842a8137cd0efe86d0b4b82fe995bfb443d935e9a6fa6c69e3c191f8 SHA512 ce1ca53281af99f15b74ea8034d8ea7db1cebbf4d35274381d03f4c7e28293be64c81a6188c5a9d168ce9af208820db235b1c5c9c9f8fcd11a14045e05cbc647 WHIRLPOOL ba83aa3bdcb3552ab35dfa1d536860a6dcaa50fcbf91bad1e7af8e7caae3af4812e2a169d9520dd9c6ddf376ff32afa7aaf9eaa3d485ff1d68e293498cc5ee34
+DIST astregister-x86_32 1178780 SHA256 14cbcfc5e6b3aa03c2885816aef87b5d96ee34b3c7f70b1b536a975423c5358d SHA512 4e6009df693878c4fcd034de122d11a5f69a085e2228604994dfce460301d70a418672e3af2fe35c22a9618dc28cb77ed0702b20e41429fb10bd28dbb085a55d WHIRLPOOL 763dfd25442a69372bffef191647972a05fbe7f06b25440e46d010f59afb74a4d219b8b704420df3b8c0a65a22ea90435713220bdaa06bc270e43065f0cc11c1
+DIST astregister-x86_64 1178780 SHA256 14cbcfc5e6b3aa03c2885816aef87b5d96ee34b3c7f70b1b536a975423c5358d SHA512 4e6009df693878c4fcd034de122d11a5f69a085e2228604994dfce460301d70a418672e3af2fe35c22a9618dc28cb77ed0702b20e41429fb10bd28dbb085a55d WHIRLPOOL 763dfd25442a69372bffef191647972a05fbe7f06b25440e46d010f59afb74a4d219b8b704420df3b8c0a65a22ea90435713220bdaa06bc270e43065f0cc11c1
+DIST benchg729-x86_32 2948664 SHA256 47a33e8588843cd7245b8ed483e061da39f12ee10c602476e302fa35ca7985e9 SHA512 e03d699f6f4cbd2d22cbab534eb032977373ef56320d061c45bd5f0a34f5f88a2f9185491d3c6ef6365c923e5703abc795eedff981e351472f3254307666d941 WHIRLPOOL ea8f0d65ac572b8827770724e400ae48b1318bb749d12fe61c3d5837459f11e9de2ee3605ea3fc86391972c01f2a994851628aab3d9aa6cf12703a3199380144
+DIST benchg729-x86_64 2358320 SHA256 bb2694fd5676eb9049933d785f79713a11fbdec0c49917787e4415866c1e25a3 SHA512 1239c64a6da40a8d0ef24f69fc31571a756e280757040e853ddbe3800c3d2a911d454a85b4474e3b5afd585ba56cc28a8f1ef17006211fe336c0cb223ee63ef9 WHIRLPOOL af1830efaa67d5a97c308524738ea642b426cc50478eab8eb496f1c1474140cd83e54a1f65d219f45bd57c029c08861359b083f052768fe177c7fc79477a9a4b
+DIST codec_g729a-11.0_3.1.5-athlon_32.tar.gz 403854 SHA256 c7a78449a5fe4f03893aa9c4e415830b4847089f4dfaecc622a2646f4c5c5ff6 SHA512 8da743dc946633f9a4f6754f938ed90591c58792346322eb3ed53f1a6b31137c2a5ba62b8856f2dc03546a05e16e2c08ba3bb5154b4e41123669293c9d335545 WHIRLPOOL 15df98054b68ca9d77d1fc229b8e8c6a16bbcc0cdc6e03ce038b55ad2849b5f9d8b134ddcfbabef9572bb0d1b30b4bf4fa014631fda3947b4d439d96660c1dd8
+DIST codec_g729a-11.0_3.1.5-athlon_xp_32.tar.gz 403409 SHA256 04395a18c3ae9889be40c0aa171806e382a5ab5ac7603186cee039c00faa872c SHA512 a7bb535adc55910444648d142b064a52e9fd8492f94338e2f26df3eb24ddb71436ab90d4beb39e2d452dcecb8fae25869ab5d52cb290368398850d60718233a3 WHIRLPOOL 9b9aa3d70961c94d87b7d0518d9496dfe44a65d880c4091e2a6771804e66e810213eb213c3536bfee01415f6370f0c7dea3906a5cc32808d2a6fd06e4f63e3f8
+DIST codec_g729a-11.0_3.1.5-barcelona_32.tar.gz 411880 SHA256 726d2b14f9cd210d113c4ef07e7cb1a60448caebb172eec16831cfdc0a6f2f99 SHA512 3bead54be5dd1d006844b6b8a7064777ea7774c90dc8d4d6d1528b64f0ade6c962806ece216ebda976dff730c235e132b2a820232ae1403681e6f86adf8bff24 WHIRLPOOL 3d7669161340d7060f86a4bc0d606af8746ec235fa04e2713ebd37453728a842b155bcf93ad1a065b4e444fdbd58fe1d46b3f42bab73faa86b4c7a99b678cc2e
+DIST codec_g729a-11.0_3.1.5-barcelona_64.tar.gz 464638 SHA256 dd23e224554a25fd8832cf5e64700122443ce8ffe980fa514b6af082d9a79c1f SHA512 f9e3b6dde8c212569e4ff94dc30abc22db967fe2fca9c5b087c29689c7e8667dae41e3f265dea4afc9da15d72047bd39e0e7f643d875e50ff7b003ed8c3ef5fa WHIRLPOOL aec9e3f04ebb7224b702dc892483b068c19fcf7743e9a5f118065663042bc43ed1cbd414b48c6caf381140135a7281c1c7290ac3b47bab5646c67026696f1d3b
+DIST codec_g729a-11.0_3.1.5-c3_2_32.tar.gz 404444 SHA256 2092329f86b2b58fc0a2451be6706ef2e8c892674b20f77f47a9df2eb3f59c55 SHA512 3a135fe006797066966f9e8f4ca6323dba35669bcec18cc028b98776f57adf911da17befb2fd04a8081bd1488263ab3c0f5b639d6d2dcc9b728a3238b4bcf91e WHIRLPOOL 996d4ebc6ced44ce096ad9fb14c380de8a7112c3c0e2b6938e7d7dea889808e19b7eb40357ba25f23d9aa15ba953d1f6d9f76378da27f7d35c35c8da636beec7
+DIST codec_g729a-11.0_3.1.5-c3_32.tar.gz 405421 SHA256 875bd2b6c25cbbf0f98829d6794eaeee355fcd17434d57a687531c6ca3d8b8ff SHA512 1b3c07d142c517847d00004041623e5b5f0c003dfe74dd299f4399659175c03e0846b2b6a5403c60ae44e765c74d18f73cd4d0509c81e145e0fe07a2eadb0630 WHIRLPOOL b3813d77c98a02b0fa4a2fd73c8881a8f9804fa108e2abaf7ac7b4728023c730e0875b19193e3a75cb571488f0ec13f27fca3ba64dc3e4df7871fd0bf0655c9b
+DIST codec_g729a-11.0_3.1.5-core2_32.tar.gz 410492 SHA256 e7adab08af2d96eaa9fd15743c66118b9d5a5bd018b9cf2d7aa3f1b56dd0f82c SHA512 431a9d0a35e7f966e52a4ca7d0c5e05753eeb3b714d6847600714d55959724ab745bceb0915c571382ab38bb160b9035b509325ba77e6fcb97623e7df0160044 WHIRLPOOL 9dedc30ecc48eac7a3058d0cbce5ad5b6c678a8e290d0d1f2e65e6e0b2b38d79a36347cbdba4ccc37547c91478d2e222416d27e12e5934413c6b98c6fef87c5c
+DIST codec_g729a-11.0_3.1.5-core2_64.tar.gz 464466 SHA256 a0f6b51ce186174a5a6d326075c5f6a06897fc159487aa64ebcd25eb1a591343 SHA512 bfd67de08e81301d46f708575d1cb0c97daee3cb004eddb9ea0eb0c72dab803147eee4bc6b4a0c9baf766b5086a1dacfd0d360def4960289b8c69c89a2d25534 WHIRLPOOL ac4149b45ed334b4b44b0111c460989153cc7f9af7ad457af9e13b111feb1c861471dabbed7fd03aba2ce86ab85cd728cfd659fc85143ad002830429453b43d6
+DIST codec_g729a-11.0_3.1.5-generic_32.tar.gz 402872 SHA256 dbcd92d9cfbc6bd807634bfa9f3535203532f97de632ab2b979f043819a33f69 SHA512 ddb2023c5f6d02238d42dbadb1b2b3d28c43a046eead3db7651ac5b5db6c8b98c49bf948f41b0bfaef5816f2c391764ed511f9fe49b340dfd1338529b25f0dde WHIRLPOOL d969cc7632e01ff95e86ad49fbf693b6c6a92c1e5aa3b31f51432e66f58a28c09d0f4b00be90490aac978be89550978794674d2fbabafa128171cc4c094b28b7
+DIST codec_g729a-11.0_3.1.5-generic_64.tar.gz 464215 SHA256 6c8feca459d1309904b5f7f712874577e0ac7206fe062c702a7671c07fb7153e SHA512 6c08626f8e0b3e7e0431c8cd10bc3192891272261c23a1aa4e43647a991c6df4b503da54a4dd3b3e446f1ae5a2d3d0ff2f9890f51e8c321a1ab40ca7fd418285 WHIRLPOOL a9ba2e6c1b8252e79aaefe18da9dd9b7cb643537c24895ca5ad8edbd5b31fe211705184a7c308344c338f3226c450350dd58dbb3dd1b599aa4f6d998282a8939
+DIST codec_g729a-11.0_3.1.5-i686_32.tar.gz 403806 SHA256 523c11abf89724e426c031bced01626ee066c61c5406b665ef306d242c7ae2e8 SHA512 b2cf9c2838fc2221ad782aaeaed4c2ab2aed94877cdc6dd10a23e064e8001b836cbd7d4a0c013500f67162d638040fa7a695a9d0b14ec22b421c01dc0a0065ca WHIRLPOOL f01de125fa66f6a3a71f0e935db78fef4b217384cff4e39f22dd9609332ebcf697fb6e76ef44da52c55678f3f4a2f9138c80809ee60d5881def08f0dd26d4dd7
+DIST codec_g729a-11.0_3.1.5-k6_3_32.tar.gz 406282 SHA256 850ba147bd0b11483ffa39d1b4bb3b5b2ea887b4688249e931c5413712a64b90 SHA512 f5ae04daa4b110b003b98d2d448db8bb370e94c291423f1b324839aabb01cbb13921edc6e9b56684456086f075370ed033074c0d9d72741b736720d01c2cd294 WHIRLPOOL f0a4191f5bd89a04af2b9547b6de3e6b4effad626bb6aa50d8d601fedc437f5d4e439345539cee1e21b5e470dedd50221161c96b083816a4cb82f2e8e792fb93
+DIST codec_g729a-11.0_3.1.5-nocona_32.tar.gz 411116 SHA256 965ff6a520dcd00f6a49a264491c82f01a05f20a62c9ecc96dd73c4eb4bd3d0e SHA512 537a0b68817a76984cea335cb3107850c4addbd953c154678f63d91957d38ed5398035ba9aa302d141a6356a4de4cc439193bd069ec3a14a3831e3e1333d298f WHIRLPOOL 4a74b42b5dfd8df356e6cd92cd170501b8ed748954e20c191e992a131ae8368e3f3a92b183b569539f14def53e7af4a378cd078444a3e967bff7628aea35aa0d
+DIST codec_g729a-11.0_3.1.5-nocona_64.tar.gz 463088 SHA256 5bfdbffca9d60785a807bb336ad75a0f98241ded3ae229c17347597e76fd2ed6 SHA512 191f2f479188b3f681e18503f44a92eb48294c2f85bcea80d43bfc75f01a4e66a02ff19e09b6712b06205389946ff333c842773bdb9cf41874c117b7c3947780 WHIRLPOOL 9a0dc965f75abf6bdc2e8c5547440d8960519903012e207a8c358a47eb1616504c31c74bd5abb593f589faf1d5d6cb2ce715b3836d533fd3df89dd138728a73b
+DIST codec_g729a-11.0_3.1.5-opteron_32.tar.gz 413573 SHA256 2efebc3320b8830606c217b208e95597049ed3a82ec8caee47a7e0325bf2309e SHA512 a16d26db435860f27fbd2cca1025a118c838340f8efe48fc73e0a51d203b7499119f14fb5bbb83e16bb34e3865f001000676d523659b4c140c99bae0dee6eb72 WHIRLPOOL b613d50e1c258f8ec7feb1e332f76b7cb292ffc62be3de47533e16f1f2d66d9f9c46e4fc0b4c4ef35c265cf932b12f23b9d812c84aa8126ed64fbf3311f5d1a2
+DIST codec_g729a-11.0_3.1.5-opteron_64.tar.gz 465658 SHA256 2a95833ed76dd8eafa69328f54a94cc6167ab4787e303faf26017ca8fdb5afed SHA512 54f1f739b8a078a9f7c7a457ec80a52624fad6278dedca76f37ff1be3fe507b9aa2e5fd033b8ca5eb99026a498185c85a0ba044c543bc6a6586280da304787e0 WHIRLPOOL 88b73f4aace812fdd0d78bb62f9170ffa49867198b3276756eb21969a52c4d94a1668aceefa12bc13e5b5cef9fc7e23735609dd58cd283ab79722a3cf07b75b9
+DIST codec_g729a-11.0_3.1.5-opteron_sse3_32.tar.gz 413509 SHA256 d16e030692b820a3c1c32b66569390d7b9a53e9836c94ffffb8ec8f6221a8033 SHA512 ee6afd47b11432de5bd22725776906be69e3835412ec143d7e8017395e46ffc83c7ad412a167606441a2e572adaa27a71eea2f64a91d82634015aaf09cf09dd8 WHIRLPOOL f9d6fde85d94e787fd555d017195f786a0978850fd1ad18c7e1f0cb9ff873f81f0f7007499533b6d99b65cd012f06bfdef795a7e899f94e9d71dfbd73639793e
+DIST codec_g729a-11.0_3.1.5-opteron_sse3_64.tar.gz 465591 SHA256 2a3322da37baf70e53f1332012a15cf258783d1d9e0fec9eb429d3b7f4a57b8c SHA512 91bc192b2feb3bcd3f9ee1e6d338e60a7e31f6c6af132597694406f44c4bc697df6e97f9929c2a03731e93e9576ec81194eacd21f883b7aa078d402baffbc3a4 WHIRLPOOL b7af18a6aeb4f2d2a3ae865d5d484361de6eb1d141d4cf460845941ad94f2e46f8569740af4a316bcaff7e5559fc90ad3e1c69b5c07815ff4bb1f9f524d19cef
+DIST codec_g729a-11.0_3.1.5-pentium3m_32.tar.gz 404457 SHA256 7c24726b038c6cbd1a23ddd79e4746a88a02a242365c6271249f42e3375a2040 SHA512 106e4c3be4784f13e6d599cdabe99ed7ec1f4d1d339da96055db4d012074bfca04cdeffb50d88dcd02b0d8eabee08ff362d532d3572723fa5e3d1611af49f436 WHIRLPOOL c1bcb45c046b257b4afe2d6ac6fb5548cdd07d6763d36c4526379e3409b8253f88bed741e40229d5ddf4d4963e495ed71ce0ce52584b0cc439f600904f8f7d89
+DIST codec_g729a-11.0_3.1.5-pentium4m_32.tar.gz 409011 SHA256 5e81fdd0a6c36a5611aa1720eed4b61fc7c00e2a5af3c9bde0690f68b532e229 SHA512 83a37a736edfd4a5d03e22983573e216da0e2ddb2a44054b94d43642932ff20afa1b55858d3be2f0197c24fc8a1e81ff2c7826c1a959a058669e9104a7e92151 WHIRLPOOL 2770511c965f9227113584ebfe65b191989c3211767c03afda96a2fb8c380781124dcc57f1360710edb3a4264f30f9ae52775107522c48180de07be0b15ac1cb
+DIST codec_g729a-11.0_3.1.5-pentium_m_32.tar.gz 413125 SHA256 7df3f2de56c5791537d23f7f8819318d6974f77bb887305b9f7f4af580b9ce5c SHA512 d1531d3a11ad8dd61d72364d63fae2e1bcb2d35984c70deb240e6ab513264314f00d74108f0f46fad2ae52b1deafbccbfc4153445362410ec646a2df5de94391 WHIRLPOOL b55951ca4bf95ad508dd7e687bed4ed73a3639c4053b119527776304fdb490543384c3627972e7f850845c6083a4a6f73631c98b1786acea4e3d60ca7998ffd7
+DIST codec_g729a-11.0_3.1.5-prescott_32.tar.gz 411126 SHA256 ccf75a1793bd851f33547f1e5a2063741768976b0d804b0962eec92b66a72247 SHA512 9ede6d14a2b0ea7bb5094dd87c7943e582dd3e49dba564131a0382e9f645ccd35ba85c96288124860e405b030de4f6a717124540053e897b2e4d5de190feebac WHIRLPOOL 556ce3f8224c3ff6b6f4b68da1aea5a1a5daa287ab761851c9d3897769a710aa4f9cb113f0be6a53c5eb3059302c4be86341f379080caac1deecac5265b4a63d
+DIST codec_g729a-11.0_3.1.6-athlon_32.tar.gz 397172 SHA256 e16bc44fa1cfae0a40fe01d3efa28a109eb256810823245dd39f74c99a3fe5ad SHA512 a08a482d686790e66bdef49a31a2b79a5a93f36565e77d7514123382ee9fbb6c1ecee48d0608a349ebda8c01b524280010da6bc03ddf206061d6504451624f00 WHIRLPOOL aadd4b88bef8d683e65b02f693e79d7fd5e064b68aac3df260d05f2961838c63eb026c36299d1a97345a8677812359dc1eca4e9049bfa130927a8c1c645e2259
+DIST codec_g729a-11.0_3.1.6-athlon_xp_32.tar.gz 397179 SHA256 6fd3c9334f1c57ec6ab3b02072a5cfe6b88d14c1da7a85f9b6e3ade89fcfd8cb SHA512 8de895251fa76fbd9b0b2d93f365aa4cdcd514a0bd00dfb9af661d5ba50849a9d3c7cc44dbd2bb4256dddf61307d64744f90a12f012ae8292b2827fa8ffb7c95 WHIRLPOOL f9b99b91db9e3b992b4609e64864661060df4f01367133d7ddfd61499e6c4e95fcb5cf407ecbf3ed34182ac92bd90bee628fc96d65618e088e28659d13c91aa0
+DIST codec_g729a-11.0_3.1.6-barcelona_32.tar.gz 397215 SHA256 2ccfa65bec2d41e32805043a075198680b16a962c0a243898ca83a371a59d606 SHA512 104a66449ad2453e68f27f7d4d6f80d12b2a186387ac39b90094a916dc1627e42e2c8829dd4c228a8f3bb0a40d71e912e01eba79c6330e4cb5c3d0a6a95db133 WHIRLPOOL ee0f0009cc49a583f00da05cec9bee6d7e8300bd34b2e2ece5dad1b6eee32b9210caee0633ef5cce9fea93f9b65a171a29f452483c93e6af555416efe4322c8c
+DIST codec_g729a-11.0_3.1.6-barcelona_64.tar.gz 453437 SHA256 5a9eb3febcd91bb26a3aaa0068493d7bec782db3547fd7e3e1683e4b9258ef41 SHA512 b9079f27f84a63e1d863af9589af848fbe052c9e9d31e65ca2c3b08f76e5afba76b236e9f85281f98d83d8082342807578d8ff183a4f8df18cd0fd7a8ffe8ae4 WHIRLPOOL b6fe69dfadc4f79de45110e4e8e0c5669b43cdc4f0527d8799a24de2e5136f577044cbad27694e81b23fc0dee09ef364cba9a8f6666c060db71f7f7d76a713a3
+DIST codec_g729a-11.0_3.1.6-c3_2_32.tar.gz 397547 SHA256 18f609b8086fa3f68491b9b66bb77d9608aa1818da2a4686d8e4fe7a799b03dd SHA512 6503920db56914c4d05ee23827d91387a5af85e7ea2524bc8d6c46250d31d126a54b422a092b0ef80418511cc1e63f3a603cab46623cc07b6be87353d7b3ffa8 WHIRLPOOL be80095af5344e320730df4af68d86cf5cd6486445248cf88d2b68ef0dc9c076bbe7627c76d55acffea39643731dedf835aeae9818c851b700e514aee17b1c13
+DIST codec_g729a-11.0_3.1.6-c3_32.tar.gz 397306 SHA256 9780e6488455ae6540f731cf3cb5bae09dd828e7b8913c78f9a8684f15de9cc3 SHA512 1e68ffe81af906ad93c8bbc69349f9e81bd6562cfe5d39251e4b7d51df422058f71b6d856b733358330242b909e156787cfa0c086ef5adc50a8dffde7fffe446 WHIRLPOOL 46d808ee4e10ef9eda92cbef9dfe46c037bb41b4c54b2e278b1d800dcbd29aeebb8f8046b78220b2aac6ae92886efef028ea43d03e14abc84084f3a8b1433414
+DIST codec_g729a-11.0_3.1.6-core2_32.tar.gz 397176 SHA256 8c9f3dfc60e3597eb24e887310f1cb9077284b2f3b0b1793e36e7d6e1bbe2af3 SHA512 1e1fd5edf26a5be5fa70529bcdc658796fcd8145ac04d0a8561552e76c48263b8194b02b9ec98893bcc5d73e34659ae45b289bebdd1e8e328683ba8f1642cc4d WHIRLPOOL 03d11b05d61b58f1d2edb1c804eb11a071b5995941b7f4cd61da28f3aeb16db332efd1c9b0adc32b2c3825590f345ce67d0f81a3f1d7daf436125aecf1ff8a93
+DIST codec_g729a-11.0_3.1.6-core2_64.tar.gz 453545 SHA256 0875b54e3f7e894c7628549c3b900813fab19a16ccc0d4399612542f40c1e8ad SHA512 813bff86d19df1458e62a4b0b65421d0d94acb99afc1c80c7f8e12aa806e67d6f432c88290035ed8225993cd54a6ac9fbadf90fe67b5a2cb70850e1f404212e5 WHIRLPOOL aadef598d98c7371f21dbe6ad75cfa4fb647fb7ad76dafd13f00fe1934bd9efff6f620c802e4a3a322e45fc867bc0eb53fef01030d569afda7c63f4310baff67
+DIST codec_g729a-11.0_3.1.6-generic_32.tar.gz 397190 SHA256 23954c6dc5be6ef6b510fa2ceec248a47653497d7e2cd65a28c2c65f57bee874 SHA512 76e38b9ecc8aa6449f499185fe3aeb98bcfa9aa4eb538807b20936d9e233a94ded25ba589ad9782071845c522c465adb1a41a63eec4b4ee714cfef36a9fe23eb WHIRLPOOL cf7181681e86e8f2eeab94d7a561c6c21f8995e181517eb08b71080dbfbbe0cfc4c55e4a6ec2135d32fdf4aa1a15d69eab5ea9e7d30f7e0587f59a0ee1c25bf4
+DIST codec_g729a-11.0_3.1.6-generic_64.tar.gz 453604 SHA256 72caf518e187dad98f4460d3e2100f83b5fe9e63b8a52ddc5f9c4ac7ea518b38 SHA512 5b66df2362b131d91f5a0b95b2ffbefde8f3b68e1f5e6b6c860666afaa4dd73e17aa5f3b942db0828c065af5124506df478d3e4d2b6b2965b39f7a80790b736c WHIRLPOOL 34a437791546c7ef0a861a2c04c33d4efe7d94592a19c7ee2d43d2a0b51e28145be5f75515afcce44aae5f7783a60d3cace1028bbfbf312f31e188ddd5dc8e01
+DIST codec_g729a-11.0_3.1.6-i686_32.tar.gz 397196 SHA256 012b038cc9786557b0a41880a8a95f9d609c00e2923284332709ef8b9b35214e SHA512 802e41b88fd1115addd45e8706a93858375f1efeed899e7102e27eaa97b07dc25c0467ef61257d23f855bc7f37177c731ca16ba61a95f52e3153770406bdfa8d WHIRLPOOL f72f9fb249c444ee4c0f290f7449e09272bf305ced5940adff4ad61c09a84106f6c71c68287890f58b4d298ae576437cf19d0198ccd2fcee4dcee842211a7bb8
+DIST codec_g729a-11.0_3.1.6-k6_3_32.tar.gz 397323 SHA256 d2f478cfc153ecdd2c69e938d7dfd41959ad756cb47a94e252cbf54a52b1e2bc SHA512 ad90f61538e0ad5eb485b35bf903e897de494daf9cfe6adc13aa5dc8dddead9a6fa4fdb05ffb8f364c53a03c1a7b7dc35e69fc6cb985b06a3943e16f3b9ad3f0 WHIRLPOOL d6e3b84d55051d265ab22f040be0b8d9782bc8fee845699efad07adecb560dc3104883ab2cc0c13d700c5d5cd5eb19eb9149b62d1d3d331d861bc1e704f0efe1
+DIST codec_g729a-11.0_3.1.6-nocona_32.tar.gz 397143 SHA256 653ca1f1cf60b9e2b142af459e0da1006e0a11810fd39877cbbe9c8e61c12f46 SHA512 0d61a03ac74a79f1c3fcdb6908ad0bd7c8dc80d94dc0d95c5c875ffa46635931b1c227f0e9f28469e9f5ec0cfac1d468c54c8c0b23008042b2990f7ac501d495 WHIRLPOOL e41007369e8ab194f61788e0c19a35c1df867386277b4e7bd9470d30d266eca675e6b50dad6c38ea16b258307d626efe302a908bbf677d413da2abbc4f80062d
+DIST codec_g729a-11.0_3.1.6-nocona_64.tar.gz 453296 SHA256 88183f53ae82577d3188e7de772c485c3434417f135159d96cf20ccb6d2a81b6 SHA512 b6fa29d4ad00842f746bcdbd8941eed6aa96b285413f6561d31b8bba66873a3ac0a25891d27714d6bccb91fb760d078d9774ab9e2a6af94f83dd80c0486e1f60 WHIRLPOOL 52f78e4bd2752e414a70c7b91bf6e88214e85d956703e328b4693bf378093229cf494e2758b1378a01e11332ac0d37dc4df8de4243b634b9c6db453e3eaffcb4
+DIST codec_g729a-11.0_3.1.6-opteron_32.tar.gz 397298 SHA256 e650bb33fa595a0d79c527160c3bbe060a0d228ab661d26d9004459930eedceb SHA512 9dea626643607b31ae5af8a2df804fd13449aec497972bbc5ff0cd95c83c976703d8776c71eef46f298ff54b3e0c9c98ec2a5ced42ece7b2391cfc72425d11bc WHIRLPOOL 89c933ad2b2457b3fc12f145e11d3a901605f78cd1d00434bd8be6f2f52428bcf38f096991bcd65f3329c2df55b55dee6e318076f98b9fa8fae994237ede80cf
+DIST codec_g729a-11.0_3.1.6-opteron_64.tar.gz 453554 SHA256 5f15361e2a954783a31ea93142bb2b997c03eefed5f20e6195a239c5053ba712 SHA512 fd4862071f1d3cf03d75c8ccc54c6ef8b0e5f3b13fca54bc748748dd85811b0e22bcff44b3515d219f4fa284174d202d7ab53f6d677b77e360018bc202fa5c18 WHIRLPOOL 5b207147ed2960bebe66da1017016f7bf4a096c2274e737dd18340c1bf88bcf47fcdd1a930d61612dfbcb8d7e134bd2982019d58705b286198bc194cc96fc839
+DIST codec_g729a-11.0_3.1.6-opteron_sse3_32.tar.gz 397309 SHA256 304900c653a624ca75412ac96c5659f0e9eab1e8df9f1a6b7c915a704ca930dd SHA512 f5bc219f183758b3ccc2175678febe3fd57456db08b487ddd3e8f215ad70f188331f9fd61423f7d3daa1dcc70e849ebe8597bed5f508735ff3a50a66f6357502 WHIRLPOOL 8efe83a12e80d41fb8d7d09c3a88469f97c1cd5d07613f87f0db0c4f4c458723c4bce0c7ba95715767b25182f43e2ce6c499163bca17e10aa1c0f0bd5625764c
+DIST codec_g729a-11.0_3.1.6-opteron_sse3_64.tar.gz 453555 SHA256 85597bcc21093b82d0664e47ceeb28ae83d69425c3a3e1ee6ac0af2d10531ac2 SHA512 e413f5a21ed3ee425dff31d246f96aa771bc52149c3ea6103939e6717fce44edb293d78473c3a49df5747cf5a166e35e5ce5d6a1227fc96297eb8d657711db04 WHIRLPOOL f3bc1456bf3821848674082fe10fafc996a8c4ffa12ddbc5ff406e3d5d7fefa970eed454c631a183fe337ec7e1bef1988093bedc61b33fc218f48c35c5930024
+DIST codec_g729a-11.0_3.1.6-pentium3m_32.tar.gz 397551 SHA256 4a3e0e81b442ecd33246a9221e530b0fedb47832de2555aaac11c29f454e6910 SHA512 776749afd3ad82a924247aa27876dd80169d39411e15ae97b145922b31e0f4713d3a23099063c7d93e98378f79924e61cd8bae6efe1918955048d1ef286e21f0 WHIRLPOOL cf87aed9f7b09603526d1123c40ae2aa880ea5a7a1019a5ae019e5395d9fb08903de8988996321e3c1b8fb5e09087f03aa1b035cb2357131faba8bd411d30456
+DIST codec_g729a-11.0_3.1.6-pentium4m_32.tar.gz 397066 SHA256 52a5e0b699b309febb2c44e1f1c57fcfd297bc6b3e8f6eb49607627d563fc802 SHA512 8f875d442c698013d43b407d805a84a6d0a5d02bb89e0d5327601b157f58d0f5754d551e4cc28ad43282389c762349e17711c2fbadeb6375159983d0d953335e WHIRLPOOL 1cfb1e392f0d40861fc9faad5f3dd701bc963dc7be038ff0f93cdcaac21c5fea9ba263c72642ad6e407d3ff4e061e85c51d825bf5cabd96cc98a6a465ade437d
+DIST codec_g729a-11.0_3.1.6-pentium_m_32.tar.gz 397552 SHA256 c3065fd37e557b387a9701f12caf9a37af8876ccf2d63d2c618b227d36b093f1 SHA512 1cb5a78e40fdb4fcda87efe3eef5d94e1f8b12699a702964f87ead1e7c5eea9e9ec18762b85a3c14207c731b9afa40c0b65eca23ea4155d5f7048d199843a6a6 WHIRLPOOL ead35bef10671d3b29d6b447d633c9a4e781fdda5337732a2c435150835f94fb510c24d668c5265487ad93feba042b1e50e0fae045ecf55228910e8b10b4ca2e
+DIST codec_g729a-11.0_3.1.6-prescott_32.tar.gz 397150 SHA256 4ffc84f3818f8dcf052b96994897affb07951ea1fbda2941a7135898d3af33db SHA512 2d6269232dc2e8d8f9b283ec374035378b942615e36f86e34e40f910b43e69460e461eefdcf27ef35e36f8164a8ea001f74b72093ac1183ea0412912279c2064 WHIRLPOOL 18666af084af6342e7e9e3cc03cc828a43bef5c9608375e3a190a4f8b8114e78d86b16ebd077f4f0c14e09a47f384a4e8cf98b46c77ad72dafb1b86ddcc807bf
+DIST collect-g729-stats.sh 4857 SHA256 901aeac3b3b5e11d8ef983820d1761cb5404a9240c9500f59e670ced2966c074 SHA512 82887e07dcb6177ce0fd11ffd5f47b985f2f65c187ab7bc892b2e9fb9527f0fabbc389b3aed1ed2bcfbe1cb04d3eef518007acc46f9f022e2898694480639431 WHIRLPOOL f6ca60583a1b14ef45f8b27efede5a836e42713810877930944ff0ba718c6d79b3355af56f2e28c7f59944ca386283ca6dae46034bca33178eb61a3a4f6b7745
+EBUILD asterisk-g729-11.0.3.1.5.ebuild 5688 SHA256 be3da12aeae75071b0c4a7b909238e3f96fba24146722b45dfc9c3c79b925fb7 SHA512 68bd41a3ab71bc8f13adb445ba3bf5657781923f3d8e8856debc642449899ef15c06745c122b2c6f0524b51bdb5ef3022129a34225892cf08e2002a92c1d8b3f WHIRLPOOL 49f6ccdd0f4ddfa7c26f906b292b58ca9b65a945e6620bf196b9a04066b6272d4060f519ab4ba070b8a2f97cbaffa67450dca40a7a180f2ccb5749918e49e38b
+EBUILD asterisk-g729-11.0.3.1.6.ebuild 5688 SHA256 4d8192890bec9cad38b3a6a278d7be84ce987f345593d9081d3163931c79310a SHA512 31db35647eb1f1edfb73dcdadaedee29f1544e0a64cc89e7386c59b90440b816414872a4988d119c053f2d4e4a0db155b03cf077c888b33ebff6987dfeee0485 WHIRLPOOL 53745a639307a9258869a478d0ca21c819a5511010d8b51a7e828de1f3767e1f35ba2fec4dbe38c65174cde130c4705890cb66884ada94f9e1f0781722887da4
+MISC ChangeLog 2280 SHA256 4036adbf3df6b023465e46d00a04eb9980738b3e1c4c6c16d2434a738692fbd1 SHA512 a3478a48db5d0289ce7f62d99b62064666d5a81d180a45d8a8a20e834bc547a2d13eec2cb937938daaf4163321f468014725904976c3c755034d4ea00afb0191 WHIRLPOOL 2ca51674dff77f9a1124759012072c0ff8f5d48009b8c4df6873b18403911e9eff70e1a2e71910695b74eed917fc96841a959d998600636be3a368a3b4fc83c5
+MISC ChangeLog-2015 2971 SHA256 59d983e0ddd0f0141fdb24b18af74e0c5c19b3a552612ef3d558e62804458c88 SHA512 7be7a855af777db7b7ffb24adb286e7b7a1929ab4108b72879d5422136e812aa179cea631fa98741513bcd1cc38e602f33f6fa56a3d8768a61d2ed706e137883 WHIRLPOOL 23c1d7834d21c41e1a790d9297744337eed56ec73f3fcba510488d68b22b76a5a7a410ea3c647289721bc4364a73f465feb788f7166585cde080836bdd3a95d6
+MISC metadata.xml 251 SHA256 f6ff468128d9aa804b47d9a184c761b4123b908d302eec0953226acd00fc80df SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd WHIRLPOOL 1610f6ab9cfa21736bbc4643fec692b621f8889a5888b4189847af4aa6f5719829cfaba363c480483fe7e8fb2c40d417e986964b52cb21d564940c4b51f8554d
diff --git a/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.5.ebuild b/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.5.ebuild
new file mode 100644
index 000000000000..9fb828d43d01
--- /dev/null
+++ b/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit versionator multilib
+
+DESCRIPTION="G.729 codec and supporting files for asterisk"
+HOMEPAGE="http://store.digium.com/productview.php?product_code=G729CODEC"
+
+BENCH_PV=1.0.8
+
+AST_PV=11.0
+MY_PV=$(replace_version_separator 2 _)
+
+SRC_URI="x86? (
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-athlon_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-athlon_xp_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-barcelona_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-c3_2_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-c3_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-core2_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-generic_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-i686_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-k6_3_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-nocona_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-opteron_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-opteron_sse3_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium3m_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium4m_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium_m_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-prescott_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-32/benchg729-${BENCH_PV}-x86_32 -> benchg729-x86_32
+	http://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32
+	http://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32
+)
+amd64? (
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-barcelona_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-core2_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-generic_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-nocona_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-opteron_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-opteron_sse3_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-64/benchg729-${BENCH_PV}-x86_64 -> benchg729-x86_64
+	http://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64
+	http://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64
+)
+http://g729.uls.co.za/static/g729-stats-collector/collect-g729-stats.sh"
+
+LICENSE="Digium"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND} =net-misc/asterisk-11*"
+
+RESTRICT="mirror strip"
+
+QA_FLAGS_IGNORED_amd64="usr/lib64/asterisk/modules/codec_g729a.so usr/sbin/benchg729"
+QA_FLAGS_IGNORED_x86="usr/lib/asterisk/modules/codec_g729a.so usr/sbin/benchg729"
+QA_PREBUILT="usr/sbin/benchg729 usr/sbin/asthostid usr/sbin/astregister"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	local binsuffix
+	local b
+
+	if use x86; then
+		binsuffix=x86_32
+	elif use amd64; then
+		binsuffix=x86_64
+	else
+		die "Ebuild only functions for x86 and amd64."
+	fi
+
+	for b in astregister asthostid benchg729; do
+		cp "${DISTDIR}/${b}-${binsuffix}" "${WORKDIR}/${b}" || die
+		fperms 755 ${b}
+	done
+
+	cp "${DISTDIR}/collect-g729-stats.sh" "${WORKDIR}" || die
+}
+
+src_compile() {
+	./benchg729 | tee benchdata
+	variant=$(sed -nre "s/^Recommended flavor for this system is '([^']*)'.*/\1/p" < benchdata)
+	[ -d codec_g729a-${MY_PV}-${variant}_${size} ] || variant=generic
+	[ -z $variant ] && variant=generic
+}
+
+src_install() {
+	local size
+
+	if use x86; then
+		size=32
+	elif use amd64; then
+		size=64
+	else
+		die "Ebuild only functions for x86 and amd64."
+	fi
+
+	dosbin astregister
+	dosbin asthostid
+	dosbin benchg729
+	dosbin collect-g729-stats.sh
+
+	dodoc codec_g729a-${MY_PV}-${variant}_${size}/LICENSE
+	dodoc codec_g729a-${MY_PV}-${variant}_${size}/README
+	insinto usr/$(get_libdir)/asterisk/modules/
+	doins "codec_g729a-${MY_PV}-${variant}_${size}/codec_g729a.so"
+}
+
+pkg_postinst() {
+	einfo "Please note that Digium's register utility has been installed as astregister"
+	einfo
+	einfo "Please consider participating in the G.729 stats collection that ULS"
+	einfo "is performing.  This will assist in picking better variants for more"
+	einfo "processors as we gather more statistics.  All you need to do is run"
+	einfo "the collect-g729-stats.sh command."
+	[ "${variant}" = "generic" ] && einfo "You are using the generic flavor of the codec, in order to install a more appropriate one please install a G.729 license and remerge this package (${PN})."
+}
diff --git a/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.6.ebuild b/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.6.ebuild
new file mode 100644
index 000000000000..719381442d7f
--- /dev/null
+++ b/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.6.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit versionator multilib
+
+DESCRIPTION="G.729 codec and supporting files for asterisk"
+HOMEPAGE="http://store.digium.com/productview.php?product_code=G729CODEC"
+
+BENCH_PV=1.0.8
+
+AST_PV=11.0
+MY_PV=$(replace_version_separator 2 _)
+
+SRC_URI="x86? (
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-athlon_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-athlon_xp_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-barcelona_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-c3_2_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-c3_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-core2_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-generic_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-i686_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-k6_3_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-nocona_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-opteron_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-opteron_sse3_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium3m_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium4m_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium_m_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-prescott_32.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-32/benchg729-${BENCH_PV}-x86_32 -> benchg729-x86_32
+	http://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32
+	http://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32
+)
+amd64? (
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-barcelona_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-core2_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-generic_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-nocona_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-opteron_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-opteron_sse3_64.tar.gz
+	http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-64/benchg729-${BENCH_PV}-x86_64 -> benchg729-x86_64
+	http://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64
+	http://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64
+)
+http://g729.uls.co.za/static/g729-stats-collector/collect-g729-stats.sh"
+
+LICENSE="Digium"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND} =net-misc/asterisk-11*"
+
+RESTRICT="mirror strip"
+
+QA_FLAGS_IGNORED_amd64="usr/lib64/asterisk/modules/codec_g729a.so usr/sbin/benchg729"
+QA_FLAGS_IGNORED_x86="usr/lib/asterisk/modules/codec_g729a.so usr/sbin/benchg729"
+QA_PREBUILT="usr/sbin/benchg729 usr/sbin/asthostid usr/sbin/astregister"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	local binsuffix
+	local b
+
+	if use x86; then
+		binsuffix=x86_32
+	elif use amd64; then
+		binsuffix=x86_64
+	else
+		die "Ebuild only functions for x86 and amd64."
+	fi
+
+	for b in astregister asthostid benchg729; do
+		cp "${DISTDIR}/${b}-${binsuffix}" "${WORKDIR}/${b}" || die
+		fperms 755 ${b}
+	done
+
+	cp "${DISTDIR}/collect-g729-stats.sh" "${WORKDIR}" || die
+}
+
+src_compile() {
+	./benchg729 | tee benchdata
+	variant=$(sed -nre "s/^Recommended flavor for this system is '([^']*)'.*/\1/p" < benchdata)
+	[ -d codec_g729a-${MY_PV}-${variant}_${size} ] || variant=generic
+	[ -z $variant ] && variant=generic
+}
+
+src_install() {
+	local size
+
+	if use x86; then
+		size=32
+	elif use amd64; then
+		size=64
+	else
+		die "Ebuild only functions for x86 and amd64."
+	fi
+
+	dosbin astregister
+	dosbin asthostid
+	dosbin benchg729
+	dosbin collect-g729-stats.sh
+
+	dodoc codec_g729a-${MY_PV}-${variant}_${size}/LICENSE
+	dodoc codec_g729a-${MY_PV}-${variant}_${size}/README
+	insinto usr/$(get_libdir)/asterisk/modules/
+	doins "codec_g729a-${MY_PV}-${variant}_${size}/codec_g729a.so"
+}
+
+pkg_postinst() {
+	einfo "Please note that Digium's register utility has been installed as astregister"
+	einfo
+	einfo "Please consider participating in the G.729 stats collection that ULS"
+	einfo "is performing.  This will assist in picking better variants for more"
+	einfo "processors as we gather more statistics.  All you need to do is run"
+	einfo "the collect-g729-stats.sh command."
+	[ "${variant}" = "generic" ] && einfo "You are using the generic flavor of the codec, in order to install a more appropriate one please install a G.729 license and remerge this package (${PN})."
+}
diff --git a/net-misc/asterisk-g729/metadata.xml b/net-misc/asterisk-g729/metadata.xml
new file mode 100644
index 000000000000..5087760546f6
--- /dev/null
+++ b/net-misc/asterisk-g729/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
new file mode 100644
index 000000000000..628daab3da67
--- /dev/null
+++ b/net-misc/asterisk-moh-opsound/Manifest
@@ -0,0 +1,13 @@
+DIST asterisk-moh-opsound-alaw-2.03.tar.gz 7496413 SHA256 8b6d63486fd58fd535eaed394f9bd32ecdf6e650975aaa258941f423c8150b81 SHA512 1bb77320c015c81fb35d31accf2c854394300053ab7be77e2e6c7fe2a603bdd3b82a6ed8e05889862177f955fcd4cac56281bf4a76fa20c6b4ac7538633a0b27 WHIRLPOOL f825373e4009f9b7f31f0fcd7860190e1e13703bb5937e8ff518f36d0593a96e864f09567df5ee99ed250fa23e5d50976e56c9c96bcca27aeda19520c359841c
+DIST asterisk-moh-opsound-g722-2.03.tar.gz 7924391 SHA256 05d206cebfb3433e1bd7fddcf8886cc043e1b21b42ba80a762302e5cf90377ad SHA512 36e0ac3293b259c975e0e0e6ede45e8f82345cdbe9941880029d1767b11d51265770424588d39c8aa02fde221a824ceedbde46e827f22e7c7216989b6c4322f6 WHIRLPOOL 8bb93b3b77992ff0f643f75921e5d94072fb4012c0a74decb4c2835621c3ec5dd3bf1e489a6cf42c9da2b20e6aca41e62d595bfb8ea10bdd0cc0da8e4b433517
+DIST asterisk-moh-opsound-g729-2.03.tar.gz 1103000 SHA256 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 SHA512 51f5b69848ca88b3f44f3f80dfed3de137db1736a83cf56839e327aa7072ed35bda0788b09d6581fbb0bb2def17f58138ff0f9b78aa29f6e70b729a76ef43f8b WHIRLPOOL eb3f7e05a5cccaa42e8d64589e08af6c90c0bc8eaa147b3698abcf64274a915a961e112fc7b9ed4987dfe48fa0df84f5bea136d7817e321fb9ddcac02fed2f6c
+DIST asterisk-moh-opsound-gsm-2.03.tar.gz 1777967 SHA256 b0fb7b52b05094a3d5298c965e98717f9907d65a9ec47604ac05d8b06a96e940 SHA512 ba60be1945589cf09d6d77617cce52bd0960cb99aa16ae5bb8d96b3c3ec45a47dbfc91e6d8e736b2f153e3ae48f4b04dff8b72a1862bd7b25e493a0e928743d4 WHIRLPOOL b0bf374873a6ef97e6b46b45d816de4a446bc63acc22195e186e3027f22f29541015d9d263b7cc3e897a6d9e6565f927fb341b9a845f888dde20de6dd12a5309
+DIST asterisk-moh-opsound-siren14-2.03.tar.gz 6518720 SHA256 521cf5dbde700b2ab14cc9b78093a38104de96914179f0be846fe1d004f67f72 SHA512 6016681ef1823ccbe35c9a6f286621700243bc4d92e3793af3a77683c1b1c4f168c4a8875efb6d8fa709259ebf5ac637d849a7d168632ef562f705a984fb692c WHIRLPOOL dd17dc32ae63d772f8b175dc77c27e2dff3de05758a55c672f97f38797c79851133d03e379771a318bd26dd22792808c930d5ce748fe91ceb3c61607c4bb2df6
+DIST asterisk-moh-opsound-siren7-2.03.tar.gz 4233366 SHA256 b3abaf1334162e15a9cb2a57289377323d70348afac653577792560b0ee290f2 SHA512 26542a7128f9ab266a70c8b8241a3117dfc0f555c11d53095b485573bfce2d51a2d23eedc9209dc1809529edd4b115a3fbde7d59993851ec1438c5c4749180e9 WHIRLPOOL e76e824311187e063f3586b9d83a0798640522b77d1ba39403c32b2f5f88dc1ca3f93ae4284a9a9ae7fcd282c9aa1e7db4c978188549b0353b52d878432ff068
+DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 SHA256 30a47e80f182c8ee860354924c2d2ee687f936a2858b8a6a209ba97b86c88eaf SHA512 e5555af8f08720c01bff19200efb7f139dcbb9d1ffa168716dbf93bed97009a441bfe63080c9ca7b15db2c98fe5839d311c39cdf8c0a8a40f8dd93a89b8a11b6 WHIRLPOOL 3f1b63bd912ba81a58933c4a29157f45b2b7e30c582d864bab707ad6c04c516c3890177ee2922b815121db0ee9d003524ab9a4796fe39e5583f8de2cb85d9b32
+DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 SHA256 95b163d7f931d58864aba2cfe32156accca7af782c850fb867a85ce88c02573c SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1 WHIRLPOOL 62492135f5b1e2c5e6b42db2374221f5d166cedab58d277eb00fe8c488a5bed0e0b894db98c6f1345f4797a9cd747787faf22d1ad0f05e48082dee5bc21c0d30
+DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 SHA256 449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872 WHIRLPOOL 2a1ae4a0299005a9cdb3304edf6f3c068c179beffea900c0a282ad9ac58d843403993662cb1d7609e78eb2527c729458c2b709fdada7949ea3f23777789234b5
+EBUILD asterisk-moh-opsound-2.03.ebuild 1134 SHA256 e87fc0adef7d43a3a2564b9f1cd571ce1752f9d85d0fbca15abe0a140c28e8fd SHA512 b4bc5e31baa221296e3fee4d784578433f4f9a73407554d030bd9a7836a378b86c3a3d3248dffd3b113c3bf6dab6361138502f70674b467fee2e24133af5d2c2 WHIRLPOOL a712825dbc421664eb0fb3d79812ceefaf487f97a1fcfcb77dd25ebd832b37922d86a13216f2cbd487e40364ef6f493a1b3a3d3983cc044ce04edc3800bd4815
+MISC ChangeLog 2213 SHA256 16e59191b692bb12ddd3f257553b75248e1889f83e6a6c27e6c5581105eb18c3 SHA512 5c2736fea7775ca59e7639e5176acd8f1730aea895c4c248f39d61f1d2347479fdfb306243bd4ad11af125bae789c9648e6eede9ee66c09236c4b2a4b4573ba7 WHIRLPOOL 0641a9fd4dd5319effacc3a1c5cd101143c5eecb721bdefcbe28e008c08f49d1fa446889dc8f41581c10a170ce0b0d4c594a989c17c20e1f1672b144b7b119bc
+MISC ChangeLog-2015 1126 SHA256 f2b6f58788d3143437d66515037bd8ffd90aa8d62ceee8665bbe586fd3d9ecf9 SHA512 d3f23ad96173e1e51053e06c70990a9c84827099ee2950954766da6930c8a548e3f4eadfe06082f6d64e2ab01098651dd35324c72339da98a944cc4b3f6f0ba9 WHIRLPOOL 2ac362eae31d04a29b15dec1a9365b23411ffbec61c59f12b9606d740feb7bbddbe006551931fa64cba4fec2ac041007dc043c1175c41d47a85bc8467736b966
+MISC metadata.xml 917 SHA256 c12ec8e21f4f708b69162bb190dce24f798f421d6aec9e0608c371c527452ba1 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a WHIRLPOOL 7b9e22c021fe8c9d6c14e838b0c693ee5ce28400d42d8fe293c3b9a043fd9bb4b7d78090378e4b7280695932339caf0060b2d88b8cb0c0561844f79ff99b6156
diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
new file mode 100644
index 000000000000..c53e54ad337f
--- /dev/null
+++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="asterisk moh music"
+HOMEPAGE="http://www.asterisk.org/"
+CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
+
+SRC_URI=""
+for c in ${CODECS}; do
+	SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${c#+}-${PV}.tar.gz )"
+done
+
+IUSE="${CODECS}"
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
+DEPEND=">=net-misc/asterisk-1.4"
+
+src_install() {
+	local c
+
+	for c in ${CODECS}; do
+		if use ${c#+}; then
+			for pf in CREDITS LICENSE CHANGES; do
+				dodoc "$pf-$PN-${c#+}"
+				rm "$pf-$PN-${c#+}"
+			done
+		fi
+	done
+
+	diropts -m 0770 -o asterisk -g asterisk
+	insopts -m 0660 -o asterisk -g asterisk
+
+	dodir /var/lib/asterisk/moh
+	insinto /var/lib/asterisk/moh
+	doins -r .
+
+}
+
+pkg_postinst() {
+	local c has_once_codec=
+
+	for c in ${CODECS}; do
+			use ${c#+} && has_one_codec=1
+	done
+
+	[ -n "${has_one_codec}" ] || ewarn "You have none of the codec use flags (${CODECS}) set.  You need to have at least one set in order for this package to be useful."
+}
diff --git a/net-misc/asterisk-moh-opsound/metadata.xml b/net-misc/asterisk-moh-opsound/metadata.xml
new file mode 100644
index 000000000000..7413756723d5
--- /dev/null
+++ b/net-misc/asterisk-moh-opsound/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<use>
+		<flag name="alaw">Install the sounds files for the alaw codec.</flag>
+		<flag name="g722">Install the sounds files for the g722 codec.</flag>
+		<flag name="g729">Install the sounds files for the g729 codec.</flag>
+		<flag name="gsm">Install the sounds files for the +gsm codec.</flag>
+		<flag name="siren7">Install the sounds files for the siren7 codec.</flag>
+		<flag name="siren14">Install the sounds files for the siren14 codec.</flag>
+		<flag name="sln16">Install the sounds files for the sln16 codec.</flag>
+		<flag name="ulaw">Install the sounds files for the ulaw codec.</flag>
+		<flag name="wav">Install the sounds files for the wav codec.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/asterisk-rate_engine/Manifest b/net-misc/asterisk-rate_engine/Manifest
new file mode 100644
index 000000000000..84745eeceb3e
--- /dev/null
+++ b/net-misc/asterisk-rate_engine/Manifest
@@ -0,0 +1,6 @@
+AUX rate-engine-0.5.4-astcfg.diff 1307 SHA256 7e9eec587b4c89074141829eabf467a453043dc23d0516dbccd74424b7ec8bd3 SHA512 5a571b8344c55297d49f74abce8af441ca9fa993aec00a9c1885258d88ed0449b9110a77dd3b8a8fc8eb063845500901d8eb8a306b4b2066557b1dd1a82b41d5 WHIRLPOOL b9b19363ade3c2aa19f82c13cee3181385e9c3a1ddd2518ef38bf14abe6aecda647f0bb5271ce49be452173c1c165b88b8ac09b7451091aa3ccfc74e2851912d
+DIST rate-engine-0.5.4.tar.gz 28883 SHA256 6077a6ece87e7e460d1a2dc45bc7907ee836327d5d7dbc211343f04f16fede83 SHA512 2ddac9731d6cd3d3d8d6c83180f5c74b0f0c7dcb2b02e4fde8caa67b32119b725e6a6b4a01419ca753b8f40508027cf8bd876fc569c76287e38d9a042f116cb1 WHIRLPOOL 9ea892a38e77db966e20e75a557b7eda0a8b16a094ba007ef999b3f559eaee52f216323f3f6416839ced5fed0ad02cda790c3d40b6e2e58bb0c9e2156560139e
+EBUILD asterisk-rate_engine-0.5.4.ebuild 826 SHA256 57f496938b658b70a91295266f4654b706f811ef8f9368e6efac69e83d27d037 SHA512 357f766114b587be2de5b0486e25348c2a4ffbbcd5d461605506747133eca4cc9a962ce7e0ad911a6303bad60706dca2a59ae561bcb53a99cf1a2c100d484102 WHIRLPOOL 244083ac4b176847f4fa96fa735ffd0b5b71b49b24c50756e5f1b82c315b7b5256207f630b2d3aa13c95d21e19487cb6e7a3858b976c35289f4e8b1ffd2248dc
+MISC ChangeLog 2255 SHA256 03928b5ed151cc68b3ae3efe1a2ba331ab31a1423b2835293fb54110b707aa42 SHA512 6203a45dee62506638e54e3d2700beb8b8ec7de3a4f3038a07b31ac2fa28b3ba0148133f451e4cfdc27514e2308ac800e9fdb166722552b22360893dd1304cbf WHIRLPOOL 50cd4e1a797c08365a96e0dbfc7a8934d3cc4178c1b988ef63d2975c120236d470b96efaf94594729df0c29a7aeb1bd16bb85983491b916aa1422756b6187fa2
+MISC ChangeLog-2015 1305 SHA256 b17aa040e3386ce70cee4f1db9335cb720c20c232d25c3f77721a1d147162d25 SHA512 b52963879a3251f591f5fcf218a6f85a832820ff84e9c4e2c8086bf8016ef1b69d13e2feeba46d82794921c733d3431ad007e43961accefff304cb4526901ae5 WHIRLPOOL 2a40157f9f0365237d9476fe12af64cffdda868776e8f14415b054c5bb8f948e2933a1e45b4365a93ae630f5004a8e77144f8018e7649556c6e0bf7431e3f68c
+MISC metadata.xml 213 SHA256 bed602a2dc9acd5d719e3bda1b0cdceb5807dd0d6649ac7b6e67d268a6407658 SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380 WHIRLPOOL 9335d6918695459b4c9c95a10f76044b1630ae9a478a05ce85125aaa61250678f68b4d0930c0e228a5546f703dfd912fa5f3c36fe18713e0c8c7b7af4bbe2edd
diff --git a/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild b/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild
new file mode 100644
index 000000000000..b6a966de805d
--- /dev/null
+++ b/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+MY_PN="rate-engine"
+
+DESCRIPTION="Asterisk application for least-cost routing"
+HOMEPAGE="http://www.trollphone.org/files/"
+SRC_URI="http://www.trollphone.org/files/${MY_PN}-${PV}.tar.gz"
+
+IUSE=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="dev-libs/libpcre
+	virtual/mysql
+	>=net-misc/asterisk-1.0.5-r1
+	!>=net-misc/asterisk-1.1.0"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# cflag fixes, install fixes and changes for asterisk-config
+	epatch "${FILESDIR}"/${MY_PN}-${PV}-astcfg.diff
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install samples || die
+	dodoc ChangeLog DISCLAIMER NEWS README TODO *.sql *.conf*
+}
diff --git a/net-misc/asterisk-rate_engine/files/rate-engine-0.5.4-astcfg.diff b/net-misc/asterisk-rate_engine/files/rate-engine-0.5.4-astcfg.diff
new file mode 100644
index 000000000000..fe2772d660cc
--- /dev/null
+++ b/net-misc/asterisk-rate_engine/files/rate-engine-0.5.4-astcfg.diff
@@ -0,0 +1,41 @@
+--- rate-engine-0.5.4/Makefile.orig	2005-02-21 04:42:24.046680160 +0100
++++ rate-engine-0.5.4/Makefile	2005-02-21 04:47:38.049944408 +0100
+@@ -10,7 +10,7 @@
+ 
+ DEBUG+=		-g -fno-inline-functions
+ 
+-CFLAGS+=	-O3 -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow \
++CFLAGS+=	-fPIC -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow \
+ 		$(DEBUG) -D_REENTRANT -I/usr/include/pcre
+ LDFLAGS+=	$(DEBUG)
+ LDLIBS+=	-lpthread
+@@ -26,9 +26,9 @@
+ OBJS:=		$(SRCS:%.c=%.o)
+ MOD=		rate_engine.so
+ 
+-ASTLIBDIR=	/usr/lib/asterisk/modules
+-ASTCONFDIR=	/etc/asterisk
+-BINDIR=		/usr/bin
++ASTLIBDIR=	$(shell /usr/bin/asterisk-config --modulesdir)
++ASTCONFDIR=	$(shell /usr/bin/asterisk-config --sysconfdir)
++BINDIR=		$(shell /usr/bin/asterisk-config --bindir)
+ 
+ .PHONY:		all
+ 
+@@ -50,12 +50,14 @@
+ .PHONY:		install
+ 
+ install:	all
+-	install -m 755 $(MOD) $(ASTLIBDIR)
++	if [ ! -d $(DESTDIR)$(ASTLIBDIR) ]; then mkdir -p $(DESTDIR)$(ASTLIBDIR); fi
++	install -m 755 $(MOD) $(DESTDIR)$(ASTLIBDIR)
+ 
+ .PHONY:		samples
+ 
+ samples:
+-	install -m 644 rate_engine.conf.sample $(ASTCONFDIR)/rate_engine.conf
++	if [ ! -d $(DESTDIR)$(ASTCONFDIR) ]; then mkdir -p $(DESTDIR)$(ASTCONFDIR); fi
++	install -m 644 rate_engine.conf.sample $(DESTDIR)$(ASTCONFDIR)/rate_engine.conf
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend
diff --git a/net-misc/asterisk-rate_engine/metadata.xml b/net-misc/asterisk-rate_engine/metadata.xml
new file mode 100644
index 000000000000..c10b09fa8f36
--- /dev/null
+++ b/net-misc/asterisk-rate_engine/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
new file mode 100644
index 000000000000..fd932557f74b
--- /dev/null
+++ b/net-misc/asterisk/Manifest
@@ -0,0 +1,26 @@
+AUX 1.6.2/asterisk.logrotate3 436 SHA256 675705506d1adf7ec8c278581412a7ed69eed2735fea6c5f2faf368fb4ad9a26 SHA512 de9893ce0b460e711cc107779afd40150398ef53f901923a7378757df2936c1bde43c39ba50924f913db81ce66550a9d2e1bb66c5712021b5f8c652d3b3740c4 WHIRLPOOL 34606860de1f8d7f45165035a4d3c0ff8726843508f0664a77db90d90556166dd3d6909dfe0f1b616e239c182e3b97f2e9a224e76628312a5e0d2a6e6a1259e7
+AUX 1.6.2/asterisk.logrotate4 848 SHA256 84546b948ff65cb5b39ba311429f151c3ba5d5edbdac6abb49bb3a33a7e21dbe SHA512 8d661424838fd9500512290785a56af4364717df87d3423ab8dc3039affd1a26fa7aae6afe2ca4fe1ce668a0172b07a96f4cc9a73eced95f25d5848f3a3f2624 WHIRLPOOL a53ab300eda68b374d320f2dd5cadba6223fe016241c75e52d6222ff3794506305a24ad4020eaee20b5f08cb5c088d3f354a95c73f21b5d1ab4ad63cc32b60c7
+AUX 1.6.2/call_data.txt 1120 SHA256 24a5b8dab0f46ffff6dddc50d4ab8d498ec90bc2a0977249f65471b3f0948a0b SHA512 0bc4ab49d3a7493d1871c63234fb4c4ec6725491d350e28836f1220d1c17097974d47afcf19265348215d3076e12266688df513614f595cbae8f996cbb6fc7cb WHIRLPOOL e28db9b7c11e9106edc3d00f611960ea3290c442607c14b0d30ba2ab773deea6b70ab37f88b60f559062b18364d7d142526d045280ff8559acf560163a9a04b7
+AUX 1.6.2/find_call_ids.sh 446 SHA256 742289cc719fbf0f119e05516b20da3fef78908f5dd08f56eaa49abe10104e77 SHA512 b3998652fa93b0cb9cf2b1a495e9d02ea4a1a0c82f6fd812df8e47d58c9da89fd8537632936b43ac72165ba38c9844ba721198a823f954feb0c7ea8a7221893b WHIRLPOOL eba7c3e8a8c2acee276177daf3649c34a8d863116c96f23ee8b377968d5ad13da16389e2881299b59270afe7cc961c8b1852d4aad13c02734bf96cd84a3ce604
+AUX 1.6.2/find_call_sip_trace.sh 530 SHA256 6818f5cde5f99b7c9be35d20e2c84c61cf0d14f63aa1e3952d0dc91ecb93e3a4 SHA512 bfff2511fd2cb9fae443c58dd627c96d831e6d5412f19fc172de1621ce031bbac2851250a2886565019f3aa5484ba41358ffdb003a6be05ed40022d30d7a3c55 WHIRLPOOL 098d8556779b2c053f8bb808354ee9f90e92a63fda99b5eb405407a90889247fa413f964261622f2749a0860bbc2b08b25c3d823d2f014b7c17cdc578ade475d
+AUX 1.6.2/sip_calc_auth 493 SHA256 18590fd24d6fa0b7392228695b764351ac9af25482e22247bf80471858a90c4c SHA512 07f11ac176206c81d491be8014436058196fcb21e5cefff1aa039c23df0c002d252d381c4bf1a55f6c7ceb5a58baa50282493c8c62e4ed8f77716da2ac7a0186 WHIRLPOOL 637cbad803360a4f7d2a5aa85b689fd072f6af7592e440025013e47cad77e1f54d614c15194511e37ba1e57630db97982a368cfdfc80264e8733d897a3aa0a10
+AUX 1.8.0/asterisk.confd 2082 SHA256 02b9572436c3411c5d71376703764131d8a5616c9c8057542d56b607d5b84cf5 SHA512 13e849af5a7be708f81ed9c021ba788175eff06fae49a3b2795fc6e03d9d1d1a51a7ee30835acf81738c79fe461636c6bb85c8661113673fd68b3b4da1e89ce3 WHIRLPOOL 4c817cb94a6febfe72954a53252f3a5b2072a28181519a6004bf66e97a5e860c1367cc63b5b87cf8a401632a07d4c7492bfa1c3fa7cf4e147ac3c18f3439944a
+AUX 1.8.0/asterisk.initd7 9261 SHA256 cfe6430953910119e6b81f414e792927f34181f4ab22c8a2bfd771d96b2ef254 SHA512 6c89c4a5260116d5e137e0bb40aeadd755d9884acb508119d0f0c9598b5325a0e987b33cefe2d83115ed5fbfad82db2352ac0378b1be51be257b38932b47c735 WHIRLPOOL a153efca2a6beb45c1a6e3de217e626bb06d877ff259cdf387b00ab31088d9cdd51e6a58838b514501e9d4bc8ba7250abd4dd83429be0b64e9080d2169c2d7b1
+AUX 1.8.0/asterisk.initd8 9784 SHA256 5999f21a4fffc82063e468a9b8fe0d32855bb798603b9d72e36233e067011dd7 SHA512 eb0f316a2fbfbc228a605118b03e213653b94ab1400e50248bd2de5ce436eab9318d486d1c46d7ee8e83c71161d6106605b38bc01d5d4b461f91962749e41ee3 WHIRLPOOL ce4d1200fa978e2932556dda286b25d850709a7c7faa35610a312f91f7cc35a6afbfe1570ff11837402a9073916b050dc4919a3fb00af9bd376aa891ff3b815b
+AUX 1.8.0/find_call_ids.sh 1078 SHA256 185d0f55f54d044eb4b4dc64954e5191f8b993d139749bfe869e34f3ecff9d09 SHA512 1690eb3ea9eb51711df9fd7c121dbc520a2a15870fa06523f096968386ca68a132a46e361b9d19367c7089cd9ad18132ed02ef0aedd990d5939550182a3366c9 WHIRLPOOL f123f60557066707d0c276451af32f5561abb8db7e8d4eeb3a2da871ae0245108e42d28c7ff77d228a963e5f5326f7382b0ac54f92fc1bfeec2c085b9b237a15
+AUX 1.8.0/find_call_sip_trace.sh 1115 SHA256 e1ebeb1dab05f552f89f380719d319cdf579cb6aeb86a9010e13e14c57f55985 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a WHIRLPOOL 8c30be245556b37dd45dd5ff5cf5c3141050f60c3e286631520f8114e167c6bd4f7930be21e57e93fd183ab65dfbd3b95b8e342808870979b67977f3ce189ebf
+AUX asterisk.service 456 SHA256 a49fb681161d05b18b1cb6e8c3952de3baf53830709e38cfb125c4cf5085bb81 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8 WHIRLPOOL f428284c586240a9e8bcba535cf34924d924649b0891c5306a911ab1416e30ff42f43941dc2aade73bcbfdc6f833b6c14341a39167051adb8365b43e5dfd987d
+AUX asterisk.service.conf 324 SHA256 cc6e988f846fdf25f9dadc01c9ac274c168cd71278bf13bdb3f14ea08083877f SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3 WHIRLPOOL efa9e1432e89efec4a0f78ac41f78e26e236f6397c528b6e5bd9d8b9191e4af8480d1ad5fbd3b12e5343e54ac4be5c20fd026ea437cfb28466ad96b9e3e4c988
+AUX asterisk.tmpfiles.conf 88 SHA256 7433786daa004699e290009d77690eafddeb475c06b2fc682c2c0ee2f8f3541c SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23 WHIRLPOOL dc175f7754f63bb2b04da2aa111f87947bd3a360992c1f65c16fcd3153c82d693dd2cd1ec69963a89eb11fed7c45ecc268f086347ad595acb6fab7b05cc9ba79
+DIST asterisk-11.25.1.tar.gz 35125897 SHA256 dc9c282ca1142b286e5a5c391647d6be73f35524c8def37718de866e8384a57c SHA512 37144b7296f929bdb707853690a12d4c1403741221c943becc88c18fe20587ba2381425574e97647c10efa9f98200336ddae7e3433740e5a509a837ed28ca02c WHIRLPOOL afc4cea1e4b7fcad7b1cfdff738cc3f6b28b9aaea0fd5a1a53b632c6fd5977f80e45984c68d51f96424eceda16cd92e45281a53abed48f6577677c51fed14a44
+DIST asterisk-11.25.3.tar.gz 35134682 SHA256 beb63953cb61b9822fc8f1d79842d821c5147f2a2944941d54a02f2e5fd4db20 SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed WHIRLPOOL 6b1ad68b719354d3e90f3e8b87d8affb1477467c7a30aa9457d8bcf4ef874d8653f36c40376507070846a558454a5522267e690aa4c2b1250af5d4bcfc74323a
+DIST asterisk-13.17.2.tar.gz 32899368 SHA256 19ae0565687b85bde382b2cc274dd5a27ac33dc57a4eb3b663cb5ad9b238f1ac SHA512 008354cb0cba679444bfbfd4be34d919ea0a0a0cbd60541b7528d254ab0fa92efee118d5b006e8dc7b709f9c44fd391026df9b8705d17515494a23ad36dedd4b WHIRLPOOL 2abd792e436a76158fd4470be81601fc11581e71b36cbe302e6987f4b0ef1f834c5b5a3731154601accc14b9d263761166780d99a0391940a57937fb46cf395c
+DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 SHA256 2af864f0b40b42c55f3c3ac737856942c9393adddd47ebf6d982d9214b85a2ad SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d WHIRLPOOL 79017eeb3737953515286db6386bfd848f7501b6f2abbc1ba6b6865a75495ce999d555e3112336abae23371a21a2d64a10f1d173e285314bb5bab22bfe2d4c1a
+DIST gentoo-asterisk-patchset-4.05.tar.bz2 2889 SHA256 2d5d90777c896065d1f1ab7e44c7040ec2b143ee816080791a1c357efe6a0a60 SHA512 6fdb245e37074f124f4725c25a1547c872f6216eb1d37faeda8ed7c5e4dc87424e9c1ba20bb34722165027692916bde4c8bfc816ac5c89710972bb3f51bd1b75 WHIRLPOOL 5d89902c3863027780d67f9aa6428a2788f191582d03e905642fc817bbb7aa7991c04423a09e06d95e92c5ba15b6ca193c47a146379ef5c120f07b9fa6419126
+EBUILD asterisk-11.25.1.ebuild 9618 SHA256 c36cb43c5dc9918bb400363b1db4358a9c80897400cfb08c7907dc6150e97cba SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0 WHIRLPOOL 4d0da52291605b3f4fa9cf42619f5b7ed40054b6e677723287f4c21b1e92004327e78c53a31b6e912ab3f2b88d8cbacd38fad6cde2b884f9e9187c9b08f06d1d
+EBUILD asterisk-11.25.3.ebuild 9619 SHA256 2cd85a29897525cc1e259b2e1aa94daee07f74b086552592e36d6be86b94a5cf SHA512 fe13a2ffb8fffa30eb08c50498d4c40ee405779a251249edf80990b9fc1f6a6a5fdf5ed72ce6bf1becf55ef83ddb1b40684ef0f6d9614f379e707aa6921139f0 WHIRLPOOL d1bbad206cfb8dad5008ce01b419fed48ecce3a105c32085deb6a317257b9f0f93c7794befb54f7a3810f53f02f15c287f4bc31f9ebcc22949d7821f21e187a5
+EBUILD asterisk-13.17.2.ebuild 9724 SHA256 b48a4c39c998641495d22c16d5591dba2184160577681bfb367ce501bcce553a SHA512 a3f8b96be8dab1b8a28177dcef963463122c1fc459419550d2329c8e054b08c9ea27bc5147c60cd6ac47ebacaa8b040691bb2a401de342b31a3073a79ba9043e WHIRLPOOL 8f6a0453196da182014a9209f62b56d59b7b9355992bda09ac327e427ec712466860e88658f15845394a4d680a325fcd547fcb7706c1027a857c66114dca5bc4
+MISC ChangeLog 9607 SHA256 db6299ba91496cb960e55aef762d7f9302a773908d501fda6550d52f412b0e0b SHA512 1994f299ab6f31a02df2aac6ac566373eaa04b7b4049a2e5d3bc04b3eb56bbf1bcce1d3553a931011c5d8105c55e8691f1991fafc67e21924848d3a43083d7ea WHIRLPOOL 44249abc5d6cac9f19cdd8eed42dec2e845d1031ca690297ba856f8d670b7b0488be1e675eecb2554291caa972b29b8d2ddc88951f64764cd986f95867f6c61d
+MISC ChangeLog-2012 113409 SHA256 6beb419f0c2e63641c73f2c14bd0c3a6a319c65bca8be526aa441fac2104fc9c SHA512 08c037acd578b9c3c387a80e45e80a68c4da84e63fced30215f22ec14eb6e223348d8e7d68f4decdf8a2d8cd0933b3f7fa3adddf7cd80bb407498b3e2868d917 WHIRLPOOL be0f2192531f7477545ccc0f10d9a50f36228e8d8d0e2773ccce3799c2d1b5e1b7be70d96502f759c7c878f88efd83122fc9230374c40c8963fe0bc7ff014b87
+MISC ChangeLog-2015 27706 SHA256 3425df3042dcfa7c66d322e95ef24fd79148f228a9f44681fe3afc38e1bfe26a SHA512 899317dc13bb64a061806dd485b0d0218a1b52366a00c24ff310c685bf9b2efe2f4e08c59db3c1bbda047a4134f67168f61f9c5f29450bd60602b681eae7766c WHIRLPOOL 16ea54b3d867af450c2802e69673b3148ea3c7edf51637fb1fccc7e034e4720f0d40c4db5afefec8779bc90db775a7c2c0ece2bd18d103032679bddfae18cc1d
+MISC metadata.xml 1162 SHA256 8c7259489ed1b76573ee5219e20034b7a647df26346b96f7b7b8d2809a7278bf SHA512 eb0d44396c7e0749634869096211ae246f15314764892018cd1a7c04bb2f10e94cb41111455365e4437e02cf259a209022a152920fa725d014f2f1f019d5269a WHIRLPOOL 0ea20c910176d6ec3031c2a7403d8b0ecebcb98fcdbbe998acd20e944054b6d3af463adae16ff8727fd74d15204a62c80d686818e4c72de518f3db6b395e7883
diff --git a/net-misc/asterisk/asterisk-11.25.1.ebuild b/net-misc/asterisk/asterisk-11.25.1.ebuild
new file mode 100644
index 000000000000..5733b5cc4eab
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.25.1.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp:0 )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	default
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-11.25.3.ebuild b/net-misc/asterisk/asterisk-11.25.3.ebuild
new file mode 100644
index 000000000000..3d1accfa89ce
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.25.3.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp:0 )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	default
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-13.17.2.ebuild b/net-misc/asterisk/asterisk-13.17.2.ebuild
new file mode 100644
index 000000000000..47689e396d0d
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.17.2.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-4.05.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp:0 )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+	pjproject? ( >=net-libs/pjproject-2.6 )
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio) \
+		$(use_with pjproject)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 13 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/asterisk/files/1.6.2/asterisk.logrotate3 b/net-misc/asterisk/files/1.6.2/asterisk.logrotate3
new file mode 100644
index 000000000000..69296c99e66d
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/asterisk.logrotate3
@@ -0,0 +1,25 @@
+/var/log/asterisk/messages /var/log/asterisk/queue_log {
+	missingok
+	notifempty
+
+	postrotate
+		/usr/sbin/asterisk -rnx "logger reload" || /bin/true
+	endscript
+}
+
+/var/log/asterisk/debug /var/log/asterisk/full {
+	missingok
+	notifempty
+	daily
+
+	postrotate
+		/usr/sbin/asterisk -rnx "logger reload" || /bin/true
+	endscript
+}
+
+/var/log/asterisk/cdr-csv/*.csv /var/log/asterisk/cdr-custom/*.csv {
+	missingok
+	notifempty
+	weekly
+	rotate 52
+}
diff --git a/net-misc/asterisk/files/1.6.2/asterisk.logrotate4 b/net-misc/asterisk/files/1.6.2/asterisk.logrotate4
new file mode 100644
index 000000000000..29e78eb16064
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/asterisk.logrotate4
@@ -0,0 +1,27 @@
+/var/log/asterisk/messages /var/log/asterisk/queue_log {
+	missingok
+	notifempty
+
+	postrotate
+		test -e /run/openrc/softlevel && /etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
+		test -e /run/systemd/system && systemctl is-active --quiet asterisk.service && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
+	endscript
+}
+
+/var/log/asterisk/debug /var/log/asterisk/full {
+	missingok
+	notifempty
+	daily
+
+	postrotate
+		test -e /run/openrc/softlevel && /etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
+		test -e /run/systemd/system && systemctl is-active --quiet asterisk.service && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
+	endscript
+}
+
+/var/log/asterisk/cdr-csv/*.csv /var/log/asterisk/cdr-custom/*.csv {
+	missingok
+	notifempty
+	weekly
+	rotate 52
+}
diff --git a/net-misc/asterisk/files/1.6.2/call_data.txt b/net-misc/asterisk/files/1.6.2/call_data.txt
new file mode 100644
index 000000000000..ba9cbbba98b5
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/call_data.txt
@@ -0,0 +1,32 @@
+It's sometimes useful to look at SIP conversations in retrospect.  If you have
+a troublesome system, enable sip debug (in the CLI: sip set debug on), set up
+logger.conf to log it to some file and then you can use the two scripts here to
+extract the SIP converssations as seen by asterisk.
+
+find_call_ids.sh:
+
+This script will locate Call-ID values given an A and B number. Just invoke it with:
+
+find_call_ids.sh /path/to/log A-num B-num
+
+eg:
+
+find_call_ids.sh /var/log/asterisk/debug 102 105
+
+To find the Call-IDs for calls going from ext 102 to ext 105 (depends on your
+exact setup and the actual values being passed in the SIP INVITE packets)
+
+find_call_sip_trace.sh
+
+This script will extract a SIP conversation from the log for one or more
+Call-ID values.  Invoke with:
+
+find_call_sip_trace.sh /path/to/log Call-ID [...]
+
+Eg:
+
+find_call_sip_trace.sh /var/log/asterisk/debug 12341665haf434qgrq3@192.168.0.5 123123@192.168.0.3
+
+This will find the SIP packets for those two conversations from the log
+(interleaving the packets in the order asterisk output them - useful for
+analysing the two SIP legs of the same call).
diff --git a/net-misc/asterisk/files/1.6.2/find_call_ids.sh b/net-misc/asterisk/files/1.6.2/find_call_ids.sh
new file mode 100644
index 000000000000..c4689bd1579d
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/find_call_ids.sh
@@ -0,0 +1,17 @@
+#! /bin/bash
+
+logfile=$1
+anum=$2
+bnum=$3
+
+function usage()
+{
+	echo "USAGE: $1 logfile anum bnum"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${anum}" ] || usage $0
+[ -n "${bnum}" ] || usage $0
+
+grep -B2 -P '^INVITE sip:'"${bnum}"'@.*\n(([^F].*|F[^r].*|Fr[^o].*|Fro[^m].*|From[^:]|From:.*<sip:'"${anum}"'@.*>.*)\r\n)+\r\n' "${logfile}" | awk '$4 ~ "^VERBOSE" { dt=$1" "$2" "$3 } $1=="Call-ID:" { if (cid != $2) { cid=$2; print dt" "cid; }}'
diff --git a/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh b/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
new file mode 100644
index 000000000000..5b2e69e517b4
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh
@@ -0,0 +1,21 @@
+#! /bin/bash
+
+logfile=$1
+callid=$2
+
+function usage()
+{
+	echo "USAGE: $1 logfile Call-ID [Call-ID ...]"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${callid}" ] || usage $0
+
+shift; shift;
+while [ $# -gt 0 ]; do
+	callid="${callid}|$1"
+	shift
+done
+
+dos2unix < "${logfile}" | grep -P '^.*\n<--- (SIP read|(Reliably )?(Ret|T)ransmitting) .*\n([^<\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^<\n].*)\n)*<-+>$|^.* chan_sip.c: (Reliably )?(Ret|T)ransmitting .*\n([^-\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^-\n].*)\n)*---$'
diff --git a/net-misc/asterisk/files/1.6.2/sip_calc_auth b/net-misc/asterisk/files/1.6.2/sip_calc_auth
new file mode 100644
index 000000000000..3f050ada5738
--- /dev/null
+++ b/net-misc/asterisk/files/1.6.2/sip_calc_auth
@@ -0,0 +1,25 @@
+#! /bin/bash
+
+[ $# -lt 7 ] && echo "USAGE: $0 username realm password method uri algorithm nonce" && exit 1
+
+un=$1
+realm=$2
+pw=$3
+method=$4
+uri=$5
+alg=$6
+nonce=$7
+
+echo "Using $un@$realm (secret $pw) for method $method to $uri with nonce $nonce (alg=$alg)"
+
+a1=$un:$realm:$pw
+a2=$method:$uri
+ha1=$(echo -n "$a1" | openssl $alg)
+ha2=$(echo -n "$a2" | openssl $alg)
+resp=$(echo -n "$ha1:$nonce:$ha2" | openssl $alg)
+
+echo "a1=$a1"
+echo "a2=$a2"
+echo "ha1=$ha1"
+echo "ha2=$ha2"
+echo "resp=$resp"
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.confd b/net-misc/asterisk/files/1.8.0/asterisk.confd
new file mode 100644
index 000000000000..f826d46f245c
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/asterisk.confd
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#
+# Additional options for asterisk
+#
+# see "asterisk -h" for a list of options
+#
+ASTERISK_OPTS=""
+
+#
+# User and group to run asterisk as
+#
+# Value: double-colon separated list of user and group, or empty to run as root:
+#
+#
+# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
+#
+#          "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
+#
+#         ":asterisk" to run as user "root" and group "asterisk"
+#
+#                  "" to run as user "root" and group "root"
+#
+ASTERISK_USER="asterisk"
+
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Value: (highest) -20..19 (lowest)
+#
+#ASTERISK_NICE="19"
+
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+#ASTERISK_NOTIFY_EMAIL="root"
+
+#
+# Send asterisk's output to this terminal
+#
+# Value: Full path to device node or a number
+#
+#ASTERISK_TTY="/dev/tty9"
+
+#
+# Start an asterisk console on the terminal specified by ASTERISK_TTY
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# Value: yes or no/empty
+#
+ASTERISK_CONSOLE="no"
+
+#
+# Maximum size of core files. 
+#
+# Value: Size in bytes, unlimited for no limit or empty to disable.
+# 
+ASTERISK_CORE_SIZE="unlimited"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant), default is /tmp
+#
+ASTERISK_CORE_DIR="/var/lib/asterisk/coredump"
+
+#
+# Max number of filedescriptors
+#
+# Value: Number of descriptors
+#
+ASTERISK_MAX_FD="4096"
+
+#
+# Delay time before restarting asterisk after a crash.
+#
+# Value: Number of seconds to sleep after a crash before restarting.
+#
+ASTERISK_RESTART_DELAY=5
+
+#
+# Kill these tasks after asterisk crashed
+#
+# Warning! This will kill _ALL_ tasks with the specified names!
+#
+# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
+#
+#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd7 b/net-misc/asterisk/files/1.8.0/asterisk.initd7
new file mode 100644
index 000000000000..0897919caac5
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/asterisk.initd7
@@ -0,0 +1,346 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
+	PID="$(cat "${ast_rundir}/asterisk.pid")"
+	[ -d "/proc/${PID}" ] || return 1
+	EXE="$(readlink -f /proc/${PID}/exe)"
+	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
+	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
+
+	# PID reported in pidfile is active, and is still an asterisk instance.
+	return 0
+}
+
+# Sets up a few variables for us for use
+# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
+# ast_rundir: directory to be used as run folder (pid and ctl files).
+# ast_spooldir: 
+setup_svc_variables()
+{
+	local t
+
+	ast_instancename=asterisk
+	ast_rundir=/var/run/${RC_SVCNAME}
+	ast_logdir=/var/log/${RC_SVCNAME}
+	ast_spooldir=/var/spool/${RC_SVCNAME}
+	ast_confdir=/etc/${RC_SVCNAME/.//}
+
+	if [ "${RC_SVCNAME}" != "asterisk" ]; then
+		t="${RC_SVCNAME#asterisk.}"
+		if [ "${RC_SVCNAME}" = "${t}" ]; then
+			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
+			return 1
+		fi
+		ast_instancename+="(${t})"
+	fi
+
+	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
+	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
+	[ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}"
+	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
+
+	return 0
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing ${ast_instancename} wrapper"
+	OPTS="$*"
+
+	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
+	touch "${ast_rundir}/wrapper_loop.running"
+
+	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F "${TTY}" sane
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} 2>&1 >/dev/null
+			result=$?
+		fi		
+
+		if [ "$result" -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ "$result" -gt 128 ]; then
+				signal="$(expr "$result" - 128)"
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 "$(pidof "${X}")";
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >"${TTY}" \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS USER GROUP PID
+	local tmp x
+
+	local OPTS ARGS 
+
+	setup_svc_variables || return $?
+
+	ebegin "Starting ${ast_instancename} PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# mangle yes/no options
+	ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')"
+	ASTERISK_WAITBOOTED="$(echo "${ASTERISK_WAITBOOTED}" | tr '[:lower:]' '[:upper:]')"
+
+	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
+
+			if [ -n "${ASTERISK_USER}" ]; then
+				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
+			fi
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then 
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	else
+		NICE=""
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in ${ASTERISK_TTY} \
+			 /dev/tty${ASTERISK_TTY} \
+			 /dev/vc/${ASTERISK_TTY}
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
+		OPTS="${OPTS} -c"
+	fi
+
+	if [ -n "${ASTERISK_USER}" ]; then
+		USER="$(echo $ASTERISK_USER | sed 's/:.*//')"
+		GROUP="$(echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }')"
+		if [ -n "${USER}" ]; then
+			if ! getent passwd "${USER}" &>/dev/null; then
+				eerror "Requested to run asterisk as ${USER}, which doesn't exist."
+				return 1
+			fi
+			OPTS="${OPTS} -U ${USER}"
+		fi
+		if [ -n "${GROUP}" ]; then
+			if ! getent group "${GROUP}" &>/dev/null; then
+				eerror "Requested to run asterisk with group ${USER}, which doesn't exist."
+				return 1
+			fi
+			OPTS="${OPTS} -G ${GROUP}"
+			GROUP=":${GROUP}"	# make it look nice...
+		fi
+		checkpath -d -m 0755 -o ${USER}${GROUP} "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}"
+		find "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}" ! -user "${USER}" | while read element; do
+ 			ewarn "${USER} is not the owner of $element, or permissions are insufficient, fixing."
+			chown ${USER} "${element}"
+			chmod u+rX "${element}"
+		done;
+		einfo "Starting asterisk as      : ${USER}${GROUP}"
+	else
+		checkpath -d -m 0755 -o root:root "${ast_logdir}" "${ast_rundir}"
+		ewarn "Starting asterisk as root is not recommended."
+	fi
+
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2 
+		is_running
+		result=$?
+
+		[ $result -eq 0 ] || wrapperstop
+	fi
+
+	eoutdent
+	eend $result
+
+	if [ $result -eq 0 -a "${ASTERISK_WAITBOOTED}" = "YES" ]; then
+		ebegin "Waiting for ${ast_instancename} to fully boot"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
+		eend $?
+	fi
+
+	return $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
+		ebegin "Killing wrapper script"
+		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
+		ebegin "Signalling wrapper script to terminate"
+		rm "${ast_rundir}/wrapper_loop.running"
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	setup_svc_variables || return $?
+
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping asterisk PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	setup_svc_variables || return $?
+
+	wrapperstop
+
+	if ! is_running; then
+		eerror "Asterisk is not running!"
+		return 0
+	fi
+	
+	ebegin "Stopping asterisk PBX gracefully"
+	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop gracefully" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for asterisk to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt="$(expr $cnt + 1)"
+			if [ $cnt -gt 60 ] ; then
+				# Waited 120 seconds now. Fail.
+				echo
+				eend 1 "Failed."
+				return
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	setup_svc_variables || return $?
+
+	if is_running; then
+		ebegin "Forcing asterisk to reload configuration"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "Asterisk is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd8 b/net-misc/asterisk/files/1.8.0/asterisk.initd8
new file mode 100644
index 000000000000..4419dda06883
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/asterisk.initd8
@@ -0,0 +1,361 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="forcestop reload"
+extra_commands="checkperms"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
+	PID="$(cat "${ast_rundir}/asterisk.pid")"
+	[ -d "/proc/${PID}" ] || return 1
+	EXE="$(readlink -f /proc/${PID}/exe)"
+	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
+	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
+
+	# PID reported in pidfile is active, and is still an asterisk instance.
+	return 0
+}
+
+# Sets up a few variables for us for use
+# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
+# ast_rundir: directory to be used as run folder (pid and ctl files).
+# ast_spooldir: 
+setup_svc_variables()
+{
+	local t
+
+	ast_instancename=asterisk
+	ast_rundir=/var/run/${RC_SVCNAME}
+	ast_logdir=/var/log/${RC_SVCNAME}
+	ast_spooldir=/var/spool/${RC_SVCNAME}
+	ast_confdir=/etc/${RC_SVCNAME/.//}
+
+	if [ "${RC_SVCNAME}" != "asterisk" ]; then
+		t="${RC_SVCNAME#asterisk.}"
+		if [ "${RC_SVCNAME}" = "${t}" ]; then
+			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
+			return 1
+		fi
+		ast_instancename+="(${t})"
+	fi
+
+	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
+	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
+	[ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}"
+	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
+
+	if [ -n "${ASTERISK_USER}" ]; then
+		ast_user="${ASTERISK_USER%%:*}"
+		ast_group="${ASTERISK_USER#*:}"
+		ast_group="${ast_group%%:*}"
+		[ -z "${ast_user}" ] && ast_user=root
+		[ -z "${ast_group}" ] && ast_group="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
+	fi
+
+	[ -z "${ast_user}" ] && ast_user=root
+	[ -z "${ast_group}" ] && ast_group=root
+
+	return 0
+}
+
+checkperms() {
+	setup_svc_variables
+
+	local path
+	checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}"
+	for path in "${ast_rundir}" "${ast_spooldir}" "${ast_logdir}"; do
+		ebegin "Checking ${path}"
+		find "${path}" ! -user "${ast_user}" | while read element; do
+			[[ "${element}" = *.gz ]] && continue # Skip logrotated files.
+			ewarn "${ast_user} is not the owner of ${element}, or permissions are insufficient, fixing."
+			chown ${ast_user} "${element}"
+			chmod u+rwX "${element}"
+		done;
+		eend 0
+	done
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing ${ast_instancename} wrapper"
+	OPTS="$*"
+
+	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
+	touch "${ast_rundir}/wrapper_loop.running"
+
+	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F "${TTY}" sane
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} 2>&1 >/dev/null
+			result=$?
+		fi		
+
+		if [ "$result" -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ "$result" -gt 128 ]; then
+				signal="$(expr "$result" - 128)"
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 "$(pidof "${X}")";
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >"${TTY}" \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS PID
+	local tmp x
+
+	local OPTS ARGS 
+
+	setup_svc_variables || return $?
+
+	ebegin "Starting ${ast_instancename} PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# mangle yes/no options
+	ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')"
+	ASTERISK_WAITBOOTED="$(echo "${ASTERISK_WAITBOOTED}" | tr '[:lower:]' '[:upper:]')"
+
+	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then 
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	else
+		NICE=""
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in ${ASTERISK_TTY} \
+			 /dev/tty${ASTERISK_TTY} \
+			 /dev/vc/${ASTERISK_TTY}
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
+		OPTS="${OPTS} -c"
+	fi
+
+	if ! getent passwd "${ast_user}" &>/dev/null; then
+		eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
+		return 1
+	fi
+	OPTS="${OPTS} -U ${ast_user}"
+
+	if ! getent group "${ast_group}" &>/dev/null; then
+		eerror "Requested to run asterisk with group ${ast_group}, which doesn't exist."
+		return 1
+	fi
+	OPTS="${OPTS} -G ${ast_group}"
+	
+	if [ "${ast_user}" = root ]; then
+		ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+	elif [ "${ast_group}" = root ]; then
+		ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+	fi
+
+	checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
+	einfo "Starting asterisk as      : ${ast_user}:${ast_group}"
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2 
+		is_running
+		result=$?
+
+		[ $result -eq 0 ] || wrapperstop
+	fi
+
+	eoutdent
+	eend $result
+
+	if [ $result -eq 0 -a "${ASTERISK_WAITBOOTED}" = "YES" ]; then
+		ebegin "Waiting for ${ast_instancename} to fully boot"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
+		eend $?
+	fi
+
+	return $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
+		ebegin "Killing wrapper script"
+		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
+		ebegin "Signalling wrapper script to terminate"
+		rm "${ast_rundir}/wrapper_loop.running"
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	setup_svc_variables || return $?
+
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping asterisk PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	setup_svc_variables || return $?
+
+	wrapperstop
+
+	if ! is_running; then
+		eerror "Asterisk is not running!"
+		return 0
+	fi
+	
+	ebegin "Stopping asterisk PBX gracefully"
+	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop gracefully" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for asterisk to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt="$(expr $cnt + 1)"
+			if [ $cnt -gt 60 ] ; then
+				# Waited 120 seconds now. Fail.
+				echo
+				eend 1 "Failed."
+				return
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	setup_svc_variables || return $?
+
+	if is_running; then
+		ebegin "Forcing asterisk to reload configuration"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "Asterisk is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/files/1.8.0/find_call_ids.sh b/net-misc/asterisk/files/1.8.0/find_call_ids.sh
new file mode 100644
index 000000000000..321f3dacd624
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/find_call_ids.sh
@@ -0,0 +1,68 @@
+#! /bin/bash
+
+logfile=$1
+anum=$2
+bnum=$3
+
+function usage()
+{
+	echo "USAGE: $1 logfile anum bnum"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${anum}" ] || usage $0
+[ -n "${bnum}" ] || usage $0
+
+#echo "Finding calls from '${anum}' to '${bnum}' in ${logfile}."
+
+# modes:
+# 0 - not processing an INVITE.
+# 1 - processing an INVITE.
+# 2 - from matched (processing).
+dos2unix < "${logfile}" | awk '
+	BEGIN { mode = 0 }
+	mode==0 && $4~"^VERBOSE" {
+		dt=$1" "$2" "$3
+	}
+
+	mode==0 && $1=="INVITE" && $2 ~ "^sip:'"${bnum}"'@" {
+		#print
+
+		mode=1
+
+		split($2, a, "[:@]")
+		bnum=a[2]
+	}
+
+	mode==1 && $1=="From:" {
+		#print
+		if ($3 ~ "^<sip:'"${anum}"'@.*>") {
+			mode=2
+			split($3, a, "[:@]")
+			anum=a[2]
+		} else {
+			#print "From does not match ... leaving block."
+			mode = 0
+		}
+	}
+
+	mode!=0 && $1=="Call-ID:" {
+		callid=$2
+
+		if (NF!=2) {
+			print "WTF @ Call-ID header having NF!=2"
+		}
+	}
+
+	mode==1 && $0=="" {
+		#print "Leaving block (no match)"
+		mode = 0
+	}
+
+	mode==2 && $0=="" {
+		#print "Leaving block (match)"
+		print dt " " anum " " bnum " " callid
+		mode = 0
+	}
+'
diff --git a/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh b/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
new file mode 100644
index 000000000000..06ae824def5c
--- /dev/null
+++ b/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh
@@ -0,0 +1,76 @@
+#! /bin/bash
+
+logfile=$1
+callid=$2
+
+function usage()
+{
+	echo "USAGE: $1 logfile Call-ID [Call-ID ...]"
+	exit -1
+}
+
+[ -r "${logfile}" ] || usage $0
+[ -n "${callid}" ] || usage $0
+
+shift; shift;
+while [ $# -gt 0 ]; do
+	callid="${callid}|$1"
+	shift
+done
+
+# modes:
+# 0 - searching for SIP start block ...
+# 1 - transmit of sorts
+# 2 - receive
+
+dos2unix < "${logfile}" | awk '
+	BEGIN { mode = 0 }
+	mode==0 && $4~"^VERBOSE" {
+		dt=$1" "$2" "$3
+	}
+
+	mode!=0 && $1 == "Call-ID:" {
+		#print
+
+		if ($2 ~ /('"${callid}"')/) {
+			callidmatch=1
+		} else {
+			#print $2" does not match ^('"${callid}"')$"
+			mode=0
+		}
+	}
+
+	(mode==1 && $0=="---") || (mode==2 && $0=="<------------->") {
+		if (callidmatch) {
+			print dt" "sipmode"\n"pckt"---"
+		}
+
+		mode=0
+	}
+
+	mode!=0 {
+		pckt = pckt $0 "\n"
+	}
+
+	mode==0 && $0 ~ "chan_sip[.]c: .*[tT]ransmitting" {
+		#print
+
+		if ($6 == "Retransmitting") {
+			sipmode = $6" "$7" to "$NF
+		} else {
+			sipmode = "Transmitting to "$NF
+		}
+
+		mode=1
+		pckt=""
+		callidmatch=0
+	}
+
+	mode==0 && $0 ~ "SIP read from" {
+		#print
+		mode=2
+		pckt=""
+		callidmatch=0
+		sipmode="Received from "$5":"
+	}
+'
diff --git a/net-misc/asterisk/files/asterisk.service b/net-misc/asterisk/files/asterisk.service
new file mode 100644
index 000000000000..08245d9fe87f
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Asterisk PBX and telephony daemon.
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory=/var/lib/asterisk
+User=asterisk
+Group=asterisk
+ExecStart=/usr/sbin/asterisk -f -C /etc/asterisk/asterisk.conf
+ExecStop=/usr/sbin/asterisk -rx 'core stop now'
+ExecReload=/usr/sbin/asterisk -rx 'core reload'
+
+LimitNOFILE=4096
+ProtectSystem=full
+ProtectHome=yes
+PrivateTmp=yes
+
+Restart=always
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/asterisk/files/asterisk.service.conf b/net-misc/asterisk/files/asterisk.service.conf
new file mode 100644
index 000000000000..b7f83b71c5b0
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.service.conf
@@ -0,0 +1,11 @@
+# Uncomment the following 7 lines to start asterisk with a console on tty7
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# [Service]
+# ExecStart=
+# ExecStart=/usr/sbin/asterisk -f -c -C /etc/asterisk/asterisk.conf
+# TTYPath=/dev/tty7
+# StandardInput=tty
+# StandardOutput=tty
+# StandardError=tty
diff --git a/net-misc/asterisk/files/asterisk.tmpfiles.conf b/net-misc/asterisk/files/asterisk.tmpfiles.conf
new file mode 100644
index 000000000000..637302a27373
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.tmpfiles.conf
@@ -0,0 +1,2 @@
+d /var/run/asterisk 0750 asterisk asterisk
+d /var/spool/asterisk 0750 asterisk asterisk
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
new file mode 100644
index 000000000000..4617312494c9
--- /dev/null
+++ b/net-misc/asterisk/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <use>
+    <flag name="newt">Include additional tools that require redhats windowing toolkit</flag>
+    <flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
+    <flag name="span">Enable support for the spandsp codec</flag>
+    <flag name="samples">Install sample sound and configuration files (default: on)</flag>
+    <flag name="srtp">Enable support for encrypted voice transmission (secure RTP)</flag>
+    <flag name="gtalk">Enable support for Google Talk services</flag>
+    <flag name="osplookup">Support secure peering using the Open Settlement Protocol</flag>
+    <flag name="http">Enable embedded web server</flag>
+    <flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
+    <flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag>
+	<flag name="pjproject">Enable support for pjproject (pjsip)</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/astmanproxy/Manifest b/net-misc/astmanproxy/Manifest
new file mode 100644
index 000000000000..1f050cab4cc3
--- /dev/null
+++ b/net-misc/astmanproxy/Manifest
@@ -0,0 +1,7 @@
+AUX astmanproxy-1.28.2-gentoo.diff 1130 SHA256 35e97c56fd26e8709100a810cc41677b1979f084ee82bb9ae017cc7308123ef0 SHA512 296d885478cc66868a7e77d5edaefe1779b5939e3ad26933c21a6e4f44744de00ff0d6d8302948b63f7b924b6cf90c9e790fc5d7d74fdc9df4a6ed3ab5a1b44a WHIRLPOOL 90e4725084f7e2c9dcf5ac7e67ec9476ac1af486803952398fe48fb2fd098a541992507c5a99e99a94459467238eee91e0ef89e949277c626dc77c4b64a552d1
+AUX astmanproxy.rc6 366 SHA256 0b700919a105beedcacd3e5c63fe5278f9a8a27c859badcd30e670709b885216 SHA512 ad9f5a180ce5f2a63efd1a9f050d963ff2504c306e177562821ab80a62daad50d2a0077a4078094991d5fa85129708cf6970ad60adacf06989980fc46012559e WHIRLPOOL b6554df6487849882a854851d30d4d44d2fce6f6f8bcbb4a74955c2d33ad3f923bc7abfc91ef7c55aade0d954b40d76625b28f95308346e2fe266bee1cf4802e
+DIST astmanproxy-1.28.2.tar.gz 65506 SHA256 09c2b5750d69c9ca8d9611cb648a5cedb0fa7102540642b06654e3ac5c31ed4b SHA512 a37caaca42649b19d40b9b0cfe61c6a0e31d7d0de50378565a6add1b27ba09dd6044c7ac2d9b38c424f143fc12acbfa0931c59492399ee34db063ed73cce9293 WHIRLPOOL 08b9d9b186ce424f309efddefa05cc91856cfbfea2b60d65030a15a0868bc1f72717431ba1f884eb0dea411d18fd950c6e17af5c356eae5db030879a0d34cc67
+EBUILD astmanproxy-1.28.2.ebuild 970 SHA256 769e9143fc61e53cc049d866b3131bd6eb388330c3652f9d53a2809a1a1ca29c SHA512 807de3dc7fe08e4f3f4d44e123bedbfa4046c5b17f9740dfba5662dd1ab9dcaaad7b5fb63a43b291aae8e1e0dfd2b3b74e1ac5ee96f9dca536981c4762d3bfcb WHIRLPOOL f472f0c762cdeeb73b750e072e4fde87aa996c96a8c989497f8cd4d0483a4098c16defec49adb499c2956ace3862c2e2f9a5e77fc9c75f1ca28819b1ab6a509e
+MISC ChangeLog 2549 SHA256 ed698b56236980e2cf5bb9ca3d8c41a3a416a260d908f4e3e8c889d90c577436 SHA512 4c45c313f39dcdbbb5eead275f149f2187619a6fb6538f67514e7f0b3feb7c2a92a9f89e2c66f3f7ac1ad9931d5bc0a6b79d97b8f007b64505b3c26fb66c1e5f WHIRLPOOL beef10664164b2bad5f6caa4657adc73533fe33dcff831e81a41892a6c02f3a4a7a820f139b9478ef8d1340ba13e563c27384c7b4992d9bd0e49afae5e5ebc0b
+MISC ChangeLog-2015 1966 SHA256 0843aa24f5088ac0fe33346d152db4b2c7305880093d86b815302bfd8e05c764 SHA512 02197fd2323d27333297b9003efb0c1fac6b4c82a4ba9ddce48aaafeb25ccd1af71776b0c987694529353053c020708de6773a8e8e3b9d20a1424024c6794b03 WHIRLPOOL f02497dbb85a7ac2962ac2627aa3f6b9f4be164a840d980029f3b3ab9094aaa0a085a46ffeed0197f2f4ebaa8587b147f26d40ab33982650ea618bd5253ecb29
+MISC metadata.xml 305 SHA256 e6109e36c9f8a13d9d9166de9e32f64b8a41da1064b189a840cd1e0f63c7d1b7 SHA512 857608df82b978c77856f5d779f1a2e7756ba7b9d7d37a57c2c5b2618e5d99d6b648cf485b51ec3782d056c83a206e32c9b6e25ecb011b7a948ee056c50b2a76 WHIRLPOOL 12e06c3294505bd827716d0a9721365208b6eeb9bfcf57be8d4a2e798090b142fc7b6e8505231366c8bd8c521ad2994a991f439af345d734b9fe63074f31f2b6
diff --git a/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild b/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
new file mode 100644
index 000000000000..73e1c6b42e1f
--- /dev/null
+++ b/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit base multilib toolchain-funcs
+
+DESCRIPTION="Proxy for the Asterisk manager interface"
+HOMEPAGE="https://github.com/davies147/astmanproxy/"
+SRC_URI="https://github.com/davies147/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=""
+PATCHES=( "${FILESDIR}/${P}-gentoo.diff" )
+
+src_prepare() {
+	base_src_prepare
+
+	# Fix multilib
+	sed -i -e "s#/usr/lib/#/usr/$(get_libdir)/#" "${S}/Makefile" \
+		|| die "multilib sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		LDFLAGS="${LDFLAGS}" \
+		LD="$(tc-getLD)" \
+		RAWLDFLAGS="$(raw-ldflags)"
+}
+
+src_install() {
+	dosbin astmanproxy
+
+	dodoc README VERSIONS
+
+	docinto samples
+	dodoc samples/*
+
+	insinto /etc/asterisk
+	doins configs/astmanproxy.conf
+	doins configs/astmanproxy.users
+
+	newinitd "${FILESDIR}"/astmanproxy.rc6 astmanproxy
+}
diff --git a/net-misc/astmanproxy/files/astmanproxy-1.28.2-gentoo.diff b/net-misc/astmanproxy/files/astmanproxy-1.28.2-gentoo.diff
new file mode 100644
index 000000000000..68534cd61086
--- /dev/null
+++ b/net-misc/astmanproxy/files/astmanproxy-1.28.2-gentoo.diff
@@ -0,0 +1,39 @@
+diff -uNr astmanproxy-1.28.2.ORIG/Makefile astmanproxy-1.28.2/Makefile
+--- astmanproxy-1.28.2.ORIG/Makefile	2014-02-10 11:18:06.027132570 +0000
++++ astmanproxy-1.28.2/Makefile	2014-02-10 11:21:07.382135291 +0000
+@@ -17,7 +17,7 @@
+ 
+ CC := gcc
+ INCLUDES :=
+-PREFIX:= /usr/local
++PREFIX:= /usr
+ BINDIR := $(DESTDIR)$(PREFIX)/sbin
+ 
+ # For compilation dependencies
+@@ -27,7 +27,7 @@
+ LIBS := -lssl
+ 
+ # Add -g below for debug/GDB symbols
+-CFLAGS:=-Wall -O2 -D_REENTRANT -D_GNU_SOURCE -fPIC -Isrc/include -I/usr/include/openssl
++CFLAGS += -Wall -O2 -D_REENTRANT -D_GNU_SOURCE -fPIC -Isrc/include -I/usr/include/openssl
+ 
+ ifeq (${OSARCH},Darwin)  
+   LIBS+=-lresolv
+@@ -62,7 +62,7 @@
+ DEFINES+='-DMDIR="$(MODDIR)"' '-DPDIR="$(PERMDIR)"' '-DPFILE="$(PERMFILE)"'
+ 
+ PROXYCERT := $(CERTDIR)/proxy-server.pem
+-PROXYSSLCONF := $(CONFDIR)/proxy-ssl.conf
++PROXYSSLCONF := $(DESTDIR)$(CONFDIR)/proxy-ssl.conf
+ 
+ CFLAGS += $(DEFINES)
+ 
+@@ -76,7 +76,7 @@
+ SRCS := $(MODS:%=src/%.c)
+ HDRS := src/include/astmanproxy.h
+ 
+-all: astmanproxy cert
++all: astmanproxy
+ 
+ astmanproxy: $(OBJS) $(SOBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(ASTLINK) $(OBJS) $(LIBS)
diff --git a/net-misc/astmanproxy/files/astmanproxy.rc6 b/net-misc/astmanproxy/files/astmanproxy.rc6
new file mode 100644
index 000000000000..7e6737de00dc
--- /dev/null
+++ b/net-misc/astmanproxy/files/astmanproxy.rc6
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting astmanproxy"
+	start-stop-daemon --start --exec /usr/sbin/astmanproxy
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping astmanproxy"
+	start-stop-daemon --stop --exec /usr/sbin/astmanproxy
+	eend $?
+}
diff --git a/net-misc/astmanproxy/metadata.xml b/net-misc/astmanproxy/metadata.xml
new file mode 100644
index 000000000000..32b67186d84f
--- /dev/null
+++ b/net-misc/astmanproxy/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 type="person">
+		<email>chainsaw@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">davies147/astmanproxy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/autossh/Manifest b/net-misc/autossh/Manifest
new file mode 100644
index 000000000000..26d003c7bf7c
--- /dev/null
+++ b/net-misc/autossh/Manifest
@@ -0,0 +1,5 @@
+DIST autossh-1.4e.tgz 65852 SHA256 9e8e10a59d7619176f4b986e256f776097a364d1be012781ea52e08d04679156 SHA512 2f71403ee005103c6a3e2e669f6b26153161c95c8dacd3e73d61673461b3512348636877760d911341771e744c0a682b107df4ac48621661ff36a9fc0191f2fb WHIRLPOOL 83ebb35b113e3b3b69ec88a692da2170d7fd726d83ba225daef45507076e91f4a112d0648b8c414da1d38c7c7b5f7a30e5366c3ef2e9ce7123d8fbcf385fac11
+EBUILD autossh-1.4e.ebuild 571 SHA256 a51016e1c7becc7d9897a80ec696b948890ddce79fc34ad9dfee4e00a2fb1738 SHA512 70b6d32df631ef97a096fcb594e9da9510bad09cacf25336801ddb8849c7199eac7e978dc6266ea40038cdc298da79d82cffdda30b18944d9e305513eff39b61 WHIRLPOOL 5996bbdba2121dd58868d3195a5fb3763e04881a5d0f418b1042557101c3764a572dc0fb0c047701feec9f9353d99424e97cae8f5380c9c531d93f764352bf92
+MISC ChangeLog 2471 SHA256 63d2c74e5b9dd81c7ca5e9d7930b571a53af49173186652e740ae029647b4a11 SHA512 f5c53ff34da29b521eef648b0e94aa7dbeec5c057779b41b72c178c4b84e67058f29c90bf2d54472996f4cd4a4dffcfed772fe8aa84a8e42259e80ae8de9fadd WHIRLPOOL c62a21de7c687a2bf7aeee1c55af84e63b63d88d8db4ef152d29bcc7f7ab84a53ec5ac6ae0125f47a098c6df53b417356533108d1fdee8196fd612bf9aabbae5
+MISC ChangeLog-2015 5286 SHA256 a33c8c2c0a5cabf1740a71e6b4abd746c5dfb777c63a68256191873d8b919010 SHA512 438564a04c7b47ad379409424a3712b9ac824ff6f1bec4e240c7965186dd955610f842fbb933f85bd10972b2b584b5ae4ae8269db5e14acdff310ce6f1de15d8 WHIRLPOOL f2397848528fa48a112b04a84ed2d7d750bd2e507d08f8c4b1414fd9a88fa1fe9364760e44a000780df9ebdcaa0cf071659b45a4afebb2abce1f61afb1f15bf4
+MISC metadata.xml 246 SHA256 92d5540a2f0904365eafb8ce96e6320cfc14e08f22e124d721521ef77ddbf6f6 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6 WHIRLPOOL d15a33750d6ada278082c675223992c98cccf98af92ec04ab5b908816381ab6965714988fac87a795265973c6fb81a588a08c385ac6fb66046d14d119e0c236c
diff --git a/net-misc/autossh/autossh-1.4e.ebuild b/net-misc/autossh/autossh-1.4e.ebuild
new file mode 100644
index 000000000000..6c73abdb0824
--- /dev/null
+++ b/net-misc/autossh/autossh-1.4e.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Automatically restart SSH sessions and tunnels"
+HOMEPAGE="http://www.harding.motd.ca/autossh/"
+SRC_URI="http://www.harding.motd.ca/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="net-misc/openssh"
+
+src_prepare() {
+	sed -i -e "s:\$(CC):& \$(LDFLAGS):" Makefile.in || die
+}
+
+src_install() {
+	dobin autossh
+	dodoc CHANGES README autossh.host rscreen
+	doman autossh.1
+}
diff --git a/net-misc/autossh/metadata.xml b/net-misc/autossh/metadata.xml
new file mode 100644
index 000000000000..78e64a5cf1ad
--- /dev/null
+++ b/net-misc/autossh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest
new file mode 100644
index 000000000000..840aefcd2eb9
--- /dev/null
+++ b/net-misc/autoupnp/Manifest
@@ -0,0 +1,8 @@
+DIST autoupnp-0.4.6.tar.bz2 240257 SHA256 a8d0a207074fafdb322510fd29a25eb4bf62da9468ea3dc45e7c9740faeccab7 SHA512 570ae76d940879a375e9336cb62cce8b2e007c57df6cbebee5878cf6a71d1fe5853218166ba0ee794586fa20a7c62b158aae9242b30880f6fe110c9bb1502ba1 WHIRLPOOL 4b2d848f36e3f2848e6f08f71296b5cf3fe7794bdfc9e6495428b3b3ae9283ed15e81de0bec2fdf0b36173d59a4c7dbec5dbef30bf3a0ba24e320de313cb20ab
+DIST autoupnp-0.4.7.tar.bz2 264916 SHA256 f68c80ae6e8061417bef2fb2ad554d49f0bf4b5ef2def84600a4b67fa756c703 SHA512 2c6bb3421fecbffea2a63ea1e930b7c789459d4626a0f281abe0e9bb62e5efc772475d4bf0c9f13fe2e9e13417940c6eb17408e6aae28bc24a4fc2e16d4dc8de WHIRLPOOL d08f6011d286f37d70d206cabe148a95e02b71bf9fdc13852da038bb87f4dde99fb206382e12879d81bff3dd5f133aae0b4bfb4c4168f8b76a4a0a2d4fbc4168
+EBUILD autoupnp-0.4.6.ebuild 638 SHA256 d84d09e334d542483744c5c8509a6dfbaca3b9ad8fa8b332f33b362b3f338180 SHA512 2f71d39e33cd92b7a856edb00fb8409661bfc9695e9bd54d323dbd8dad854fde137c675f13b978828877da5dcccb2691d3e13195f5baff32346016c98f114332 WHIRLPOOL 98f8762b77a5f76266930750951d75f6754e38ba82de5fb16cfd21d6657c7b0131cddd9def8f8a3521b79bab000496650aa6e454a9aa2205eb79cbf73cc1e4b7
+EBUILD autoupnp-0.4.7.ebuild 610 SHA256 c21078b2703d0a8dee48f0742d252a63b070a032fe63aec6e2bde9ab4522c302 SHA512 a433cd85eb23299a5ae377ddeccdc41bcaa2875b81fd9e09092647e5eee15aded956a24d6d9120c829491ec8dde370ac64b9917f98cbf4f7e8159e32a099d033 WHIRLPOOL 7e7852873776ef4d82c68a3e2a6b9386ddc0c0b9077fd23b0d71d530edfc5440ac341eca80a914b284745155e2cb89be698b2105301f09532a89b73d1b6611c3
+EBUILD autoupnp-9999.ebuild 776 SHA256 9a71733711ce8d60d9c01d9005c925c0bee4d5db278058b79d243324d34b7f89 SHA512 714a716c73c950068a91659593d82493eec249da7d9b8f38074eeaa377f5f0920a62418c426a7d5dc511ce888e6d06672a8825000d68fda1e1f5540fd30c5008 WHIRLPOOL 306519d79fcbbf2487c2be0d0ce7c8534ce07d6b0cfd79e66be518b134204dd85dd85bc5f3ae51dc86c47287291e83bc21bbc35a3c8c347a029c3a2896ede7c0
+MISC ChangeLog 2580 SHA256 20d71486b23e7e32b9c95ca5e6735c23e1e2484361d8ccfcac909f342b309945 SHA512 0fb2a71f98abbebe270b8fc9bfcb6a372d18b75c937a538a28d6f87e26da49f3bdbd471dc08d89de88271769fbe72c4afc55e277ed9b265613870f8eca739b5c WHIRLPOOL 22785cd4dbf5dd3adc51bc3934de7467a0c8c108d8d296f2284e10ef3e90817f81b1a9b5031ec1955f8c55db27967363dbab05feb45bfe9cec01a1f5082ec4a3
+MISC ChangeLog-2015 1288 SHA256 7cf9f1ea844766a6aae1516a4c74f63e7b2d0e32146f121db92e98dbf4ccf67c SHA512 276bb90987664fa42a232c97ac01bb935c65c777763fe6fe9251bf03b2ccfb204f94ad93d0c35caa442caaa1bcadc2bceb174c01be3ad04f53ac4f23632e9f38 WHIRLPOOL 9687cea90dd934743160a1c0d3c0ea1b683f22e7f3e19d41024ff003ff3b036db5938d63aa11651ce887269cbf1ded12afac5132785bd2a0efc72c260729f5f2
+MISC metadata.xml 511 SHA256 2c394eb1b6ca1cfcdd8ff8093ed6ad6040cc4e1df1edc9fd622313c22c5a2f19 SHA512 91af116a031d29419468e6d690a12aa9dda0095cab46e529634e2eb3cd486e069a8ff0ab59637cf0ced97aedac86afe0ae4469226ea49f1b637d65931e090b22 WHIRLPOOL ca22ccaaa10a35afdaf33c6478c1c2854d3efdb67d64a4e609b8a98d5fa6f9f98b9fa732721e16bbef23571d9c28c54ccb63c80d7e0166bf07a361380a4a807e
diff --git a/net-misc/autoupnp/autoupnp-0.4.6.ebuild b/net-misc/autoupnp/autoupnp-0.4.6.ebuild
new file mode 100644
index 000000000000..e28dde826431
--- /dev/null
+++ b/net-misc/autoupnp/autoupnp-0.4.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Automatic open port forwarder using UPnP"
+HOMEPAGE="https://bitbucket.org/mgorny/autoupnp/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="net-libs/miniupnpc
+	libnotify? ( x11-libs/libtinynotify )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	myeconfargs=(
+		$(use_with libnotify)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	prune_libtool_files --all
+}
diff --git a/net-misc/autoupnp/autoupnp-0.4.7.ebuild b/net-misc/autoupnp/autoupnp-0.4.7.ebuild
new file mode 100644
index 000000000000..88e67f8857d4
--- /dev/null
+++ b/net-misc/autoupnp/autoupnp-0.4.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Automatic open port forwarder using UPnP"
+HOMEPAGE="https://bitbucket.org/mgorny/autoupnp/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="net-libs/miniupnpc:0=
+	libnotify? ( x11-libs/libtinynotify:0= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local myconf=(
+		$(use_with libnotify)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-misc/autoupnp/autoupnp-9999.ebuild b/net-misc/autoupnp/autoupnp-9999.ebuild
new file mode 100644
index 000000000000..c7de9275db3e
--- /dev/null
+++ b/net-misc/autoupnp/autoupnp-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#if LIVE
+EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
+
+inherit autotools git-r3
+#endif
+
+inherit eutils
+
+DESCRIPTION="Automatic open port forwarder using UPnP"
+HOMEPAGE="https://bitbucket.org/mgorny/autoupnp/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="net-libs/miniupnpc:0=
+	libnotify? ( x11-libs/libtinynotify:0= )"
+DEPEND="${RDEPEND}"
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+
+src_prepare() { eautoreconf; }
+#endif
+
+src_configure() {
+	local myconf=(
+		$(use_with libnotify)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-misc/autoupnp/metadata.xml b/net-misc/autoupnp/metadata.xml
new file mode 100644
index 000000000000..527c08acfeae
--- /dev/null
+++ b/net-misc/autoupnp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://bitbucket.org/mgorny/autoupnp/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/autoupnp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
new file mode 100644
index 000000000000..1dc3cba80865
--- /dev/null
+++ b/net-misc/axel/Manifest
@@ -0,0 +1,13 @@
+AUX axel-2.4-bffr-overflow.patch 333 SHA256 c8d1b28a21247bd8a40f8b0c93eefc601be52fed617943759fa9e2738f5b457f SHA512 8072f7a7d15028f2272e45f6b42704fb3cadb30aec1ade093c80ee3b5d983d6362ed426c529bf46864f3f1adf8d2cd582be632796c8abcb43b125db87b1f0f75 WHIRLPOOL 48170028645e30a306075fa3731bfee7951f19c63ae34526c5c987fe5ab6fdf50a15d86a2481c4aee7764b2ffe47cef556ee88278e9a613b309fdb50e4ad4ad6
+AUX axel-2.4-buildsystem.patch 566 SHA256 da7ccc2dc5969eb4c4f5cc8631c1f75823cb3f733650098888cd2de923f5fd69 SHA512 5a6d087a959adb88aed6ae7df602e3731c9a6773877eb731e670ab854c20fd0e41e24a91b759192882ccb9c5dff2a07d51f73b5e5cbb868f25b0aa991b6af428 WHIRLPOOL 081b69d3c4ea7ac8973f20eb1e5609c4275248d52ab95189af573570f7b9b9f45e5fb64d469e3c4a558d1ca56deec4b222b7ac61edfa4cce8db91df5406091e1
+AUX axel-2.4-max-redir.patch 412 SHA256 0007c9c2f61ec39769d13ef93e4820f0f819d598bcd40aca7382fe098071b55c SHA512 81aa9e566798959af38ff9f59f493462acfdff7e817c2285717456463505149a00970a39cf7f14cc4f5c79c159e5a57b83b76eff690d454921ecb80efabd7491 WHIRLPOOL 3e01fa52c69a4c28d552faf326405ee89eb523f3c1ff4069f440466c939d6426fc15d08f8f468a6379caa57a9b1b95343d29a0c29c87ab4f40401323716cba2d
+DIST axel-2.12.tar.gz 82995 SHA256 28e7bb26b7be3f56a61b60ef07e15e05ea9a41850b0ed45a0c56d6d2202f4a8b SHA512 5e163c319366f7efd16f8b35dbcf901300c884ab303696dabe87ad47511f56cc3f1e399af738dc79ca717ca70fd529b6dd1adf30f5162cfb530105ce34e2eaf2 WHIRLPOOL dece4ad9eae5441e0b24952a96189417e75eb155ad46b199ce531b35fa6d027ffb75a16c016044a37dd4e76601865e51c0310b69b7fc70b974f9b67a6b2b1fe5
+DIST axel-2.14.1.tar.gz 89356 SHA256 acf6820d98a792faf309fc9acf22f7caf4b8a4b7001072c8f546b3c4fc755e39 SHA512 72c37fc6def0c765ed8220c27efe22255073b1e3cf1c8f6bda5ee2ce9cd36ac46263ac602a185efd40ca8f197a268612f2dcda69bcb49891c2538b910d971e8b WHIRLPOOL 1384ab65a689200f68d2549deb2f22526ae82a25f1b580ce5a270babc33d577513c2732a57676ea1e51b99eb09267960a5e24b6507ebca64a61d6ab4070eb374
+DIST axel-2.4.tar.bz2 44995 SHA256 ebc7d40e989c680d2afa632a17e5208101608924cf446da20814a6f3c3338612 SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9 WHIRLPOOL 373af984738008572847ae0ed84a518d0b61323e3612f48affa96175792b0856c2bd13601ddcdd0c81ead5059ee41130759bf9b0ada2a2654f767ec69d992a0f
+EBUILD axel-2.12.ebuild 1155 SHA256 989c636775a189e4ba72c9054bc0b8c1a0fc70e6168115184eca34af2ed3dea2 SHA512 5070aeaefbc1649011db1791fd3594adc79f39aa530207324e73fafbffb3496da83302dfe3c994dae87d90bf28c7ecebd327458882629061f0255d61ac6bb1f2 WHIRLPOOL c317ec66f89658047214f4db1d13ba45e67179a0f18276f668e7c02e7935f70b2b401e8982ff382fd6b4f8b894d057bdd706ada27404877e0e6abe196552a469
+EBUILD axel-2.14.1.ebuild 1358 SHA256 2dff4ac46259acc893742f994e9d529958fd5228fcfeaaf2235392f760a14ab2 SHA512 d5e22c787ca992239a5d7cf3064cb1cc074fcc3d3d95635ed9fa5b7f2f6243ba1ca024d4e3b17ab4a7fe3af72c115fcf6b487698503543a4d39ebdb6ecde548b WHIRLPOOL 3473f00f6c7e8ed74b5e0550fbffa9b0ebf226f39523052630177acd9727b52b63a12ab289d5267ef932427f6f89a009e7db4840a678c28b2dac216c7614f538
+EBUILD axel-2.4-r3.ebuild 1247 SHA256 60e4e41abe8d92a8c3052d870e9db0ccaaae9ca18319c42025feb1afcfaf6c22 SHA512 faa5ee4628df473cef38395d5e458743697ee03cca323a690796d21ea26427e052b25a42b3362fa289a716fb12b600eeb19ef2fa833448aa150d9afe41221b08 WHIRLPOOL 3795796d1a229df4333c243c22cb442419a2524c36c8e29f1960726729194e3be7be8de7459106ccfc042fcc7dbc2099fa9aefc26aa6b8c17d01552ab05782fc
+EBUILD axel-9999.ebuild 1027 SHA256 72ea1aa89eed76250fabe357198536e6e61bbd1dbedad3c2681f9223d0ef72ce SHA512 86dc06242516228d50eef795f79124dc085660fa6f1b6eee9fa62a404fd1762683de8c242a08feea7ffa4dcfa1552cbc0f91d6d0d967223a4ef3864f887b5bc5 WHIRLPOOL f79ce7e7554a0f7a5d8b2f56897e41d14a2e2aa037153b08a1ae1b702ab57d31dded65eb44ac301705d5bf553315c5c7da82ec14900ecb40ac45c8ec519ea018
+MISC ChangeLog 4030 SHA256 9d962ecf6ad498532e81f70f07ce29ce08a68cccc01a69afe9a1ba323b60d98e SHA512 3cfcb2b934827c5c62718148eef092a02d5701fcda79eea1b98a9cdfe69284a1f58b522115271ea470f0ff039de3b937f93a3c2ac0ff4286dc5650f11ea63530 WHIRLPOOL b2f9256f8245dc5ad5788ed0dc661b82a9266afbe8bccbc1d56303db297b57b341ca91505c3dab188c435c8a820e67902cd8e211acceb8683e78e12f3a2f18d3
+MISC ChangeLog-2015 7608 SHA256 579fc6aa7f68ef2c3554329a481c9bd7008ce2844e61207b69398d83b5c55831 SHA512 904527bdfd9f6ad80eb103a811cf162d1a0781067063b3b4171e3ecf3af380e22d23ce5a3b041611ed6e7dde2e79384664a115fba8c36d0c509102248640254f WHIRLPOOL 50cf0a4a76766fa482212e44549392d9d952d4c02f2e29dd2b975fcd6db30858add12ff4794c0e285f9886371ac70bd21fd6ed7173f0dc874cf803ade371aae4
+MISC metadata.xml 297 SHA256 2f8bb0e67e181f88997e57eee8f05aef14fe9d99261a632031f1a0504feb0aef SHA512 8d005244ca7b5f8dd30f9a158e4a53880d8a395bf11c73f8a3c7a3c668153a4c126b0a88942d3bd895a0e5ddc1f672eb770858356d0e12af75a098d36a80d56d WHIRLPOOL f08be791e102bbce96877f9e1e97ae9a0c53ea595739388e5a4ee25e27d13baf90594d80b0513622ccfe997f17fd0bf48749bd682908f9d6b7d4b4959306f1a8
diff --git a/net-misc/axel/axel-2.12.ebuild b/net-misc/axel/axel-2.12.ebuild
new file mode 100644
index 000000000000..1ab2acc7f251
--- /dev/null
+++ b/net-misc/axel/axel-2.12.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="https://github.com/eribertomota/axel"
+SRC_URI="https://github.com/eribertomota/axel/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+IUSE="debug libressl nls ssl"
+
+REQUIRED_USE="libressl? ( ssl )"
+
+CDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libintl virtual/libiconv )"
+
+DOCS=( doc/. )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl openssl)
+}
+
+pkg_postinst() {
+	einfo 'To use axel with portage, try these settings in your make.conf'
+	einfo
+	einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\'
+	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
+}
diff --git a/net-misc/axel/axel-2.14.1.ebuild b/net-misc/axel/axel-2.14.1.ebuild
new file mode 100644
index 000000000000..4bd7ad89659d
--- /dev/null
+++ b/net-misc/axel/axel-2.14.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
+SRC_URI="https://github.com/axel-download-accelerator/axel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+IUSE="debug libressl nls ssl"
+
+REQUIRED_USE="libressl? ( ssl )"
+
+CDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libintl virtual/libiconv )"
+
+DOCS=( doc/. )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl)
+}
+
+pkg_postinst() {
+	einfo 'To use axel with portage, create a script in'
+	einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
+	einfo
+	einfo ' #!/bin/bash'
+	einfo ' set -e'
+	einfo ' /usr/bin/axel -o "$1.axel" "$2"'
+	einfo ' mv "$1.axel" "$1"'
+	einfo
+	einfo 'and then add the following to your make.conf:'
+	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}.axel" "\${URI}"'\'
+	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
+}
diff --git a/net-misc/axel/axel-2.4-r3.ebuild b/net-misc/axel/axel-2.4-r3.ebuild
new file mode 100644
index 000000000000..d9fb8f0ef787
--- /dev/null
+++ b/net-misc/axel/axel-2.4-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DOWNLOAD_ID=3016
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="http://axel.alioth.debian.org/"
+SRC_URI="http://alioth.debian.org/frs/download.php/${DOWNLOAD_ID}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+IUSE="debug nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND="nls? ( virtual/libintl )"
+
+DOCS=( API CHANGES CREDITS README axelrc.example )
+
+src_prepare() {
+	append-lfs-flags
+	epatch \
+		"${FILESDIR}"/${P}-buildsystem.patch \
+		"${FILESDIR}"/${P}-bffr-overflow.patch \
+		"${FILESDIR}"/${P}-max-redir.patch
+	tc-export CC
+}
+
+src_configure() {
+	local myconf=()
+
+	use debug && myconf+=( --debug=1 )
+	myconf+=( --i18n=$(usex nls 1 0) )
+	econf \
+		--strip=0 \
+		${myconf[@]}
+}
+
+pkg_postinst() {
+	einfo 'To use axel with portage, try these settings in your make.conf'
+	einfo
+	einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\'
+	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
+}
diff --git a/net-misc/axel/axel-9999.ebuild b/net-misc/axel/axel-9999.ebuild
new file mode 100644
index 000000000000..70eda56e3f0d
--- /dev/null
+++ b/net-misc/axel/axel-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools git-r3
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="https://github.com/eribertomota/axel"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/eribertomota/axel.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug libressl nls ssl"
+
+REQUIRED_USE="libressl? ( ssl )"
+
+CDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libintl virtual/libiconv )"
+
+DOCS=( doc/. )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl openssl)
+}
+
+pkg_postinst() {
+	einfo 'To use axel with portage, try these settings in your make.conf'
+	einfo
+	einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\'
+	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
+}
diff --git a/net-misc/axel/files/axel-2.4-bffr-overflow.patch b/net-misc/axel/files/axel-2.4-bffr-overflow.patch
new file mode 100644
index 000000000000..24fae8ce19c0
--- /dev/null
+++ b/net-misc/axel/files/axel-2.4-bffr-overflow.patch
@@ -0,0 +1,16 @@
+ http.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/http.c b/http.c
+index 5d64e9b..db91701 100644
+--- a/http.c
++++ b/http.c
+@@ -164,7 +164,7 @@ int http_exec( http_t *conn )
+ 		{
+ 			i ++;
+ 		}
+-		strncat( conn->headers, s, MAX_QUERY );
++		strncat( conn->headers, s, MAX_QUERY - 1);
+ 	}
+ 
+ #ifdef DEBUG
diff --git a/net-misc/axel/files/axel-2.4-buildsystem.patch b/net-misc/axel/files/axel-2.4-buildsystem.patch
new file mode 100644
index 000000000000..a1571f0fc576
--- /dev/null
+++ b/net-misc/axel/files/axel-2.4-buildsystem.patch
@@ -0,0 +1,23 @@
+ Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1c3863a..b43fcff 100644
+--- a/Makefile
++++ b/Makefile
+@@ -51,13 +51,13 @@ uninstall-etc:
+ ### MAIN PROGRAM
+ 
+ $(OUTFILE): axel.o conf.o conn.o ftp.o http.o search.o tcp.o text.o
+-	$(CC) *.o -o $(OUTFILE) $(LFLAGS)
++	$(CC) $(LDFLAGS) *.o -o $(OUTFILE) $(LFLAGS)
+ ifndef DEBUG
+ 	-$(STRIP) $(OUTFILE)
+ endif
+ 
+ .c.o:
+-	$(CC) -c $*.c -o $*.o -Wall $(CFLAGS)
++	$(CC) $(CPPFLAGS) -c $*.c -o $*.o -Wall $(CFLAGS)
+ 
+ install-bin:
+ 	mkdir -p $(DESTDIR)$(BINDIR)/
diff --git a/net-misc/axel/files/axel-2.4-max-redir.patch b/net-misc/axel/files/axel-2.4-max-redir.patch
new file mode 100644
index 000000000000..f52796c35e2d
--- /dev/null
+++ b/net-misc/axel/files/axel-2.4-max-redir.patch
@@ -0,0 +1,16 @@
+ axel.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/axel.h b/axel.h
+index e90d30d..f6ebfe8 100644
+--- a/axel.h
++++ b/axel.h
+@@ -66,7 +66,7 @@
+ /* Compiled-in settings							*/
+ #define MAX_STRING		1024
+ #define MAX_ADD_HEADERS	10
+-#define MAX_REDIR		5
++#define MAX_REDIR		25
+ #define AXEL_VERSION_STRING	"2.4"
+ #define DEFAULT_USER_AGENT	"Axel " AXEL_VERSION_STRING " (" ARCH ")"
+ 
diff --git a/net-misc/axel/metadata.xml b/net-misc/axel/metadata.xml
new file mode 100644
index 000000000000..2a0e2be810bd
--- /dev/null
+++ b/net-misc/axel/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 type="person">
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eribertomota/axel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/balance/Manifest b/net-misc/balance/Manifest
new file mode 100644
index 000000000000..7e79c28bc6da
--- /dev/null
+++ b/net-misc/balance/Manifest
@@ -0,0 +1,6 @@
+AUX balance-3.57-Makefile.patch 1349 SHA256 b49abc8e5e00206134244e395061c78a838b4e3bd9e0350ccbca0b4d7c639096 SHA512 95d98992206d21784ed53874a55c0e1bc8b0b8ad918d7daefe89f118e200d62d1bb445b6371cbca2418b2f362c57a67fc929aaba2256f502211cda96a89f443a WHIRLPOOL 48aa47831731e737ae47196433347ae280f2310e86865c693f99e438256003deba3f0a0f78276da76f58ec292b6f7cabf36bfe9dd09f4f44b817005952b66ffd
+DIST balance-3.57.tar.gz 35547 SHA256 b355f98932a9f4c9786cb61012e8bdf913c79044434b7d9621e2fa08370afbe1 SHA512 191195e2aa62c867d85085f273db911e8957c3eea7bed8e58abc29e125a0b0a4487048c7db5857e32f54545de1f81f8148b174225aaf8cf1e3a66e4b040748b4 WHIRLPOOL 7fac226f9829f5ded949d7b42c34338cf5cdc487e41d04d63b48cc35b019406d5c34db39079405ac188d47eddfae8166115ae7e679f4127e077e0871b1638d37
+EBUILD balance-3.57.ebuild 549 SHA256 01b6390a186d04cfcd39e44d0161042c2895fbb3ac58db7a2952b2011d87b095 SHA512 e0cc0aa6e999f917697eefb46d58268cf3f66372c1eb2ee1cc8c3ec15e9b4ff9e7b4fabdf41302dba635976e6fa811025c9386b59f0ae63ba5e8c019a9fe4cee WHIRLPOOL 72a755b462581b7661818c4c50d20e8eade8158a4835c3a6c5de2a81392d90e654d3978216dc833f4c21c0995f0d0c06d90c11a114df635a4937a41282df7e3a
+MISC ChangeLog 2216 SHA256 23c0893cc2a6ea45f6724c30f5946af8a4dc4641f272c689917f0a21e9eb6520 SHA512 ac3265f1b0ac1990b630468301b992ba4b8969c89ae19c550fed90f823b1719ce07099e550ef5c940aa63c1a48858dbe0318b8d2caac238813e213c1b5991a93 WHIRLPOOL 670e9a853ea306cd99a58fefecfd31306ef96597c7afa5e4a02792ddf86e15815a065505d3842f752c7c7b6af351f0c6cd594a782c44a242be1a73eb66de6bd9
+MISC ChangeLog-2015 2801 SHA256 5259c3e3f1430e12ef49619d0a1db4a6c36f6be45c9f9e7a7c92783ab89c4b7c SHA512 8e328d0f48b84a848da8a3aa917d56f79eb4b16af42f215075abf452d446e73011990d311fc6439528f8dddfd56a38d4532058ba89a1f1cc599667e9e7efc607 WHIRLPOOL 5cfda139985d59248330653ff4384e1bbe9820037546f9f236b9671d0dcf6ca13fc226a2f1e1d7f19f5d45156b7be79c3b8776bfd781b5d6b1550b9cf20d80cf
+MISC metadata.xml 243 SHA256 ea7c9e5f065da7aa5425675f3750400b765c0eff02f0593783bb069401f73564 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b WHIRLPOOL 4028c4779286eb8eece0b9834f1f83ea8bd212c5255dbfb60605cabb7559ede33da53884a1788100998b2dcf26abed2cf82468a3275cabac58f9eceb1e596757
diff --git a/net-misc/balance/balance-3.57.ebuild b/net-misc/balance/balance-3.57.ebuild
new file mode 100644
index 000000000000..2252401cdb41
--- /dev/null
+++ b/net-misc/balance/balance-3.57.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="TCP Load Balancing Port Forwarder"
+HOMEPAGE="http://www.inlab.de/balance.html"
+SRC_URI="http://www.inlab.de/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	#autocreated on program start, if missing
+	rmdir "${D}"/var/run/${PN}
+}
diff --git a/net-misc/balance/files/balance-3.57-Makefile.patch b/net-misc/balance/files/balance-3.57-Makefile.patch
new file mode 100644
index 000000000000..fad7f1f13151
--- /dev/null
+++ b/net-misc/balance/files/balance-3.57-Makefile.patch
@@ -0,0 +1,52 @@
+--- balance-3.57/Makefile
++++ balance-3.57/Makefile
+@@ -1,14 +1,14 @@
+ # $Id: Makefile,v 1.14 2015/04/28 07:49:37 t Exp t $
+ 
+ #CFLAGS=-g -I.
+-CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized
++CFLAGS+=-Wall -Wstrict-prototypes -Wuninitialized
+ 
+ # uncomment for any OS other than Cygwin
+ BALANCE=balance
+ ROOT=root
+ INSTALL=install
+ BINDIR=/usr/sbin
+-MANDIR=${BINDIR}/../man/man1
++MANDIR=/usr/share/man/man1
+ 
+ # uncomment for Solaris:
+ # LIBRARIES=-lsocket -lnsl
+@@ -20,13 +20,13 @@
+ # BALANCE=balance.exe
+ # ROOT=Administrators
+ 
+-CC=gcc
++CC?=gcc
+ RELEASE=3.57
+ 
+ all: balance 
+ 
+ balance: balance.o butils.o
+-	$(CC) $(CFLAGS) -I. -o balance balance.o butils.o $(LIBRARIES)
++	$(CC) $(CFLAGS) $(LDFLAGS) -I. -o balance balance.o butils.o $(LIBRARIES)
+ 
+ balance.o: balance.c balance.h
+ 	$(CC) $(CFLAGS) -I. -c balance.c
+@@ -48,12 +48,15 @@
+ 	rm -f $(BALANCE) *.o balance.ps balance.pdf
+ 
+ install:
++	$(INSTALL) -o $(ROOT) -g $(ROOT) -m 755 -d \
++		$(DESTDIR)$(BINDIR) \
++		$(DESTDIR)$(MANDIR)
+ 	$(INSTALL) -o $(ROOT) -g $(ROOT) -m 755  $(BALANCE) \
+ 		$(DESTDIR)$(BINDIR)/$(BALANCE) 
+ 	$(INSTALL) -o $(ROOT) -g $(ROOT) -m 755  balance.1 \
+ 		$(DESTDIR)$(MANDIR) 
+ 	mkdir -p $(DESTDIR)/var/run/balance
+-	chmod 1777 $(DESTDIR)/var/run/balance
++	chmod 1755 $(DESTDIR)/var/run/balance
+ 
+ release: balance.pdf
+ 	rm -rf ./releases/balance-$(RELEASE)
diff --git a/net-misc/balance/metadata.xml b/net-misc/balance/metadata.xml
new file mode 100644
index 000000000000..3c3d5ced6412
--- /dev/null
+++ b/net-misc/balance/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
new file mode 100644
index 000000000000..3c084c1c7d18
--- /dev/null
+++ b/net-misc/batctl/Manifest
@@ -0,0 +1,7 @@
+DIST batctl-2013.4.0.tar.gz 53074 SHA256 4deae3b6664d0d13acf7a8ece74175a31a72fe58fb15cb9112a9a2014b32cb4c SHA512 1c099f8b5633923669e41a01b8364f3b665de2c67efe05a1938e1977ffe6067e91be308f3445492001acd5e6fc0c9c930610edf351bda6920579b80b45811011 WHIRLPOOL 8ac0a563b4899b715542dad6b6761603f0fe6538e42dfdd5473049fb5ee112195cf078e2282b4cd33761591fa20b11c8365a4cd9138d376450c507537e1112fa
+DIST batctl-2014.2.0.tar.gz 56536 SHA256 872b4835d29e907e1c9e7181a6a6c34ead1aceda748b752d4f1afcd4fb2913c2 SHA512 4d78cd0914dce293b9a88c26f2b0f692fd8061aef6f47deeea433a0e700f6d11e608043981e1859dd36ed58b7bbe31483937b1f05070a210b0d55875160d2ca6 WHIRLPOOL 55b3db86a55c6a754735c763fd10323099f33d79e4d619c67efa865b93c616983ed5d5a104771ee3e442e8554a6a25f5176ed9596be4646557fe33e892f71a6f
+EBUILD batctl-2013.4.0.ebuild 815 SHA256 330f119c0849db177b2fb1d15dcddf5d50eb10e39cd1a0e4ef82e5229fcab40b SHA512 ee2e7a8ea7b035bb616f846a6ba9b85cdd0359087ca9610fe6f5f80fa96c7485f9c8da447f32b02228218b0797dd2705fd3ecd4f3c25efb31cb8b2f6c9551738 WHIRLPOOL a21d076a16726fd75e010196e12cbd8db8b441263e5e0208909eabdf461a9a21fa7696550bb57a3902c4f2e993b823684b874143250cd8a30b8920ab319a9102
+EBUILD batctl-2014.2.0.ebuild 860 SHA256 0996d69867d301936d4049a1987c0c6d06b298c2ee743c7b5ad2d78fb2b13d1d SHA512 f6998356a383ca66aa82b81277269ecc1b3879a31af5877ed584df5afd96c1f4813234698dcb416b2b055a7ddbda5f15b70d1d7c89eac0055db74e5e2c3b5aa5 WHIRLPOOL fab5761ad50ddf759a60dd45bc5bcf133a1953b40645cfb460e4021bf703d0505d118784572027cc326ecc3c4d677c553ce9ee15ed55db1a544d266a91155b78
+MISC ChangeLog 2628 SHA256 ff0bde73db6d61d6938e3522342cb771253537b9686b4883ceeab590678b1d56 SHA512 17923f5961169269934b9356373077f7b31423fcd160c5dea7a00b03b7e9cafba3d4aafa89d26f36f15b7a1e7f8c48128007037a19f1b0314f8c3e983a318988 WHIRLPOOL 095fea2c3c507c9cbb0794d40bd437742079a973394c63c9c0c971af2297e5175462408eb32a455e8f23c8c1a44494871b4cc96578fcc53af3945d1dd494508f
+MISC ChangeLog-2015 2736 SHA256 3cf9a13e0c4ba636dea000e29015c59a3f7a821933a32b924948f99e3620f221 SHA512 6cba7a72937b78490d154a072e2d10d6d0e21c246d0ac20fa982bd9d8f3e6b2bd76eaa7f953cdd820bc3e16d2d7afb56c89c5346aa6003d685d765cbc43546ce WHIRLPOOL e22821d25c5f38af4984c9a48f012b31bf5727a4fdcdab6e2c24585d52598fcc14fe77ad50b7f38a12cd1f75d4b892a0c89a413dbbb95d2ab35882e2c31d0bc2
+MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/net-misc/batctl/batctl-2013.4.0.ebuild b/net-misc/batctl/batctl-2013.4.0.ebuild
new file mode 100644
index 000000000000..a63dad363faf
--- /dev/null
+++ b/net-misc/batctl/batctl-2013.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="BATMAN advanced control and management tool"
+HOMEPAGE="http://www.open-mesh.org/"
+SRC_URI="http://downloads.open-mesh.org/batman/stable/sources/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	if ( linux_config_exists && linux_chkconfig_present BATMAN_ADV ) \
+		|| ! has_version net-misc/batman-adv ; then
+		ewarn "You need the batman-adv kernel module,"
+		ewarn "either from the kernel tree or via net-misc/batman-adv"
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" V=1 REVISION=gentoo-"${PVR}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc README
+}
diff --git a/net-misc/batctl/batctl-2014.2.0.ebuild b/net-misc/batctl/batctl-2014.2.0.ebuild
new file mode 100644
index 000000000000..c597188edc59
--- /dev/null
+++ b/net-misc/batctl/batctl-2014.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="BATMAN advanced control and management tool"
+HOMEPAGE="http://www.open-mesh.org/"
+SRC_URI="http://downloads.open-mesh.org/batman/stable/sources/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libnl:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if ( linux_config_exists && linux_chkconfig_present BATMAN_ADV ) \
+		|| ! has_version net-misc/batman-adv ; then
+		ewarn "You need the batman-adv kernel module,"
+		ewarn "either from the kernel tree or via net-misc/batman-adv"
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" V=1 REVISION=gentoo-"${PVR}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc README
+}
diff --git a/net-misc/batctl/metadata.xml b/net-misc/batctl/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/net-misc/batctl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/batman-adv/Manifest b/net-misc/batman-adv/Manifest
new file mode 100644
index 000000000000..e1e42bc98d2e
--- /dev/null
+++ b/net-misc/batman-adv/Manifest
@@ -0,0 +1,7 @@
+DIST batman-adv-2013.4.0.tar.gz 138232 SHA256 a9b1b7542c94cc6bf7c97b7b0d02bf071b5632a64480ae419358b9cb9cab6870 SHA512 e4f29b9bf9b13a6afe25ed138e4c811b8a3b09917c435ccd5a7720b60922f215e5bb04322d9299cf6464f4f0ade892f913e3510dc19907efa475abab4a84dfa3 WHIRLPOOL 56cd2eeccd4317459162afb3995f992e90795099c2e0dde29b7f5a7ba8b2e2aa0b09d16927c1ebe580113388ced7654fef23f0af4b63466ef793202526a5eab9
+DIST batman-adv-2014.2.0.tar.gz 170320 SHA256 34764607e1ce4256105d2c49e3445fedd2bd5d56480e011a7b66449a0baeab52 SHA512 35650aa3eb8b4ddd70284d42a41ac81ea5b9184ee22cb0cbf322312b45cb0761e5344c4c20543480b58d37c9616299355694560bd38677144a9f258b5b027daa WHIRLPOOL 4b8bc3c397414245f7b88906e65c833abf4e70e4f587a2ff98524cd3648f627190f977d635d44eac10016ca18d00ead3a0f6c668f32d7d984d36a99e89b812ae
+EBUILD batman-adv-2013.4.0.ebuild 918 SHA256 3c828feb4cf9f33cc44054abbdb2cec88abc570cd99eb4afbeb93fc80649c1ea SHA512 9b9add1ea5cb1e05f7730a766a7fa68cd78075fceed28720ddd9f863232143153f412939acfe4ffef9ac23ebe8bdb08654f658f6e63c27a26e1fc3fbf8748d62 WHIRLPOOL 441e08ba14b471981e89aa2100be32b42c2590cb70dc19c087c3b788f1b160b6ccff220c1e585b5a86ec46c9fb63931ffc549d80411d1b3f032964c51fe39f23
+EBUILD batman-adv-2014.2.0.ebuild 992 SHA256 403520de7d25a224890420a0f1e7f599d704d82d4055ae16576ca00ba724ce81 SHA512 13a86180fd4bd7826f6c8608235c56932cefca94fa70d3ab82e93e70dd153a68f7e90f754490f10d21ee0ebae4b2a10e71bc692b836a5a0d1beaafc5a6e3aca4 WHIRLPOOL 54e793a0342716004eb4ca7f9f0f94d34fe40141caa906930d8d157c89ba3e1fd76516265ad8d335a47ce12b61a5cbbdb0d3fb96f18cc0ef75d30f9b2cf5498e
+MISC ChangeLog 2648 SHA256 ac9efb73f8f59dccb07482040c6d7e3843a99b32f34d5e4abccc55a98a04189c SHA512 8daa28bbefb9e44134a1ee9f68b9696e391e79e242667941260b898afb3c7b0c80d3623c14534507ef04e325ff57a0a5ad0cd62d5e1bffac16b208e730210143 WHIRLPOOL bc407febcaa8bf4d0cf01e01d9df30999ab12e5433c17d69c5cf632f45eb15442fc5fe6c546bb8c701f868142786cb18f4a589ddcbd57427e266f24b88e6db14
+MISC ChangeLog-2015 4000 SHA256 198f76866e700521d19b7eaf6d049dcfc767be733da317cd2a1af8767112b05c SHA512 2729bc228669340ab80d57d60438620ddecf257741ab0cef2b5f4b1da497efed4cff12abd563a5f6b28e3cbe3fb4db4ff43d3255597eb09ed801ea892ceff57b WHIRLPOOL 9c0fb22aef8ecdac1442e2aeebd65aa61e3425affe0847c74d684259da3ca7754d36253bef908267cd4fae97e784e27469d95cba280788e55ac13bae68aabe27
+MISC metadata.xml 486 SHA256 1bde1521d05ccf53f5c89c126fede2894ec8d6671db6debcb09a360c4e84c667 SHA512 be8936eb6768c058955038123a9af0380cac6a20d80aa29a93d0ecd41b68e4527e7d1e18bcd0c0f21b3e57ff2fce2da73335373eba37f7f0bd75f84fde44b7f6 WHIRLPOOL 7fb9665aee381c0272f13c3ce4e48c6ce7d8ca8405cc7cffe856a2246590fb5f21c8721c1001464b4754e88d2bab4c8decbf86923bd4aa6f2cf6acf8c45dca40
diff --git a/net-misc/batman-adv/batman-adv-2013.4.0.ebuild b/net-misc/batman-adv/batman-adv-2013.4.0.ebuild
new file mode 100644
index 000000000000..bb9723b081fb
--- /dev/null
+++ b/net-misc/batman-adv/batman-adv-2013.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+CONFIG_CHECK="~!CONFIG_BATMAN_ADV"
+MODULE_NAMES="${PN}(net:${S}:${S})"
+BUILD_TARGETS="all"
+
+inherit eutils linux-mod
+
+DESCRIPTION="Better approach to mobile Ad-Hoc networking on layer 2 kernel module"
+HOMEPAGE="http://www.open-mesh.org/"
+SRC_URI="http://downloads.open-mesh.org/batman/stable/sources/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bla dat debug nc"
+
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	BUILD_PARAMS="CONFIG_BATMAN_ADV_DEBUG=$(usex debug y n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_BLA=$(usex bla y n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_DAT=$(usex dat y n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_NC=$(usex nc y n)"
+	export BUILD_PARAMS
+	export KERNELPATH="${KERNEL_DIR}"
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README CHANGELOG
+}
diff --git a/net-misc/batman-adv/batman-adv-2014.2.0.ebuild b/net-misc/batman-adv/batman-adv-2014.2.0.ebuild
new file mode 100644
index 000000000000..69e019603b04
--- /dev/null
+++ b/net-misc/batman-adv/batman-adv-2014.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+CONFIG_CHECK="~!BATMAN_ADV ~LIBCRC32C ~CRC16"
+MODULE_NAMES="${PN}(net:${S}:${S})"
+BUILD_TARGETS="all"
+
+inherit eutils linux-mod
+
+DESCRIPTION="Better approach to mobile Ad-Hoc networking on layer 2 kernel module"
+HOMEPAGE="http://www.open-mesh.org/"
+SRC_URI="http://downloads.open-mesh.org/batman/stable/sources/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bla dat debug nc mcast"
+
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	BUILD_PARAMS="CONFIG_BATMAN_ADV_DEBUG=$(usex debug y n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_BLA=$(usex bla y n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_DAT=$(usex dat y n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_NC=$(usex nc y n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_NC=$(usex mcast y n)"
+	export BUILD_PARAMS
+	export KERNELPATH="${KERNEL_DIR}"
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README CHANGELOG
+}
diff --git a/net-misc/batman-adv/metadata.xml b/net-misc/batman-adv/metadata.xml
new file mode 100644
index 000000000000..dd744838a0ec
--- /dev/null
+++ b/net-misc/batman-adv/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<use>
+	<flag name="bla">B.A.T.M.A.N. bridge loop avoidance</flag>
+	<flag name="dat">B.A.T.M.A.N. distributed arp table</flag>
+	<flag name="nc">B.A.T.M.A.N. network coding</flag>
+	<flag name="mcast">B.A.T.M.A.N. multicast optimizations</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
new file mode 100644
index 000000000000..44d85be8aa10
--- /dev/null
+++ b/net-misc/bfgminer/Manifest
@@ -0,0 +1,19 @@
+DIST bfgminer-3.10.10.tbz2 1087392 SHA256 b361d6f195e4c91eb01b08f0907615029fc9bd7d58c017bc7943d0333c4ba018 SHA512 c8f6ee424dfd948f543c4ef20885f683acd9fc8925eb4cd2b4255b4b1073b5a58303f468adff2e9689df16833d4a1cdabc9f464d241d9eb1c8c5df0eae322cf0 WHIRLPOOL aabce648db6026f6a4527dafa6ed7e64b03cb9b0e5993a8a48b22c93683b78f992f0cb67c03dd2c72945bc92a42fa514a7a28a97a7e73149ddf1fd5e840c8d6a
+DIST bfgminer-3.10.5.tbz2 1091287 SHA256 224e02979ed27f7cebe47ca7a17fa9a1ecce7680531c3995daade54cc3be2807 SHA512 500745b09ced2102cb7bfee8dbe3e44bf69c3220fff5d2fdc642a1b4c0674f36a1786c1e384ab641dde5b3149713d9b0a4e520cfd50c2cc89710fe54f1315303 WHIRLPOOL 0b4299b56b86cc4633225a321c957ce47fd719f3132c32f34618de2e7b15fc388a39cc3627959207490d7f8fb263942cc3be5a710b9cbe7114988364ba1a43fa
+DIST bfgminer-4.10.3.tar.xz 988552 SHA256 c9e4ac3754dad838d3a8120afd499751ac2e8b15fe6dd6d18be28fc1ec72355a SHA512 99b684382c61c9e2eb0a3469af0f33ddb427f8f612bbad5623de29168547c7a87d065b18134b7e944163dcb429a9025f42c19ff8ac68cfeed705e008ef6292fb WHIRLPOOL b0887909dc878d9cf914bd092f3abbc2527a30cb4359f31cafbcc417cffa145bc3d3ab7a4809e8b068d8545ee5f01078cde753e37a615dc4532a2a352d75987a
+DIST bfgminer-4.10.4.tar.xz 988348 SHA256 93c7e5f3170b39353fa4e924268a2497810df64ad8aae281f205484971e2c0c9 SHA512 5c367babbe7c9cd42fb5f75328989a9da14f0ed11c8922d2a0dcfb40a41552dbfe30c79a7e4f33a1612e85dab506869f96c6b401d6cf57afd27cff71950a3e75 WHIRLPOOL 716eba07b3fb0ab8a1a5600bc14bcc444a70d1b1d3707de547e8c59c3ef587452f4cb153c2fb8b90f806df60d3cd6148fbcf5e1c94de1221e05a2ef25bc4a3c5
+DIST bfgminer-5.3.0.tar.xz 1017536 SHA256 d48fa6e51ff70ee1a85f77334a24f842ca6774c073c2d864fe739f07093ef77f SHA512 935b2a0595a2230f8ba9f832a280f52418c1b50b884010bebd2059cbef83d28c535d8d0b3cd7abe5b2420f6dc9fa8e9e0e32839ccdb6cd002a1e874dc5b1841a WHIRLPOOL 0244c9cf2a8928590f69819cfaa222498ae9e0b65aba4c0bc3fc751b7712e9284110ef238dd3bdeaa0562f4eaa292b4257e4d509966ff8e92731dd3f1d9f8ecc
+DIST bfgminer-5.4.0.tar.xz 1037568 SHA256 c265e060919545bd2cdb187de0549b372413c49ca02c5bd5621ef9a91b9f5c0c SHA512 26d49e0a8b336c6dcfbae7abb4d5fc97707dffc0cb9d790984d02c4557d8383120b58c8a3e08ce7cc4f5bbfc051d01d518181eab4344b57d119527dfb1d75f84 WHIRLPOOL 2299b8a4082a59541f13cd04cb516b40d599f3080c70c7020e4581bb4ed583902d2221fd418cd13b8d6edcaaf3290db4f03e8e4fc6073ca31a33786b1da547bd
+DIST bfgminer-5.4.1.tar.xz 1037828 SHA256 1a0c3e43741d9061aa0b5257353a812b84632fc8ac7d5ec84d91fb134803cc0c SHA512 3ef88991c18743bfe90749e488ae512a7d10b33ef22d4b1bd6ebfeb3e19cbdb6886f20b1b625b9003cca5b417d8cb814143941d8e2b982552ffb623a4f0e0959 WHIRLPOOL 132d2a8c0ca23e11232af8644e4ab77dee6b15ae64a6a9a1ae1c8efae0c3332c84f133777256f7975d63e5b55d0436d7e7c504d99c491d9879c7598f68e863bc
+DIST bfgminer-5.4.2.tar.xz 1039200 SHA256 7030632a08cfc5a3fdca485fd8d7213d8f41560134c54d356426b974d91ce01a SHA512 b5ae8ae44df166d5576f89683ce9ee0832ca1f506b2522da7e3cd432abc5e218e9080e2a79f4da29e40db0d3179e63c9a8907d5d6b60d5d4895d6cac2b15d8ca WHIRLPOOL b6472c13e65dc9be18bbc760a1c9f84a70a25d695408d52c8ef9de461e6c7539a9915d85cced4b09c797686499280ad5109d9332a28f56ea4a9e3c0babf05394
+EBUILD bfgminer-3.10.10.ebuild 3574 SHA256 a79e69bd67ee1bfce8313c0faf5543179cbf8da1af1b26a44e764b9f3d265f90 SHA512 01f2b7b09968aee28bb48b4b27227cc964ad7d6595ecc668b389134b671710d86cbca2b6e825825646d857a19992371da1d2ddeea5609390103dd3535a1515f3 WHIRLPOOL 09a026a392ff0c9bf24fc2d1105589baece44d31f92c96204e75269ec0a40ea878c35343d31c1c66ebad1d6441299841a4148e8e142e9e75532c0b81a2c1fb15
+EBUILD bfgminer-3.10.5.ebuild 3564 SHA256 1bfa3223449959fd99bdbf4d749979d568cc30cb24fccdcb2b91bb43b2027712 SHA512 7105a5109a4b72cac54550e01354ff963ed7f04519e78779698c8cc3325eeaa71a987d15eb1d6702c4ea3c1ed574d827913a0314c4e6b2ea3bc1a498877f0591 WHIRLPOOL ccfb7e2b684b94dacc848fd6ca6d7daa046667ab1f7c6be961d025e451047f70057a3d972de2a19a8ccc7a379b1c2a777cdab9c8f07c9e4262116e2fe7aff3b6
+EBUILD bfgminer-4.10.3.ebuild 4197 SHA256 1d800eeab2cd02fcd4cdc7e4ca216733faacc77119cf847ed8cef203078df075 SHA512 0df960a246cf21bbff12a7f9ce7cbbb2ab7ac2db397c339b87d218f598372dcef2ee815f0a90b94d66c59953d3c4f9db4ab53f2556cbb259ece2fc6761ece62e WHIRLPOOL b84f953057adea5561493abe8ebfed4db2cc0e6385f4217528efca3269f7b3b7a0a24e67336d51ddf94b7db46156c68d07b345281b91422886b8828ad8328e16
+EBUILD bfgminer-4.10.4.ebuild 4197 SHA256 1d800eeab2cd02fcd4cdc7e4ca216733faacc77119cf847ed8cef203078df075 SHA512 0df960a246cf21bbff12a7f9ce7cbbb2ab7ac2db397c339b87d218f598372dcef2ee815f0a90b94d66c59953d3c4f9db4ab53f2556cbb259ece2fc6761ece62e WHIRLPOOL b84f953057adea5561493abe8ebfed4db2cc0e6385f4217528efca3269f7b3b7a0a24e67336d51ddf94b7db46156c68d07b345281b91422886b8828ad8328e16
+EBUILD bfgminer-5.3.0.ebuild 5124 SHA256 44056e78ee45589b1747ff3460bf9d1b2616efd71a36cbe89d2e147ed761ade3 SHA512 07ecfb2d636d770d839bea957ce2ce6e9fd6f125dc051d8bb19d2f8ac9210f12aadb84e6b743dcabe23ec5dcff5a2da8b51c252ca12503c0b1d730163e9fa41f WHIRLPOOL a18f7b70316e8a5c7edbaa84447ce3dfe5e50f06db1f1bdb17e10a2ed4163a2d3b6b8386280d834fa86873ed4ac060c8ed9df7732dda5f4a798364773b83ffc0
+EBUILD bfgminer-5.4.0.ebuild 5124 SHA256 44056e78ee45589b1747ff3460bf9d1b2616efd71a36cbe89d2e147ed761ade3 SHA512 07ecfb2d636d770d839bea957ce2ce6e9fd6f125dc051d8bb19d2f8ac9210f12aadb84e6b743dcabe23ec5dcff5a2da8b51c252ca12503c0b1d730163e9fa41f WHIRLPOOL a18f7b70316e8a5c7edbaa84447ce3dfe5e50f06db1f1bdb17e10a2ed4163a2d3b6b8386280d834fa86873ed4ac060c8ed9df7732dda5f4a798364773b83ffc0
+EBUILD bfgminer-5.4.1.ebuild 5124 SHA256 44056e78ee45589b1747ff3460bf9d1b2616efd71a36cbe89d2e147ed761ade3 SHA512 07ecfb2d636d770d839bea957ce2ce6e9fd6f125dc051d8bb19d2f8ac9210f12aadb84e6b743dcabe23ec5dcff5a2da8b51c252ca12503c0b1d730163e9fa41f WHIRLPOOL a18f7b70316e8a5c7edbaa84447ce3dfe5e50f06db1f1bdb17e10a2ed4163a2d3b6b8386280d834fa86873ed4ac060c8ed9df7732dda5f4a798364773b83ffc0
+EBUILD bfgminer-5.4.2.ebuild 5124 SHA256 44056e78ee45589b1747ff3460bf9d1b2616efd71a36cbe89d2e147ed761ade3 SHA512 07ecfb2d636d770d839bea957ce2ce6e9fd6f125dc051d8bb19d2f8ac9210f12aadb84e6b743dcabe23ec5dcff5a2da8b51c252ca12503c0b1d730163e9fa41f WHIRLPOOL a18f7b70316e8a5c7edbaa84447ce3dfe5e50f06db1f1bdb17e10a2ed4163a2d3b6b8386280d834fa86873ed4ac060c8ed9df7732dda5f4a798364773b83ffc0
+MISC ChangeLog 4684 SHA256 b6cf95414ee65e2fe595e596b51f17667a3bc9e6199fa75ae50dfee105795408 SHA512 28cef92031056b21279fab485b70e6a4eeb8dad3417b95657fa0151f9d098fb0d517c0600dc0840e8fee50942d62c352afd6f98242c4f7cb3a5552c5ee9ab666 WHIRLPOOL efeac9f0020a51b682a0717dd4d1791667ccfe183f89ff5aad262749c8e6f8b088bf94d0ee3bfaef29d4aef8e4c040555410a7bcff5f8d89834b9741a9e1663a
+MISC ChangeLog-2015 17817 SHA256 da0dd52de84583f682d350d80a4803a25e7ef45e623c912c1dbd293b09724d21 SHA512 0a3ae30f374e6b113ec6102f7d794c3f9692e7ad156d7087d0ea2f6590d0633c8b4dcaef981a3ce1d14ad2fe4261812eb33d4ab5261b5ad8a9956817509bd565 WHIRLPOOL e26bd1afe44a3b3f26f23c3a6a8c7892c2b1b749ac4f8b61d24ff07d2a807633d68d992851e951abeaa44c6c7c7157e6345e49a1185511876b786a61c53fdf78
+MISC metadata.xml 3868 SHA256 198a2a5683d51d0d5cbc1f44ecacb3f9f9c954e06a4750ec05a5cdc634222fa9 SHA512 5231fc476a9478cfe043554f0ed2ca4e7a0986d8ba7b8a74fe1a235c6ebfe01e931dc9d3e9bb9b7d6733acdf49b87a3cc5ba92c240a12f812e0854388d7b207f WHIRLPOOL e1c35be5824da3c96d44db851833f92162d8cbd6e85838d8bed6a73d6f1d42594013a4faf5ee8cab5443d3c16294d6ff5e6f0ff5add0a48eec8686eae378287a
diff --git a/net-misc/bfgminer/bfgminer-3.10.10.ebuild b/net-misc/bfgminer/bfgminer-3.10.10.ebuild
new file mode 100644
index 000000000000..fdf63a4cad57
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-3.10.10.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+IUSE="+adl antminer avalon bifury bitforce bfsb bigpic bitfury cpumining drillbit examples hardened hashbuster hashbuster2 hashfast icarus klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum screen scrypt twinfury +udev unicode x6500 ztex"
+REQUIRED_USE='
+	|| ( antminer avalon bfsb bifury bigpic bitforce bitfury cpumining drillbit hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 ztex )
+	adl? ( opencl )
+	bfsb? ( bitfury )
+	bigpic? ( bitfury )
+	drillbit? ( bitfury )
+	hashbuster? ( bitfury )
+	hashbuster2? ( bitfury libusb )
+	klondike? ( libusb )
+	littlefury? ( bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( bitfury )
+	nanofury? ( bitfury )
+	scrypt? ( || ( cpumining opencl proxy ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	x6500? ( libusb )
+	ztex? ( libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	net-libs/libblkmaker:=
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable scrypt) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/bfgminer-3.10.5.ebuild b/net-misc/bfgminer/bfgminer-3.10.5.ebuild
new file mode 100644
index 000000000000..a7e6030b2462
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-3.10.5.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
+
+# TODO: knc (needs i2c-tools header)
+IUSE="+adl antminer avalon bifury bitforce bfsb bigpic bitfury cpumining drillbit examples hardened hashbuster hashbuster2 hashfast icarus klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum screen scrypt twinfury +udev unicode x6500 ztex"
+REQUIRED_USE='
+	|| ( antminer avalon bfsb bifury bigpic bitforce bitfury cpumining drillbit hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 ztex )
+	adl? ( opencl )
+	bfsb? ( bitfury )
+	bigpic? ( bitfury )
+	drillbit? ( bitfury )
+	hashbuster? ( bitfury )
+	hashbuster2? ( bitfury libusb )
+	klondike? ( libusb )
+	littlefury? ( bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( bitfury )
+	nanofury? ( bitfury )
+	scrypt? ( || ( cpumining opencl ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	x6500? ( libusb )
+	ztex? ( libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable scrypt) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/bfgminer-4.10.3.ebuild b/net-misc/bfgminer/bfgminer-4.10.3.ebuild
new file mode 100644
index 000000000000..adb50f4b29ff
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-4.10.3.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: minergate (needs actual miner_gate)
+# TODO: titan
+IUSE="adl antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	bfsb? ( bitfury )
+	bfx? ( bitfury libusb )
+	bigpic? ( bitfury )
+	drillbit? ( bitfury )
+	dualminer? ( icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( bitfury )
+	hashbuster2? ( bitfury libusb )
+	klondike? ( libusb )
+	littlefury? ( bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( bitfury )
+	nanofury? ( bitfury )
+	scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	x6500? ( libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/bfgminer-4.10.4.ebuild b/net-misc/bfgminer/bfgminer-4.10.4.ebuild
new file mode 100644
index 000000000000..adb50f4b29ff
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-4.10.4.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: minergate (needs actual miner_gate)
+# TODO: titan
+IUSE="adl antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	bfsb? ( bitfury )
+	bfx? ( bitfury libusb )
+	bigpic? ( bitfury )
+	drillbit? ( bitfury )
+	dualminer? ( icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( bitfury )
+	hashbuster2? ( bitfury libusb )
+	klondike? ( libusb )
+	littlefury? ( bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( bitfury )
+	nanofury? ( bitfury )
+	scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	x6500? ( libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/bfgminer-5.3.0.ebuild b/net-misc/bfgminer/bfgminer-5.3.0.ebuild
new file mode 100644
index 000000000000..b8a8a19ef1d6
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-5.3.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: kncasic & titan (need systemwide knc-asic install)
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+	|| ( keccak scrypt sha256d )
+	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	antminer? ( sha256d )
+	avalon? ( sha256d )
+	avalonmm? ( sha256d )
+	bfsb? ( sha256d bitfury )
+	bfx? ( sha256d bitfury libusb )
+	bifury? ( sha256d )
+	bigpic? ( sha256d bitfury )
+	bitforce? ( sha256d )
+	bitfury? ( sha256d )
+	cointerra? ( sha256d )
+	drillbit? ( sha256d bitfury )
+	dualminer? ( || ( sha256d scrypt ) icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( sha256d bitfury )
+	hashbuster2? ( sha256d bitfury libusb )
+	hashfast? ( sha256d )
+	icarus? ( || ( scrypt sha256d ) )
+	jingtian? ( sha256d )
+	keccak? ( || ( cpumining opencl proxy ) )
+	klondike? ( sha256d libusb )
+	littlefury? ( sha256d bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( sha256d bitfury )
+	minion? ( sha256d )
+	modminer? ( sha256d )
+	nanofury? ( sha256d bitfury )
+	scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
+	sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	rockminer? ( sha256d )
+	twinfury? ( sha256d )
+	x6500? ( sha256d libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( sha256d libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable keccak) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable sha256d) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/bfgminer-5.4.0.ebuild b/net-misc/bfgminer/bfgminer-5.4.0.ebuild
new file mode 100644
index 000000000000..b8a8a19ef1d6
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-5.4.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: kncasic & titan (need systemwide knc-asic install)
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+	|| ( keccak scrypt sha256d )
+	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	antminer? ( sha256d )
+	avalon? ( sha256d )
+	avalonmm? ( sha256d )
+	bfsb? ( sha256d bitfury )
+	bfx? ( sha256d bitfury libusb )
+	bifury? ( sha256d )
+	bigpic? ( sha256d bitfury )
+	bitforce? ( sha256d )
+	bitfury? ( sha256d )
+	cointerra? ( sha256d )
+	drillbit? ( sha256d bitfury )
+	dualminer? ( || ( sha256d scrypt ) icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( sha256d bitfury )
+	hashbuster2? ( sha256d bitfury libusb )
+	hashfast? ( sha256d )
+	icarus? ( || ( scrypt sha256d ) )
+	jingtian? ( sha256d )
+	keccak? ( || ( cpumining opencl proxy ) )
+	klondike? ( sha256d libusb )
+	littlefury? ( sha256d bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( sha256d bitfury )
+	minion? ( sha256d )
+	modminer? ( sha256d )
+	nanofury? ( sha256d bitfury )
+	scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
+	sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	rockminer? ( sha256d )
+	twinfury? ( sha256d )
+	x6500? ( sha256d libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( sha256d libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable keccak) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable sha256d) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/bfgminer-5.4.1.ebuild b/net-misc/bfgminer/bfgminer-5.4.1.ebuild
new file mode 100644
index 000000000000..b8a8a19ef1d6
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-5.4.1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: kncasic & titan (need systemwide knc-asic install)
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+	|| ( keccak scrypt sha256d )
+	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	antminer? ( sha256d )
+	avalon? ( sha256d )
+	avalonmm? ( sha256d )
+	bfsb? ( sha256d bitfury )
+	bfx? ( sha256d bitfury libusb )
+	bifury? ( sha256d )
+	bigpic? ( sha256d bitfury )
+	bitforce? ( sha256d )
+	bitfury? ( sha256d )
+	cointerra? ( sha256d )
+	drillbit? ( sha256d bitfury )
+	dualminer? ( || ( sha256d scrypt ) icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( sha256d bitfury )
+	hashbuster2? ( sha256d bitfury libusb )
+	hashfast? ( sha256d )
+	icarus? ( || ( scrypt sha256d ) )
+	jingtian? ( sha256d )
+	keccak? ( || ( cpumining opencl proxy ) )
+	klondike? ( sha256d libusb )
+	littlefury? ( sha256d bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( sha256d bitfury )
+	minion? ( sha256d )
+	modminer? ( sha256d )
+	nanofury? ( sha256d bitfury )
+	scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
+	sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	rockminer? ( sha256d )
+	twinfury? ( sha256d )
+	x6500? ( sha256d libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( sha256d libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable keccak) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable sha256d) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/bfgminer-5.4.2.ebuild b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
new file mode 100644
index 000000000000..b8a8a19ef1d6
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: kncasic & titan (need systemwide knc-asic install)
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+	|| ( keccak scrypt sha256d )
+	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	antminer? ( sha256d )
+	avalon? ( sha256d )
+	avalonmm? ( sha256d )
+	bfsb? ( sha256d bitfury )
+	bfx? ( sha256d bitfury libusb )
+	bifury? ( sha256d )
+	bigpic? ( sha256d bitfury )
+	bitforce? ( sha256d )
+	bitfury? ( sha256d )
+	cointerra? ( sha256d )
+	drillbit? ( sha256d bitfury )
+	dualminer? ( || ( sha256d scrypt ) icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( sha256d bitfury )
+	hashbuster2? ( sha256d bitfury libusb )
+	hashfast? ( sha256d )
+	icarus? ( || ( scrypt sha256d ) )
+	jingtian? ( sha256d )
+	keccak? ( || ( cpumining opencl proxy ) )
+	klondike? ( sha256d libusb )
+	littlefury? ( sha256d bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( sha256d bitfury )
+	minion? ( sha256d )
+	modminer? ( sha256d )
+	nanofury? ( sha256d bitfury )
+	scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
+	sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	rockminer? ( sha256d )
+	twinfury? ( sha256d )
+	x6500? ( sha256d libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( sha256d libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable keccak) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable sha256d) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
new file mode 100644
index 000000000000..aa456e90bcef
--- /dev/null
+++ b/net-misc/bfgminer/metadata.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>luke-jr+gentoobugs@utopios.org</email>
+		<name>Luke Dashjr</name>
+	</maintainer>
+	<use>
+		<flag name="adl">Enable support for controlling fans and overclocking on AMD cards with AMD Display Library</flag>
+		<flag name="antminer">Enable support for mining with AntMiner U1 sticks</flag>
+		<flag name="avalon">Enable support for mining with Avalon 1 ASIC modules</flag>
+		<flag name="avalonmm">Enable support for mining with Avalon 2/3 ASIC modules</flag>
+		<flag name="bifury">Enable support for mining with Bi*fury USB sticks</flag>
+		<flag name="bitforce">Enable support for mining with ButterFly Labs BitFORCE ASICs and/or FPGAs</flag>
+		<flag name="bfsb">Enable support for mining on BFSB host Raspberry Pi</flag>
+		<flag name="bfx">Enable support for mining with BFx2 USB sticks</flag>
+		<flag name="bigpic">Enable support for mining with Big Picture Mining USB sticks (Red/BlueFury, BF1, etc)</flag>
+		<flag name="bitfury">Enable support for mining with 55nm Bitfury-based devices</flag>
+		<flag name="cointerra">Enable support for mining with CoinTerra TerraMiner.</flag>
+		<flag name="cpumining">Enable support for mining with CPUs</flag>
+		<flag name="drillbit">Enable support for mining with Drillbit boards</flag>
+		<flag name="dualminer">Enable support for mining with DualMiner USB sticks</flag>
+		<flag name="gridseed">Enable support for mining with 5-chip GridSeed orbs</flag>
+		<flag name="hashbuster">Enable support for mining with HashBuster nano boards</flag>
+		<flag name="hashbuster2">Enable support for mining with HashBuster micro boards</flag>
+		<flag name="hashfast">Enable support for mining with HashFast devices</flag>
+		<flag name="icarus">Enable support for mining with Icarus-compatible devices (including Block Erupter Sapphire ASICs)</flag>
+		<flag name="jingtian">Enable support for mining on JingTian boards via SPI/GPIO</flag>
+		<flag name="keccak">Enable support for mining with Keccak miners</flag>
+		<flag name="klondike">Enable support for mining with Klondike USB miners</flag>
+		<flag name="libusb">Use libusb</flag>
+		<flag name="littlefury">Enable support for mining with LittleFury USB sticks</flag>
+		<flag name="metabank">Enable support for mining on Metabank host Raspberry Pi</flag>
+		<flag name="minion">Enable support for mining on minion chips via SPI (BlackArrow Prospero)</flag>
+		<flag name="modminer">Enable support for mining with ModMiner FPGAs</flag>
+		<flag name="nanofury">Enable support for mining with NanoFury USB sticks</flag>
+		<flag name="opencl">Enable support for mining with OpenCL-capable devices (GPUs)</flag>
+		<flag name="proxy">Enable support for virtual proxy device</flag>
+		<flag name="proxy_getwork">Enable proxy support for getwork protocol (often used with Block Erupter Blades)</flag>
+		<flag name="proxy_stratum">Enable proxy support for stratum protocol</flag>
+		<flag name="rockminer">Enable support for mining with RockMiner devices</flag>
+		<flag name="screen">Provide start-bfgminer.sh script to launch BFGMiner in app-misc/screen</flag>
+		<flag name="scrypt">Enable support for scrypt mining algorithm</flag>
+		<flag name="sha256d">Enable support for SHA256d mining algorithm</flag>
+		<flag name="twinfury">Enable support for mining with Twinfury USB sticks</flag>
+		<flag name="udev-broad-rules">Enable broader udev rules that may match non-mining devices</flag>
+		<flag name="x6500">Enable support for mining with X6500 FPGAs</flag>
+		<flag name="zeusminer">Enable support for mining with ZeusMiner units</flag>
+		<flag name="ztex">Enable support for mining with Ztex FPGAs</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/bgpq3/Manifest b/net-misc/bgpq3/Manifest
new file mode 100644
index 000000000000..8ef815491ec1
--- /dev/null
+++ b/net-misc/bgpq3/Manifest
@@ -0,0 +1,7 @@
+DIST bgpq3-0.1.22.tgz 62550 SHA256 ce1aa4321573565f5b87966725fa198b238c4c4b13ea855ff6d80071f6b77814 SHA512 c2d0d1f209bdd1016a0c5d3e048b3700c1725b6c4135ba8d47daf3ef03fc05f31a190b640d143f3b6ac8b529754539285673caaf3dbf9cc11d80df1b8920f79c WHIRLPOOL 4a77bb35332eedb0371c4bcd858c6189ae8c4fe95f515c49df19ab6c8edecc9f080a94f9c349b62799d05dfe2e7c2acd244f4bab8eb28bc4ccee11337dc54aeb
+DIST bgpq3-0.1.33.tar.gz 82696 SHA256 f3a58d547368c4396e5bc2b6189fe968567f1afde47245220b1ba9486b26fb39 SHA512 f4faec46eaa5fe77a9118ed76e3d2dddce855cebfe6ead3dadffe0f72ea720502e378febd04829409039fd2bd6a693e518814408c628df1a9e5c7e7c5c170f49 WHIRLPOOL 63e9ee7a5fe811d50c7e05eb2b4529df8e26bbc5668c0f5977e1f221d2032f3542c66135ccf3abefa9fe80f5603cbb55fb19d769fcaa85749a4e9d4f46a3c0c5
+EBUILD bgpq3-0.1.22.ebuild 624 SHA256 fadeb21c98b3de1d175a56fb4b8b649b070bca5c2057b41c806d1f22bb74bdf0 SHA512 f960e4d4104f14b8e1d10f3b1b830fe5fba11a7f39c292974dd1090d11249f3317d62d8e5da08d45df2b4ed58e14b9c525edac72fdbcf67e6154c8934c3a1175 WHIRLPOOL eb1a5b165a090acc505d8019ad47e6b6cd1ee24f427bdcc9efe2a258fc5367bd8d7d35c37c49d0fc2c78eb2a669a0a4e6c478ab09204a5718f802f5466260490
+EBUILD bgpq3-0.1.33.ebuild 674 SHA256 5d00097a079cee2534b37f5d63bc9ce2bff7681a7dca7dbef3b3ecca34e1f41e SHA512 dcbb1c3312da4aec1455b74d2fa9a741c295e1053ae55651a6df2c86011a0f0dbf0799f1dbb4d30383539fff9a6c8f8931022bf6650d3795f76e3ccd6e377bb0 WHIRLPOOL 1142a3c7b8193fc5eb76ee1af6c508ceae0eec9b2c7c9ddf380f2fb1b5554cd616bb51dd93794a8a6e1d00f3494b7a679713ccc5449bc7b47d836a65dc7336c1
+MISC ChangeLog 2222 SHA256 4df166d31a27c303bd807fc3ab53c873745ac9dcc1295a9034a972839cd5c479 SHA512 64508359de1dfdda23aae6011f7cbdf472526b12116c88c66848de1133efbe3281d1389b987ff22bd2223f5f921265537fb7269bc62e4da1acfd1520f4cdef3c WHIRLPOOL 413b77f6f95efd05db77cb640d652cda40901ad8310d9e3afad56493f99b83f6b3e976d32943eb01d9abe31726f9fbd1a7b285933f7e3f6988e6dca49be45e78
+MISC ChangeLog-2015 607 SHA256 5cab1e650ef10a956d42c9b5acc77d5550c32c371470cbdfe5200cbd37a593cf SHA512 b2a89953138886506c2201dab75db877e0909171bf19cdfe73917874f53c8443c13f1d3b195fb5187e159ef6ad0af21272684e65f0c1477d1c0c3e94c8f33c89 WHIRLPOOL 6196926e9f8420750b476b928857542c6dab7d877ed1fadd5fb5f4183b16a3e035eb3523d1d2dac832132f0ce1bbc34afded802f5eeeffb37b4e18559093533b
+MISC metadata.xml 1265 SHA256 a036479468771b194cf5fda516b8edb672f3db25bc682b070e2fe0970a0ec2ae SHA512 9364ecadb0b1fd98841b69d59e5bf000be9cd92997c4203506ee4ebfba9513b33141526153defc23bbeb3e5ae6542648e5ba7d2583893fb06420e831b2cd41a1 WHIRLPOOL 4918e3e80c6ecaed2d78f0502ccc46b0395dc90f8099cf180a7810ef3719759e9018c359d141ede8ae82b5436503958e2af3482fe4059da556f6b5b8b58174ef
diff --git a/net-misc/bgpq3/bgpq3-0.1.22.ebuild b/net-misc/bgpq3/bgpq3-0.1.22.ebuild
new file mode 100644
index 000000000000..c2b0ceab0697
--- /dev/null
+++ b/net-misc/bgpq3/bgpq3-0.1.22.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Generate access-lists for Cisco/Juniper routers, successor of bgpq"
+HOMEPAGE="http://snar.spb.ru/prog/bgpq3/"
+SRC_URI="http://snar.spb.ru/prog/bgpq3/${P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	# Respect CFLAGS
+	sed -i \
+		-e '/^CFLAGS=/s/-g //' \
+		-e '/^CFLAGS=/s/ -O0//' \
+		Makefile.in || die 'sed on Makefile.in failed'
+
+	epatch_user
+}
+
+src_install() {
+	dobin bgpq3
+	doman bgpq3.8
+	dodoc CHANGES
+	dohtml *.html
+}
diff --git a/net-misc/bgpq3/bgpq3-0.1.33.ebuild b/net-misc/bgpq3/bgpq3-0.1.33.ebuild
new file mode 100644
index 000000000000..3c1cd11d960a
--- /dev/null
+++ b/net-misc/bgpq3/bgpq3-0.1.33.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Generate access-lists for Cisco/Juniper routers, successor of bgpq"
+HOMEPAGE="https://github.com/snar/bgpq3/"
+SRC_URI="https://github.com/snar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	# Respect CFLAGS
+	sed -i \
+		-e '/^CFLAGS=/s/-g //' \
+		-e '/^CFLAGS=/s/ -O0//' \
+		Makefile.in || die 'sed on Makefile.in failed'
+	eapply_user
+	eautoreconf
+}
+
+src_install() {
+	dobin bgpq3
+	doman bgpq3.8
+	dodoc CHANGES
+	dohtml *.html
+}
diff --git a/net-misc/bgpq3/metadata.xml b/net-misc/bgpq3/metadata.xml
new file mode 100644
index 000000000000..8c641240d13a
--- /dev/null
+++ b/net-misc/bgpq3/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<longdescription lang="en">
+		bgpq3 allows to generate different config entries with prefix lists, useful for Cisco/Juniper routers and their software analogs, such as Quagga.
+		This program is a successor of bgpq from same author, main difference - it supports IPv6.
+	</longdescription>
+	<longdescription lang="ru">
+		bgpq3 позволяет создавать различные чaсти конфигурационных файлов со списком сетей для маршрутизаторов Cisco/Juniper и их программных аналогов,
+		таких как Quagga.
+		Данная программа - идейный наследник bgpq от того же автора, основное отличие - поддержка IPv6.
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>snar@snar.spb.ru</email>
+			<name>Alexandre Snarskii</name>
+		</maintainer>
+		<remote-id type="github">snar/bgpq3</remote-id>
+		<bugs-to>https://github.com/snar/bgpq3/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
new file mode 100644
index 000000000000..50bfa2c3b360
--- /dev/null
+++ b/net-misc/bird/Manifest
@@ -0,0 +1,17 @@
+AUX initd-v4-bird-1.3.8 801 SHA256 25d61357a6e47b7e1e82aa2f5343d4cf0bbe97d73a250f5f8a68179ecb457299 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879 WHIRLPOOL 18a0c27e23513b5ee0c45caf1d4bcd294d4d2b8975061327b39768ed639b44b3c6ba475ebc3c8929456299771d4bc2ce8c29259a3a9e5cffa79a3d79aeaecd00
+AUX initd-v6-bird-1.3.8 802 SHA256 e4af0ec5b0a9d742279f6b4be839a592d84046ca0d630537508fd5066f854f87 SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9 WHIRLPOOL f84a383aee3cd7d526284b9da2319e00a8f24dc473639784c3399ca8bc8ef8de67fec66cacffbb53c0b97303f40240c8acda8ae9987745c2911f15ef5a1ec97f
+DIST bird-1.4.5.tar.gz 1284666 SHA256 ff485f0c64c5f762458e0f09e327e2f518a14b0247194c62ffa480d1eb3f9ffc SHA512 fba60e7daacfdf86e3fa9cb4dc627d33928b4b84dca98d3bfbd378265e422b7ecfe10c2d17369d295afe8a5f1f2e771209bbd54710485a19d64e6551f16d6b94 WHIRLPOOL 894401301e1756f2b2cf27d6829a911e51f81569a92b375ec0a504f1aa1563b37396eb929ccf1423e5387ca181ab2669a08a26040da52c4134128ebc5bc36ba4
+DIST bird-1.5.0.tar.gz 1300141 SHA256 79d5c4254e25f5890626830ca42aae03735716bdf152ddd8368473d2b3c17b5d SHA512 6814a1393d192083bc9807fd9c56e4bfe169aa34b70811f10da61c79d2fd4b18827bd4f3ea70d9ceba32125e54afb3f8df388416bff619c6f7e838a171f70ae8 WHIRLPOOL 2bd9429fef41dc4be09c9ece7ea6a109237c8d405ef16f5748516a3ec6ce3423ae05796e9ea875d08e476ea0da91ae617a9a90f574085decdab2bcdc40a7274d
+DIST bird-1.6.0.tar.gz 1273899 SHA256 db3dfe37deac73b38b7d6966e577985f7b8e23f246760cb095ad13b0d8010e13 SHA512 3b73c5aa26ac725547d8ff67c35008b6793ef4dc9f22940bacc3871f60abb77e41d93bef0e493d5808eea455e17a04bbba837f16665d726a0a80e73270fed67a WHIRLPOOL 05abee4f45e687c9ff7e31fef3b9a8385081ead8d13b723cb0c79faf59964f9cec46f337eecc2207d0cf2c67c2ad9ea04c096a13465b81a89eba5effe7bba9d1
+DIST bird-1.6.1.tar.gz 1286450 SHA256 23ab3cbbf879f1b672e8c20f2e198d4e6342b2ca50893f9a70473d99a1f8ef25 SHA512 ac95aafdc0c94af32a9a78c7d9746bc085d6c4ba74e1acbf5ddf9c1f80a035ce6ece2adf66b1de54c9405e0887c79c6bbde3657c6c7cb727869b661fb7105196 WHIRLPOOL b7bba4586680c6dd990a244d73565d5209a668b6c6ec39459155ba3f2c5c38343c7bdf10a11c6000cca0b3663931e2d52bb5503c9d1329a62c4040dbdca3b037
+DIST bird-1.6.2.tar.gz 1300037 SHA256 8853f857045057e02c645232629754e9f5554eafa9d19fdef6097af72a3a98f6 SHA512 a45ef7fba6caec3ae3908a4cad83d5b5d75533f625bd9fd75d4c42aa1642e76ffd01b2d4f2fbaeffc298b525f426c726432a092d15c9d23e7ccf9ddfa6beeaa1 WHIRLPOOL 98dd7e227ec4d72b1efe6d9f5798ed9b9f1b30b601883095528bbaf875ca8f33e9549d3f8b5adb2163cf1a4a36c9d4f926c0790c806b61f1628d211aaec9c8ca
+DIST bird-1.6.3.tar.gz 1337198 SHA256 39c51cf57c3ba8b5978b2a657ffa2f647ec7f3ae643e91cf42ee5cb070cf7e7c SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df WHIRLPOOL 08172f354df6955e1a4542faf51f3f1d7754a2d2f3c1dd2f19679f46c059874bc96d615a4f342cd6f7ccb60a4ef63bdb917a2af6a38538d210fa82435fbc964e
+EBUILD bird-1.4.5.ebuild 1115 SHA256 3495e6dc7f10dd4fe3b2989179c4db127d9abe8f87420f9996a65cdd68268619 SHA512 8cadb81688945095b460e473dec075b6727752320e312603e9540c7d12f845c1ca5fb7c396050aa88de21b487190d0d72b1175722f06e00409d33844eff4f210 WHIRLPOOL a7325979184f246ac0103bf2e6affc57f9305849834adcd31d5fdd114136b3e1868356fae66916447dded1b5b1201dca09f8ff83108ed4315ea0575de3e1d8a2
+EBUILD bird-1.5.0.ebuild 1115 SHA256 cc10299fb130197fc5b84206bcc22757843e070ca60a692db83f741b839c03a8 SHA512 aa25e90d6aaa996b98767170412fe10d10ac9f75723651eb19a97db1d746cc634e061b193e8499bb0ac6adea9fbf261c9ee4098126b8ae1283e6c33d8ebbf8a1 WHIRLPOOL 2a77695f4f0dea02d083425792d5b107d012a230ab0f5010cdef317dad3da6cd9549c8b5a160f92c6272ba9df801508a87d89fc654c9a0f0c81f50765aeffd94
+EBUILD bird-1.6.0.ebuild 1128 SHA256 59c0e0398a4ab03f023dd51cf8e2356b2a97894ab2a37dd824e51e203c7b7868 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf WHIRLPOOL 9f27bab23500cbdfab0a1ea72a92b49108e90b0186b9f2c7111be4afdc188ee3addfa89eb660a34546490bf2cf62c658c32234eeb0f5bb9505ddaeb208ea197a
+EBUILD bird-1.6.1.ebuild 1128 SHA256 59c0e0398a4ab03f023dd51cf8e2356b2a97894ab2a37dd824e51e203c7b7868 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf WHIRLPOOL 9f27bab23500cbdfab0a1ea72a92b49108e90b0186b9f2c7111be4afdc188ee3addfa89eb660a34546490bf2cf62c658c32234eeb0f5bb9505ddaeb208ea197a
+EBUILD bird-1.6.2.ebuild 1128 SHA256 59c0e0398a4ab03f023dd51cf8e2356b2a97894ab2a37dd824e51e203c7b7868 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf WHIRLPOOL 9f27bab23500cbdfab0a1ea72a92b49108e90b0186b9f2c7111be4afdc188ee3addfa89eb660a34546490bf2cf62c658c32234eeb0f5bb9505ddaeb208ea197a
+EBUILD bird-1.6.3.ebuild 1128 SHA256 59c0e0398a4ab03f023dd51cf8e2356b2a97894ab2a37dd824e51e203c7b7868 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf WHIRLPOOL 9f27bab23500cbdfab0a1ea72a92b49108e90b0186b9f2c7111be4afdc188ee3addfa89eb660a34546490bf2cf62c658c32234eeb0f5bb9505ddaeb208ea197a
+MISC ChangeLog 4135 SHA256 b24adc62e6ae70e2eb35ff83588cf822610812cc08d1954dfd16c25d187e5077 SHA512 3eac369dcb546b9d62379c8b4fcd6526518b3ca1f890fd899c5309b10a183f11711391ca9406595d96bce27bcd00c9760134ed958d9f3a05818be2a8732c318e WHIRLPOOL a22faeb1f50807634a3a5f35cc7cf051eb8faa9c542bebcbbda9777bb621a2445044fbe917265fe0750e0eee7f7a5988eca95670fdec5e79d850c889d2751e59
+MISC ChangeLog-2015 9207 SHA256 6422d7676716580b23f4be188cdb922272b09bbb3fcd36d8cef941ca51d0837c SHA512 826847c41f522b45bb631addc400903fcd10b56f070058ee375bd10592c8e7158b9147806e672c5011311837108ae11f06f19a48fdafa44fb52e45a4b87f7da6 WHIRLPOOL 5c6f3c112506f4456d12137e48f2efba4ef7e1e7aa2ebe2ad0f1b3039df80e42909eab34b70bacca56f9010bc73b77c2320e1ea40976475d575dd9a908b15c29
+MISC metadata.xml 245 SHA256 c8964f140b486f6785a7576737b490c7014d31a7b19e5118f05cb736ab2d2601 SHA512 c3c7907e50537dd94fdcec1da306eee2f050e5a456d369cd3df8c9bf36c810d811fe547418a8025e533916eb52a742d9feafae647b2957820d99ed962dad302e WHIRLPOOL 6a28ad9ed8e4870f04f5857e38bf3f6025f495b76106daa9762335dcae27e14e2dac260e1899bc73d62e4570beb9de6471175a5d5f05677d46d2b0941a138cd3
diff --git a/net-misc/bird/bird-1.4.5.ebuild b/net-misc/bird/bird-1.4.5.ebuild
new file mode 100644
index 000000000000..4804c17b02d8
--- /dev/null
+++ b/net-misc/bird/bird-1.4.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ipv6"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+}
+
+src_configure() {
+	econf \
+		--enable-client \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-client \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		newbin ipv6/birdc birdc6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
+	fi
+	dobin birdc
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-1.5.0.ebuild b/net-misc/bird/bird-1.5.0.ebuild
new file mode 100644
index 000000000000..2cad4e37a202
--- /dev/null
+++ b/net-misc/bird/bird-1.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ipv6"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+}
+
+src_configure() {
+	econf \
+		--enable-client \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-client \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		newbin ipv6/birdc birdc6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
+	fi
+	dobin birdc
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-1.6.0.ebuild b/net-misc/bird/bird-1.6.0.ebuild
new file mode 100644
index 000000000000..580dd5694106
--- /dev/null
+++ b/net-misc/bird/bird-1.6.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ipv6"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--enable-client \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-client \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		newbin ipv6/birdc birdc6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
+	fi
+	dobin birdc
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-1.6.1.ebuild b/net-misc/bird/bird-1.6.1.ebuild
new file mode 100644
index 000000000000..580dd5694106
--- /dev/null
+++ b/net-misc/bird/bird-1.6.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ipv6"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--enable-client \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-client \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		newbin ipv6/birdc birdc6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
+	fi
+	dobin birdc
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-1.6.2.ebuild b/net-misc/bird/bird-1.6.2.ebuild
new file mode 100644
index 000000000000..580dd5694106
--- /dev/null
+++ b/net-misc/bird/bird-1.6.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ipv6"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--enable-client \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-client \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		newbin ipv6/birdc birdc6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
+	fi
+	dobin birdc
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-1.6.3.ebuild b/net-misc/bird/bird-1.6.3.ebuild
new file mode 100644
index 000000000000..580dd5694106
--- /dev/null
+++ b/net-misc/bird/bird-1.6.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ipv6"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--enable-client \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-client \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		newbin ipv6/birdc birdc6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
+	fi
+	dobin birdc
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/files/initd-v4-bird-1.3.8 b/net-misc/bird/files/initd-v4-bird-1.3.8
new file mode 100644
index 000000000000..c7c6a0b63af7
--- /dev/null
+++ b/net-misc/bird/files/initd-v4-bird-1.3.8
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+EXE=bird
+SOCK="/var/run/${EXE}.ctl"
+
+depend() {
+	need net
+	use logger
+}
+
+checkconfig() {
+	if [ ! -f "/etc/${EXE}.conf" ]; then
+		eerror "Please create /etc/${EXE}.conf"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	ebegin "Starting BIRD"
+	start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
+	eend $? "Failed to start BIRD"
+}
+
+stop() {
+	ebegin "Stopping BIRD"
+	start-stop-daemon --stop --exec /usr/sbin/${EXE}
+	eend $? "Failed to stop BIRD"
+}
+
+reload() {
+	ebegin "Reloading BIRD"
+	start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
+	eend $? "Failed to reload BIRD"
+}
diff --git a/net-misc/bird/files/initd-v6-bird-1.3.8 b/net-misc/bird/files/initd-v6-bird-1.3.8
new file mode 100644
index 000000000000..94ba4426e5dd
--- /dev/null
+++ b/net-misc/bird/files/initd-v6-bird-1.3.8
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+EXE=bird6
+SOCK="/var/run/${EXE}.ctl"
+
+depend() {
+	need net
+	use logger
+}
+
+checkconfig() {
+	if [ ! -f "/etc/${EXE}.conf" ]; then
+		eerror "Please create /etc/${EXE}.conf"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	ebegin "Starting BIRD"
+	start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
+	eend $? "Failed to start BIRD"
+}
+
+stop() {
+	ebegin "Stopping BIRD"
+	start-stop-daemon --stop --exec /usr/sbin/${EXE}
+	eend $? "Failed to stop BIRD"
+}
+
+reload() {
+	ebegin "Reloading BIRD"
+	start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
+	eend $? "Failed to reload BIRD"
+}
diff --git a/net-misc/bird/metadata.xml b/net-misc/bird/metadata.xml
new file mode 100644
index 000000000000..1a06e96ebdc7
--- /dev/null
+++ b/net-misc/bird/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/blinkperl/Manifest b/net-misc/blinkperl/Manifest
new file mode 100644
index 000000000000..7263a1b3ca5f
--- /dev/null
+++ b/net-misc/blinkperl/Manifest
@@ -0,0 +1,10 @@
+AUX blinkperl-20030301-Makefile.patch 623 SHA256 1ba66b79f24b1560bdfd0f206658ee5f8904362a49663f23b6d4b788d1a831fc SHA512 a59a3035eb49c7df55ecb4c7fecf0f44e4650dfcdd008b0df9296766405845eb7d7c33d605032ca3ce6edb3ebff6906acf5fa22c9901e27ede17ae22ff697a06 WHIRLPOOL 48b4245b9cecf36bcea6ec30cf4a6072d12dffd67bd277a3b48061d48959d337c929993acf5bede24c3c65d93ef959799a9772d11f6e37a8b6fef8a72f9f3cc2
+AUX blinkperl-20030301-fix-pod2man.patch 338 SHA256 cc3fb127aa0b65963d50da806cf3e4f5a8769524b09c914f1cfb014ceb65ba37 SHA512 ed57566d29074c1a09dec48df014ca84dd17865c4130f12d5c34a8311b05cde17f95a4194b68be7029a63c06be81183d66e8d8c839563a254b56c05fae2f99c3 WHIRLPOOL b2205a8415af545dcd2a48f5a399678e6c0ee465154e5886c7202d56707142584e3890c7c9fcf2965cf4e67a4999ffcff307c7d93d5d8aa6926a3f23915ef62d
+AUX blinkperl-20030301-non-local.patch 578 SHA256 3396c8663b2be05db2e62a6dad6d673713e459b72bc3cd50bc648a2fe6571c5b SHA512 3ab799dd71489f4ef946c7bb846695a4a7ed69aabd9fcc641ccd5c464932dafbce98822dd4bc2ec42f07d089231f3260f571e4fd2d871ed8a4509c6b26ba0a40 WHIRLPOOL 5ce1538dc7510fa7430e12b23a729727fde46eac94d0c3e6a0a81fe412b88b6c7c55b11b9801864b1489a2fb708657d8f6885f6c8544b4236935cb60917bf160
+AUX blinkperl.confd 74 SHA256 660f99dbbf3c41dbfa74f1f6fc69775bee534760c748000e2fa1ce6ac2087f5f SHA512 cb022b1a9c0e030cf5b093bebac1682a74e4ef7b35a77ecc0ad33a7f4c3d8e7a193a37ff84e9566c7271472c4d18dca6045cdf55c48d25027b32646f847e6590 WHIRLPOOL 968136d19502305b7d866f4842d53cb0dc89b2be819cace7332851e5777173a1486c0e199c93d794db0d5f9a9f79356ef29c497832de9d4deed12baed3aecb6f
+AUX blinkperl.rc 454 SHA256 55be404c90d7b8a789acc27e1e7c1908e3d6355c4110cc9c80c0453b6e1b6f8e SHA512 fffbc4cd340a0a5e59d7c3cc69e8787ca9e7966a9609288fed71298f5e9fd5c5f23c8476d4c97f025436549c72309dd683187d2d4198647ed5a82818205f4eed WHIRLPOOL 1a8afc90b8b4ec9cf72eb3e029be52d1565278796f4f3b18098ebcfdc3d28e9fada6f5bf2c778457435c7ca2e3cc9a19268ea6b876ac559d7c7c47560417fda8
+DIST blinkperl-2003-02-08.tar.gz 64918 SHA256 f131d00432df6b991d38d035565ba471508de822caed1cb7422ace03f11382b0 SHA512 4759e00b179ecc210af7b0a83d0eb18ffd09d1659b38ae4a3de346bc7d5b7d6c319e80f0b28981eb643d165581b2dc35ce78ad59c6b97f1d4b1ce6df33127c9e WHIRLPOOL ec33b073d20677364b28dc94750d6a688f6a0a173d24900d8954e50ef0cb66ef34f1de4772e3f71e70188a47a34ae6ea9dcbb0f50b2b064ceaf0df000f3aac2d
+EBUILD blinkperl-20030301-r2.ebuild 703 SHA256 2be38b8055205007db8bc22e20d267c03b7639227ddec2045bf33c176f017f1a SHA512 fd17783d76deded36c0036128b840b476d8e277304d2690df9ec76c9d2e2756cab1fd9b7baf7a6a53029c699884d11edb089b0b15ca51ffa14daff10330aeca4 WHIRLPOOL 0ea52442b65ecb616283a8d17aa2f15f5153e9734155ce8bdc4aefc8210b1f16c19b99bcf0d25a6dfb7ec70920e90a081a7fef36e7046eb2ead21c40ade7bc20
+MISC ChangeLog 3209 SHA256 1055790dc5811602ef0c85863b77a54d97a38d6daa8da734cc1c990378f31bdb SHA512 ce96f4138ff241c11f313374e4524ab97c4faea8a8feb76a08f263b18548ace1d174ff2f91f3810b2d2fe1e3eb7fee0544f5b481e79d6eb94aea743aebb01e53 WHIRLPOOL 1e7142a23bec44a40f8d240194853745495d9c73ba3ebe7337590757c1beb3a48907dac37b800b1c0e61d1ccc7927357098fcec4d822ece18df806f76d34f754
+MISC ChangeLog-2015 1521 SHA256 bb822fb4a5236ef728836faf3fda91a6977225d2cd7fee1b4bb617a471d6495a SHA512 5f258f95ddb3ee5ad8b301bc08f56010d781a8af28d7873494e4d2cc1d62e09bcbaf101029e394fcc9fd88a0467f5eff3c273cd83c4cf5d2b97210213f78b85c WHIRLPOOL 13adf9b0b010611deffbfa7637176b0d33016a731ef63e5778c2972ce77e2d50aa5d610e7f18e44fba985c63ff633c32baac93a524040a59086f8fe11eac9af9
+MISC metadata.xml 246 SHA256 54b842893088a14c7585f217f742828b7218f9e76e2560c66466f53d67fba599 SHA512 103266130c9817b5c7b1b4bcad84892f76119e16f0afc1935a1d7102553451ca3c6894fa0dbd411cc50cbca1d65f48f990aa2b74ce4e700375b03e6702e58144 WHIRLPOOL 6334cd7eed568367e55d1bb7e28b9982f5cc74919051d9c99bf5a8743bb35b1e3d7f1eb8c02ed5ccec52c5153ab2124ea0fe13d384b8fc15c8730a2123ad8a2c
diff --git a/net-misc/blinkperl/blinkperl-20030301-r2.ebuild b/net-misc/blinkperl/blinkperl-20030301-r2.ebuild
new file mode 100644
index 000000000000..5887c9930a6f
--- /dev/null
+++ b/net-misc/blinkperl/blinkperl-20030301-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-2003-02-08"
+S=${WORKDIR}/${PN}
+
+DESCRIPTION="blinkperl is a telnet server, which plays BlinkenLight movies"
+SRC_URI="mirror://sourceforge/blinkserv/${MY_P}.tar.gz"
+HOMEPAGE="http://blinkserv.sourceforge.net/"
+
+SLOT="0"
+KEYWORDS="~hppa x86"
+LICENSE="GPL-2"
+IUSE=""
+DEPEND=""
+RDEPEND="dev-lang/perl dev-perl/Term-ANSIScreen"
+
+PATCHES=( 	"${FILESDIR}"/${P}-fix-pod2man.patch
+			"${FILESDIR}"/${P}-non-local.patch
+			"${FILESDIR}"/${P}-Makefile.patch )
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/blinkperl.rc blinkperl
+	newconfd "${FILESDIR}"/blinkperl.confd blinkperl
+}
diff --git a/net-misc/blinkperl/files/blinkperl-20030301-Makefile.patch b/net-misc/blinkperl/files/blinkperl-20030301-Makefile.patch
new file mode 100644
index 000000000000..1f8d3bee0df6
--- /dev/null
+++ b/net-misc/blinkperl/files/blinkperl-20030301-Makefile.patch
@@ -0,0 +1,20 @@
+Do not install into /usr/man and be consistent about the package name.
+
+--- blinkperl/Makefile.orig	2003-02-08 15:58:10.000000000 +0100
++++ blinkperl/Makefile	2008-11-27 21:14:03.000000000 +0100
+@@ -1,12 +1,12 @@
+ SHELL=/bin/sh
+-PREFIX=/usr/local
+-MANDIR=${PREFIX}/man
++PREFIX=/usr
+ BINDIR=${PREFIX}/bin
+ SHAREDIR=${PREFIX}/share
++MANDIR=${SHAREDIR}/man
+ #
+ # Be sure to modify $moviedir in blinkserver.pl if you modify it here!
+ #
+-BLINKENPERLSHAREDIR=${SHAREDIR}/blinkenperl
++BLINKENPERLSHAREDIR=${SHAREDIR}/blinkperl
+ MOVIEDIR=${BLINKENPERLSHAREDIR}/movies
+ 
+ # Enable "make install DESTDIR=some-path" to make it easier
diff --git a/net-misc/blinkperl/files/blinkperl-20030301-fix-pod2man.patch b/net-misc/blinkperl/files/blinkperl-20030301-fix-pod2man.patch
new file mode 100644
index 000000000000..01f8703feb95
--- /dev/null
+++ b/net-misc/blinkperl/files/blinkperl-20030301-fix-pod2man.patch
@@ -0,0 +1,11 @@
+--- blinkperl/blinkserver.pl.orig	2016-05-03 16:22:49.510379864 -0500
++++ blinkperl/blinkserver.pl	2016-05-03 16:22:27.172380760 -0500
+@@ -148,6 +148,8 @@
+ 
+ =item B<--port>=I<number>: On which Port should the server listen?
+ 
++=back
++
+ =head1 DESCRIPTION
+ 
+ B<This program> will listen on the defined port (current default value: 10001)
diff --git a/net-misc/blinkperl/files/blinkperl-20030301-non-local.patch b/net-misc/blinkperl/files/blinkperl-20030301-non-local.patch
new file mode 100644
index 000000000000..3394918ebb47
--- /dev/null
+++ b/net-misc/blinkperl/files/blinkperl-20030301-non-local.patch
@@ -0,0 +1,13 @@
+Do not install in locale/share and be consistent about the package name.
+
+--- blinkperl/blinkserver.pl.orig	2003-02-06 19:38:00.000000000 +0100
++++ blinkperl/blinkserver.pl	2008-11-27 21:14:24.000000000 +0100
+@@ -21,7 +21,7 @@
+ 
+ # be sure to modify ${MOVIEDIR} in the Makefile
+ # (if you want to use "make install"), if you modify it here!
+-my $moviedir = "/usr/local/share/blinkenperl/movies" ; # where to find the movies
++my $moviedir = "/usr/share/blinkperl/movies" ; # where to find the movies
+ my $blmext = "blm" ;     # extensions of blm files in the movie directory
+ 
+ 
diff --git a/net-misc/blinkperl/files/blinkperl.confd b/net-misc/blinkperl/files/blinkperl.confd
new file mode 100644
index 000000000000..3eab7db5a977
--- /dev/null
+++ b/net-misc/blinkperl/files/blinkperl.confd
@@ -0,0 +1,3 @@
+# config what port to listen for telnet connections on
+BLINKPORT="10001"
+
diff --git a/net-misc/blinkperl/files/blinkperl.rc b/net-misc/blinkperl/files/blinkperl.rc
new file mode 100644
index 000000000000..4d9aca88eafc
--- /dev/null
+++ b/net-misc/blinkperl/files/blinkperl.rc
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting blinkserver"
+	start-stop-daemon -o --background --quiet --start --exec /usr/bin/blinkserver.pl --pidfile /var/run/blinkserver.pid -- --port=${BLINKPORT}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping blinkserver"
+	start-stop-daemon -o --quiet --stop --name blinkserver.pl
+	eend $?
+}
diff --git a/net-misc/blinkperl/metadata.xml b/net-misc/blinkperl/metadata.xml
new file mode 100644
index 000000000000..9886a6b8fa16
--- /dev/null
+++ b/net-misc/blinkperl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">blinkserv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/bopm/Manifest b/net-misc/bopm/Manifest
new file mode 100644
index 000000000000..87e26a6d22df
--- /dev/null
+++ b/net-misc/bopm/Manifest
@@ -0,0 +1,11 @@
+AUX bopm-3.1.3-autotools.patch 7563 SHA256 9b63f8f82dbb3e57b42ffcfecac8e41a4da9137acd9432ad0dd81d3974166786 SHA512 1a44edcc1c9bf154e3d5763bb8e7937050781623d2311bd404efbea96c9949e9bc1472d5c22ab598152195a933146585a3efaaf28a5e7fb369e471167e571d8c WHIRLPOOL 062690bedf89bd3f805ef94b943b1f4733dd10b5fd2f4833275fa6d0153f69d3d93022300765b418aaf2304534c7810ab53eef39d3c847cc853b17031ee3338b
+AUX bopm-3.1.3-remove-njabl.patch 816 SHA256 566c8c9866dd449a8d88051a2671dca54327783434f37f12eb0ed0d8203bd8a7 SHA512 d74ccfa25c5f70b852647e90e8d9a80d8d848cf0e488004fc8dc0fdc196271659c7b53d47bfa79321f159ec374ecb7626b98b91de82aa62649c3a3c449c4aef3 WHIRLPOOL 348885b0b18cde0e1b77ac4310c57aa1ca40ae5cc9190f0bfddaa6c599362c7a9d3fdc455424d83c2533278b571321b5e8a4b1f4f1e90884badd621921460207
+AUX bopm.conf.d 158 SHA256 2c788cdc23767b1dc2209e4290c1404635ae7875a9370d40a9f0274f3b8ce9a7 SHA512 f47dbcc6c46b9bc4269ebfa0015e3827360f8e78f2485a3217a5b4775d2890b31fb0d6bb56815547aa91208c412079f81bff8c086a0f947ef48171fee1caeb6d WHIRLPOOL 3c97959f0bbca02cac8e9c46730ec84d067fdde2d08b535ac3fea770a51753ad9766dbca281df9a4e4c82204d677d0d8a26bd0a31ac118251510ecd565df9cfe
+AUX bopm.conf.d-r1 221 SHA256 888a8abb73ef3ba977edac00f525c08681c7bd2ad963ec36788e3837312e0684 SHA512 6070b84b90a905be88cf8ac64c67bf057be4c369e9129c877f643e4154c81699ac7084c5377c22afb673e44c696b890d1dc16e653e6bcaa46368a93a09414ec2 WHIRLPOOL 6b2d0a06e0973b9028418866ae72794a13ed56cb74357cd98553f44568b8a61c801b4f947e115bf933799ce4ed669499de9bf2bc763a661d307458da67d32493
+AUX bopm.init.d 450 SHA256 9bdc44a21aa9894488f4a4557c359347a53cdc5a34942107b8cb5a0496e6cf4f SHA512 14f310b94d66d904b83b475210b5b78730a0d7776b725a46c01f3da1a62599fffd964231133e9f4514d49c770bb406e94ce748cf7d67d2b6a3b174c71b8d0e6e WHIRLPOOL 99e51d73eaafae588b6d9cac402572052dbf0b21d442f00525ceedc40f8a5257ef1b50403894ac20341b5d12d9271687d95d29d5148dc68ab851eb98a268497a
+AUX bopm.init.d-r1 362 SHA256 c5b70bffec57c178765f7c40a13d2cb057629ca2e9bf5d82c8f9b8c0b8142abb SHA512 33665898874ad63bbbe9e204952b25d8619013b4599c0566352ffb70a7b02dee9756bb4db5bf171925634ab1c0a237a350e2cb1663e075b0ac56d81e3823bea7 WHIRLPOOL 3e9281cac2084e497cc3369c9134021d23a9394b8ee5a9bc7631d6d01c97ce8e304cf83d8921a717f14a1c62d3890194fb4e32284d87338028401c91287a08a9
+DIST bopm-3.1.3.tar.gz 819273 SHA256 6062e80e57785b7f992f71c1d1b4c99c12ea0f20bd7c4d2c0fe2c1f57fdcbf59 SHA512 974c243e4fb7e184d3aa570dda2d919cea33df71215746d156b37b7fa3d6f45cd5448c847a7321d4ca22356fffa372f5486e6c3cd958698e173d79731f8ef8af WHIRLPOOL 57e91221e5af5d6eb009aec1bffdbaa1360b0cef4146eb432a971bade1c668195fd50167989acf3ab63ff13197cfd3d933bb96c09069413098ca65d73b2d8820
+EBUILD bopm-3.1.3-r3.ebuild 1333 SHA256 854b43702bef9ff8b2e52dca025a268b9b02923891c13d47685d9ea06176eb96 SHA512 6cae1524c733299bc1a9d9fd7244c5f10ac750408b477faaa8367ccdb084aae5cdcbb395c6ab38f84614da2f4930074b2b91b55a67e812f9f803ccded314d3d5 WHIRLPOOL 858179d32f35c3f1c014f1da9998b818bcaec60c2cdb4e3b3e542a9a037c103a94457a706818a8a2f54f32e12b44a4ae0acb16c19d27d2ddead8c04255b2fff0
+MISC ChangeLog 4797 SHA256 5f6cd07aff0857bffd6319f95604e27489474c559ccf816d1f4958363158357f SHA512 8a1d72556ac841848a5bd4c0d68b538fc94d38b57ae672455f04dda41b92fc822e41143fe5347d679644e13f5b26aecb9097e008a3271d26de29af93bcb1c2e0 WHIRLPOOL 3025d3b7546e1aa8ac364098881edfff70045a23240e28b21bab22f21d1d21d859e27d255e5b2a42ea79ec342521b4c4a8af7e28f936771df8d0cdfd65555bb5
+MISC ChangeLog-2015 1347 SHA256 1a0faa6b2fcc9173020c14cd7f5f4a4dede4d66f439fd8ee4e2ab08d18ead2df SHA512 8ffd0ebc09f14fa60e7a12eb050223b08e00b0e7235863c1cf499c58df4273f31176d57f9ec076b6ff7dfd72e4b8ddd816a0e41eb7075a69c70d6afa8c99c6f0 WHIRLPOOL a247afe91fcf47df177700c7ba88968d48557a28eb51fd102cdb7b4f023b453b6823d144f3864bfe3ecafb5e4df54e3286e912e13f1ff70dad8d0f49d285bc3f
+MISC metadata.xml 440 SHA256 757426a5e58d5c01767736972bb5a3532d3d4b01acea35eb32245c0b7558fbb6 SHA512 f55f7dd218a0d3998a847750bad43fc58e947c292f0c31f8a89b5d05bdd2accb8f132b734787f2b4c8802752561dca7ddac07dfea3eaf16a15116ece2301d797 WHIRLPOOL 841904b80c1f0787f1cd0682724935fcf041b0cb70b37f26b7bd01b79beb7f22a061ce132cdd3b99ef4630a56c183f0e33a83f34beefe05331b4fb2375333cff
diff --git a/net-misc/bopm/bopm-3.1.3-r3.ebuild b/net-misc/bopm/bopm-3.1.3-r3.ebuild
new file mode 100644
index 000000000000..5e306a502712
--- /dev/null
+++ b/net-misc/bopm/bopm-3.1.3-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools user
+
+DESCRIPTION="Blitzed Open Proxy Monitor"
+HOMEPAGE="https://github.com/blitzed-org/bopm"
+SRC_URI="http://static.blitzed.org/www.blitzed.org/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-njabl.patch
+	"${FILESDIR}"/${P}-autotools.patch
+)
+
+pkg_setup() {
+	enewuser bopm
+}
+
+src_prepare() {
+	sed -i \
+		-e "s!/some/path/bopm.pid!/run/${PN}/${PN}.pid!" \
+		-e "s!/some/path/scan.log!/var/log/${PN}/scan.log!" \
+		bopm.conf.sample || die
+
+	mv configure.{in,ac} || die
+	mv src/libopm/configure.{in,ac} || die
+
+	default
+	cp bopm.conf{.sample,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --localstatedir="${EPREFIX}"/var/log/${PN}
+}
+
+src_install() {
+	default
+
+	# Remove libopm related files, because bopm links statically to it
+	# If anybody wants libopm, please install net-libs/libopm
+	rm -r "${ED}"usr/$(get_libdir) "${ED}"usr/include || die
+
+	newinitd "${FILESDIR}"/bopm.init.d-r1 ${PN}
+	newconfd "${FILESDIR}"/bopm.conf.d-r1 ${PN}
+
+	dodir /var/log/bopm
+	fperms 700 /var/log/bopm
+	fowners bopm:root /var/log/bopm
+
+	fperms 600 /etc/bopm.conf
+	fowners bopm:root /etc/bopm.conf
+}
diff --git a/net-misc/bopm/files/bopm-3.1.3-autotools.patch b/net-misc/bopm/files/bopm-3.1.3-autotools.patch
new file mode 100644
index 000000000000..e2927b0b74b6
--- /dev/null
+++ b/net-misc/bopm/files/bopm-3.1.3-autotools.patch
@@ -0,0 +1,218 @@
+--- bopm-3.1.3/configure.ac
++++ bopm-3.1.3/configure.ac
+@@ -1,5 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(bopm, [3.1.3])
++AC_CONFIG_MACRO_DIR([src/libopm/m4])
+ AC_CONFIG_SRCDIR(src/opercmd.h)
+ AM_CONFIG_HEADER(src/setup.h)
+ AM_INIT_AUTOMAKE()
+--- bopm-3.1.3/Makefile.am
++++ bopm-3.1.3/Makefile.am
+@@ -2,22 +2,9 @@
+ 
+ SUBDIRS = src
+ 
+-data_DATA = bopm.conf.sample bopm.conf.blitzed
++dist_doc_DATA = bopm.conf.sample bopm.conf.blitzed
+ 
+-EXTRA_DIST = ChangeLog contrib INSTALL README bopm.conf.sample bopm.conf.blitzed network-bopm
++EXTRA_DIST = ChangeLog contrib INSTALL README network-bopm
+ 
+-install-data-local:
+-	@if test -f $(sysconfdir)/bopm.conf ; then \
+-		echo "$@ will not overwrite existing $(sysconfdir)/bopm.conf"; \
+-	else \
+-		$(mkinstalldirs) $(sysconfdir); \
+-		echo "$(INSTALL_DATA) bopm.conf.sample $(sysconfdir)/bopm.conf"; \
+-		$(INSTALL_DATA) bopm.conf.sample $(sysconfdir)/bopm.conf; \
+-	fi
+-	$(mkinstalldirs) $(localstatedir)
++dist_sysconf_DATA = bopm.conf
+ 
+-uninstall-local:
+-	@if test -f $(sysconfdir)/bopm.conf ; then \
+-		echo "rm -f $(sysconfdir)/bopm.conf"; \
+-		$(RM) -f $(sysconfdir)/bopm.conf; \
+-	fi
+--- bopm-3.1.3/src/libopm/configure.ac
++++ bopm-3.1.3/src/libopm/configure.ac
+@@ -1,5 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(libopm, [0.1])
++AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(src/libopm.h)
+ AM_CONFIG_HEADER(src/setup.h)
+ AM_INIT_AUTOMAKE()
+--- bopm-3.1.3/src/libopm/m4/ax_func_snprintf.m4
++++ bopm-3.1.3/src/libopm/m4/ax_func_snprintf.m4
+@@ -0,0 +1,85 @@
++# ===========================================================================
++#     http://www.gnu.org/software/autoconf-archive/ax_func_snprintf.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_FUNC_SNPRINTF
++#
++# DESCRIPTION
++#
++#   Checks for a fully C99 compliant snprintf, in particular checks whether
++#   it does bounds checking and returns the correct string length; does the
++#   same check for vsnprintf. If no working snprintf or vsnprintf is found,
++#   request a replacement and warn the user about it. Note: the mentioned
++#   replacement is freely available and may be used in any project
++#   regardless of it's license.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Ruediger Kuhlmann <info@ruediger-kuhlmann.de>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 5
++
++AU_ALIAS([AC_FUNC_SNPRINTF], [AX_FUNC_SNPRINTF])
++AC_DEFUN([AX_FUNC_SNPRINTF],
++[AC_CHECK_FUNCS(snprintf vsnprintf)
++AC_MSG_CHECKING(for working snprintf)
++AC_CACHE_VAL(ac_cv_have_working_snprintf,
++[AC_TRY_RUN(
++[#include <stdio.h>
++
++int main(void)
++{
++    char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
++    char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
++    int i;
++    i = snprintf (bufs, 2, "%s", "111");
++    if (strcmp (bufs, "1")) exit (1);
++    if (i != 3) exit (1);
++    i = snprintf (bufd, 2, "%d", 111);
++    if (strcmp (bufd, "1")) exit (1);
++    if (i != 3) exit (1);
++    exit(0);
++}], ac_cv_have_working_snprintf=yes, ac_cv_have_working_snprintf=no, ac_cv_have_working_snprintf=cross)])
++AC_MSG_RESULT([$ac_cv_have_working_snprintf])
++AC_MSG_CHECKING(for working vsnprintf)
++AC_CACHE_VAL(ac_cv_have_working_vsnprintf,
++[AC_TRY_RUN(
++[#include <stdio.h>
++#include <stdarg.h>
++
++int my_vsnprintf (char *buf, const char *tmpl, ...)
++{
++    int i;
++    va_list args;
++    va_start (args, tmpl);
++    i = vsnprintf (buf, 2, tmpl, args);
++    va_end (args);
++    return i;
++}
++
++int main(void)
++{
++    char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
++    char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
++    int i;
++    i = my_vsnprintf (bufs, "%s", "111");
++    if (strcmp (bufs, "1")) exit (1);
++    if (i != 3) exit (1);
++    i = my_vsnprintf (bufd, "%d", 111);
++    if (strcmp (bufd, "1")) exit (1);
++    if (i != 3) exit (1);
++    exit(0);
++}], ac_cv_have_working_vsnprintf=yes, ac_cv_have_working_vsnprintf=no, ac_cv_have_working_vsnprintf=cross)])
++AC_MSG_RESULT([$ac_cv_have_working_vsnprintf])
++if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes"; then
++  AC_LIBOBJ(snprintf)
++  AC_MSG_WARN([Replacing missing/broken (v)snprintf() with version from http://www.ijs.si/software/snprintf/.])
++  AC_DEFINE(PREFER_PORTABLE_SNPRINTF, 1, "enable replacement (v)snprintf if system (v)snprintf is broken")
++fi])
+--- bopm-3.1.3/src/libopm/m4/etr_socket_nsl.m4
++++ bopm-3.1.3/src/libopm/m4/etr_socket_nsl.m4
+@@ -0,0 +1,81 @@
++dnl @synopsis ETR_SOCKET_NSL
++dnl
++dnl @obsoleted Use LIB_SOCKET_NSL instead.
++dnl
++dnl This macro figures out what libraries are required on this platform
++dnl to link sockets programs. It's usually -lsocket and/or -lnsl or
++dnl neither. We test for all three combinations.
++dnl
++dnl @category Obsolete
++dnl @author Warren Young <warren@etr-usa.com>
++dnl @version 2005-09-02
++dnl @license AllPermissive
++
++AC_DEFUN([ETR_SOCKET_NSL],
++[
++AC_CACHE_CHECK(for libraries containing socket functions,
++ac_cv_socket_libs, [
++        oCFLAGS=$CFLAGS
++
++        AC_TRY_LINK([
++                        #include <sys/types.h>
++                        #include <sys/socket.h>
++                        #include <netinet/in.h>
++                        #include <arpa/inet.h>
++                ],
++                [
++                        struct in_addr add;
++                        int sd = socket(AF_INET, SOCK_STREAM, 0);
++                        inet_ntoa(add);
++                ],
++                ac_cv_socket_libs=-lc, ac_cv_socket_libs=no)
++
++        if test x"$ac_cv_socket_libs" = "xno"
++        then
++                CFLAGS="$oCFLAGS -lsocket"
++                AC_TRY_LINK([
++                                #include <sys/types.h>
++                                #include <sys/socket.h>
++                                #include <netinet/in.h>
++                                #include <arpa/inet.h>
++                        ],
++                        [
++                                struct in_addr add;
++                                int sd = socket(AF_INET, SOCK_STREAM, 0);
++                                inet_ntoa(add);
++                        ],
++                        ac_cv_socket_libs=-lsocket, ac_cv_socket_libs=no)
++        fi
++
++        if test x"$ac_cv_socket_libs" = "xno"
++        then
++                CFLAGS="$oCFLAGS -lsocket -lnsl"
++                AC_TRY_LINK([
++                                #include <sys/types.h>
++                                #include <sys/socket.h>
++                                #include <netinet/in.h>
++                                #include <arpa/inet.h>
++                        ],
++                        [
++                                struct in_addr add;
++                                int sd = socket(AF_INET, SOCK_STREAM, 0);
++                                inet_ntoa(add);
++                        ],
++                        ac_cv_socket_libs="-lsocket -lnsl", ac_cv_socket_libs=no)
++        fi
++
++        CFLAGS=$oCFLAGS
++])
++
++        if test x"$ac_cv_socket_libs" = "xno"
++        then
++                AC_MSG_ERROR([Cannot find socket libraries])
++        elif test x"$ac_cv_socket_libs" = "x-lc"
++        then
++                ETR_SOCKET_LIBS=""
++        else
++                ETR_SOCKET_LIBS="$ac_cv_socket_libs"
++        fi
++
++        AC_SUBST(ETR_SOCKET_LIBS)
++]) dnl ETR_SOCKET_NSL
diff --git a/net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch b/net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch
new file mode 100644
index 000000000000..318dae660c51
--- /dev/null
+++ b/net-misc/bopm/files/bopm-3.1.3-remove-njabl.patch
@@ -0,0 +1,28 @@
+Remove NJABL as an example blacklist.
+
+NJABL has been shut down and bopm upstream still lists it in its default
+configuration.
+---
+diff --git a/bopm.conf.sample b/bopm.conf.sample
+index 74483e1..bc05bf4 100644
+--- a/bopm.conf.sample
++++ b/bopm.conf.sample
+@@ -363,18 +363,6 @@ OPM {
+ #        };
+ 
+ 
+-	/* example: NJABL - please read http://www.njabl.org/use.html before
+-	 * uncommenting */
+-#	 blacklist {
+-#	    name = "dnsbl.njabl.org";
+-#	    type = "A record reply";
+-#	    reply {
+-#	       9 = "Open proxy";
+-#	    };
+-#	    ban_unknown = no;
+-#	    kline = "KLINE *@%h :Open proxy found on your host, please visit www.njabl.org/cgi-bin/lookup.cgi?query=%i";
+-#	};
+-
+ 	/*
+ 	 * You can report the insecure proxies you find to a DNSBL also!
+ 	 * The remaining directives in this section are only needed if you
diff --git a/net-misc/bopm/files/bopm.conf.d b/net-misc/bopm/files/bopm.conf.d
new file mode 100644
index 000000000000..48eb33790cd1
--- /dev/null
+++ b/net-misc/bopm/files/bopm.conf.d
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bopm
+
+BOPM_UID=bopm
diff --git a/net-misc/bopm/files/bopm.conf.d-r1 b/net-misc/bopm/files/bopm.conf.d-r1
new file mode 100644
index 000000000000..eb27446768c3
--- /dev/null
+++ b/net-misc/bopm/files/bopm.conf.d-r1
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bopm
+
+BOPM_UID=bopm
+CONFFILE=/etc/${SVCNAME}.conf
+PIDFILE=/run/bopm/${SVCNAME}.pid
diff --git a/net-misc/bopm/files/bopm.init.d b/net-misc/bopm/files/bopm.init.d
new file mode 100644
index 000000000000..7b0d0591aca5
--- /dev/null
+++ b/net-misc/bopm/files/bopm.init.d
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="depend start stop"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting Blitzed Open Proxy Monitor"
+	start-stop-daemon --start --quiet --chuid ${BOPM_UID} --exec /usr/bin/bopm
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Blitzed Open Proxy Monitor"
+	kill $(</var/run/bopm/bopm.pid)
+	eend $?
+	rm -f /var/run/bopm/bopm.pid
+}
diff --git a/net-misc/bopm/files/bopm.init.d-r1 b/net-misc/bopm/files/bopm.init.d-r1
new file mode 100644
index 000000000000..6a292f800be2
--- /dev/null
+++ b/net-misc/bopm/files/bopm.init.d-r1
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/bopm"
+description="Blitzed Open Proxy Monitor"
+start_stop_daemon_args="--quiet --chuid ${BOPM_UID}"
+pidfile="${PIDFILE}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath -o ${BOPM_UID} -d "$(dirname "${PIDFILE}")"
+}
diff --git a/net-misc/bopm/metadata.xml b/net-misc/bopm/metadata.xml
new file mode 100644
index 000000000000..1da5439889b8
--- /dev/null
+++ b/net-misc/bopm/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>shentino@gmail.com</email>
+		<name>Shentino</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">blitzed-org/bopm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
new file mode 100644
index 000000000000..144d78cb9cd2
--- /dev/null
+++ b/net-misc/bridge-utils/Manifest
@@ -0,0 +1,8 @@
+AUX bridge-utils-1.5-linux-3.8.patch 435 SHA256 ce60b2328784307ad7a408fad96c0e0165b7740d1e4aaadb3cf2d6e6feaef235 SHA512 dea1668cc0b76b1f88e7040262e3056db278000df2680e8d3a1596b6821e7f8213a0e67ae26ffc23950b848c2ccc5dabf61baf6c40159eecfb7c22118dec2635 WHIRLPOOL 056fdf262ac2765a6996d54da8014d1f52d72d646ac215476dfb14bdb983fd0c8283ff61a056d3d909ef9a9cd1f0cb7cc08db112e4f477204d8a94371edf84ea
+DIST bridge-utils-1.5.tar.gz 33243 SHA256 42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688 SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3 WHIRLPOOL f11eb95ae9b562cb301bb1f657d87878f0a0729a2129b90fa5957747f078f3afe2ebdadd1eb7ea4a59e544acc8194cf1744126db9ba3f3704210bc18ee3480fa
+DIST bridge-utils-1.6.tar.xz 29904 SHA256 cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 WHIRLPOOL 29e25c79c4abcf33917333b872fa0d49600a87c7393ee99a9c3f97917698d15e5c44fff781b9013d91d46958273fa9dc5745281bdca3f0177733ade8bf7e4a6c
+EBUILD bridge-utils-1.5.ebuild 1281 SHA256 1a36094576c7e5bce9b67504bda4c59bd7d2bb054911a809399372c88309581a SHA512 f2770626ffb714981d426b4d9f005922724389580d0dd3252c91123fdd94212b6aecaed5547c66a459dd1d1d6109d4f93453103c996e55a1659fa27e72c57636 WHIRLPOOL 0b98818fdfa72073a87bab638689a7759f6319bf87af4da176911136f02c38da53e96df5a537553b30c78b552dc6ba99ac4835cf66a89303193ce32ea3755c38
+EBUILD bridge-utils-1.6.ebuild 1346 SHA256 e212a0268ffec6c6c0704dc55670295ff0811d19738b6ab7870a56d5a5ea582b SHA512 405c661cba4d088ae986f75a1df0cf43efe623df0d0547242d05eab5575ba315a5f8e623725e7d59de59562bca86a65c4d789c80ee125c2364999041699bf08c WHIRLPOOL 74cb005ef888ac298dd176542b34fe160d14b56873d89216af93089ba1a90034496e61d27d7bc63799a465b2d9f2ab0c3de9b72eac54209617a036c32a3909cb
+MISC ChangeLog 2479 SHA256 669239dd5eccd538a94a7de8b80e5c55985e32531404fef7a2d4e571d1cd2945 SHA512 e2045ae448a113c560492661c247505ebba96f43c8481e41d01a5f1103e0cbe274de78f4534e2651b2906ea69e1d9aec389741afa8860676a7913cd7ffffd76d WHIRLPOOL b26c965f6a74cd837606cd36a86362fcd42e95e23102bf1c28223def0b02c88ffd8b47ec4e4f74537815de98e558ca74afcfc79aaa3c770de7377d39fc0fd12e
+MISC ChangeLog-2015 10269 SHA256 09a7e39e286023aa1bb9adaae16cb4f0eb5bcebfdf269ec259539f4f7d21aad6 SHA512 3993e85d6ad2f3afb9ad741ee56bb90ed468be20e91d50cc96b3fbd3b710984ff4f7f0ebb390dafe93689f7058c05e4c004c6ce0bd3d4a16935d32a998eb4a3b WHIRLPOOL e4b8f8e80174c7b38ae1b116b9b88304206bc0a4ef96bd1305db0c8877d650603d09e23aceb802b71384731e6b0936b9ce05ae26f40ea9bd2af031fef1053a24
+MISC metadata.xml 426 SHA256 b34c0320b4f643677f7b03ecb26c8f0336ab1f9a68c7156f4d0a0ae85eafec60 SHA512 b6d8f31496815fff6ee465b4eff20dba27a478e803c299e1d329ad33dd80493380b746fd0aba19d15a3780e4a4b37365829781cda5aaccfca2f044506b15c38e WHIRLPOOL 177367f59aae104c6aa481ca706e54aaf8f204843c647856595e30dc736d6f593d1dc36c93049eccc047f50faf364a6cbb35247a652b8531fba1129da317ab72
diff --git a/net-misc/bridge-utils/bridge-utils-1.5.ebuild b/net-misc/bridge-utils/bridge-utils-1.5.ebuild
new file mode 100644
index 000000000000..153aec032ceb
--- /dev/null
+++ b/net-misc/bridge-utils/bridge-utils-1.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils linux-info toolchain-funcs
+
+DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
+HOMEPAGE="http://bridge.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="selinux"
+
+DEPEND="virtual/os-headers"
+RDEPEND="selinux? ( sec-policy/selinux-brctl )"
+
+CONFIG_CHECK="~BRIDGE"
+WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel"
+
+get_headers() {
+	CTARGET=${CTARGET:-${CHOST}}
+	dir=/usr/include
+	tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include
+	echo "${dir}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-linux-3.8.patch
+	eautoreconf
+}
+
+src_configure() {
+	# use santitized headers and not headers from /usr/src
+	econf \
+		--prefix=/ \
+		--libdir=/usr/$(get_libdir) \
+		--includedir=/usr/include \
+		--with-linux-headers="$(get_headers)"
+}
+
+src_install () {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog README THANKS TODO \
+		doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
+	[ -f "${D}"/sbin/brctl ] || die "upstream makefile failed to install binary"
+}
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
new file mode 100644
index 000000000000..5cdc85e8f10c
--- /dev/null
+++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info toolchain-funcs
+
+DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
+HOMEPAGE="http://bridge.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
+SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="virtual/os-headers"
+RDEPEND="selinux? ( sec-policy/selinux-brctl )"
+
+CONFIG_CHECK="~BRIDGE"
+WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel"
+
+get_headers() {
+	CTARGET=${CTARGET:-${CHOST}}
+	dir=/usr/include
+	tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include
+	echo "${dir}"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# use santitized headers and not headers from /usr/src
+	local myeconfargs=(
+		--prefix=/
+		--libdir=/usr/$(get_libdir)
+		--includedir=/usr/include
+		--with-linux-headers="$(get_headers)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install () {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog README THANKS TODO \
+		doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
+	[ -f "${ED%/}"/sbin/brctl ] || die "upstream makefile failed to install binary"
+}
diff --git a/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch b/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch
new file mode 100644
index 000000000000..49ebb4e9da28
--- /dev/null
+++ b/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch
@@ -0,0 +1,18 @@
+unfortunately if_bridge.h from Linux 3.8+ is not self-contained and the struct
+for ip6 is missing
+
+http://bugs.gentoo.org/460262
+
+this is not unheard of with Linux headers, for example, <linux/cdrom.h> needs
+<limits.h> to get INT_MAX
+
+--- libbridge/libbridge.h
++++ libbridge/libbridge.h
+@@ -20,6 +20,7 @@
+ #define _LIBBRIDGE_H
+ 
+ #include <sys/socket.h>
++#include <netinet/ip6.h>
+ #include <linux/if.h>
+ #include <linux/if_bridge.h>
+ 
diff --git a/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
new file mode 100644
index 000000000000..995aec82049e
--- /dev/null
+++ b/net-misc/bridge-utils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">bridge</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/bsdwhois/Manifest b/net-misc/bsdwhois/Manifest
new file mode 100644
index 000000000000..70575535f0cf
--- /dev/null
+++ b/net-misc/bsdwhois/Manifest
@@ -0,0 +1,5 @@
+DIST bsdwhois-1.43.2.1.tar.gz 85895 SHA256 b0db304f3becbecac7701399210e6c1badb5646b5c9e9683937656ccbc9b5655 SHA512 c1b3f93b8d7f838478d59cb70a7326fba84f87e1fcb4af9e7cc64ac1928adf96b0e6facbd6dfabaa7d146f0d1ea1abe1330771be4c7a6f3590d3c9e86a3b53dc WHIRLPOOL 5c7092a5275d4ccbb3098f2419db2867e83f3e15c0ee43d90e547547ce94de2dbf58036c72093d1c2b8232f9c92cfcdcb3196902c1c49fd6876bcddefe3521c8
+EBUILD bsdwhois-1.43.2.1.ebuild 512 SHA256 f63cb6afedf09f68c64ed98c28f09f85568f1cfae49729a38fd7a4a0bd452784 SHA512 79ed1695441c987880a99495e5d3e2dd0181651541ce8c3c7d160a60e113f8822be83aa36226f63610812272df22efb53e60a24d5cbe08c44643ea96a366c964 WHIRLPOOL d1fefdd7f6877525d35b73335df831c970514b87f0539f7ced5d1a878d5c1f054dc791e8e427e1889cd99fd36a1ba552026916633ddf813e30e7cc97b8a20ace
+MISC ChangeLog 2436 SHA256 984dbe1025404a2007a7d0835197b8a5763569fb4988b289fd2e0b6b7f5592b9 SHA512 083648f7f35c78491759f127b7e379edd906a8b0bc71296f1a8785386857367c794a520cfd0d45d0c6984b288bfdc763c028391650aff33abc4e79960e486075 WHIRLPOOL 5a93adc4ecfc1f6eb64ea25f587cd7c27d3fd7ccb7c422639a773b5a9a854231cac822223aaec5bba0871efa27fbed879f79acf94c5a48eac21bb20b46cc33b4
+MISC ChangeLog-2015 1767 SHA256 4ebccb82a3c5d19cdaae4ff0a4a017d6b66a7f21fcaacb4a7e25fd79c0318d63 SHA512 8f06f48d90160250b7c22796c901136b42e75e239deea27c07cbd0b0952dc5ffee3c0350a3a821d16e13bdd28ec337a029bcd2721a9873309a03e120855823be WHIRLPOOL c037b3d11fcc2ad130aed8b1982814105a5d685f9f63210d5d96be48a53365521fce3252810b048e7bc9e7ad8bee6147e35d7ba82b816eda54aa4c11f3944b45
+MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
diff --git a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
new file mode 100644
index 000000000000..65052de2ef7b
--- /dev/null
+++ b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="FreeBSD Whois Client"
+HOMEPAGE="http://www.freebsd.org/"
+SRC_URI="http://utenti.gufi.org/~drizzt/codes/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="userland_BSD"
+
+src_install() {
+	default
+
+	if ! use userland_BSD; then
+		mv "${ED}"/usr/share/man/man1/{whois,bsdwhois}.1
+		mv "${ED}"/usr/bin/{whois,bsdwhois}
+	fi
+}
diff --git a/net-misc/bsdwhois/metadata.xml b/net-misc/bsdwhois/metadata.xml
new file mode 100644
index 000000000000..a00f3aeb1f81
--- /dev/null
+++ b/net-misc/bsdwhois/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/bti/Manifest b/net-misc/bti/Manifest
new file mode 100644
index 000000000000..df6519cf1fa5
--- /dev/null
+++ b/net-misc/bti/Manifest
@@ -0,0 +1,5 @@
+DIST bti-034.tar.xz 93328 SHA256 8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83 SHA512 2b7cd66cff617f7592863a1a8e03754b3dea314c8eeb98bf0993601d4d4db848a74b26941bbd04f57a348bf0d02aefca4e3125f00fed531a67a3f17f36e665ba WHIRLPOOL d75f679aa4d1c766a88a9124073befa4c3b320304c747d756aba0169918cce7c44660b8627002d8fa3503a635bb0b10c68f032837b93504f378f7093dfc02768
+EBUILD bti-034.ebuild 792 SHA256 7b05a263220f6d89d32985755a68b23aeb0509cd7e170fd9b6ba2a9062d96828 SHA512 f4dcf0d16357717861760fb39a8749237c69179530a1f1463bb887cbf9d9eb3d3def99029c2d2fe93cba4016d9175d376965cfb9406c3a920376773c7422642a WHIRLPOOL e25cf8e25ab1769687faff8909f6cdfe13ff2f98d1a1c089c344b7ece1e68100367bf53aa664a478252be4a12efa61d8af75f7b80c80dfe58e62b187fd5dd63b
+MISC ChangeLog 2542 SHA256 cccfc531032aac7db0b0dfbc76ec243a199f934437f9f0a244d38847fab9e35b SHA512 b96c5899831b450a05096545d0fe06f4f3dd24cc9f58d038ffef8746d140cc5109707c3123f5a062ef3ae14dabf92ffe75cac37d487930c9c052dcd8158b7421 WHIRLPOOL 307442282ad86aef100ae55d0c9a739ea717aad8e11ea0acfc211a5759fde012692c6c50ceb8977e6263a60e2076b1557d778236a6dc50624c628982629f5811
+MISC ChangeLog-2015 3452 SHA256 470d01aa47aa2a5387f8d3b5756798436bcd7908e18a663b702dd5ce6b443f8b SHA512 86d8dfe041a9e62127bd6e3d8342de4a796bf0d70549d700587d783e7cb2b38f2a8aa8f5bff112ab15fbce32cfc83bb61afe0812fe8f7fe431189836106b506f WHIRLPOOL 47257eda61f0a268b72ef8d8a82262b9a8ad4d27ade9c2820b0691dae3dbef5b19ebe35922d5ce8fc819cff12d0c029c985e4fafa7b1d37e66fcb4983c5619f8
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/net-misc/bti/bti-034.ebuild b/net-misc/bti/bti-034.ebuild
new file mode 100644
index 000000000000..65b7eb207a09
--- /dev/null
+++ b/net-misc/bti/bti-034.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="A command line twitter/identi.ca client"
+HOMEPAGE="https://gregkh.github.com/bti/"
+SRC_URI="mirror://kernel/software/web/bti/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/json-c
+	dev-libs/libpcre
+	dev-libs/libxml2
+	net-libs/liboauth
+	net-misc/curl
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+# Readline is dynamically loaded, for whatever reason, and can use
+# libedit as an alternative...
+RDEPEND="${COMMON_DEPEND}
+	|| ( sys-libs/readline dev-libs/libedit )
+"
+
+DOCS=( bti.example ChangeLog README RELEASE-NOTES )
+
+src_install() {
+	default
+	newbashcomp bti-bashcompletion ${PN}
+}
diff --git a/net-misc/bti/metadata.xml b/net-misc/bti/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/net-misc/bti/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/net-misc/buka/Manifest b/net-misc/buka/Manifest
new file mode 100644
index 000000000000..d74bea4ecb72
--- /dev/null
+++ b/net-misc/buka/Manifest
@@ -0,0 +1,4 @@
+DIST buka-2.0.tar.gz 14088 SHA256 b7d33f15687198a78b7114251038e54ef70f3ef1a74dd84a36176874ca699793 SHA512 809c35fa0caed30c11f438fc5d68a446a2c8a6ffa6b233f5e65bb522d8de8db095ad3ef8c0811a3670a49e3994d4956f917d3d2dfda3ff488ca8793d7389e4a6 WHIRLPOOL 761a9614b41cecc821bc1279d863b620512fd7788a1ec3cbd8ad3d75e89a47ffd8e485b45b323964970ae90c5852becc10fdb61672b19e4d26bae76b67ff0135
+EBUILD buka-2.0.ebuild 537 SHA256 dd92b1d620abeba736272ab4000e3b9d07a14be4068fa6aa4aaabbd425fd5ae1 SHA512 cabf5066540c8f7297a27c5fda9e8c430e01538114c6a3a4d608a7c17c1b3c9b2a173261fbe76b1a97fcdca496eec4f21d7a656abd80d2799a345ccb2fbc0182 WHIRLPOOL 163b38fc55b3ce58d0b95f6c07a1f36dde11ff53734d4145e5fc89aea5f085d6697b822c7f0bb7c9a00aea3c9780265972c7a476074a9dfe318ad809bad20d69
+MISC ChangeLog 745 SHA256 d0d7cb1cdb8b6405f30f6c3aa7c8ddc0241ce1ec4b7d254743e9f89f36b090ce SHA512 164eab5085a2e972868af640a3c6a387cadf12d63022388f0d3aed4148483c0e6907dfefc32592f97c86487d1c37cc4d4d44349f7dbdb9e01c3d834cbb96b0fa WHIRLPOOL ea32823a368172c09c76ed0758b113ea719499b7e72a581f467a64fd23ce4ebeb1725dd036090416eb7eb5d75a4dfe3d012cee913fd45c25ff11636a0a2dd992
+MISC metadata.xml 384 SHA256 19f8daf79678a832958b2f485c94fa7f56c5ae6607ba54ad4aad0af98949360f SHA512 2887c3fdb384617067e693c4ef66e74353127b9e95f756c510d928ae0bc2423f6812b0be1d5d0ff49af8d7b57d13c6c5cadb21d86fc74516172ce05d1a570e65 WHIRLPOOL 1ada4800acf890782a22c011c4af59acc2b1e85097486f73471534e620843bdbc5d29bc8076d58fe0d1320fdf1971d54a07cf8a9e98bde991382056acd481ac2
diff --git a/net-misc/buka/buka-2.0.ebuild b/net-misc/buka/buka-2.0.ebuild
new file mode 100644
index 000000000000..ad08fbeb3b37
--- /dev/null
+++ b/net-misc/buka/buka-2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Download manga from buka.cn"
+HOMEPAGE="https://gitgud.io/drylemon/buka"
+SRC_URI="http://lick.moe/buka/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-process/parallel
+	net-misc/curl
+	dev-util/dialog"
+
+src_install()
+{
+	default
+	doman ${PN}.1
+	dobin ${PN}
+}
+
+pkg_postinst()
+{
+	optfeature "pdf support" media-gfx/imagemagick
+	optfeature "cbz support" app-arch/zip
+}
diff --git a/net-misc/buka/metadata.xml b/net-misc/buka/metadata.xml
new file mode 100644
index 000000000000..aaeff42e1b3c
--- /dev/null
+++ b/net-misc/buka/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mo@openmailbox.org</email>
+    <name>Mohamad Issawi</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/bwwhois/Manifest b/net-misc/bwwhois/Manifest
new file mode 100644
index 000000000000..3650fbb68d80
--- /dev/null
+++ b/net-misc/bwwhois/Manifest
@@ -0,0 +1,5 @@
+DIST whois-5.5.2.tgz 50008 SHA256 8ccc9107d8c0d348ddc250597ea0b5f4122076bcce5e8ef2bc32e87f77f5fc8d SHA512 ee6c1fa183fa009a6e47ec0c51815a215f29e24bd443683a2df8f02bca822cb91c5fb91148aaea37c5d9c993e2c7ad39d310c7cd9358ea6a7fa88ec2c8aaba16 WHIRLPOOL 737745a9309da3968d2f897a3fe878471624c1fb6386d7700699afb2b755f01f69e4ed09445f602203a48bcc4c3ea5c4cfbe79d64d051904e94b7ad245bf3774
+EBUILD bwwhois-5.5.2-r2.ebuild 879 SHA256 603ee5bb4a98fb93731f1fd4c9c242f08fb19bfa8bd616e2b8f51c6fa666b7d7 SHA512 5580f9ffc613f02db731d4885dbf5aed15c095b7e15da60d20c8246eaf8bd0b210571ec501ba204861975c027241b0570d81a055a6f08c6ee09d80b0424962f4 WHIRLPOOL 4ca9ea729736d3e37fe5dbd1f26a2494c1757331934ec9882b9ed944b9175ee737b719a1f54df4e5499e92bbb14b77d5fac6e02cdbaf5c7f7d65e5d2c99c92be
+MISC ChangeLog 2182 SHA256 81e2c734e769905e7f45bf44811a85db34009ee838145e3730942bee13325a58 SHA512 39d58ce934e0502d15fecc2f79f11ba20cfd256167505615da5ba943cfe16f6c9e34a905b4af9e9e5f5591145aa3a212e5fcac11c0833c7f3846a771825eac13 WHIRLPOOL bae48117046d54d198c4d11060b44afeade0ae407ad5436e95214e2935d61c55a37f691c053c655384fc6adc10d44ac6e5d814d27547d2d43b3f9417fbc0ba38
+MISC ChangeLog-2015 4737 SHA256 26cad5fd913e4cd12041d88fc6acc949f799dce4a617e5ed3ee017b584555016 SHA512 15477ee4f7bafbfb9a0575874523c68f43bd257fccc2105c09acdc56388a727c1e94435170525839f1c44ae227bb20aa0376300b5c6a07f1e6eb166d3d3f855f WHIRLPOOL 06ee33dd83fe389fc73687b0c83bf1eb50deec313cceee2ce741e9fb107993f41ecb3a8afb0531fff94e27f6120f126984f4b13a1b94ab9637065b2bcf600bfa
+MISC metadata.xml 355 SHA256 e068e9fb4db701dfb5f944b88e8ff83ed61c32384660c9e7b32a7539d8ca8044 SHA512 31b407791cd97b141997fff192ac75298957edee59fe3a9c46d7a08f839b99ca2e4f3536632beca933d74a8e22464dbd7fd34fa61c106829c62c8dc69b1b8231 WHIRLPOOL c788c7b91a8921fad524e903abc6b88ab159f5baecd90c7879e41388b41f786cf4669b6fb8155caef9eef7a1d5400e9f7048951e8aad1f5cfe2ef4bdec9a03c5
diff --git a/net-misc/bwwhois/bwwhois-5.5.2-r2.ebuild b/net-misc/bwwhois/bwwhois-5.5.2-r2.ebuild
new file mode 100644
index 000000000000..c2840fab62ed
--- /dev/null
+++ b/net-misc/bwwhois/bwwhois-5.5.2-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
+inherit perl-app
+
+MY_P="${P/bw/}"
+
+DESCRIPTION="Perl-based whois client designed to work with the new Shared Registration System"
+SRC_URI="http://whois.bw.org/dist/${MY_P}.tgz"
+HOMEPAGE="http://whois.bw.org/"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# bug #440390
+	sed -i -e '/^\.ru/s/ripn.ru/ripn.net/' tld.conf || die 'sed on tld.conf failed'
+}
+
+src_install() {
+	exeinto usr/bin
+	newexe whois bwwhois
+
+	newman whois.1 bwwhois.1
+
+	insinto /etc/whois
+	doins whois.conf tld.conf sd.conf
+
+	perl_set_version
+	insinto "${VENDOR_LIB}"
+	doins bwInclude.pm
+
+	dodoc HISTORY INSTALL README
+}
diff --git a/net-misc/bwwhois/metadata.xml b/net-misc/bwwhois/metadata.xml
new file mode 100644
index 000000000000..2cb7edde3a31
--- /dev/null
+++ b/net-misc/bwwhois/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
new file mode 100644
index 000000000000..91355acb439d
--- /dev/null
+++ b/net-misc/cadaver/Manifest
@@ -0,0 +1,6 @@
+AUX cadaver-0.23.2-disable-nls.patch 399 SHA256 b9ece3e63b6fa3138c3291f84c2923a74fb275f58e4db77bc8c682e3faf6420c SHA512 5c48bd17c555bfd4e1b157615273b1343f364ad99d0a98c0b8c045863172a90f94f3652b7456fc5d7c3e29380547311b7a62a889c2868aa6cbbdf9197734a6d8 WHIRLPOOL 9df3ad944fd5120ab05a0965c978a6f61718e50c8ff5817659f8f6ba4b8d54a3dcf62bc1f8dda3d72efbb1b7bbc605ed0be8d0dca7d78ddb4b9c9ff236ed6f86
+DIST cadaver-0.23.3.tar.gz 831884 SHA256 fd4ce68a3230ba459a92bcb747fc6afa91e46d803c1d5ffe964b661793c13fca SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41 WHIRLPOOL 5d49960382b8063968674b5456d4fa77f654bb81a5cca6cf79cd439f362fbc039cb69d36f35159fb085935ef0909a927e803b023d46744854f18853509a8b203
+EBUILD cadaver-0.23.3.ebuild 1061 SHA256 da8c62bb494e72180b5ef58865580254f9b1f5a6afd45e4b87b9440407e0f461 SHA512 ca0af0e9ef94f0243d43247965ea00387470d2f0277a6787bbaa6fae5be37e20f8441e787c5a28f61f1c795890cd37b0631194b5d5206868f92a7bf41602e1d2 WHIRLPOOL ebd5cc5c3265e4f12223d4ac9d1235a31b54e4483446ba37569b7facbeb6b07f79a4e83f54556118b2898b2ab06aa28c61b963c3964d53f3515246c26e6fd91e
+MISC ChangeLog 2470 SHA256 2a5e95aa70dea1f74b2500c6aba5cf00b5c377a01728f9b6a30c3dcc9e9f1c87 SHA512 0be014314732a1dcc1fcc2e01437a05c80c6b9f5ca1d880a06a5f730daf161fec2668a1b255343d2100b2d7824db697ed123f2cc4828f28b87ee15f3ce66204e WHIRLPOOL efdf48b60b3d028ae425cfd386eba1e4c9ff5e9db037fdeaf20aa426213a748a16741e616d4dabe0d75508779bfd1949e6788966252e067dac22fda4d88147e4
+MISC ChangeLog-2015 6167 SHA256 311cdee7e0fbe3e10315d933e2fcedbd95ed6208ad264fa821c86a2c813f04dc SHA512 60941995a85dfa12aef325e05a03ade01ae3632e9623339f020064bae3e09b23f9e9d5d92e19ee77c3f1426fa09e15da042631bf45092d2537a572911053b0bf WHIRLPOOL 4333baecc4af09a418edd97c5c2ff871158aa45b1f02c8b6b31761eacdb06444b8fbed127aaa891b3ea6a359ad6aa55c3921c9e29008fbd3b52d730c575dd2f9
+MISC metadata.xml 338 SHA256 b5a375202c82f1f4baf8bf5c1ded6eb2815aba6d7a4fcc2b5064ce22f5466def SHA512 7d37b09863b6d2a4a6c00930f8f4b9d2237cd216e52af58ea002875d0f65325b7c1a112a9832046db347d7b4bd5881e01cd06257be61516f9e1f975939989749 WHIRLPOOL f58d6dccbceaaa421411d5bc5c46e18feb0ac2e609decfeb22fdcf9a9589fd74b5b0cc1243356644cf11e947ae70196e554a8a8952e93346e14c515517a5e6d4
diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild
new file mode 100644
index 000000000000..89897109b85e
--- /dev/null
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit autotools eutils
+
+DESCRIPTION="Command-line WebDAV client"
+HOMEPAGE="http://www.webdav.org/cadaver"
+SRC_URI="http://www.webdav.org/cadaver/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
+IUSE="nls"
+
+RDEPEND=">=net-libs/neon-0.27.0"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
+
+	rm -fr lib/{expat,intl,neon}
+	sed \
+		-e "/NE_REQUIRE_VERSIONS/s/29/& 30/" \
+		-e "s:lib/neon/Makefile lib/intl/Makefile ::" \
+		-i configure.ac || die "sed configure.ac failed"
+	sed -e "s/^\(SUBDIRS.*=\).*/\1/" -i Makefile.in || die "sed Makefile.in failed"
+	cp /usr/share/gettext/po/Makefile.in.in po || die "cp failed"
+
+	AT_M4DIR="m4 m4/neon" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-libs=/usr
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc BUGS ChangeLog FAQ NEWS README THANKS TODO
+}
diff --git a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
new file mode 100644
index 000000000000..6610d479b30d
--- /dev/null
+++ b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
@@ -0,0 +1,17 @@
+Fix building with --disable-nls.
+--- src/cadaver.c.~1~	2007-08-22 14:17:27.000000000 +0200
++++ src/cadaver.c	2008-03-29 08:58:57.248793293 +0100
+@@ -838,11 +838,12 @@
+ 
+     progname = argv[0];
+ 
++#ifdef ENABLE_NLS
++
+ #ifdef HAVE_SETLOCALE
+     setlocale(LC_ALL, "");
+ #endif
+ 
+-#ifdef ENABLE_NLS
+     bindtextdomain(PACKAGE_NAME, LOCALEDIR);
+     textdomain(PACKAGE_NAME);
+ #endif /* ENABLE_NLS */
diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
new file mode 100644
index 000000000000..c2d1a82c0e89
--- /dev/null
+++ b/net-misc/cadaver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest
new file mode 100644
index 000000000000..1b99cb64612b
--- /dev/null
+++ b/net-misc/calicoctl/Manifest
@@ -0,0 +1,48 @@
+DIST calicoctl-1.5.0.tar.gz 63645 SHA256 e055b1b33b3225228abf37c474c91dabe8d1b292ca5b0df4c97df096dacc6487 SHA512 57bf1b9e008df0c652881f84e59cbfdb3bf6192ff0810ef068c16e7601a6da78e7d0c4bdd912606c2095059ced8e7fe820bbb42f328bf9e7a5404f773f4c883f WHIRLPOOL 9a959d0d13cb585505a1e86eea05194c2414c5e87c31f6560e580f470399e22f6dfaa5106a29d391f10070ef4ff8f7b5a314a77f857115be0377d7aff453da3b
+DIST github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz 5943 SHA256 c2898252c1bf79e16edbbeec0e0e8590372681a54b16e2ff1172ecf5cd291383 SHA512 431e41870728d86accd7ed78d1e16c92adebfe79cef59b7f656a395e4bf7727ae9521f7e9d291931590680fd32eaef26622d888f30a4a4511dbddcae8dda1c08 WHIRLPOOL a41c4a579ce1a269f94e2b406bd19d21a505bbd6a094bd60b7e556627d457f6383dbccd1d94f27949b67ec67367abd6f0a4b26afba4eca12aff975e7c9c3d6ac
+DIST github.com-coreos-etcd-17ae440991da3bdb2df4309936dd2074f66ec394.tar.gz 2538523 SHA256 013a89f6351967a85dafeb959ca8932db1198057f105becbe949e80c8f73a6e2 SHA512 9202595469d538328cd0ca57f08e29d66f93080592eb65fb32ae76c13a14dfaefdacb9d7b1aca8c069db52363e3d798b4882c5977bbcd600159d3d8cb65d5eeb WHIRLPOOL 838cac222af8505bd56e3b0bb37593df05658585a0e978541ec863a8fbe7654224240877326eb3b8b83a84ab22f3de03c2011f1c3b5bebccb0dacf8c1fc35c2a
+DIST github.com-coreos-go-semver-568e959cd89871e61434c1143528d9162da89ef2.tar.gz 7314 SHA256 adfc3851d9fab5dcf5dce627ae82d461951bf460bb9c17e5d7a00acb7633d76b SHA512 8e17cad3a52ffbdf658e71fbe97364a2a202ff6520baf25ce119d537f0d03c10b591772df4ed0e5da06665354c9deffcc06ffa3749c47d2042350d3ab1134940 WHIRLPOOL 16c487154c01e5063e63c068b61fc24850d10f09050c9434b92703fe25daee6de9fe3d4b69e8c0d327a3b37c85b278cc1b7a67944a622cc9547c8a776c1c1a17
+DIST github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz 23844 SHA256 b281aee76036bb69f735b60003cf04ce631433223a10dd57e4a60bce598269bb SHA512 1d97e29b2dd84b3ccb619efbffa396ad0f988c5e09e18136edb64ed046d25512e31bd43f5586852d520ef2a38bd98ae2fd9c2e66c49bb52e828c386285bd9391 WHIRLPOOL a3409875407f58be35c3165d74699295a07b77d4a29d50f9de4847b7c94123439bafc8abef2489ff8ec184679d5d08827572cd8ebf2c334634900fa5d38c780a
+DIST github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz 11711 SHA256 a0ecb40125ac5e2733bd2e9630679899b81356186d0e57999d673951532307c4 SHA512 378d5ae07b41275c6a1633e26470255210ba62d6fdd6b926ae3f48e37160f659fc050e9866267cbfd86fe07a8c0ef3cd00eeda8cd9deb0ef66af697773d71601 WHIRLPOOL d50e2a76c20ff0ab1687a8a9483bd19a12e8c1b08aa4edcb269b30b06a25486be6ca1b8d990e6e7ccd7e7b237333fc43b67ba269fdb2dc3d57762c9dfb76b424
+DIST github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz 3504 SHA256 8d5bc1b6778852eed64f160989a9448fc97fcd52a2bd9db8afd75296d412b5df SHA512 5641abf798c2e238885f692262d5b6932c41c770f9a2a6806c764a31a14e14b99eccc59d3571a83919aaeaa619fe1f8e5e492d245c6d6d41fdc03c45d2b69670 WHIRLPOOL 9cfc237b47015be4ddac5a0df53a5bbca5d6043876d305176642e1d0efe7d144fd05d1e6662ced67fa88dfe9a1788ece7282a42d7fc4bedba73f12a3d59bdd71
+DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 SHA256 782e83c5384cb2e233b947ffba27c8d067f23fadf38b86f6df779c144425cc36 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab WHIRLPOOL e6cadc7272518d2ecd03e9b208b12500fe6b5bea6c490a22133b8021bd2befc77cce104d29c2ceb01f0b18e0f2eef44321fe61427c2834bc09ced956526c6f36
+DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 SHA256 48fceb7c90ff0b7afa6886a685f2fb5e680489f471c6fbf0a955b49dc3e16874 SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6 WHIRLPOOL 9434c8eec8c646472627ce85b30c2541c70c3521fb015ce1f47db8ea1ddacf90b86abacb24d6617ee1f540d8584f20dc8f2766df23b9c619b0a9638215d5ad09
+DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 SHA256 2379edcc225238167aa0d45cb28d3561c5193979b136a6cf3443a1fe3b85c78a SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d WHIRLPOOL fc39214f5e5d7063069f7173bfea57483d3a8f46c586c704d93a9af1ebb534493de343a9f2dbbd51eb22de118db2f0e3e9838ee4df2c414d2921545f2ed3ed7f
+DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 SHA256 797da0554bccf4a972b558b476a6829488a6c08d519bce91d5fc39a7f0704cf6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5 WHIRLPOOL 7b478544aba49b0b129990a68e80fd6509cf2b1dab0e1d4d4e082bcc0a8271048fd73ef6227eb73c2564c6052d227bf9180d3aef6b883cb38f46b382ac163657
+DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 SHA256 9339c2c779e8d27fd122b1b1bf5c5df108bbe658a403d1df9356a993ed1c7505 SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9 WHIRLPOOL 566a469f1c3738391bed2ea8fb63a605e670d52f65919e61d5c6a84bab6d0b03bfd1a1ea7c2344f981dffb0498ab2d46e39b45cda0dd90699fd42e8477ab0bde
+DIST github.com-golang-net-f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz 768453 SHA256 682fa4218ff45a77b6d09439f2155977a53872f01a6a67d14cdd24f8db1e3ee8 SHA512 ad0b00afcfd95101939ec307eb6413f638797ce464cd13c4b5810032f633538be297bb30a785bde7623da8eeb6007814f0531572acd67b1b5c5ce0aa1de819cf WHIRLPOOL 7c696d884180330b967b25432248bc4683b96faeaafeda684d54c8986d60bdcec6cd0cf6f39e9edecdd31d8075763701247c6b04f3010ddbf6b14c8d17c7ceef
+DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 SHA256 868e51ac5f618fce24ae295c14be2872defbc1a31c3bdcc622c20f4a50a86aeb SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31 WHIRLPOOL fbb5301c22568e0872a90283aae5f2db744064d7508f8c61f235b47cea7560243279255f7881825223a8b04febabf6d4119db8ca913731dd89d4c30a42047822
+DIST github.com-golang-sys-8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9.tar.gz 598397 SHA256 3715c3030a1d573de33670c6cfb57bd7b1c2ee301d20cff4b8220d89c644de94 SHA512 d97b5d39302e52a7ffa337199137cefc91ada8c31135f4862b3aa09fe98ad2279f5d04874d3a53e64f6daa71cacefa8fdbbf29a1c6b86225844f3fdc65f86eb3 WHIRLPOOL 9c76b355fff2d95b9d6c99eb0c8b5f2c112215be323a1831c032fdd47252f6f96e8c6a7888a4d47b7460183b9b2d38c5b0d5b0d25a8a7ce3621b36927bc5d7b9
+DIST github.com-golang-text-19e51611da83d6be54ddafce4a4af510cb3e9ea4.tar.gz 4549757 SHA256 e60e0f1b5c0da0c8ade8561a0892fc85a7ac538832b0f5898cdfa0de8bc9287b SHA512 dc82a73eded06af2572d2906c8727467c0b330ddf9c0e21227253f55c1559796882124c6c689c6be5d0204a5141a782b00642dfdf0024a3d7a156df96e7ccad4 WHIRLPOOL e1b27aa800e8450d467e4475908e54156e6e8a365568e8bfed0ddc7c9b64f0f37185a8b05791db8f275c11a98cadb8dad9bedf1e7e97eea2ab1858a4f46523da
+DIST github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz 220340 SHA256 c50b8f8542546791a6946eef488d6767226a8d077fa526fb02b7795de890b0bf SHA512 ca79d38bc7d68f1d98869bee21dcdc563c3fee1a8d28b77d474752376fb91cc7b368466dfac41ddebbec13c1560ac3c22257a52deb6d844add5d208646d2e3f5 WHIRLPOOL 0d64d65d3c54c8559b735beefa31dcbf882a599ac7505b60b8c2aede4c6f8b3d195a420f28cfa18b98f7ad9d07b36bcb0ec46fd4eaff273381b359b1060df8f8
+DIST github.com-hashicorp-hcl-392dba7d905ed5d04a5794ba89f558b27e2ba1ca.tar.gz 69703 SHA256 cb03c9315702107460323de4543b90e776036189dbb18c7661cc292e45fce1c9 SHA512 07ac3405d91039471e7ff86ab21d832ba1da223a3e4a07a97b090d13d05b508fdd65c60350209db0f9731b3316b684303875af72e4db1c20c924bb16585b2692 WHIRLPOOL eec39b801395df44f1e7bc39c4f612f186faadfc1c39eaed8032302176904c9cbda9e9384fad09c2ade1ae7324ceaf604d5437aeb629fc47760506e4e49a0a83
+DIST github.com-influxdata-influxdb-392fa03cf3cc98b78e606c34996976cea65b6814.tar.gz 1071651 SHA256 8b7024ce414ba78a29675523c8904e7a24131059c5a9ffc9f0cd62165445732a SHA512 615fac477fd2dbd7afecef1be0cdd222997ef977cf388d3c6ce856cafd5ccf62e35cd76c5a9bcc04d93370bd45035e0fb346d1099950768ea60eafb36c5e19b4 WHIRLPOOL b7d9b4009090323477dd7c473752399f0e286979baee4371adf85206f6ffc246376b364cf372c9a2ae8bdd41ee245e89dc11efde2b4646b17b0cd24a9ea666ba
+DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 SHA256 15b8c46fe72b45595752a4a997d4293211c77bc84ebf929521ab5a51daaae763 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf WHIRLPOOL 7ec6180d23105c2918e9d56a0d687b7846ff452400ab9fb2a99b64ee7724ea7bb560a5b724aeb7acebe75e7b407a4d0094467630970d888b9ae14eb884b40860
+DIST github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz 1317793 SHA256 ac3c6482a00116d7d70257c6e4eab92aa8f543837578abae82f03b552a4e29b2 SHA512 f44fd60453259a050b591d198a6e64c0e8729065b3b3ba73bb36b22211428e2d9bbadc7a8286a31084f5253f9f8cf95aeb7d1ee4ad5eba870887a5f7787a81c1 WHIRLPOOL 92aa66b880d75105dfdafc7cc0a661401226a8ece818aca12898530b16a9093331cef242ffb01d818ee52e3e94d7627597d18f3e727197f530b1d66616684bae
+DIST github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz 2764746 SHA256 5b4a33bbe76604042014ed38fded8e6652ccf6fc6e08102ddea6170f4673f0e5 SHA512 63e57485cf08a438d913ee221d95fe61eab33c66548a24cc3dda0d833cc49cd1a30ea75c1678c407384e7e7d6f23d8e4ef22c944f208676a9693affad57a5cfe WHIRLPOOL 13eff7813edde256176ad3b3f7a69c6c1962f8d184a78096a55f31b7139df5e46fb10089fdbc8503b92a6e72add6cf7e9beabff774a379bef94d4f7a590dfd63
+DIST github.com-magiconair-properties-be5ece7dd465ab0765a9682137865547526d1dfb.tar.gz 27514 SHA256 7c7e41378dbf9c51ef8c7f823068c56143362b49db2fc756831b188100bac1a3 SHA512 63731f3772ec2f8b503824d9d7805d8f087c96f95c37ce15500fb6a528a1d3c09ab95f0d5fb86a6cccbca185a9c666c87a8130676a01e0c887b1ba57216c4b12 WHIRLPOOL a8e25091fd8fc50e43445305aeed5268a922f3686886a3eceaad6868795bcac77d0dab8fd56f4acd69ed243b5b2debfd838b91ff1766c89e69d22f6f8b0bb4ab
+DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 SHA256 60afaf4d86f11a5d256d240cbccba766c5ef6ba2e695661df6bc4608021ca186 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70 WHIRLPOOL 5606a1879961eed55f00e3d7cfb21663db1d9f7059a586ea5a423f58655713a333d89ceb8dab328af0cea9d13e9dd02bde49bff6a086d80d571a03c79fc72ba8
+DIST github.com-mcuadros-go-version-257f7b9a7d87427c8d7f89469a5958d57f8abd7c.tar.gz 12273 SHA256 68b746c46734bff67dce291443376e5862b5840997954b04c5696ac899b323d5 SHA512 68c62bd29ae3d1e67b626be39b4af69134ac973d75b880ba935315d4ea1b47769683ba50739b5d65e9a01022e2f9ed0f73a483a6023113eb762667636fe9a190 WHIRLPOOL 1efcc4dae17874cea2591267208ae952bf3f0da29fac12f083a64048b4ba2030640872a083ebdf486414982bfa85fff9a9a6f9cb823d8be01701152fbd0794e4
+DIST github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz 7591 SHA256 300a8ed1bb4cf09ee1437f35309f62c6ff2f4b7e737a8689da008b8684332b30 SHA512 143b517ef8b5a8bda86dee77b573b12e051816bb6cd0ba962befa3fde4d849a4b95c02c76d36a08209fa29681bbb39fe28a69ba9fb326f218bb4f3ca70350496 WHIRLPOOL cc5749ba5c0de0591d4218754f069d45c061b981d46b8daaee8f3534d2eee69202649714c56a416ca051e5466cb45d200b8ede0db9573f88fee050f35645cf4f
+DIST github.com-mitchellh-mapstructure-d0303fe809921458f417bcf828397a65db30a7e4.tar.gz 15563 SHA256 a40e38d64fddfb7d833453885ffc9861aec4811acdaa880706e9c9bbb049b765 SHA512 f4a77684d2919f48c274df444525772e0714d600fa64523cbe0598ff6294e0806d7ce7cddd34b87b852526c0d7ddf9ac2b65e38ade9de8b86d7cf04165886287 WHIRLPOOL 9ce0e1d44cee17212f54bd94a407fb0d285b7e915f2bef17e30014969eec11bb14fb2404a48710b88c17dc1168320bc2b2cec6746a8f1a7ed4c0196c4ce2690e
+DIST github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz 12269 SHA256 a3f2a6f367b97d8406402a674eaf96c5ee9baab05de32b2031085b8d92e7eea1 SHA512 444bf361e0b602fba43a4b0d991614f10ed79a105bbba30bf3054d0dec687de6e9f4583793d52d5e25c99d55f3d39c5121f60110f3a879cf0bbd37594834a929 WHIRLPOOL f43f7093b37580845a7e87fe487684d5ef5e51646413d9188e6e3895403a6e028f873c1fc52ae60cf9d677cc9c3d5373c6cb39cb05e3632172ff3827ae4f7064
+DIST github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz 669740 SHA256 96b72ffbda35514c151600bc3b46f45f2b649629f8c153e34c5e4fb0788e76bc SHA512 5d9da0f1ccb9443e834d32662906c8cda0c4b0a780d61283a433e0a86af97579938ab5814e5c337c3febe57963256db0107564e73884eaf78edb2357fc4eb7b1 WHIRLPOOL f2162ef07e9f8445da547f3452a52cf3e9cbb824722790eb39195d459fdb194b8993b4de80213d24682b317a7feaf0f814d90f6fa81b80581851066f9410fa44
+DIST github.com-pelletier-go-toml-69d355db5304c0f7f809a2edc054553e7142f016.tar.gz 52209 SHA256 bdaba9070329fdd53b2b4eb2ef7297ae95f30a08aa8f95853f1be58835fc55dd SHA512 5cf649a8c1883ce7c9e189f0518b0b364ecd314f77238783c95cb1a0cfd7c863f7209ea59a346927cc9ea67fc8a4dee77ce5e0248f0e8b0191a8a9097a2d336d WHIRLPOOL d1596e5a99864eba02d296a8d1c745afd602b8878f4534dfc3cf2ab8ff0d1ee113032f6d8d03552f155872953f9b92c03a2b051df03d189e6bd59cf8e750cbd6
+DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 SHA256 24ff87a92a1e160251fb32d2f529bf574ca71f6944ee3a562da2fdfda687313a SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593 WHIRLPOOL 32ce47e091d24f48a431326a59db0f35763a6b10f6bcb22eb815544bb4a315f66fe154370ebb73afd8335f895c988723eb4e083f5611de549d89627b3deec83b
+DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 SHA256 db66b04139d6629f5974735bd207a789e31a3e7af2810585c11ac4ce678217ef SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755 WHIRLPOOL 566af5526b6c7d109d8e411b36b49576ae001a28de768021532388bf145d7f09b7bd36443d80242488ac516035a57627bf317a85266a0a296126b1860f103977
+DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 SHA256 26989379d6b8473e43a6bb4c27166a6203af361a3e86f80a047b55e6f3bcea1b SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e WHIRLPOOL 2e633dd9411d36208adb6fabbfa867d170d9afeb3932f43c40508aa83aee18e4251615ff8dbe5bda2aca954b262989671fb0aaa4415a9d738535b06e88638546
+DIST github.com-projectcalico-libcalico-go-25a8c377d7b3299a50197a92704d606f5f5ca691.tar.gz 196217 SHA256 dd5ca866fc7457e55f6af674cc04efb82e7f71f388d55ad067de4ab756112189 SHA512 15ad47cd54f4424eaf5300094d4b85760d344bf6f10bd01c6a165bc63dacbe09e08bccd727e03dbda9d0fbd00663f51a257a0e49b7fa94ba549d131f5e56c5ca WHIRLPOOL 168608b3a85ebbe9f145ba14af503ed1a6090a87451dfb60d569eae3fede4cc144cd8a60b3f8d49691ade698953f5ece1ab04fd6401ca3a4bc5344ba3e032f1c
+DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 SHA256 c4902a24e1ada0905214b868fb097c051b37872bcd7da9112770eab0b47eb479 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39 WHIRLPOOL edfa508abea9ebcb564c1014af758edc04e6501a101350676126c41563e63107eeddb85d8ca0af4b1fc9d5f903f44fb4e923b9bdf7db67074ed7455c4651abd0
+DIST github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz 26698 SHA256 f467efaa34789907be3031a660d948af306452ffb15efa1883416300d0f13744 SHA512 7152a9e355e21de7980a28e915b712103ae1eaaa4142a5c37db00d8d30415cb2ecacf53bbe178cce49a1b9c4ad57336e8438a40f0bb92dd20a2bcabb1980013b WHIRLPOOL fc9b10c2a11975c295e787f67319bdc9b61e7017acd4ff6c13cb75310232f4d813b7bfb5a84de2af0b85b378ee02ff31e90956f516f620a59b417a02e100e94d
+DIST github.com-spf13-afero-9be650865eab0c12963d8753212f4f9c66cdcf12.tar.gz 40637 SHA256 54745ae52cc3225566784e39fa02e707853e9c1f62c3c6c0fbe36a28dc7045dc SHA512 098a94d3c143170c2e06836c5f975acc49ec39c4225e6f4fd258648febe91ee4bb69ffe3ce9be53873184aaf7c34c5afcd2ad56969f576ada075f46cd8e8f66a WHIRLPOOL c1750f60c9ac14f9d9145d6caab4db01fb355cb71d8a94d37fb191e6814698ee5055b81212bb219bed0fb7cdf9692f7f5c87e272fbf5f8c5d2de7a9835df2eb9
+DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 SHA256 5c428be057fe99972435a4b4887a577bc551e6dd6c3f16a98bc09b4ea16bdaa1 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad WHIRLPOOL 950e2b14be1f45d9b68b5a8c3f64edf040df4c7022e9fdb0bb7e891d2c6cfd00370649dd6fe372ac92f618a0f9014c7231e88b7d603ca7a4d00d6b507e795c55
+DIST github.com-spf13-jwalterweatherman-0efa5202c04663c757d84f90f5219c1250baf94f.tar.gz 6340 SHA256 ab802eaff3a85c75a1e6f28ad8e8a3ffff61fc2db8cbf71a3e3d5c39cdade331 SHA512 e994187443d8c4f05e9864a9c6db52847f3459d4afb1b094bfd9ab6d9d374856028319f7b8a99e2483242a2decc6432e8fd85cb567b4f6dc76dc700900eb5ca1 WHIRLPOOL d13ea97a5d6ba2ac5f09b375fc0616c3657b79b0b813e0d82e2796efe962536b664108a60f731121649ce510774b020f767322f05112dfbb0a20f366fff563b7
+DIST github.com-spf13-pflag-08b1a584251b5b62f458943640fc8ebd4d50aaa5.tar.gz 28833 SHA256 9bd31bbe61fbe23d4255402850c3249afcc8edc1472a8cb216e493cb4956715f SHA512 5bd4af9e36625b508b106ddc288c09d65735875fcb6a0235ab9eef99958fe4b4666037b63faab74c63a76bb7f4eb2ca2f60d53ece71e695bf6d73ce818c2bed3 WHIRLPOOL 5b15e2214849c200edb89a9330c214633d1f54682fff57d920a4c8adcab48746eedb1569a481f07f2a17f526900ec85a9f5b921a26a803b629635b7efe0ccbe8
+DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 SHA256 12b14519a2b4a2f148b7529dd83ec51fee118f603e11b7e873c4ad4c62f778ac SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd WHIRLPOOL a5109c48c04c871a7162117d77168b82b9640e447f357aa313ca64a3da7a7f28c0b1e828984e0c72e367f1f75729ece273c0e4fd554918122da0f88bf3810890
+DIST github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz 11995 SHA256 bd49895b4aeadff6fef1dbb8c159df259a134b88bf9afdcb0eeca81ae2cf69b0 SHA512 e8aade384d3505c3bc9389c7215b789e013bc4088c1662e23170503876f2ad2ef97df63cfc6ed9b30c58b6287793e003d4c3a2e6250c0ea76aab807b2eb08ab2 WHIRLPOOL bd0371e169113836a0e1f6afb02f17ec51f05a90094deb9710a9f01c147f7d43614c62596c49567d2dbcbcc94eb6ecc8f6e58214ccdef77ffc95865f0528b9dd
+DIST github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz 3684 SHA256 5a62c397ced0a191e7a0cda0f8added46ef9a688e2b1a9c1420d4716f91960c5 SHA512 b007be79389160c27a602f4ec35a969a408abb340ab9b3bd8f44578a6dd9ac95fcede4edc56b1c1c7a2a9f258c5cb448cda54bc91d6dd17f0464cb050b946769 WHIRLPOOL 262640f386b360fdc9b86448236794ff1eeeb9dd97090bd154d11dcbdbb8c0e3e6a4c51204abf0196fd1416ad6b6a1071638f80f03d8f5fac20583234529cac1
+DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 SHA256 49670b1b620823420cd4b562ec3d12eff1339181c63d03a115101ccb16ca66fc SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8 WHIRLPOOL 64e8d03f49ae119facab176a4a20cd881a95667a6e446ed6f3cd9e31a5737979a76048cd2867e7ec820dba268057fb425e8d999e4cf8ac6d44c6e354de099d23
+DIST github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz 103396 SHA256 8db668261d9e599f131bab0b575e6ceb3f961c4cc1a82b19a85dfe89584c189c SHA512 4e9f7d7017486160599aa6b98d32c41b135b74fdcc08f642dbb3ec9db83c21a94a2b4c9ff52ee78d0762468710c566c052e5b4fe7287e5ef99263136ae595184 WHIRLPOOL 35d9ac6dbb88ca08105b08b3f6c7b71cb2a0205a0ca2bb38ee1c39a5e517452f97f1537b8b7bdfa39614d6afc7252ca25f48328b8dbfd2f3b88c883d227d3ece
+DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 SHA256 03e96e28a21673014946d6ef0df0a8d4885dfa7aa16eb511ee414c07db1e909d SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86 WHIRLPOOL 74d2b791d9aa437d58d36edc95ee0ea19d1392b28fb3dcc7056f482454e8d71a6b72254ee988ca528e585ea6154f11072a1a01dd036cc34e1617eed917825761
+EBUILD calicoctl-1.5.0.ebuild 4548 SHA256 d7df21f82529441a9f34bc77d2486773aaa786eb4048c88d1c0ffb71e739f988 SHA512 d4f7b1c9440797478d7253f1e73d52c0e7b93520b11cac134c4840b73912ab4945aa48643c278a970bce924354d31df0c768c6fffd725cafa669d1bb5391a53c WHIRLPOOL 2e587eecb1c6892a915f77ec5692ae8c42ee18c38b3b363d8e2e371e9954a44151b4fb15efbb3dfbf8ff30e6afc3d7a74ba4dcc390ee8ccaa94eead1d23c1ebc
+MISC metadata.xml 333 SHA256 4656d935febc8f49d31181b13af4a3ccf9b9d744aa251672fef44ec2fa9e2bd0 SHA512 3e2d87ccb2206d26aa0000ff9fc684bbd42c6d84b7b19572d1a8e49bfd96ee103a498372ff54acb29169c3b053dae55a9aa7635027d1175b649c15a49106b61e WHIRLPOOL 6cbc99d12418fa9d4f2a6cc89a7f105430d5f23749b1d939072efe55df19e39fc4652eb955c5a47e5a48e626cd80bddb41f36504ecfb6d920ad56d6e44da464b
diff --git a/net-misc/calicoctl/calicoctl-1.5.0.ebuild b/net-misc/calicoctl/calicoctl-1.5.0.ebuild
new file mode 100644
index 000000000000..45eb88efab70
--- /dev/null
+++ b/net-misc/calicoctl/calicoctl-1.5.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
+	"github.com/mcuadros/go-version 257f7b9a7d87427c8d7f89469a5958d57f8abd7c"
+	"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
+	"github.com/olekukonko/tablewriter be5337e7b39e64e5f91445ce7e721888dbab7387"
+	"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
+	"github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635"
+	"github.com/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
+	"github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263"
+	"github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98"
+	"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+	"github.com/influxdata/influxdb 392fa03cf3cc98b78e606c34996976cea65b6814"
+	"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
+	"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
+	"github.com/projectcalico/libcalico-go 25a8c377d7b3299a50197a92704d606f5f5ca691"
+	"github.com/coreos/etcd 17ae440991da3bdb2df4309936dd2074f66ec394"
+	"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
+	"github.com/coreos/go-semver 568e959cd89871e61434c1143528d9162da89ef2"
+	"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
+	"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
+	"github.com/sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
+	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
+	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+	"github.com/hashicorp/hcl 392dba7d905ed5d04a5794ba89f558b27e2ba1ca"
+	"github.com/magiconair/properties be5ece7dd465ab0765a9682137865547526d1dfb"
+	"github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4"
+	"github.com/pelletier/go-toml 69d355db5304c0f7f809a2edc054553e7142f016"
+	"github.com/spf13/afero 9be650865eab0c12963d8753212f4f9c66cdcf12"
+	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+	"github.com/spf13/jwalterweatherman 0efa5202c04663c757d84f90f5219c1250baf94f"
+	"github.com/spf13/pflag 08b1a584251b5b62f458943640fc8ebd4d50aaa5"
+	"github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c"
+	"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
+	"github.com/vishvananda/netlink f5a6f697a596c788d474984a38a0ac4ba0719e93"
+	"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
+	"golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d github.com/golang/net"
+	"golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9 github.com/golang/sys"
+	"golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4 github.com/golang/text"
+	"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+	"google.golang.org/grpc 777daa17ff9b5daef1cfdf915088a2ada3332bf0 github.com/grpc/grpc-go"
+	"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
+	"gopkg.in/tchap/go-patricia.v2 666120de432aea38ab06bd5c818f04f4129882c9 github.com/tchap/go-patricia"
+	"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
+	"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+	"k8s.io/client-go 4a3ab2f5be5177366f8206fd79ce55ca80e417fa github.com/kubernetes/client-go"
+	"k8s.io/apimachinery b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215 github.com/kubernetes/apimachinery")
+
+inherit golang-vcs-snapshot
+
+CALICOCTL_COMMIT="118b8ae1cbfb852f387c9066b5ae27633593a99f"
+
+KEYWORDS="~amd64"
+DESCRIPTION="CLI to manage Calico network and security policy"
+EGO_PN="github.com/projectcalico/calicoctl"
+HOMEPAGE="https://github.com/projectcalico/calicoctl"
+MY_PV=${PV/_/-}
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \
+		"-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \
+		-X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \
+		-X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die
+	popd || die
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	dobin "dist/${PN}"
+	dodoc README.md
+}
diff --git a/net-misc/calicoctl/metadata.xml b/net-misc/calicoctl/metadata.xml
new file mode 100644
index 000000000000..bd8c0f9ed937
--- /dev/null
+++ b/net-misc/calicoctl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">projectcalico/calicoctl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/capi4hylafax/Manifest b/net-misc/capi4hylafax/Manifest
new file mode 100644
index 000000000000..92fbc1a2b874
--- /dev/null
+++ b/net-misc/capi4hylafax/Manifest
@@ -0,0 +1,8 @@
+AUX capi4hylafax.confd 555 SHA256 f61418080f0c7fa5cca6197fa00b007224124e9aa78b4efdb2c9e0e7005fbea3 SHA512 357504c887bb12a3b93e0ab8a4e7a7789e2848b831f27fba653e3fd9bf62b694edfb758d82693b61b992de834e9d5a0d1e4a8aa1e50dbd6e2d0649c9581e9821 WHIRLPOOL 0b119c2aa37973a16d72eabefbc6bae49425f1274e1a5d82866deb91e87644f352b39cb289595d79d94fc392d6b56b2f3b624334226979eb0c864fc5d1ac5359
+AUX capi4hylafax.initd 1821 SHA256 4139d1d3bbcafb32eaf1e7729601b69a97eec116d2538c3b489df663157de31a SHA512 bd5d427631b825b886f1e56ff118c795bd04868df459cc8dc0a66d87004a36748eb8f55978bda64af19db3706f7be96b55739da43f28c762a6cd69ed91fd70c5 WHIRLPOOL 049b8b0ea081b39301aaf4c3df6e682245c31c9223edf202796d4e7e2d02b6cddc48dec09f21b6e08911f6bff5f53b6acdb822aa196a59cdec9dab768287a9f4
+DIST capi4hylafax_01.03.00.99.svn.300-20.debian.tar.gz 546271 SHA256 783d31e3ae73df91607e86856ff93338eaf2c84f9b31ad21106005e479232f4c SHA512 a0c1e64d783150abf80feecca07a3eebead95a982133ac9601b204b73933468c61fa39863be8c93ea2bf52c5262b9944b4d5c4a8795475d3a5ca17e481401b8e WHIRLPOOL 25e9d37697fdf0bbde5bb84bfeea37ac749bdfca5da8b75b5474e39c3684efdd9ff517773bc0d77641331a5bdb9c500dc0caf7dfec84733fb200e1a5c7e1bf92
+DIST capi4hylafax_01.03.00.99.svn.300.orig.tar.gz 533410 SHA256 8c5433fda85d5f178382c0a4fbc07cf22fc22c448146a4b7a090bc6a0b1789c2 SHA512 c01063bcdf7d5dfbeef0eadd94a0714b5f34f442c19e5287a0fa40ce3ecbbad53afaddeb093435952367fb7b503dd9c637002d954a58175df3920d9d2966c468 WHIRLPOOL 1fafcf1f88fe02f7b4b0bca0b4c40d1917d5fb1f02a11bd67aeebe46e049fcadecde78f8c6b7626c4bb4f23a3bdbec86a3e013e383ccf202cae407842ec0ae29
+EBUILD capi4hylafax-01.03.00.99.300.20-r2.ebuild 4258 SHA256 66353bb81b7833c72c0cad8cc3dba613b30d6349f3353abdf6a04fe3843e5134 SHA512 0dfb6723616096ba308d410c7294931fc9c56b09a908138288c9edf6b1db0887880dfbdec37eae1e3a198c413dd2b1a70f2429c2398c38248cf73fb56e8afa8d WHIRLPOOL 9f2b254894e33ce91ce10ed13d2c6ebb603fc10ce535e7a98d7174e89940b9a5eafb2f1b09fefe2e2aaf42da816d2dc26ba31e2adb21a569c05b29890ff34c20
+MISC ChangeLog 4390 SHA256 300f50b3190ae017156c2e4647f632873a7016ef8ffb12c9261604905dbd20f3 SHA512 11ede10ff2560113fb7b3c64a9f944747661cbe00799ba1b860cc110f42c7c1272ee2ff9bc40aaabf054f5686fd0907339ccec7fc38129d0b11839502ea9c959 WHIRLPOOL d518a150cfa919767cbca49e871a6e43fe6c2fecb82ac2b09a51f74308bf3b561b7111b1090023b1fdd7b9ab40b1936e99ae1aa58f7f222281672145b42c69b4
+MISC ChangeLog-2015 5587 SHA256 62808c51e91a8a7697e263de3da0baa68f7945517fdd881ed88b36a9d5e31083 SHA512 7d2d06ab7a40ab0f1720fbaecc9b21015cf159cf74dc92646ee6dfcf593519c2d9d22ad4c5b067bf3ea311f667a035bc31a60ad310731abde682b1cc710d9f9f WHIRLPOOL 6fdd846b00883dd473a6137299c4ac893a74e82b305df82902abc6adb944bc1a7fb80a15af2dd9a7b5ec62cff4e2db8699c2e2f747b2f22b69e54242621171c5
+MISC metadata.xml 680 SHA256 29622e82f3965fd229659f38ed3002fe71282a27a5d95a840d55ef15f633bcfb SHA512 c27851901f9af6dc6d30cf3fe0c9133b9a2f9fa97b488a763d7eb2208a1829bd4bd16c7c8581257b9367142ca458d330b0ec8507b0e0160760506e3a180e31aa WHIRLPOOL 8266f3daf958cbd364cfb4e40322dcbaa26d6ffc1bd9ea7b380945b4c394a0e093f54c5af9f93451d3a77a7602957f19c35edb8ff0b263f582eda8eef8b3a6fa
diff --git a/net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.20-r2.ebuild b/net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.20-r2.ebuild
new file mode 100644
index 000000000000..bcdf51d45f78
--- /dev/null
+++ b/net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.20-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils versionator
+
+FAX_SPOOL_DIR="${ROOT}/var/spool/fax"
+
+MY_PV1="$(get_version_component_range 1-4)"
+MY_PV2="$(get_version_component_range 5)"
+MY_PV3="$(get_version_component_range 6)"
+MY_P="${PN}_${MY_PV1}.svn.${MY_PV2}"
+
+DESCRIPTION="capi4hylafax adds a faxcapi modem to the hylafax enviroment"
+HOMEPAGE="https://packages.qa.debian.org/c/capi4hylafax.html"
+SRC_URI="mirror://debian/pool/main/c/capi4hylafax/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/c/capi4hylafax/${MY_P}-${MY_PV3}.debian.tar.gz"
+
+S="${WORKDIR}/${PN}-svn"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="
+	app-shells/bash:0
+	media-libs/tiff:0
+	net-libs/libcapi
+	sys-libs/zlib
+	virtual/jpeg:0
+"
+RDEPEND="
+	${DEPEND}
+	dev-util/dialog
+"
+
+DOCS=( AUTHORS ChangeLog Readme_src )
+HTML_DOCS=( README.html LIESMICH.html )
+
+src_prepare() {
+	EPATCH_SOURCE="${WORKDIR}/debian/patches" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
+
+	eapply_user
+
+	eautoreconf
+
+	mv ../debian . || die
+
+	# fix location of fax spool
+	sed -e "s:/var/spool/hylafax:${FAX_SPOOL_DIR}:g" \
+		-i config.faxCAPI \
+		-i Readme_src \
+		-i src/defaults.h.in \
+		-i debian/*.1 || die
+
+	# fix location of fax config
+	sed -i -e "s:/etc/hylafax:${FAX_SPOOL_DIR}/etc:g" setupconffile || die
+
+	# fix name and location of logfile
+	sed -e "s:/var/spool/fax/log/capi4hylafax:/var/log/${PN}.log:" \
+		-i config.faxCAPI || die
+
+	sed -e "s:/tmp/capifax.log:/var/log/${PN}.log:" \
+		-i src/defaults.h.in config.faxCAPI || die
+
+	# patch man pages
+	sed -e "s:/usr/share/doc/capi4hylafax/:/usr/share/doc/${PF}/html/:g" \
+		-e "s:c2send:c2faxsend:g" \
+		-e "s:c2recv:c2faxrecv:g" \
+		-e "s:CAPI4HYLAFAXCONFIG \"1\":C2FAXADDMODEM \"8\":g" \
+		-e "s:capi4hylafaxconfig:c2faxaddmodem:g" \
+		-i debian/*.1 || die
+
+	cp -f debian/capi4hylafaxconfig.1 debian/c2faxaddmodem.8 || die
+}
+
+src_configure() {
+	econf --with-hylafax-spooldir="${FAX_SPOOL_DIR}"
+}
+
+src_install() {
+	keepdir "${FAX_SPOOL_DIR}"/{etc,recvq,pollq,log,status}
+	fowners uucp:uucp "${FAX_SPOOL_DIR}" "${FAX_SPOOL_DIR}"/{etc,recvq,pollq,log,status}
+	fperms 0700 "${FAX_SPOOL_DIR}"
+
+	default
+
+	# install setup script
+	newsbin setupconffile c2faxaddmodem
+
+	# install sample config
+	insinto "${FAX_SPOOL_DIR}/etc"
+	newins config.faxCAPI config.faxCAPI.default
+
+	# install docs
+	newdoc debian/changelog ChangeLog.debian
+
+	# install man pages
+	doman debian/c2fax*.[18]
+
+	# install examples
+	insinto /usr/share/doc/${PF}/examples
+	doins sample_faxrcvd config.faxCAPI fritz_pic.tif GenerateFileMail.pl
+	newins sample_AVMC4_config.faxCAPI config.faxCAPI_AVMC4
+	newins debian/faxsend sample_faxsend
+
+	# finally install init-script + config
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
+
+pkg_postinst() {
+	einfo
+	elog "To use capi4hylafax:"
+	elog "Make sure that your isdn/capi devices are owned by"
+	elog "the \"uucp\" user (see udev or devfsd config)."
+	elog "Modify ${FAX_SPOOL_DIR}/etc/config.faxCAPI"
+	elog "to suit your system."
+
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "If you're upgrading from a previous version"
+		elog "please check for new or changed options."
+		elog "A sample default config is installed as:"
+		elog "${FAX_SPOOL_DIR}/etc/config.faxCAPI.default"
+	else
+		elog
+		elog "Please run package config to install a default configuration."
+	fi
+
+	elog
+	elog "You should also check special options in:"
+	elog "/etc/conf.d/${PN}"
+	elog
+	elog "The following optional dependency is also available:"
+	optfeature "hylafax integration" net-misc/hylafax
+	elog
+	elog "Then append the following line to your hylafax"
+	elog "config file (${FAX_SPOOL_DIR}/etc/config):"
+	elog "SendFaxCmd:			 /usr/bin/c2faxsend"
+	einfo
+}
+
+pkg_config() {
+	local config_file="${FAX_SPOOL_DIR}/etc/config.faxCAPI"
+	if [ -e "${config_file}" ]; then
+		eerror "The configuration file already exists. Please either update"
+		eerror "or remove this file and re-run package configuration."
+		eerror "Configuration file location: ${config_file}"
+	else
+		elog "Installing template configuration file to ${config_file}"
+		cp -f "${FAX_SPOOL_DIR}/etc/config.faxCAPI.default" \
+			"${config_file}" || die
+	fi
+}
diff --git a/net-misc/capi4hylafax/files/capi4hylafax.confd b/net-misc/capi4hylafax/files/capi4hylafax.confd
new file mode 100644
index 000000000000..40aa8cfe603d
--- /dev/null
+++ b/net-misc/capi4hylafax/files/capi4hylafax.confd
@@ -0,0 +1,19 @@
+# configuraton file for /etc/init.d/capi4hylafax
+
+# Activate Logging (Filename have to be specified in the config file).
+#ACTIVATE_LOGGING="yes"
+
+# Specify the output format. Allowed types are:
+# HYLAFAX (default), TIFF, SFF, G3
+#OUTPUT_FORMAT="HYLAFAX"
+
+# Virtual device name only needed for Hylafax.
+#VIRTUAL_DEVICE="faxCAPI"
+
+# Name and path of the config file
+#CONFIG_FILE="/var/spool/fax/etc/config.faxCAPI"
+
+# Directory where received faxes are to be stored.
+# Do not set it in Hylafax mode (see OUTPUT_FORMAT)!
+#RECEIVE_DIR="/var/spool/fax/recvq"
+
diff --git a/net-misc/capi4hylafax/files/capi4hylafax.initd b/net-misc/capi4hylafax/files/capi4hylafax.initd
new file mode 100644
index 000000000000..08c3917f6f8f
--- /dev/null
+++ b/net-misc/capi4hylafax/files/capi4hylafax.initd
@@ -0,0 +1,63 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need capi
+}
+
+checkconfig() {
+	local DEFAULT_OUTPUT_FORMAT="HYLAFAX"
+	local DEFAULT_VIRTUAL_DEVICE="faxCAPI"
+	local DEFAULT_RECEIVE_DIR="/var/spool/fax"
+	local DEFAULT_CONFIG_FILE="/var/spool/fax/etc/config.faxCAPI"
+
+	[ -n "${CONFIG_FILE}" ] || CONFIG_FILE="${DEFAULT_CONFIG_FILE}"
+	[ -n "${OUTPUT_FORMAT}" ] || OUTPUT_FORMAT="${DEFAULT_OUTPUT_FORMAT}"
+	[ -n "${VIRTUAL_DEVICE}" ] || VIRTUAL_DEVICE="${DEFAULT_VIRTUAL_DEVICE}"
+	[ "${OUTPUT_FORMAT}" = "HYLAFAX" ] || DEFAULT_RECEIVE_DIR="/var/spool/fax/recvq"
+	[ -n "${RECEIVE_DIR}" ] || RECEIVE_DIR="${DEFAULT_RECEIVE_DIR}"
+
+	if [ ! -f "${CONFIG_FILE}" ]; then
+		eerror "You're missing ${CONFIG_FILE}"
+		return 1
+	fi
+
+	OPTIONS=""
+	PIDFILE="/var/run/c2faxrecv.pid"
+
+	[ "${ACTIVATE_LOGGING}" = "yes" ] && OPTIONS="${OPTIONS} -L"
+
+	[ "${OUTPUT_FORMAT}" = "${DEFAULT_OUTPUT_FORMAT}" ] || \
+	OPTIONS="${OPTIONS} -f ${OUTPUT_FORMAT}"
+
+	[ "${CONFIG_FILE}" = "${DEFAULT_CONFIG_FILE}" ] || \
+	OPTIONS="${OPTIONS} -C ${CONFIG_FILE}"
+
+	[ "${OUTPUT_FORMAT}" = "HYLAFAX" -a "${RECEIVE_DIR}" = "${DEFAULT_RECEIVE_DIR}" ] || \
+	OPTIONS="${OPTIONS} -q ${RECEIVE_DIR}"
+
+	if [ "${VIRTUAL_DEVICE}" != "${DEFAULT_VIRTUAL_DEVICE}" ]; then
+		PIDFILE="/var/run/c2faxrecv.${VIRTUAL_DEVICE}.pid"
+		OPTIONS="${OPTIONS} ${VIRTUAL_DEVICE}"
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting CAPI4HylaFAX for ${VIRTUAL_DEVICE}"
+	start-stop-daemon -b -m --quiet --start --pidfile ${PIDFILE} \
+		--exec /usr/bin/c2faxrecv -- ${OPTIONS}
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+
+	ebegin "Stopping CAPI4HylaFAX for ${VIRTUAL_DEVICE}"
+	start-stop-daemon >/dev/null --quiet --stop --pidfile ${PIDFILE} --retry 10 && \
+	/bin/rm -f ${PIDFILE}
+	eend $?
+}
+
diff --git a/net-misc/capi4hylafax/metadata.xml b/net-misc/capi4hylafax/metadata.xml
new file mode 100644
index 000000000000..b5d05033d344
--- /dev/null
+++ b/net-misc/capi4hylafax/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-needed -->
+	<longdescription lang="en">
+		capi4hylafax adds a faxcapi modem to the hylafax enviroment. So you can
+		send and receive FAX documents with CAPI 2.0 fax controllers via a
+		hylafax server.
+	</longdescription>
+	<longdescription lang="ja">
+		capi4hylafax は hylafax 環境に faxcopi 
+		モデムを加えます。つまり hylafax 
+		サーバに対して CAPI 2.0 fax コントローラ経由で FAX 
+		ドキュメントを送信したり
+		受信したりできるようになります。
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/cbqinit/Manifest b/net-misc/cbqinit/Manifest
new file mode 100644
index 000000000000..98caec5617fa
--- /dev/null
+++ b/net-misc/cbqinit/Manifest
@@ -0,0 +1,8 @@
+AUX cbq-1280.My_first_shaper.sample 79 SHA256 e794aca2ca2ac3188f0ef8025381a13bdd6ecb4a197285f77385407bff7a678f SHA512 859b8fc0cd73ae348df0816c73bec4a835b645cf972700b04b2e53590bf10f0a44e18ec25a1f03585056570a04dc882dae29b68aeee107dce6a9fbcf5c3e9ee2 WHIRLPOOL 0c86ef5d74229af37f1166e72385462918ba38eb9c56bdcc7061f12ba45cbfbefcfe2732984f1fa2a9455aa7d61ac183e0be7a33ca7d8aa010facfe0940c05b6
+AUX cbqinit-0.7.3-gentoo.patch 1904 SHA256 b7ff8f52b703287c71e2395d34b0b695e01fb090a87c147f739c1b072e618054 SHA512 b33e3e7e23d6363dcb4b66357f666bdc5b299b851798db7a935d3edaf2612ae3494e6d0e0ea68375409a2834a0d50d322170c9c3f2b97ab00054a19f5bb27d44 WHIRLPOOL 1f355512d41f829c654a2de19f3c1ea1e09ca77a54ce3540950322ab5b90bee72aea4f7f421594c15fb125b52dcc7dcdd11c8135b8c374a0d502ba3775b4c555
+AUX rc_cbqinit-r1 505 SHA256 8b1a3211654d1a8a328ff5f3707057db6a0d172c6427aa1cee2c6258855ef3ca SHA512 29ace7a58bfc942c29b4992b317704ce05d11c6e9a205f0d74e604d65036b0932bacd4768fd0a6fe449ebd0d9735cf9232e956d2dbf45b5fda66215eff5d61d2 WHIRLPOOL 29d3ba17d22337cc0dd1dab45d99d31a60ca35b08754b0cdaae3cea419a029a4c3e65d3223bfe01a819622b2a59f2f67dddc100be00405a5b679f200e75668f9
+DIST cbqinit-0.7.3 33438 SHA256 e7f9016be2efb340de7ce82d775ea3c863f1163b934d16438a6517689d1dc022 SHA512 ab1f66ebce4653f53d85314f47dc4d5e2f28c081f7c0385138c33cbc78e588d7190eedcf8354b744cfae8b34d536d610a944d492c9b49361109978016fa167a1 WHIRLPOOL 5a2b76d135b2ff67b9157bcd7af5da09385617308a9e6cdf22e729a0c3a38a0478f0b66f74e31e2f6da2af8cdfc36095ce2cb3ce7644d168ff69cc95512c652c
+EBUILD cbqinit-0.7.3-r3.ebuild 801 SHA256 902692c2bfa241270964c1c312acffeaf9dd32848347feef847e0b7a514c926b SHA512 8c0ec5228b8f0b14b771dcb66ca4486e43781cf879679302ba8da9b40a86fbd999e5c6a7b15de7f6c64d36b6ca7f443526624ae02b0ecc0ac55aa9d2c86918b0 WHIRLPOOL a631ea2447a812d773c38ff3d8ef2d29b0a02fd0c108942e717b62f1d96dcd2849b1a9d198833a8f418298c3c08a38ab0530002abbdc94ce33708d35d54624d3
+MISC ChangeLog 3076 SHA256 b85f51f42a04a1ff1023ad7ec37a447052e532e120f6d2ac757053118a0e06bb SHA512 a976084543d8bd713e630c4bdb54857334448bb0069a21e4faffa9d974ba9eba30cb7d993a7f93bfa6cd526736382660d84dafa977d7b375912f5aee961efa3f WHIRLPOOL f594770f3a5bd8dc5052ed8814f02299374c9d42e2bea52cc52a3e60d5098e317edb1edd9cff43899ce7256075dd81fce7f37343e6ea15e552fed11b16c65396
+MISC ChangeLog-2015 3130 SHA256 e6ef9eb636becdbaa59c5dde9452d46cd0e8fbcf90d8673e9554e3695bb4e74d SHA512 db4cafa00dd24e936204ad07193333b5e3cc4d5a83d7163640c406109d7a9411d131decad9e8b47a2a0b03552c11c0132e3bcd876a6e6582dea8e9116c490c4c WHIRLPOOL 069705c51b1d860d6133c62cc66e96684a6315246e7e8d1b07596233a3d4321ab7e13a68416f4a0790aed778e357286e500262a93c773b79d0a3cd2c27ace379
+MISC metadata.xml 244 SHA256 ffdbeb4c645efad13e8aeb89f087143dae128eb717af78d46c47ffb81c11cb50 SHA512 d922092251c07becd0effd06de2ed063038394b7396c9a303e4e234ac514ec7a3c9f00e76503f4bb435ac5dce5401f3d05495def1ce94d63fa9d823dda1e3a54 WHIRLPOOL 90572f1bcc80e6f3ff795d929c267dd746b59b111f4f97342e700ee2f8f1f0ceb644f34a04a83f80d3cb6a5c9bba60f0c677a5cfbd1c910a68e855a7b6cfd578
diff --git a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild
new file mode 100644
index 000000000000..6ab3386730f8
--- /dev/null
+++ b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2"
+HOMEPAGE="http://www.sourceforge.net/projects/cbqinit"
+SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV} -> ${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="sys-apps/iproute2"
+DEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/${P} "${S}"/cbqinit || die
+	grep '^#' cbqinit > README
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}"/${P}-gentoo.patch
+	sed -i -e 's:/sbin/ip:/bin/ip:' cbqinit || die
+	default
+}
+
+src_install() {
+	dosbin cbqinit
+	newinitd "${FILESDIR}"/rc_cbqinit-r1 cbqinit
+	dodoc "${FILESDIR}"/cbq-1280.My_first_shaper.sample README
+}
diff --git a/net-misc/cbqinit/files/cbq-1280.My_first_shaper.sample b/net-misc/cbqinit/files/cbq-1280.My_first_shaper.sample
new file mode 100644
index 000000000000..3b3c1a01804b
--- /dev/null
+++ b/net-misc/cbqinit/files/cbq-1280.My_first_shaper.sample
@@ -0,0 +1,5 @@
+DEVICE=eth0,10Mbit,1Mbit
+RATE=128Kbit
+WEIGHT=10Kbit
+PRIO=5
+RULE=192.128.1.0/24
diff --git a/net-misc/cbqinit/files/cbqinit-0.7.3-gentoo.patch b/net-misc/cbqinit/files/cbqinit-0.7.3-gentoo.patch
new file mode 100644
index 000000000000..edd78da2451e
--- /dev/null
+++ b/net-misc/cbqinit/files/cbqinit-0.7.3-gentoo.patch
@@ -0,0 +1,53 @@
+Use Gentoo friendly config paths and incorporate 
+cbq-0.7.1-avpkt-enhancement.patch from Fedora
+
+--- cbqinit
++++ cbqinit
+@@ -484,8 +484,8 @@
+ PRIO_REALM_DEFAULT=${PRIO_REALM:-300}
+ 
+ ### Default CBQ_PATH & CBQ_CACHE settings
+-CBQ_PATH=${CBQ_PATH:-/etc/sysconfig/cbq}
+-CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbq.init}
++CBQ_PATH=${CBQ_PATH:-/etc/cbqinit}
++CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbqinit}
+ 
+ ### Uncomment to enable logfile for debugging
+ #CBQ_DEBUG="/var/run/cbq-$1"
+@@ -501,6 +501,9 @@
+ CBQ_WORDS="$CBQ_WORDS|PRIO_MARK|PRIO_RULE|PRIO_REALM|BUFFER"
+ CBQ_WORDS="$CBQ_WORDS|LIMIT|PEAK|MTU|QUANTUM|PERTURB"
+ 
++### Source AVPKT if it exists
++[ -r "${CBQ_PATH}/avpkt" ] && . "${CBQ_PATH}/avpkt"
++AVPKT=${AVPKT:-1000}
+ 
+ #############################################################################
+ ############################# SUPPORT FUNCTIONS #############################
+@@ -749,7 +752,7 @@
+ 
+ 	### Setup root qdisc + class for device
+ 	tc qdisc add dev $dev root handle 1 cbq \
+-	bandwidth $DEVBWDT avpkt 1000 cell 8
++	bandwidth $DEVBWDT avpkt $AVPKT cell 8
+ 
+ 	### Set weight of the root class if set
+ 	[ -n "$DEVWGHT" ] &&
+@@ -766,7 +769,7 @@
+ 	### Create the class
+ 	tc class add dev $DEVICE parent 1:$PARENT classid 1:$CLASS cbq \
+ 	bandwidth $BANDWIDTH rate $RATE weight $WEIGHT prio $PRIO \
+-	allot 1514 cell 8 maxburst 20 avpkt 1000 $BOUNDED $ISOLATED ||
++	allot 1514 cell 8 maxburst 20 avpkt $AVPKT $BOUNDED $ISOLATED ||
+ 		cbq_fail_off "failed to add class $CLASS with parent $PARENT on $DEVICE!"
+ 
+ 	### Create leaf qdisc if set
+@@ -940,7 +943,7 @@
+ 	### Replace CBQ class
+ 	tc class replace dev $DEVICE classid 1:$CLASS cbq \
+ 	bandwidth $BANDWIDTH rate $NEW_RATE weight $NEW_WGHT prio $PRIO \
+-	allot 1514 cell 8 maxburst 20 avpkt 1000 $BOUNDED $ISOLATED
++	allot 1514 cell 8 maxburst 20 avpkt $AVPKT $BOUNDED $ISOLATED
+ 
+ 	### Replace leaf qdisc (if any)
+ 	if [ "$LEAF" = "tbf" ]; then
diff --git a/net-misc/cbqinit/files/rc_cbqinit-r1 b/net-misc/cbqinit/files/rc_cbqinit-r1
new file mode 100644
index 000000000000..2c811a54db26
--- /dev/null
+++ b/net-misc/cbqinit/files/rc_cbqinit-r1
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -d /etc/cbqinit ] ; then
+		eerror "You need to create some config files in /etc/cbqinit first"
+		eerror "Please read the README file"
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting cbqinit"
+	/usr/sbin/cbqinit start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cbqinit"
+	/usr/sbin/cbqinit stop
+	eend
+}
diff --git a/net-misc/cbqinit/metadata.xml b/net-misc/cbqinit/metadata.xml
new file mode 100644
index 000000000000..30d444a41f42
--- /dev/null
+++ b/net-misc/cbqinit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">cbqinit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/cbugzilla/Manifest b/net-misc/cbugzilla/Manifest
new file mode 100644
index 000000000000..cbef2f4456f0
--- /dev/null
+++ b/net-misc/cbugzilla/Manifest
@@ -0,0 +1,5 @@
+DIST cbugzilla-0.2.1.tar.xz 240824 SHA256 b0da07e40cabf38915a9ad61521c6dc73b3eae8707c199c58b67295d04c8e5ad SHA512 4a5671bfb222d17841082d123e68250526f6504aee3ba816b454b5d37174391eb464a7e3eaa9fdcfbbb5619b443b4af28ae520dc4bfd49faab1e523d59e2392f WHIRLPOOL beec75039c81e88cc6ceecbc4a185b35d1c4d1c37b37faa2a3f58884045a7f8969370ec1739c9e2678c1ea2fbe5e069f55f022f406999c4347cafebca8be8746
+EBUILD cbugzilla-0.2.1.ebuild 503 SHA256 d9171ce8e0bbc1529f5695249073c3323abfa2ff167717b0b3a744c928aa99b6 SHA512 191078acc3f87c586801b2ec50f9517a1c66f68414275364caf60e2d26014fbf061348db5bebf7e3289c507af9dd8b29452d5a082eec35388cc11176cad11625 WHIRLPOOL b9f8c276c366d3c514019ae0b59e3da45e140f443d94a9897232d8fc8c50e6a95ce50b55c7a8a1c1ad5aba9904ea1511d11a44b4e3496c3e52cf4df9396b93f7
+MISC ChangeLog 2329 SHA256 650b3f8c5856f65e993cca30388b8e381f504dd34ae8bd43b9fef530982c08f4 SHA512 0cfc7bc210c48aad33b06ba626d6dd76a14dbbde732ed4834c1ed7ec804c7a6d165e9d680be48f5154cdbdb28c3f077dd9242e0998f5aea4f9da41b64f86d422 WHIRLPOOL 8878a5799377a3e5a7ad1f1801a990cb36c762d87639c2ed738c1b437f36702e9c60df9f79207b2dcbe85e981c1ee48125ca958ea9d0fd59c9cff2dad6126455
+MISC ChangeLog-2015 937 SHA256 5a2f23331bb47f41c98afb94f64e0227ab2a0389f3469ba10797a2e5de592312 SHA512 7323f4cf54abaade140b9e2cc1314c511252b2df1222e2bee8c810af411042a9a9e0f48c98c46eb1f7a3827f90353714bd0ccc067fc9ac00631bdbd3c81b192c WHIRLPOOL c9538198e5a875a46ee350eee3cb0165735264886366cc51672399fdbf5d18e7b701de62b488a022899c1beb73de361161e83cd73a0243056db17a38c21ee127
+MISC metadata.xml 219 SHA256 a5dfa3877b9f453b15da392c73157ea6bb6794710c80b190ea5ee96036cbb979 SHA512 021d496fe799448cd9007cc723d597e6c30da18cfc421ee24e3bedd3a642bde8874530e5f5357a1ea6443f6112f3039fd1117050062a1ba6b6e89b8d55607b91 WHIRLPOOL c091a89c5ebcabe4d17a69145012856b1111b0f87f232f82704533a34de5cb868403947d91e820dc19989aec569add54ccae36a688bf7b0af744307452c57d0e
diff --git a/net-misc/cbugzilla/cbugzilla-0.2.1.ebuild b/net-misc/cbugzilla/cbugzilla-0.2.1.ebuild
new file mode 100644
index 000000000000..ca0c621bce54
--- /dev/null
+++ b/net-misc/cbugzilla/cbugzilla-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="CLI and C api to get data from Bugzilla"
+HOMEPAGE="https://github.com/yaccz/cbugzilla"
+SRC_URI="https://dev.gentoo.org/~yac/distfiles/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-misc/curl
+	dev-libs/libxdg-basedir
+	app-text/htmltidy"
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.rst" "ChangeLog.rst" )
+
+src_configure() {
+	econf --disable-werror
+}
diff --git a/net-misc/cbugzilla/metadata.xml b/net-misc/cbugzilla/metadata.xml
new file mode 100644
index 000000000000..eec401c4071e
--- /dev/null
+++ b/net-misc/cbugzilla/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">yaccz/cbugzilla</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
new file mode 100644
index 000000000000..51b00b542bc3
--- /dev/null
+++ b/net-misc/cfengine/Manifest
@@ -0,0 +1,26 @@
+AUX 511666-segfault.patch 731 SHA256 cb38c886bf92c1ae48000a65a93a2cf610a9b9d991c44fb1b7df00c3bd9af54d SHA512 3a4e971e7cd60a1cef9644b075f45787d3ef8159d9d18c3aea4847391f246b5c96c658ab98f8b7184e9d315acca3d0d2961826a2785d029b2b4b009686fe7133 WHIRLPOOL 5a4ec189d798d5efdab1c800d7370c534ee1c8d5f96264f289faf0ab3ecbf4e1935ffb9253a1e2e793d3bb5729b971502a2c2f7d1d4ccf0b960640b4326ccda3
+AUX admit-noclass-520696.patch 400 SHA256 d882a327a3788640f96ef7fa5a38953365f358722883ce105c8be973fbb6c5d2 SHA512 1263459a8a91962ddd5290374f4066f38d09eb021bedc86c15683d5b0b9ad3969672cb490ccf386a7816f8401ee1665aef60a10735e539357112f785ce7407ad WHIRLPOOL 5c4ce5d0bd9fb2bcb8dd5f2f3053f0a6254d6fee7ac29bbf087c5c4269e3c538f76205fa73df81c167be4020c2c12f26c65b0543f3f39f3c590a9e8ada1b98b2
+AUX cf-execd.rc6 319 SHA256 eef3f8470a52231a71a906e5518fa802e7e6c8ba4929f17e8d76d55fa5845d0b SHA512 cac7ac5126d8d2f3c3acf61a694e89f6a2cddbf0748442e4ce82064a520c077adf2bf6cdcd8dda398b684699c03031e9b48178bd21c97badaa84a2776a04998d WHIRLPOOL d01df35e426fbe500ae5ae0505671166e3e60d224009c126f6880d47d53f3bc79645213db4b8936e4a5c229a8c9c2fb3fb4ce4bbee59938e2a494f43508393fc
+AUX cf-monitord.rc6 316 SHA256 c2bb8ca8aa397e050ff0d339e519b0908f75e26dda6131f75afb8eb62a3a83cc SHA512 d141891e6cac6ddc4dad6c7caa623e5fb43846a91c23ae99fcc27e9fad5aeed6c5ee2ddc4bf88363523bd04c977241d649b818833e13a58319c4b8a48efadb1a WHIRLPOOL 276c96977aaa766deb010b7fa4896b2925ac07cd1c77d54baa5c7fc20697783d3882bf46f8ad3f0c06c7c5c5c1ab849e89af3933b6ef4830d4a7d6cda2840bf8
+AUX cf-serverd.rc6 311 SHA256 a066067d1a0f3a5017a76d46967eb0c4943ea4d356918a2c2d84842e29a52838 SHA512 ef22d159ab71c311e5105709956cfca11dbe1569de4278a87bfbe82a496ac9b0e715b35f65b66a36dc84b7f4254d00172f16ab72240348282f9702b084a7b8bf WHIRLPOOL 173a8fc7bd7c11573da147215713dd1504a0dc099052b17be05b7a6883a0c0fe1f61db74b6d134222cf236ead7052a976d31b57a21491728d2d16ca90c28036e
+AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 456 SHA256 25a37e3d23163459844789b3817814768a7126f564fd473ec0a6d1136897ebff SHA512 6e38707d638ad9570ba88d07c13ba0c0a5f13e8642b040b10a2cc25cbb27599c4108692ca44cc98a79b390a471e082cf68496e980d787be2f74fa11288ca817c WHIRLPOOL 0f992e1bc9b1ecb7e0eaf43a81726023248c223c7188b617d345fbc00da534da12fc7f6ed8a03730596c996ceee1a42dbe1210e91bb43dd677ffe411256cc0b1
+AUX cfengine-3.4.5-acl.patch 1024 SHA256 f2d20259aeb1e9cfe42cc3781a870ea57a8d6b5ee6e8aceda875f749e9919cf3 SHA512 f8e7987cf26c8791d3b0c816a61fdd8b877114729c804d096270f9e98c69f0cdcfe4d72a4120d9d8fa8fd260fae340ef75f9897b4a421da7648d05c10a4bc02b WHIRLPOOL 9b2f5063eda082987a19979059b3a99c445c21a951336090029f733d3c602b545673f80bb4ec2813e87e4765404d913fefe71df4d4b30b8c0120fe421bdecc28
+AUX cfengine-3.4.5-ifconfig.patch 1447 SHA256 fe38644ff8befa5b6e760fc0773b174d2ab0bf872d40c8909cb5529f8069a1e3 SHA512 e2e3f362777951c9778fe9f98f95fb934fd76a3a0af39612ab3a6aeec320d181834d4531382ab70c0ebc3162180dd9e9508f082ee99fd80fb5144eb1815ebc55 WHIRLPOOL 3848016a9b96c4d37a09794f933bbdff7804e64d1a1e4637062c554d43d74bad240c97fcd466836c99fd31b829404e50f4532ac1dc21588ac6513f5bdde0a82d
+AUX cfengine-3.5.3-ifconfig.patch 1776 SHA256 ab42f79688799fc76bfd0825f6ce2ccee8c86ebe948b757949353c235b625eb0 SHA512 33c7ce6a3f064e8d9fbb393dcf56816be3ed4e679864dd2163681686b15c458b7694a05731607971acadd643c763c8d94d3fd14d19e5fb1814e4898cfedf9ef9 WHIRLPOOL 4d2fe1611ef7af8b560bc7e8c5c08fc88d8ace62f211d2033d65043c8aa4dcc89c0a34135ac690157eab08194b4d194bdc50a55e394f6c67b175950ea35ef8b1
+AUX cfengine-3.6.2-ifconfig.patch 486 SHA256 e0e891429b3e56150840c7e5d1c6b9033e8be7403c302a3a1122ac638b08f28a SHA512 e0c308dcb1ac1d865b6410e5e4a5afb4619dc56e77ddb247a4c3314e9b2e9ffcab7dd09682ead3acd259dfdc76403c5c7312d3306e53285da7812912f59d8582 WHIRLPOOL 19f924480dcb34640d727d3cf0decc31033a78cf3d5eebf815c39d17b2efc74435b90e4a88f828e4a78ac2237cd2c44c390e5dc1e363b16b19448a8a2c89b55a
+AUX cfenvd.rc6 255 SHA256 39e563ab9ac318cccc52deeb8ff790e3be983d337038c9402a4a46ff0300156b SHA512 3b6356bd75d2986d4482a6d603cb1b07697d5314a748f440b8f11e7275670c072ed96fddd5a41d4066e19ebbf1d126f93d70428324e37bbb40185dc414e10994 WHIRLPOOL 120c0ee00039faf7b7b2ab507687c8ce83fba747ad7ef244067f2d795e8440a33f7e0c35debcffe441f5726d6f847306dd5dc27015c7880cb9bd82594dcf2688
+AUX cfexecd.rc6 260 SHA256 17fc807054ebc954ccf3c40bf2a03cd5744c96a5f0c1d6a93645a3828885f641 SHA512 735a34204b6c9d555b454f264edeaf371e1ee7cf80a2c23fcc83d604ed87d3a19dcd9008f6c815a024535b1d9e9a32aac008ce7b4e440f9b688b642050ec7ff1 WHIRLPOOL 0347075d9ca7bd490beba22f1566dcd088382658c235bea1de76ec60495b41de5edec7ebd19963d2ab7637e806745b09c4563b7de4a96afdc0f49ad454daf6d2
+AUX cfservd.rc6 260 SHA256 f6c1120671d398c45347c842fbbd68ea9843ea55100a4e0f240e316aee39a62d SHA512 c69b2bcc509b0dbcf93a7131a85bcbb57ea2a648b90fb1a886a4fa6bcb787593dc49d03857b0ef8f552e10db46c3002799c67bc57655e43927e02ce1d13c393d WHIRLPOOL 49d8825465d024c8678b011124505bb2da8691cb40797ac54c4bcf0272ac34dbf9a93f5055e070044ea023d88158ff3c94a87508b1a92a448b35036bddc81cb3
+DIST cfengine-2.2.10.tar.gz 2690333 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783 SHA512 861af25f32248e115512790357cb4739b16bee9d19db33cc1b93ab2091d020991770970fc916796a5894c978ee6a5956100d2f714efb6e97e9e9a9ea88f64dea WHIRLPOOL 11ab19f4ce898a3409f88b27f429103d624ae4b0412c8129566462ec7182df33d82d6c65154b7cf8dbc60a60f1d5cea6eb8a1f6f9d709e6a0916491a40179b0c
+DIST cfengine-3.3.9.tar.gz 1256138 SHA256 54b44dd1c7a77a7ec4e4dea9542ac4d79cb689a7aaefda88ef227e571a462a61 SHA512 9d64667d001daa2db506abf97ecde43e6b6ac672d3ca6dba4c5e68b742b72f2c7cee65c2f5ab82a12cf0f9b385f48fb0d2bb9eae7fe2ff57b187c725238faf1f WHIRLPOOL d57204c63835c75a4bd4b23390a7013149920c856a19fd76f960d72bbc051c3ef2f220361afb225d41e51d5f0eb6cf817d6605d290c7452dcf112e7f54ee0528
+DIST cfengine-3.4.5.tar.gz 4671628 SHA256 542808b9f532e77d66dca19e83bdc1f995d7d0066b940a39bdd5db9a71680011 SHA512 3de95b511c03b4e4f83b13b605d4cc8185419fb7ee6b42e34faf300e5af2a755713b2f8f61305a1cd3dea02f89c09076b164469549cfc96fec09a813c7069f0f WHIRLPOOL 9e7516bfeffc1fae87eeb67f51207f056b0644a6d51e7b1da8d4f1eb27e581781af3f5f56bb98ed405909b2497eea3668df5bb78ece447dac528d7b18fdcd90f
+DIST cfengine-3.5.3.tar.gz 1542468 SHA256 0e2d13ba1d75f826bf15411912ce21075734796a35e8fb8ecf545d70d60f41e1 SHA512 20ead13d5290905dc51567887807a0c2c5d9d753cb48ffe2859041b75239698ad0f4bee1ad0eac4eee96122b3a5a475d516566c1571c4fcbc460be757583da18 WHIRLPOOL 2434abd1b6228e87fb848ea013dafca7d1e62dfeaa3ddafd534d663f69eb8b84221f452f8d288571352b641efbde0d1e65f6377d74f7cfa7678267f548036c7b
+DIST cfengine-3.6.2.tar.gz 1966966 SHA256 0e0195c1998fc261d4ef2e47e9cc50b273d204bc8b221d469bb83071933c4a09 SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc WHIRLPOOL 989a7853b74848a69d4323f0e10ab05a7522132b6b52362b02d40e95a361ef85b74bef3e3263942376c3f6f4a29c3174967a3ca00fc5acef774537af14ce6352
+EBUILD cfengine-2.2.10-r4.ebuild 3245 SHA256 622ccf067b4775fbc49ea15ec4e7fe0524084fb2f55b903f66cad2c77e942884 SHA512 c6879fd4efd6fa430e730fe80db44da0a19543c14a3a5dbe366343ed3ddc7067ebe6f1e33418109a2f31026540d0d6ad1bff1f11ffe27136940a9beea12943d6 WHIRLPOOL 6bd4a4efafdf838352e3367487b58f5bd961d6d13a74975a663544bdceb0e38280ca71eb43a4de3a96d54c19239c7ee19058c99930bc0bb609109973ce0e0d1b
+EBUILD cfengine-3.3.9.ebuild 3519 SHA256 23ba6bdcc30a8287c3e32b28931d639039bef659fbee105c97d8d77bbc22ae0f SHA512 34b5cfedcde9f47894146e4f528e928cb31777ca36c9951f69fc937de19d80a9c950493d8351e13406e99a1c4eeb060527d6f17597fa5f6598a7908becd0a2ed WHIRLPOOL b964d1b1a0c08434ce19fa1d5548c0eb72fcf11fa3aa6770e7094d683044c292d6f0ea8e878548dfad68aa891c3a15464b6bfab6b8d57dd0e3d470f75ec6e74c
+EBUILD cfengine-3.4.5.ebuild 3745 SHA256 49562914e05f8dd8db09794e1cd920caa2e84611a51c022c59e38c95fd757425 SHA512 285447ad8239f57f076ebf10224e5582414be174b4f1f35644dff2f170e2032a65fa76aa2877c22fdb6681abe855492a1cd7da13409563a1d83ef21b45871e89 WHIRLPOOL 8805136855177bc15a6d868d6c96ed7747cf4de8051dd373c189dc69292b56a87c4ef5a4b226e130061baa6cf71da64a1f8369d1c9962d247dbe56f6a5063bd9
+EBUILD cfengine-3.5.3.ebuild 3812 SHA256 dd2e40852ec04aa248933b3b8d1c47df2c9649f5942d7476a118112a6b600e6a SHA512 d0bec07edd75d17705894a9d771feb112f7fb892cbdae8c341bac6290a82eeef5e90187fc6dc7d7f1b911c5f020d30de9b8f043d196f663805eae628701656b4 WHIRLPOOL c04fb48cb7cb5d08d9e64727166d45db781ea8460d4d8ed8efb6ff49f5d1f3ad7315bebbd929d24334b2739c935cd011215e3734f1a6ced2c4d0fee0be7d031c
+EBUILD cfengine-3.6.2.ebuild 3753 SHA256 fa4220abb1521f89e1fc8832e96720725b1c0bec384aefd23462512d464477e8 SHA512 4d0670fa4fdb02cc5e3c3643154af2c5c25e8046f4c6d6118d6d26d9753642fe5d3a09f66210a426dc08dda373020661fdc6c05fdadd5d082200d9ef59388115 WHIRLPOOL 36d56a5dfbe702ff4957e860e96a4488c4958d2992610503133945ff91e6ced3890dafe1bff53b80ccce67ca42420c42a4feae08e253d57fbe58196ab2cc04fc
+MISC ChangeLog 4147 SHA256 b11e88777236b6e69372c41248350095081db6c579433b984de3577d86a5619b SHA512 0d1c2f0df59ddfd6d4cd5c9a0a256dbb79e203d6c92adf158bccdb70e377dbf11b8e69a4a8267373f602b5f8b699bacc36db6a844780b7ce741266d68cc2aea1 WHIRLPOOL fcd28b50f9ccf806e3e5d60d9be2a49f7f429e7315cbece0c13be0b9b4e80f5b7809466dfd506431e234971bd53b4c1151c168a077949cc3980697feb1fbdd59
+MISC ChangeLog-2015 28780 SHA256 db23ee741ac594def34e8ddfc2793691f0b737cf423e0b8b70a8bb94be059d5e SHA512 b6f7a4206d359aeab1c9e70e4c8ef3995dacc2a4f8385fe8b863fcf5a7b81b44b230f5c8684ab37dd7b551ded8a2b8af4fb173a04d9035cb3046b8d8f5329d35 WHIRLPOOL 58a19cbe5250a90c97759ec2693c38bb3857662b68d736cacf399e3f81bc8bc3f6e8a73cdac34f4a512ae39d8f1692f3bf589a7de02de88909fab94b346d7172
+MISC metadata.xml 2241 SHA256 2ae9dc21e9974c95b3d2cbdf9e8b382a853c3c3bbb22102ea53c0a473a84c2ec SHA512 7dfd5dc90230ed92b1b44bbf06d6bbe386511339e9510db728b48a2a19c48b6e2371be245905f8254b488980235e9e0c66906f0f01d36a29d79116017f220739 WHIRLPOOL 25f4cf792097dc52de3e82c7b07c2f3eecdb985a8ab629151bc2d1be3afd9665176fd148ac39e6593a48ebdcfee0c57cbeb285e05417edfbd9056e2e44818587
diff --git a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
new file mode 100644
index 000000000000..a2f6f9d7afc1
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils multilib
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 ~s390 sparc x86"
+IUSE="vim-syntax"
+
+RDEPEND=">=sys-libs/db-4
+	>=dev-libs/openssl-0.9.7
+	app-portage/portage-utils"
+DEPEND="${RDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+src_prepare() {
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
+	# https://bugs.gentoo.org/339808
+	epatch "${FILESDIR}/admit-noclass-520696.patch" \
+		"${FILESDIR}/511666-segfault.patch" \
+		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
+
+	# 2048 causes crashes on some 32-bit hardened kernels, and the warning
+	# messages say to turn it back down.
+	use x86 && sed -ie "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h
+}
+
+src_configure() {
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--with-workdir=/var/cfengine \
+		--with-berkeleydb=/usr
+
+	# Fix Makefile to skip doc,inputs, & contrib install to wrong locations
+	sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' Makefile
+	sed -i -e 's/\(SUBDIRS.*\) contrib inputs/\1/' Makefile
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile
+
+	# Fix man pages
+	sed -i -e 's/\/usr\/local/\/usr/' doc/*.8
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die
+	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die
+	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
+
+	make DESTDIR="${D}" install || die
+
+	# Remove static library and libtool file as they are not needed
+	rm "${D}"/usr/$(get_libdir)/*.la
+	rm "${D}"/usr/$(get_libdir)/*.a
+
+	dodoc AUTHORS ChangeLog README TODO INSTALL
+
+	# Manually install doc and inputs
+	doman doc/*.8
+	docinto examples
+	doinfo doc/*.info*
+	dodoc inputs/*.example
+
+	# Create cfengine working directory
+	mkdir -p "${D}"/var/cfengine
+	fperms 700 /var/cfengine
+	keepdir /var/cfengine/bin
+	keepdir /var/cfengine/inputs
+	dodir /var/cfengine/modules
+}
+
+pkg_postinst() {
+	# Copy cfagent into the cfengine tree otherwise cfexecd won't
+	# find it. Most hosts cache their copy of the cfengine
+	# binaries here. This is the default search location for the
+	# binaries.
+
+	cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
+
+	einfo
+	einfo "NOTE: The cfportage module has been deprecated in favor of the"
+	einfo "      upstream 'packages' action."
+	einfo
+	einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cfexecd -F"
+	einfo
+
+	elog "You MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+}
+
+pkg_config() {
+	if [ "${ROOT}" == "/" ]; then
+		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+			einfo "Generating keys for localhost."
+			/usr/sbin/cfkey
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}
diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild b/net-misc/cfengine/cfengine-3.3.9.ebuild
new file mode 100644
index 000000000000..907365bda35c
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.3.9.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://cfengine.com/source-code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="amd64 ~arm ~ppc ~s390 ~sparc x86"
+
+IUSE="examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet vim-syntax"
+
+DEPEND=">=sys-libs/db-4
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	selinux? ( sys-libs/libselinux )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	qdbm? ( dev-db/qdbm )
+	libvirt? ( app-emulation/libvirt )
+	>=dev-libs/openssl-0.9.7
+	dev-libs/libpcre"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+REQUIRED_USE="^^ ( qdbm tokyocabinet )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--enable-fhs \
+		--docdir=/usr/share/doc/${PF} \
+		--with-workdir=/var/cfengine \
+		--with-pcre \
+		$(use_with qdbm) \
+		$(use_with tokyocabinet) \
+		$(use_with postgres postgresql) \
+		$(use_with mysql) \
+		$(use_with libvirt) \
+		$(use_enable selinux)
+
+	# Fix Makefile to skip inputs, see below "examples"
+	#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
+
+	# We install the documentation through portage
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+
+	emake DESTDIR="${D}" install || die
+
+	# Evil workaround for now..
+	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+
+	dodoc AUTHORS
+
+	if ! use examples; then
+		rm -rf "${D}"/usr/share/doc/${PF}/example*
+	fi
+
+	# Create cfengine working directory
+	dodir /var/cfengine/bin
+	fperms 700 /var/cfengine
+
+	# Copy cfagent into the cfengine tree otherwise cfexecd won't
+	# find it. Most hosts cache their copy of the cfengine
+	# binaries here. This is the default search location for the
+	# binaries.
+	for bin in know promises agent monitord serverd execd runagent key report; do
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+	done
+
+	if use html; then
+		docinto html
+		dohtml -r docs/ || die
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
+	echo
+	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
+	echo
+
+	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+
+	# Fix old cf-servd, remove it after some releases.
+	local found=0
+	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+		found=1
+		rm $fname
+		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+	done
+
+	if [ "${found}" -eq 1 ]; then
+		echo
+		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
+	fi
+}
+
+pkg_config() {
+	if [ "${ROOT}" == "/" ]; then
+		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+			einfo "Generating keys for localhost."
+			/usr/sbin/cf-key
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}
diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild b/net-misc/cfengine/cfengine-3.4.5.ebuild
new file mode 100644
index 000000000000..c377a81c5a5f
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.4.5.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils autotools
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://cfengine.com/source-code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+
+IUSE="acl examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet
+vim-syntax xml"
+
+DEPEND=">=sys-libs/db-4
+	acl? ( virtual/acl )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	selinux? ( sys-libs/libselinux )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	qdbm? ( dev-db/qdbm )
+	libvirt? ( app-emulation/libvirt )
+	xml? ( dev-libs/libxml2:2  ) \
+	dev-libs/openssl
+	dev-libs/libpcre"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+REQUIRED_USE="^^ ( qdbm tokyocabinet )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	epatch "${FILESDIR}/${P}-acl.patch"
+	epatch "${FILESDIR}/${P}-ifconfig.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--enable-fhs \
+		--docdir=/usr/share/doc/${PF} \
+		--with-workdir=/var/cfengine \
+		--with-pcre \
+		$(use_with acl libacl) \
+		$(use_with qdbm) \
+		$(use_with tokyocabinet) \
+		$(use_with postgres postgresql) \
+		$(use_with mysql) \
+		$(use_with libvirt) \
+		$(use_enable selinux)
+
+	# Fix Makefile to skip inputs, see below "examples"
+	#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
+
+	# We install the documentation through portage
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+
+	emake DESTDIR="${D}" install || die
+
+	# Evil workaround for now..
+	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+
+	dodoc AUTHORS
+
+	if ! use examples; then
+		rm -rf "${D}"/usr/share/doc/${PF}/example*
+	fi
+
+	# Create cfengine working directory
+	dodir /var/cfengine/bin
+	fperms 700 /var/cfengine
+
+	# Copy cfagent into the cfengine tree otherwise cfexecd won't
+	# find it. Most hosts cache their copy of the cfengine
+	# binaries here. This is the default search location for the
+	# binaries.
+	for bin in promises agent monitord serverd execd runagent key report; do
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+	done
+
+	if use html; then
+		docinto html
+		dohtml -r docs/ || die
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
+	echo
+	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
+	echo
+
+	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+
+	# Fix old cf-servd, remove it after some releases.
+	local found=0
+	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+		found=1
+		rm $fname
+		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+	done
+
+	if [ "${found}" -eq 1 ]; then
+		echo
+		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
+	fi
+}
+
+pkg_config() {
+	if [ "${ROOT}" == "/" ]; then
+		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+			einfo "Generating keys for localhost."
+			/usr/sbin/cf-key
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}
diff --git a/net-misc/cfengine/cfengine-3.5.3.ebuild b/net-misc/cfengine/cfengine-3.5.3.ebuild
new file mode 100644
index 000000000000..8f39bfb0f9b0
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.5.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils autotools flag-o-matic
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://cfengine.com/source-code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+
+IUSE="acl examples libvirt mysql postgres +qdbm selinux tokyocabinet vim-syntax xml"
+
+DEPEND="acl? ( virtual/acl )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	selinux? ( sys-libs/libselinux )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	qdbm? ( dev-db/qdbm )
+	libvirt? ( app-emulation/libvirt )
+	xml? ( dev-libs/libxml2:2  ) \
+	dev-libs/openssl
+	dev-libs/libpcre"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+REQUIRED_USE="^^ ( qdbm tokyocabinet )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	epatch "${FILESDIR}/${PN}-3.4.5-acl.patch"
+	epatch "${FILESDIR}/${P}-ifconfig.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Enforce /var/cfengine for historical compatibility
+
+	econf \
+		--enable-fhs \
+		--docdir=/usr/share/doc/${PF} \
+		--with-workdir=/var/cfengine \
+		--with-pcre \
+		$(use_with acl libacl) \
+		$(use_with qdbm) \
+		$(use_with tokyocabinet) \
+		$(use_with postgres postgresql) \
+		$(use_with mysql mysql check) \
+		$(use_with libvirt) \
+		$(use_enable selinux)
+
+	# Fix Makefile to skip inputs, see below "examples"
+	#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
+
+	# We install the documentation through portage
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+
+	emake DESTDIR="${D}" install || die
+
+	# fix ifconfig path in provided promises
+	find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
+
+	# Evil workaround for now..
+	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+
+	dodoc AUTHORS
+
+	if ! use examples; then
+		rm -rf "${D}"/usr/share/doc/${PF}/example*
+	fi
+
+	# Create cfengine working directory
+	dodir /var/cfengine/bin
+	fperms 700 /var/cfengine
+
+	# Copy cfagent into the cfengine tree otherwise cfexecd won't
+	# find it. Most hosts cache their copy of the cfengine
+	# binaries here. This is the default search location for the
+	# binaries.
+	for bin in promises agent monitord serverd execd runagent key; do
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+	done
+}
+
+pkg_postinst() {
+	echo
+	elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
+	echo
+	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
+	echo
+
+	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+
+	# Fix old cf-servd, remove it after some releases.
+	local found=0
+	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+		found=1
+		rm $fname
+		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+	done
+
+	if [ "${found}" -eq 1 ]; then
+		echo
+		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
+	fi
+}
+
+pkg_config() {
+	if [ "${ROOT}" == "/" ]; then
+		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+			einfo "Generating keys for localhost."
+			/usr/sbin/cf-key
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild
new file mode 100644
index 000000000000..a4e5ae6c7db9
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils autotools flag-o-matic
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="acl examples libvirt mysql postgres +qdbm selinux tokyocabinet vim-syntax xml"
+
+DEPEND="acl? ( virtual/acl )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	selinux? ( sys-libs/libselinux )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	qdbm? ( dev-db/qdbm )
+	libvirt? ( app-emulation/libvirt )
+	xml? ( dev-libs/libxml2:2  ) \
+	dev-libs/openssl
+	dev-libs/libpcre"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+REQUIRED_USE="^^ ( qdbm tokyocabinet )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}/${P}-ifconfig.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# Enforce /var/cfengine for historical compatibility
+
+	econf \
+		--enable-fhs \
+		--docdir=/usr/share/doc/${PF} \
+		--with-workdir=/var/cfengine \
+		--with-pcre \
+		$(use_with acl libacl) \
+		$(use_with qdbm) \
+		$(use_with tokyocabinet) \
+		$(use_with postgres postgresql) \
+		$(use_with mysql mysql check) \
+		$(use_with libvirt) \
+		$(use_enable selinux)
+
+	# Fix Makefile to skip inputs, see below "examples"
+	#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
+
+	# We install the documentation through portage
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+
+	emake DESTDIR="${D}" install || die
+
+	# fix ifconfig path in provided promises
+	find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
+
+	# Evil workaround for now..
+	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+
+	dodoc AUTHORS
+
+	if ! use examples; then
+		rm -rf "${D}"/usr/share/doc/${PF}/example*
+	fi
+
+	# Create cfengine working directory
+	dodir /var/cfengine/bin
+	fperms 700 /var/cfengine
+
+	# Copy cfagent into the cfengine tree otherwise cfexecd won't
+	# find it. Most hosts cache their copy of the cfengine
+	# binaries here. This is the default search location for the
+	# binaries.
+	for bin in promises agent monitord serverd execd runagent key; do
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+	done
+}
+
+pkg_postinst() {
+	echo
+	elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
+	echo
+	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
+	echo
+
+	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+
+	# Fix old cf-servd, remove it after some releases.
+	local found=0
+	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+		found=1
+		rm $fname
+		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+	done
+
+	if [ "${found}" -eq 1 ]; then
+		echo
+		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
+	fi
+}
+
+pkg_config() {
+	if [ "${ROOT}" == "/" ]; then
+		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+			einfo "Generating keys for localhost."
+			/usr/sbin/cf-key
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}
diff --git a/net-misc/cfengine/files/511666-segfault.patch b/net-misc/cfengine/files/511666-segfault.patch
new file mode 100644
index 000000000000..ea3ae9686254
--- /dev/null
+++ b/net-misc/cfengine/files/511666-segfault.patch
@@ -0,0 +1,20 @@
+Fix a bug involving CheckFriendReliability (see bug #482439)
+
+Index: cfengine2-2.2.9/src/instrument.c
+===================================================================
+--- cfengine2-2.2.9.orig/src/instrument.c	2009-03-06 21:25:59.000000000 +0000
++++ cfengine2-2.2.9/src/instrument.c	2009-03-06 21:26:31.000000000 +0000
+@@ -716,11 +716,11 @@
+       key.data = timekey;
+       key.size = strlen(timekey)+1;
+ 
+-      if ((errno = dbp->get(dbp,NULL,&key,&value,0)) != 0)
++      if ((errno = dbpent->get(dbpent,NULL,&key,&value,0)) != 0)
+          {
+          if (errno != DB_NOTFOUND)
+             {
+-            dbp->err(dbp,errno,NULL);
++            dbpent->err(dbpent,errno,NULL);
+             exit(1);
+             }
+          }
diff --git a/net-misc/cfengine/files/admit-noclass-520696.patch b/net-misc/cfengine/files/admit-noclass-520696.patch
new file mode 100644
index 000000000000..1e5d8594aaed
--- /dev/null
+++ b/net-misc/cfengine/files/admit-noclass-520696.patch
@@ -0,0 +1,15 @@
+Fix a bug with admit/grant that let cfengine2 fails when the class
+of a cfengine fragment does not exist and more than a host or IP
+ranges are specified for a path (see #520696)
+
+--- a/src/install.c
++++ b/src/install.c
+@@ -6561,7 +6561,7 @@
+ if (!IsDefinedClass(classes))
+    {
+    Debug1("Not installing Auth path, no match\n");
+-   InitializeAction();
++//   InitializeAction();
+    return;
+    }
+ 
diff --git a/net-misc/cfengine/files/cf-execd.rc6 b/net-misc/cfengine/files/cf-execd.rc6
new file mode 100644
index 000000000000..8c3936d8a718
--- /dev/null
+++ b/net-misc/cfengine/files/cf-execd.rc6
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+	after cf-serverd
+}
+
+start() {
+	ebegin "Starting cf-execd"
+	start-stop-daemon --start --exec /usr/sbin/cf-execd -- ${EXTRA_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cf-execd"
+	start-stop-daemon --stop --pidfile /var/cfengine/cf-execd.pid --exec /usr/sbin/cf-execd
+	eend $?
+}
diff --git a/net-misc/cfengine/files/cf-monitord.rc6 b/net-misc/cfengine/files/cf-monitord.rc6
new file mode 100644
index 000000000000..6f985a62b020
--- /dev/null
+++ b/net-misc/cfengine/files/cf-monitord.rc6
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cf-monitord"
+	start-stop-daemon --start --exec /usr/sbin/cf-monitord -- ${EXTRA_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cf-monitord"
+	start-stop-daemon --stop --pidfile /var/cfengine/cf-monitord.pid --exec /usr/sbin/cf-monitord
+	eend $?
+}
diff --git a/net-misc/cfengine/files/cf-serverd.rc6 b/net-misc/cfengine/files/cf-serverd.rc6
new file mode 100644
index 000000000000..d73e2bc2c729
--- /dev/null
+++ b/net-misc/cfengine/files/cf-serverd.rc6
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cf-serverd"
+	start-stop-daemon --start --exec /usr/sbin/cf-serverd -- ${EXTRA_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cf-serverd"
+	start-stop-daemon --stop --pidfile /var/cfengine/cf-serverd.pid --exec /usr/sbin/cf-serverd
+	eend $?
+}
diff --git a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
new file mode 100644
index 000000000000..dee9b797f6ac
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
@@ -0,0 +1,11 @@
+--- src/instrument.c.old	2010-10-15 22:20:58.014091858 +0200
++++ src/instrument.c	2010-10-15 22:21:34.132271440 +0200
+@@ -542,7 +542,7 @@ while (dbcp->c_get(dbcp, &key, &value, D
+    
+    tthen = (time_t)then;
+ 
+-   snprintf(datebuf,CF_BUFSIZE-1,"%s",ctime(&tthen));
++   snprintf(datebuf,CF_MAXVARSIZE-1,"%s",ctime(&tthen));
+    datebuf[strlen(datebuf)-9] = '\0';                     /* Chop off second and year */
+ 
+    snprintf(addr,15,"%s",hostname+1);
diff --git a/net-misc/cfengine/files/cfengine-3.4.5-acl.patch b/net-misc/cfengine/files/cfengine-3.4.5-acl.patch
new file mode 100644
index 000000000000..815f257c36fa
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-3.4.5-acl.patch
@@ -0,0 +1,30 @@
+From a12b5b3b8cd4397545104923d1de3297fd971f9e Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Fri, 29 Mar 2013 00:23:21 +0100
+Subject: [PATCH] Fix acl header detection
+
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ configure.ac | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 542d115..f3f0c04 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -335,7 +335,10 @@ AC_ARG_WITH([libacl],
+ if test "x$with_libacl" != xno; then
+   CF3_WITH_LIBRARY(libacl, [
+     AC_CHECK_LIB(acl, acl_init, [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library); fi])
+-    AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h], [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library headers); fi])
++    AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h], [found_acl_h=yes], [])
++	if test "x$found_acl_h" != xyes; then
++		AC_MSG_ERROR(Cannot find libacl library headers)
++	fi
+   ])
+  fi
+ 
+-- 
+1.8.1.5
+
diff --git a/net-misc/cfengine/files/cfengine-3.4.5-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.4.5-ifconfig.patch
new file mode 100644
index 000000000000..47107784ce0f
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-3.4.5-ifconfig.patch
@@ -0,0 +1,42 @@
+Patch by clabbe.montjoie@gmail.com
+https://bugs.gentoo.org/444532
+
+--- src/conf.h.in.old	2012-12-28 16:18:23.000000000 +0100
++++ src/conf.h.in	2012-12-28 16:19:08.000000000 +0100
+@@ -773,3 +773,6 @@
+ 
+ /* Define to rpl_vsnprintf if the replacement function should be used. */
+ #undef vsnprintf
++
++/* Define to the path for running ifconfig -a */
++#undef IFCONFIG_RUN
+--- src/unix.c.old	2012-12-28 16:05:28.000000000 +0100
++++ src/unix.c	2012-12-28 16:13:15.000000000 +0100
+@@ -900,7 +900,7 @@
+ 
+     default:
+ 
+-        if ((pp = cf_popen("/sbin/ifconfig -a", "r")) == NULL)
++        if ((pp = cf_popen(IFCONFIG_RUN, "r")) == NULL)
+         {
+             CfOut(cf_verbose, "", "Could not find interface info\n");
+             return;
+--- configure.ac.old	2012-12-29 11:38:20.000000000 +0100
++++ configure.ac	2012-12-29 11:49:11.000000000 +0100
+@@ -882,6 +882,16 @@
+ 
+ 
+ dnl ######################################################################
++dnl Find the path to ifconfig
++dnl ######################################################################
++
++AC_PATH_PROG(IFCONFIG_PATH,ifconfig)
++if test x"$IFCONFIG_PATH" = x"" ; then
++  AC_MSG_ERROR([Cannot found the ifconfig binary.])
++fi
++AC_DEFINE_UNQUOTED(IFCONFIG_RUN, "$IFCONFIG_PATH -a", [the path to run ifconfig -a])
++
++dnl ######################################################################
+ dnl Summarize
+ dnl ######################################################################
+ 
diff --git a/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch
new file mode 100644
index 000000000000..dc982c6801f7
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch
@@ -0,0 +1,42 @@
+diff -ur cfengine-3.5.3.orig/configure.ac cfengine-3.5.3/configure.ac
+--- cfengine-3.5.3.orig/configure.ac	2013-12-09 13:13:14.000000000 +0100
++++ cfengine-3.5.3/configure.ac	2014-02-27 12:36:55.179893570 +0100
+@@ -1047,6 +1047,16 @@
+ AM_SUBST_NOTMAKE(post_macros)
+ 
+ dnl ######################################################################
++dnl Find the path to ifconfig
++dnl ######################################################################
++
++AC_PATH_PROG(IFCONFIG_PATH,ifconfig)
++if test x"$IFCONFIG_PATH" = x"" ; then
++  AC_MSG_ERROR([Cannot found the ifconfig binary.])
++fi
++AC_DEFINE_UNQUOTED(IFCONFIG_RUN, "$IFCONFIG_PATH -a", [the path to run ifconfig -a])
++
++dnl ######################################################################
+ dnl Summarize
+ dnl ######################################################################
+ 
+diff -ur cfengine-3.5.3.orig/libpromises/unix.c cfengine-3.5.3/libpromises/unix.c
+--- cfengine-3.5.3.orig/libpromises/unix.c	2013-12-09 13:13:14.000000000 +0100
++++ cfengine-3.5.3/libpromises/unix.c	2014-02-27 12:38:35.036608105 +0100
+@@ -767,7 +767,7 @@
+         return;
+     }
+ #else
+-    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL)
++    if ((pp = cf_popen(IFCONFIG_RUN, "r", true)) == NULL)
+     {
+         Log(LOG_LEVEL_VERBOSE, "Could not find interface info");
+         return;
+diff -ur cfengine-3.5.3.orig/libutils/config.h.in cfengine-3.5.3/libutils/config.h.in
+--- cfengine-3.5.3.orig/libutils/config.h.in	2013-12-09 13:55:25.000000000 +0100
++++ cfengine-3.5.3/libutils/config.h.in	2014-02-27 12:39:41.537416111 +0100
+@@ -914,3 +914,6 @@
+ 
+ /* Define to rpl_vsnprintf if the replacement function should be used. */
+ #undef vsnprintf
++
++/* Define to the path for running ifconfig -a */
++#undef IFCONFIG_RUN
diff --git a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
new file mode 100644
index 000000000000..ae0f491347f9
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
@@ -0,0 +1,11 @@
+--- cfengine-3.6.2.orig/libenv/unix_iface.c	2014-09-25 07:53:31.000000000 -0400
++++ cfengine-3.6.2/libenv/unix_iface.c	2014-11-26 23:55:20.151351070 -0500
+@@ -625,7 +625,7 @@
+         return;
+     }
+ #else
+-    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL)
++    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL || (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
+     {
+         Log(LOG_LEVEL_VERBOSE, "Could not find interface info");
+         return;
diff --git a/net-misc/cfengine/files/cfenvd.rc6 b/net-misc/cfengine/files/cfenvd.rc6
new file mode 100644
index 000000000000..638ae993dcf5
--- /dev/null
+++ b/net-misc/cfengine/files/cfenvd.rc6
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cfenvd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/cfenvd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cfenvd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cfenvd
+	eend $?
+}
diff --git a/net-misc/cfengine/files/cfexecd.rc6 b/net-misc/cfengine/files/cfexecd.rc6
new file mode 100644
index 000000000000..032a9c469b50
--- /dev/null
+++ b/net-misc/cfengine/files/cfexecd.rc6
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cfexecd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/cfexecd 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cfexecd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cfexecd
+	eend $?
+}
diff --git a/net-misc/cfengine/files/cfservd.rc6 b/net-misc/cfengine/files/cfservd.rc6
new file mode 100644
index 000000000000..034b25c72000
--- /dev/null
+++ b/net-misc/cfengine/files/cfservd.rc6
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cfservd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/cfservd 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cfservd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cfservd
+	eend $?
+}
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
new file mode 100644
index 000000000000..fb9078d2d2d0
--- /dev/null
+++ b/net-misc/cfengine/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+		<description>cfengine 2.x only</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	<use>
+		<flag name="html">Install HTML documentation</flag>
+		<flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag>
+		<flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend</flag>
+		<flag name="tests">Install test files</flag>
+		<flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database backend</flag>
+	</use>
+	<longdescription>
+	Cfengine, or the configuration engine is an autonomous agent and a middle to
+	high level policy language for building expert systems which administrate
+	and configure large computer networks. Cfengine uses the idea of classes and
+	a primitive intelligence to define and automate the configuration and
+	maintenance of system state, for small to huge configurations. Cfengine is
+	designed to be a part of a computer immune system, and can be thought of as
+	a gaming agent. It is ideal for cluster management and has been adopted for
+	use all over the world in small and huge organizations alike.
+	</longdescription>
+	<longdescription lang="ja">
+	Cfengine 、つまり the configuration engine (設定エンジン)は大規模
+	コンピュータ・ネットワークの管理と設定を行うエキスパート・システム
+	を構築するためのハイレベルなポリシ言語の自律型エージェントとその
+	ミドルを指します。莫大な設定を軽減するため、Cfengineはクラス概念と
+	プリミティブ・インテリジェンスの導入及びシステム状態の設定と保守を
+	自動化します。Cfengine は免疫型システムの一部としてデザインされ、
+	ゲーム・エージェントにもなります。クラスタ制御には最適で、世界中
+	の小さな組織および大きな組織で採用されています。
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
new file mode 100644
index 000000000000..81b471f0ccba
--- /dev/null
+++ b/net-misc/cgminer/Manifest
@@ -0,0 +1,7 @@
+DIST cgminer-4.10.0.tar.bz2 1306225 SHA256 debd49291f8335b48496896dc28a43f941d1c981525950497acc89d0d5fc1e84 SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db WHIRLPOOL 846af94146146809c6d7e150dc0aa26388a9a52f1ec91e4b26fd0191b426db0fa42229a896c65b566147283c97af243f51f9b452f1bbf535a04ab507d6b3195c
+DIST cgminer-4.9.2.tar.bz2 1476371 SHA256 7a94719c520c3ebd96fee65e2f737e87c9ae70c8e21865ee0ce16ac9b02e6e62 SHA512 48371657c84f09ad8c500a29ca85f35af70eb8720d9d97b565cd8c5356289d889ee60c06f37c0507a53c8f50ae827a77fa0c41609bac6b1e8849ad26b55d67d4 WHIRLPOOL bc1827049171683a7bae77b7693cf579cc18523dd1db1d54c3de41f3c81d6786f749dcee6e6e74c54ce7aceb5b946d357f8c04ded2d02dc40faddadcb015b828
+EBUILD cgminer-4.10.0.ebuild 2471 SHA256 f32372bfde888df2f79bb3d5eebce16d6fcfbdf1f8be9da14d30661bef1ed7f5 SHA512 483a4d06c95291b8d6fd0bc94be4232bc24e7b75055ac370084db4bdb9acf3ac5add77c30a9eab4f2e1109c54b48c2db96253756a383b908546d296c9e3a08d8 WHIRLPOOL 5ed525c8346ac6cfcf465658184429646d7ccbd556a550096924a5ccf453bc2c5ee8dd5e058331a4e3c7b867aca6793df271ede030c99cb409d59f55a91311eb
+EBUILD cgminer-4.9.2.ebuild 2393 SHA256 7e138fb8288174639bb170e09d435a78f4d46eadc480e65bfeed1d49894d9973 SHA512 0061ff81671e80f694ea85fa7305fdceaa8af4038734fc619cb63e5e15b08474674b0dfb1ba7fff0e0db92c68b7eac119c1ad7ac083daaaa40a90dd2cc0de120 WHIRLPOOL b20d111afc51c3e3bfb17ad5f875b52e65946c16dc6262792e65decea6f7825d3e90cee759bdec45169f3877fc29d950fb7d81962e7b006c7adcfe313efc4a91
+MISC ChangeLog 3087 SHA256 ede484a67a3c8a5dbaaae3b782d6b282965f8b4dcc4d835d080b18b6c55c7479 SHA512 000c7bcbe57204b46d41c2f5e828a94cf0cd65ca7bb8168fa7a30f94532550fff277272b1618095fca177dd24f48db2958230665cf25ac411775d3ccebc2f650 WHIRLPOOL 885dfa86848629311fe3b014c87127f0467319259dcdb5807e3a61a8bdfb4d404ea6a83491ec75599baf009326b05d784b8844f6e4342e4989e61705efa86c16
+MISC ChangeLog-2015 14519 SHA256 9bba0bc9e4b38aff2a2bb677f31f9f1fe9fe43c25618ac2814f65d5906da4e8d SHA512 79fb4e6053f19d5f7b021f63ac52138fbc0f203b85e3be151249086a985b3dd2af95c4e9e2e9386e9236580e7a97c5756b91d0b7d60d00c6fb85d70343d1ae23 WHIRLPOOL 76caf591b59c88188c43da91065b3efc20ef82a5a0e2ca6ba66e7d5e0611b27c685859fdbb6c16bfc70b6f2ef91e9063bc5a8577ebf4d797faa51f16d4fd8411
+MISC metadata.xml 2382 SHA256 5b6d3d715a1fcea1ed1709a125b1e3c7b0aad84a71cf8ec94fa1c03b0eefe83a SHA512 770e9bc5a34c7ee0efaf9ce697bfe84d3c5f46929c4ab394c049cd483bcc0d4057da8e0b068520de037074a5384ea06cecb688a92f8b6d3bd0a581553424fcd7 WHIRLPOOL dec4c740e753639fc944c6b6c0c29ce4fcb20e11ac7dc0d76ed1df1a2612149f5b56c1abb787afa0a7ea6ec0cb482250ce80ac56ac5a20f277bce4c9c768f7ed
diff --git a/net-misc/cgminer/cgminer-4.10.0.ebuild b/net-misc/cgminer/cgminer-4.10.0.ebuild
new file mode 100644
index 000000000000..2cfb7edf4ec1
--- /dev/null
+++ b/net-misc/cgminer/cgminer-4.10.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
+HOMEPAGE="http://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer"
+SRC_URI="http://ck.kolivas.org/apps/cgminer/${P}.tar.bz2"
+#SRC_URI="http://ck.kolivas.org/apps/cgminer/4.5/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+HARDWARE="ants1 ants2 ants3 avalon avalon2 avalon4 avalon7 avalon-miner bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30"
+IUSE="doc examples udev hardened ncurses ${HARDWARE}"
+
+REQUIRED_USE="|| ( ${HARDWARE} )"
+
+RDEPEND="net-misc/curl
+	>=dev-libs/jansson-2.6
+	virtual/libusb:1[udev]
+	ncurses? ( sys-libs/ncurses:0= )
+	udev? ( virtual/libudev )"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+src_configure() {
+	use hardened && append-cflags "-nopie"
+
+	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
+	export PKG_CONFIG=/usr/bin/pkg-config
+	econf $(use_with ncurses curses) \
+		$(use_enable ants1) \
+		$(use_enable ants2) \
+		$(use_enable ants3) \
+		$(use_enable avalon) \
+		$(use_enable avalon2) \
+		$(use_enable avalon4) \
+		$(use_enable avalon7) \
+		$(use_enable avalon-miner) \
+		$(use_enable bab) \
+		$(use_enable bitmine_A1) \
+		$(use_enable bflsc) \
+		$(use_enable bitforce) \
+		$(use_enable bitfury) \
+		$(use_enable blockerupter) \
+		$(use_enable cointerra) \
+		$(use_enable drillbit) \
+		$(use_enable hashfast) \
+		$(use_enable hashratio) \
+		$(use_enable icarus) \
+		$(use_enable klondike) \
+		$(use_enable knc) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable sp10) \
+		$(use_enable sp30) \
+		$(use_enable udev) \
+		--disable-forcecombo \
+		--with-system-libusb \
+		--with-system-jansson
+	# sanitize directories (is this still needed?)
+	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h
+}
+
+src_install() { # How about using some make install?
+	dobin cgminer
+
+	if use udev; then
+		insinto /lib/udev/rules.d
+		use udev && doins 01-cgminer.rules
+	fi
+
+	if use doc; then
+		dodoc AUTHORS NEWS README API-README
+		use icarus || use bitforce || use modminer && dodoc FPGA-README
+		use avalon || use bflsc && dodoc ASIC-README
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc api-example.php miner.php API.java api-example.c example.conf
+	fi
+}
diff --git a/net-misc/cgminer/cgminer-4.9.2.ebuild b/net-misc/cgminer/cgminer-4.9.2.ebuild
new file mode 100644
index 000000000000..5f46b8c57d24
--- /dev/null
+++ b/net-misc/cgminer/cgminer-4.9.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
+HOMEPAGE="http://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer"
+SRC_URI="http://ck.kolivas.org/apps/cgminer/${P}.tar.bz2"
+#SRC_URI="http://ck.kolivas.org/apps/cgminer/4.5/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+HARDWARE="ants1 ants2 ants3 avalon avalon2 avalon4 bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30"
+IUSE="doc examples udev hardened ncurses ${HARDWARE}"
+
+REQUIRED_USE="|| ( ${HARDWARE} )"
+
+RDEPEND="net-misc/curl
+	>=dev-libs/jansson-2.6
+	virtual/libusb:1[udev]
+	ncurses? ( sys-libs/ncurses:0= )
+	udev? ( virtual/libudev )"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+src_configure() {
+	use hardened && append-cflags "-nopie"
+
+	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
+	export PKG_CONFIG=/usr/bin/pkg-config
+	econf $(use_with ncurses curses) \
+		$(use_enable ants1) \
+		$(use_enable ants2) \
+		$(use_enable ants3) \
+		$(use_enable avalon) \
+		$(use_enable avalon2) \
+		$(use_enable avalon4) \
+		$(use_enable bab) \
+		$(use_enable bitmine_A1) \
+		$(use_enable bflsc) \
+		$(use_enable bitforce) \
+		$(use_enable bitfury) \
+		$(use_enable blockerupter) \
+		$(use_enable cointerra) \
+		$(use_enable drillbit) \
+		$(use_enable hashfast) \
+		$(use_enable hashratio) \
+		$(use_enable icarus) \
+		$(use_enable klondike) \
+		$(use_enable knc) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable sp10) \
+		$(use_enable sp30) \
+		$(use_enable udev) \
+		--disable-forcecombo \
+		--with-system-libusb \
+		--with-system-jansson
+	# sanitize directories (is this still needed?)
+	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h
+}
+
+src_install() { # How about using some make install?
+	dobin cgminer
+
+	if use udev; then
+		insinto /lib/udev/rules.d
+		use udev && doins 01-cgminer.rules
+	fi
+
+	if use doc; then
+		dodoc AUTHORS NEWS README API-README
+		use icarus || use bitforce || use modminer && dodoc FPGA-README
+		use avalon || use bflsc && dodoc ASIC-README
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc api-example.php miner.php API.java api-example.c example.conf
+	fi
+}
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
new file mode 100644
index 000000000000..63f03907d2d1
--- /dev/null
+++ b/net-misc/cgminer/metadata.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ki@baka.bakka.su</email>
+		<description>In baka-bakka overlay.</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="ants1">Enable support for Antminer S1 Bitmain</flag>
+		<flag name="ants2">Enable support for Antminer S2 Bitmain</flag>
+		<flag name="ants3">Enable support for Antminer S3 Bitmain</flag>
+		<flag name="avalon">Enable support for Avalon ASICs</flag>
+		<flag name="avalon2">Enable support for Avalon2 ASICs</flag>
+		<flag name="avalon4">Enable support for Avalon4 ASICs</flag>
+		<flag name="avalon7">Enable support for Avalon7 ASICs</flag>
+		<flag name="avalon-miner">Enable support for Avalon miner ASICs</flag>
+		<flag name="bab">Enable support for BlackArrow Bitfury</flag>
+		<flag name="bflsc">Enable support for BFL ASICs</flag>
+		<flag name="bitforce">Enable support for mining with ButterFly Labs BitFORCE FPGAs</flag>
+		<flag name="bitfury">Enable support for mining with BitFury ASICs</flag>
+		<flag name="bitmine_A1">Enable support for mining with Bitmine.ch A1 ASICs</flag>
+		<flag name="blockerupter">Enable support for mining with BlockRupter ASICs</flag>
+		<flag name="cointerra">Enable support for mining with Cointerra ASICs</flag>
+		<flag name="drillbit">Enable support for mining with Drillbit BitFury ASICs</flag>
+		<flag name="hashfast">Enable support for mining with Hashfast</flag>
+		<flag name="hashratio">Enable support for mining with Hashratio</flag>
+		<flag name="icarus">Enable support for mining with Icarus FPGAs</flag>
+		<flag name="klondike">Enable support for mining with Klondik ASICs</flag>
+		<flag name="knc">Enable support for mining with KnC miners</flag>
+		<flag name="minion">Enable support for mining with BlackArrow Bitfury </flag>
+		<flag name="modminer">Enable support for mining with ModMiner FPGAs</flag>
+		<flag name="sp10">Enable support for Spondoolies SP10</flag>
+		<flag name="sp30">Enable support for Spondoolies SP30</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ckolivas/cgminer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/cgterm/Manifest b/net-misc/cgterm/Manifest
new file mode 100644
index 000000000000..71504e748978
--- /dev/null
+++ b/net-misc/cgterm/Manifest
@@ -0,0 +1,6 @@
+AUX cgterm-1.6-QA.patch 1404 SHA256 1d3991ecbf38835c7b1fa6c1a162d947de425fdb195ec5f5d4f68fb31152b835 SHA512 6ffa4e5f1bf7f9eff35b4b06905efc88e8ce9398482a574c18c21d487b21ddf54422cb8b980fa8cf4f7276def7da01cd12df679e629f29bfd1bb826b2e99984c WHIRLPOOL 10a5be1ead5e981bd38163d82a286a0c35f6f0d033c31801b6153c212141355bfd8926a881965a3bf275839886a85efb050fa886992a1346a9ad43446fec1974
+DIST cgterm-1.6.tar.gz 87887 SHA256 21b17a1f5178517c935b996d6f492dba9fca6a88bb7964f85cce8913f379a2a1 SHA512 a2f0fe07e64b947188a4aaf9abe22365551e0dcc65c2cffb1e09559a172be33e5dbfeb931095509b25fbe26487d2968b77b34605e50c6f1679225a4f3f7f1996 WHIRLPOOL 30227230bc1e3954badc8bc138532fd1d761eb6783fe6bbfed85a466dcc1cb7fa119a5331929199efb81a6765e1d434703d5400246f024b165d11590976fe457
+EBUILD cgterm-1.6.ebuild 715 SHA256 cec82255b77ff178f778923ace1d74a751730a89af5d4397e167c7662619f822 SHA512 4f6ddddd1e005803e2e2176d797d40e14c37ed5885a7501612d4d13ea4cc28075586001f98238ff346a9d117a74d1ec22cf0a90aebfdfffe874f0379eb79d9ff WHIRLPOOL 724d2b65e26fe7d31f34f4df51b10c65e8aef900d9ec9e3f105c9d672ef2636dff1a98fe89a21aec77f7ba50951030b33d9c6ffe25841c4efb0154535f6fa1f3
+MISC ChangeLog 2543 SHA256 f1e37d925cddc65a7a436972d7d8e3ee342085c0184c9c1e98dae3d2a421cc93 SHA512 6e515f184e88b98cb8322e25e303415433e5fd2cdb45045a0884d01fab2e4d91737a0cf66165d32c4d618fb09bb941e566a6077bf50e184eef34b9312c925796 WHIRLPOOL e6d9f11ef1b76743443b2b4f93a0d5e49777208a7964d243aa7e388416cac79c08705408470dda0df6b22e50012635bd447653298ba32c32a5efc43f25064dd7
+MISC ChangeLog-2015 1045 SHA256 5b1a93b6223704a7a70dcb64073693e60409de167ee3836e431bd6ab493b6d39 SHA512 ee70c9c51c2fabf67335ff836773ed97c9f294c28c32f5a98b69324f6aed8057848a0a4754f6c2ea995b19a6c22d8bee1eb34fc508f7cfaf04b85e4ae5dd1893 WHIRLPOOL 4920c3dfc6e6fc72973c98fed2e1246f6b8d78064394507457dc4bc5dced15fa501f1402cf57ef2f5cf4b974ba0ba6b9c222e39bec110888a85026d4a6dc8198
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/cgterm/cgterm-1.6.ebuild b/net-misc/cgterm/cgterm-1.6.ebuild
new file mode 100644
index 000000000000..44b5057cb065
--- /dev/null
+++ b/net-misc/cgterm/cgterm-1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Connect to C64 telnet BBS's with the correct colours and font"
+HOMEPAGE="http://www.paradroid.net/cgterm/"
+SRC_URI="http://www.paradroid.net/cgterm/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc x86"
+
+DEPEND=">=media-libs/libsdl-1.2.5"
+RDEPEND="${DEPEND}"
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-QA.patch"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} `sdl-config --cflags` -DPREFIX=\\\"/usr\\\"" || die
+}
+
+src_install() {
+	mkdir "${D}/usr"
+	emake install PREFIX="${D}/usr" LDFLAGS="`sdl-config --libs`" || die
+	rmdir "${D}/usr/etc"
+}
diff --git a/net-misc/cgterm/files/cgterm-1.6-QA.patch b/net-misc/cgterm/files/cgterm-1.6-QA.patch
new file mode 100644
index 000000000000..76d253bd8b27
--- /dev/null
+++ b/net-misc/cgterm/files/cgterm-1.6-QA.patch
@@ -0,0 +1,46 @@
+diff -NrU5 cgterm-1.6.original/Makefile cgterm-1.6/Makefile
+--- cgterm-1.6.original/Makefile	2009-09-07 08:43:52.000000000 -0600
++++ cgterm-1.6/Makefile	2009-09-07 09:06:07.000000000 -0600
+@@ -8,11 +8,11 @@
+ # for solaris:
+ #SOCKETLIBS = -lsocket -lnsl
+ 
+ CC=gcc
+ CFLAGS=-O3 -Wall `sdl-config --cflags` -DPREFIX=\"$(PREFIX)\"
+-LDFLAGS=`sdl-config --libs` $(SOCKETLIBS)
++LDFLAGS+=`sdl-config --libs` $(SOCKETLIBS)
+ 
+ 
+ OBJS= \
+ 	kernal.o \
+ 	gfx.o \
+@@ -62,25 +62,22 @@
+ 
+ testimage: testimage.c diskimage.c dir.c
+ 	$(CC) -g -O3 -Wall -o testimage $^
+ 
+ install: all installdirs
+-	strip cgterm$(EXESUFFIX)
+ 	cp cgterm$(EXESUFFIX) $(PREFIX)/bin/
+ 	cp cgchat$(EXESUFFIX) $(PREFIX)/bin/
+ 	cp *.bmp *.kbd *.wav $(PREFIX)/share/cgterm/
+ #	cp cgterm.cfg $(PREFIX)/etc/
+ #	cp cgchat.cfg $(PREFIX)/etc/
+ 
+-installdirs: $(PREFIX)/bin $(PREFIX)/share $(PREFIX)/share/cgterm $(PREFIX)/etc
++installdirs: $(PREFIX)/bin $(PREFIX)/share/cgterm $(PREFIX)/etc
+ 
+ $(PREFIX)/bin:
+-	mkdir $(PREFIX)/bin > /dev/null 2>&1
+-$(PREFIX)/share:
+-	mkdir $(PREFIX)/share > /dev/null 2>&1
++	mkdir -p $(PREFIX)/bin > /dev/null 2>&1
+ $(PREFIX)/share/cgterm:
+-	mkdir $(PREFIX)/share/cgterm > /dev/null 2>&1
++	mkdir -p $(PREFIX)/share/cgterm > /dev/null 2>&1
+ $(PREFIX)/etc:
+-	mkdir $(PREFIX)/etc > /dev/null 2>&1
++	mkdir -p $(PREFIX)/etc > /dev/null 2>&1
+ 
+ clean:
+ 	rm -f cgterm$(EXESUFFIX) cgchat$(EXESUFFIX) testkbd$(EXESUFFIX) *.o *~
diff --git a/net-misc/cgterm/metadata.xml b/net-misc/cgterm/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/cgterm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/charm/Manifest b/net-misc/charm/Manifest
new file mode 100644
index 000000000000..7bc7c2dc8176
--- /dev/null
+++ b/net-misc/charm/Manifest
@@ -0,0 +1,5 @@
+DIST charm-1.9.2.tar.gz 84927 SHA256 ae2d536303e770ceb002f69c1e71f6a8532c8d5dd075d2f5c1bf09ad02c3c015 SHA512 9ea4c7411764dd1d1c87a1a19de2de3061e08e030e793ff259e80477aa5880a01f05f8a8d1ecc9b1e696111c3f3f9504f5387f535d9d52d1496d20b04c68835b WHIRLPOOL 9e25c985ea6f3e0f9bdf4ad4c2508a2b77886eaaeb3ffce9e04887a2d6fbc9b553a4accdcbfa2114fee81926864872b06aacf1f36a2af7108ad2fffdc1f0a329
+EBUILD charm-1.9.2-r1.ebuild 831 SHA256 35814af5c877111b9b60e5045f45f1c0ec3ac68fa93fea6529ec7673ed0f3098 SHA512 4657bee6fc6681eff86e6ca84037a2c86b50457eb337319bf7137f7a159d7e271fd38733d982cf0d87db6f741b8e627f0dd36f371ff3d5050308216bd8ef5746 WHIRLPOOL ff0e434c47776fb07f568d38e0e3c55c4a478c6032e6acfda56dadd7965293fbb198bcb2ba1a14cfb8792204beeaaf1ec9e9024e6e38ed09e6f29fe6d67a9985
+MISC ChangeLog 2949 SHA256 09f5dbf0b56e4ce9d050d7b9c5029581038fdd38fc6cf8551b5a6d2982ea7be2 SHA512 47041d113ffb7075d1d6bcf2b5bc3dfcaf23c3ab571043a58cfc3c24ff97ce94bac47ab435e4bb3906b48a4181d6937b8d127b1bee184d5a87050c68818735fc WHIRLPOOL a0d5a2a9b2d07fd110bc109261481c740402b6bfa2d4e734e2c252e6a8c6f2968e9750e7983eb7442eb6f4510f0704257e2224d63955f13ead789a046b85b91a
+MISC ChangeLog-2015 3001 SHA256 61d7c51322ffaff3fa54c03b2b806a535cbf58acaf48b137ad8190c4ffe71633 SHA512 fe7a265ee06720478e60a63c8f989877fcc0147864cb164dd79f4fdb4bcc34a758a3b44614c94352da3db69ec8abb30bccb2d32d2d2206a4889927dd7de36ca8 WHIRLPOOL b095ad0bfb396a569af6765f3d5b8bef40a67862333404b3bdeeda2c250aa5a9fde73e24986f7d497a5e585972e4393fff89bc09de6c96f9ebe1f6f88ac4878a
+MISC metadata.xml 244 SHA256 f3f9849d89d4057ad977e759a9317114470c639ee60fb7e99f0ee849870420ab SHA512 e563e61a42c0710c2c87775e29ce2804ad1ebe2cf9619f0babf342b72a0a38ff44aa79c6a940b4486b9982cb962d56d12698c3cdc5aa6eecdf515d4a3057bbd0 WHIRLPOOL e26c5003ebb528f22ddb6f59e0b083369058fb5f9b5105b788b068ac6bfdcbd8aa6b1415d3b6d040f6e6a1801ac8509a693a5b8c0e2165effe05f9043aafed16
diff --git a/net-misc/charm/charm-1.9.2-r1.ebuild b/net-misc/charm/charm-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..3b5fe2799c91
--- /dev/null
+++ b/net-misc/charm/charm-1.9.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL="1"
+
+inherit distutils-r1
+
+DESCRIPTION="A text based livejournal client"
+HOMEPAGE="http://ljcharm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ljcharm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 sparc x86"
+IUSE=""
+
+DEPEND="dev-python/feedparser[$PYTHON_USEDEP]"
+
+DOCS=( CHANGES.charm sample.charmrc README.charm )
+HTML_DOCS=( charm.html )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e 's/("share\/doc\/charm", .*),/\\/' -i setup.py || die "sed failed"
+}
+
+pkg_postinst() {
+	elog "You need to create a ~/.charmrc before running charm."
+	elog "Read 'man charmrc' for more information."
+}
diff --git a/net-misc/charm/metadata.xml b/net-misc/charm/metadata.xml
new file mode 100644
index 000000000000..e7d7e8d65d89
--- /dev/null
+++ b/net-misc/charm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">ljcharm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
new file mode 100644
index 000000000000..87c6078463af
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -0,0 +1,15 @@
+AUX chrome-remote-desktop-44.0.2403.44-always-sudo.patch 820 SHA256 696e7ca85cfcbe4b2a379e3d23c1549153dda07c9addd21a8e96e3f03fc4eeb4 SHA512 aa35c9e81b056fded2ff95b6fc7ab9cf3bb89282513b7bf1a04a9d25567d0e59da9c8c9877500e7290e40d712f4be06ae8b482d3f830d818ea5897e6ffde248b WHIRLPOOL 2edbf083c4b8732a013054d00aef5c24c23c297005bfc945cc5316295a1134b3aa3e24ecd0a8511bc21461167bde724bc67ec4c1e4052618fc6d4b81d57782f4
+AUX chrome-remote-desktop.conf.d 579 SHA256 f2d871fcb5164bbb93326608d410e42f139bd949138e8386e69bc74a8755ea7a SHA512 60d6f49bd9f08553b0e317d74571c66bd5e42f9a59cbd2c350802b4a3a4958cd75eca96222e96bae600b6c6f1e6f221a33093df4de0a3b499c1ebaaf5c081983 WHIRLPOOL 87a732d92e1d88bb6eef4ca12d6f4e2a6abe4ea589a8ccc0d508be92fc59a717129f6d839d30bdc553c6a11031265721736add4449e00d65b40273770d0712f7
+AUX chrome-remote-desktop.rc 1388 SHA256 608e318ccdcec86bf6babf6dbadaac9f132a2fddae836cfe537c22b935bfa945 SHA512 f5d0755bfa337b7f3bf7b9d58cd9bd820404e1257e2d64cf74a073afece6af4dcb00a46ee2192087870eadd768b85a0b5ebd2b50223f13d105496a3902d094c2 WHIRLPOOL e589c9b72240c050b5a2f1c357290de91d6044643fc73e440b654da6e6401129df73c0321f291cff3e758d489ac9311f7477d3fd13a9cb14fa470f6e9ae61d52
+DIST chrome-remote-desktop_49.0.2623.40_amd64.deb 20315570 SHA256 2f3cb883e1ff2465db47d5aadf773efb49c5f11b0bfe3dfba973608e4db45047 SHA512 d936885a986a749a0b4ebb1bb68fe0bc14d10d21363a409abbbb224b4f3ee048ef030ee81469be9bbb8c3852d7c6793fcab1f51d52fcaf5b02cda07550b72330 WHIRLPOOL 6662bfc8a8c298b7c062e4a10752aa3dfe910c7602a0bc20dc64533195d61ceb414dbc411c7f872e085dd13c46372ee46b33904d68bb5aae13698a04442e3905
+DIST chrome-remote-desktop_49.0.2623.40_i386.deb 20941574 SHA256 00e480a90b3ed3545ea762d7501b323f2471eb06b11f87882c046598b8f38df7 SHA512 00cf6641ee993fb8c295ca99cb57cde42eb3dd6cc34ae4684f858279615695d5b1a257081e8988293f94e887986492e112bc0276f572cd592d9879dec88eace8 WHIRLPOOL effd2650ee7d5b97f87ede0ac79bc1818ddc06e3eb742a080b12a4ef67283f5ba20495d5a5b4f5a5923d2a9a574a711513344b08abac3938ad142f27af48ed88
+DIST chrome-remote-desktop_55.0.2883.50_amd64.deb 21636452 SHA256 972b48e05ee80c38b30a362147b051b560051e80e17874eaa32d9bfea53066ae SHA512 3e140407d6e34caed18f3280d2136ea924ba7c9fc0159cde4981927be9c0bd090c58581ed01b3a99b8a796211500ff1588a847d5d3273ec814d9fb10285a97f8 WHIRLPOOL abca4bba11ea4f8044247a102eec2b761b403b3fccc3c1f4cd3694265f629c146b21122034b2f1adb986325a22f48db90f1c43d2bfdf647122e4054e3864c190
+DIST chrome-remote-desktop_56.0.2924.51_amd64.deb 13879608 SHA256 7bdb11e9fe929ca263bb0a9b813f6cd7f6762c3e33166735afa3b6d16343b896 SHA512 0578f430d93270b398c7341515e10e25ffe4c8827b3a8dc01b789fc530eb0919cd560bfa8377d5e1f0c74c53db7ba2f60354c57e2c435dcb411d9168610a3b7f WHIRLPOOL dc9407e4416b38b43cfdd99948072886c6c8dae92b273413995a701cab0e15351474cec03d43717a4da312583a14da78e07a8bd54dee3f3f76542ee654846b93
+DIST chrome-remote-desktop_57.0.2987.37_amd64.deb 15677362 SHA256 65e510b6b0ae203f421ba7404446c679620e4448f10ea469684286931840200d SHA512 df470d9f69545dd2793b5d97674bb8724f5ad3dfad05b4d5572b01a21443d79e6776fb72ca14044d7ee00660b7d040023c9716e2568551e2862bdfd3cff99d88 WHIRLPOOL c7d469d30ac0a8aea7e655795ed3bf421a7e214594c3013272c56a056f350199450ba6aae95bd666b3ca04a8e1c1e7be120f0c06fcdc4708f65c4ed863cf084a
+EBUILD chrome-remote-desktop-49.0.2623.40.ebuild 3668 SHA256 d312214b4b4bd7a61dd724a266d56167bf02e083f2b9533669223c83f7d92e6d SHA512 7486227050481ba09ac2f5a0c1fa205d1461210354bbbd2b1fdcd40195fc223ed018b439ad421c1f93c825e67106042e867f57552b68c26134fd185daa4126be WHIRLPOOL 30bf9c972dfd80da694b7ac5e90be96ed0a0add4756a325ead07ae50c6c015c24277be685402ea819b861d2d9c6ccc3500697d0eb6c83ed0264eae74a9cebe2c
+EBUILD chrome-remote-desktop-55.0.2883.50.ebuild 3403 SHA256 62c20860776e567b10f08bedad96094031346b0956c49cf4a75f2da2673b4c3b SHA512 bc100be9a1d350e8e2068d7fc9cccefa54f846a7703222d6371a5b3b6f7a012e9c8de406518c69935999b03a45480ac8028820a601a1bcc9ccf7a1ecd5cdbf3c WHIRLPOOL ce465f149d1c2815e572cea42cea9eadaa06d7ab0845538ea1b24832c5b21240f22be93cb41c4bcbb522afe788a9bb34af78196f77e533062f15fa01cccbc3e4
+EBUILD chrome-remote-desktop-56.0.2924.51.ebuild 3405 SHA256 fe46b6210b20740a136cec03ae977383ab7bda54306202569a71b7624942adab SHA512 f82404cef04d54b7e99b8fc271d8403e2e4bc659bb1c2b701794d1fc8823174b5e889622ca1873a37ffd56a121f9cb4e4b6ddce5b1253746fead511423400a9b WHIRLPOOL 55b50e3826a8224b35819788ac2ec70b2df01e5db0e109edfb31ce31cef5e69d6a4a36c7142d6f83b7f39e69b79d2474a77aee46c07808003c2995a39c739caf
+EBUILD chrome-remote-desktop-57.0.2987.37.ebuild 3826 SHA256 f1d7a5606c84405efe69f385f666fe137356ef1fdcfef5c2e7cd8c8bc228d0c4 SHA512 009b75c18f84a40d5d10a40704b12cd31cce0402c07740d6a906d7767239d8914f5744d25649ecc6037c7049f15e353668229ac27e49f728b7feb87ecf930cfe WHIRLPOOL c2e59c57492e52ff51da05408321ca6ad29d57d90595b56d547d4158e61bf919ceaaaa8af23eb4027b85d0a5b9e9b4486c3be2d75d22c44c502b3dfbc396edc4
+MISC ChangeLog 5661 SHA256 b4be6d12ea28e589306709f22b9181fcb605d23d0048b88d9759225d06aebe33 SHA512 56cd5133c49b09ddf6873a652ac88da7aac99961b966156f0edaa8a7fba2205b79aa33c5532fe95704a2e202a78c489841382bae72f4e1e3ee68bc7ee2f0fd6b WHIRLPOOL 79dd999ea16d52a98f75e3f7c04331f4051684dc776b26fc313faffe24b4e45f4366e0bfdc932abd267e07f4e05096e9a68f15db82f7d9a91a765cd3d6cdaa9a
+MISC ChangeLog-2015 1286 SHA256 3c217a97571f813c569f2bbe86a52b4bd8af5b4b21cde80a140c547fdb070bc3 SHA512 461a0940bd3fa0af9b59a708bd84257a7554d90377197bd28310f96d944ae45e2a4792b2e5c2a97980df9eb4fecd7d7837e667f63e8f369c9a389ed7e4de6296 WHIRLPOOL 83d1f5ba61dc4b2b2fa9c2aa7f6fa2d56d347004b3ccfa073422385f136009cd416c115d3d2ba3a269c413dd2681b6ef8e41d685b1f17e16ba355cc959180157
+MISC metadata.xml 214 SHA256 d6339a92715ade5f609951c445c03024adbfecbca53a9cb232c6838c8ded201e SHA512 ac8342ba1f8eaf027f23e677b348b4da59f5d6b0d9ddf434def5413c6f7c9b3d803fe2c8141fd7aaf8c8d9ac2a0fe800e3d0c41017c28dbd9104e34f83ca24f7 WHIRLPOOL 5c05dce3362f17da9c9478ea9ad10b392d6fb5ec493b4904abff61ebc4e4b838fd5f77abfbea0f9ccd334027105ada679f392cd1a0940d3a28f0c6af1c99e375
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild
new file mode 100644
index 000000000000..36683aa535d6
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
+# Fetch the Release file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
+# Which gives you the Packages file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
+# And finally gives you the file name:
+#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
+#
+# Use curl to find the answer:
+#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit unpacker eutils python-single-r1
+
+DESCRIPTION="access remote computers via Chrome!"
+PLUGIN_URL="https://chrome.google.com/remotedesktop"
+HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
+BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
+SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
+	x86? ( ${BASE_URI}_i386.deb )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# All the libs this package links against.
+RDEPEND="app-admin/sudo
+	${PYTHON_DEPS}
+	>=dev-libs/expat-2
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-python/psutil
+	gnome-base/gconf:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/pam
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/pango"
+# Settings we just need at runtime.
+RDEPEND+="
+	x11-base/xorg-server[xvfb]"
+DEPEND=""
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
+	python_fix_shebang opt/google/chrome-remote-desktop/chrome-remote-desktop
+}
+
+src_install() {
+	insinto /etc
+	doins -r etc/opt
+
+	insinto /opt
+	doins -r opt/google
+	chmod a+rx "${ED}"/opt/google/${PN}/* || die
+
+	dodir /etc/pam.d
+	dosym system-remote-login /etc/pam.d/${PN}
+
+	dodoc usr/share/doc/${PN}/changelog*
+
+	newinitd "${FILESDIR}"/${PN}.rc ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Two ways to launch the server:"
+		elog "(1) access an existing desktop"
+		elog "    (a) install the Chrome plugin on the server & client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) on the server, run the Chrome plugin & enable remote access"
+		elog "    (c) on the client, connect to the server"
+		elog "(2) headless system"
+		elog "    (a) install the Chrome plugin on the client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) visit https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromoting+https://www.googleapis.com/auth/googletalk+https://www.googleapis.com/auth/userinfo.email&access_type=offline&redirect_uri=https://chromoting-auth.googleplex.com/auth&approval_prompt=force&client_id=440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com&hl=en&from_login=1&as=-760f476eeaec11b8&pli=1&authuser=0"
+		elog "    (c) run the command mentioned on the server"
+		elog "    (d) on the client, connect to the server"
+		elog
+		elog "Configuration settings you might want to be aware of:"
+		elog "  ~/.${PN}-session - shell script to start your session"
+		elog "  /etc/init.d/${PN} - script to auto-restart server"
+	fi
+}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-55.0.2883.50.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-55.0.2883.50.ebuild
new file mode 100644
index 000000000000..3c0165a981a5
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-55.0.2883.50.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
+# Fetch the Release file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
+# Which gives you the Packages file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
+# And finally gives you the file name:
+#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
+#
+# Use curl to find the answer:
+#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit unpacker eutils python-single-r1
+
+DESCRIPTION="access remote computers via Chrome!"
+PLUGIN_URL="https://chrome.google.com/remotedesktop"
+HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
+BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
+SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# All the libs this package links against.
+RDEPEND="app-admin/sudo
+	${PYTHON_DEPS}
+	>=dev-libs/expat-2
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-python/psutil
+	gnome-base/gconf:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/pam
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/pango"
+# Settings we just need at runtime.
+RDEPEND+="
+	x11-base/xorg-server[xvfb]"
+DEPEND=""
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
+	python_fix_shebang opt/google/chrome-remote-desktop/chrome-remote-desktop
+}
+
+src_install() {
+	insinto /etc
+	doins -r etc/opt
+
+	insinto /opt
+	doins -r opt/google
+	chmod a+rx "${ED}"/opt/google/${PN}/* || die
+
+	dodir /etc/pam.d
+	dosym system-remote-login /etc/pam.d/${PN}
+
+	dodoc usr/share/doc/${PN}/changelog*
+
+	newinitd "${FILESDIR}"/${PN}.rc ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Two ways to launch the server:"
+		elog "(1) access an existing desktop"
+		elog "    (a) install the Chrome plugin on the server & client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) on the server, run the Chrome plugin & enable remote access"
+		elog "    (c) on the client, connect to the server"
+		elog "(2) headless system"
+		elog "    (a) install the Chrome plugin on the client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) run ${EPREFIX}opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
+		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
+		elog "    (d) run start-host again, and past the code when asked for an authorization code"
+		elog "    (e) on the client, connect to the server"
+		elog
+		elog "Configuration settings you might want to be aware of:"
+		elog "  ~/.${PN}-session - shell script to start your session"
+		elog "  /etc/init.d/${PN} - script to auto-restart server"
+	fi
+}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-56.0.2924.51.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-56.0.2924.51.ebuild
new file mode 100644
index 000000000000..a2172a6f3a1b
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-56.0.2924.51.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
+# Fetch the Release file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
+# Which gives you the Packages file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
+# And finally gives you the file name:
+#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
+#
+# Use curl to find the answer:
+#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit unpacker eutils python-single-r1
+
+DESCRIPTION="access remote computers via Chrome!"
+PLUGIN_URL="https://chrome.google.com/remotedesktop"
+HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
+BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
+SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# All the libs this package links against.
+RDEPEND="app-admin/sudo
+	${PYTHON_DEPS}
+	>=dev-libs/expat-2
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-python/psutil
+	gnome-base/gconf:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/pam
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/pango"
+# Settings we just need at runtime.
+RDEPEND+="
+	x11-base/xorg-server[xvfb]"
+DEPEND=""
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
+	python_fix_shebang opt/google/chrome-remote-desktop/chrome-remote-desktop
+}
+
+src_install() {
+	insinto /etc
+	doins -r etc/opt
+
+	insinto /opt
+	doins -r opt/google
+	chmod a+rx "${ED}"/opt/google/${PN}/* || die
+
+	dodir /etc/pam.d
+	dosym system-remote-login /etc/pam.d/${PN}
+
+	dodoc usr/share/doc/${PN}/changelog*
+
+	newinitd "${FILESDIR}"/${PN}.rc ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Two ways to launch the server:"
+		elog "(1) access an existing desktop"
+		elog "    (a) install the Chrome plugin on the server & client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) on the server, run the Chrome plugin & enable remote access"
+		elog "    (c) on the client, connect to the server"
+		elog "(2) headless system"
+		elog "    (a) install the Chrome plugin on the client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) run ${EPREFIX}opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
+		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
+		elog "    (d) run start-host again, and past the code when asked for an authorization code"
+		elog "    (e) on the client, connect to the server"
+		elog
+		elog "Configuration settings you might want to be aware of:"
+		elog "  ~/.${PN}-session - shell script to start your session"
+		elog "  /etc/init.d/${PN} - script to auto-restart server"
+	fi
+}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
new file mode 100644
index 000000000000..47641db6d60e
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
+# Fetch the Release file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
+# Which gives you the Packages file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
+# And finally gives you the file name:
+#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
+#
+# Use curl to find the answer:
+#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PLOCALES=(
+	am ar bg bn ca cs da de el en-GB en es-419 es et fa fil fi fr gu he hi hr
+	hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw
+	ta te th tr uk vi zh-CN zh-TW
+)
+
+inherit unpacker eutils python-single-r1 l10n
+
+DESCRIPTION="access remote computers via Chrome!"
+PLUGIN_URL="https://chrome.google.com/remotedesktop"
+HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
+BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
+SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="${PLOCALES[*]/#/l10n_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# All the libs this package links against.
+RDEPEND="app-admin/sudo
+	${PYTHON_DEPS}
+	>=dev-libs/expat-2
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-python/psutil
+	gnome-base/gconf:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/pam
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/pango"
+# Settings we just need at runtime.
+RDEPEND+="
+	x11-base/xorg-server[xvfb]"
+DEPEND=""
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
+	python_fix_shebang opt/google/chrome-remote-desktop/chrome-remote-desktop
+}
+
+src_install() {
+	pushd opt/google/chrome-remote-desktop/remoting_locales >/dev/null || die
+	rm -f fake-bidi.pak
+	local l
+	for l in "${PLOCALES[@]}" ; do
+		use "l10n_${l}" || rm -f "${l}.pak"
+	done
+	popd >/dev/null
+
+	insinto /etc
+	doins -r etc/opt
+
+	insinto /opt
+	doins -r opt/google
+	chmod a+rx "${ED}"/opt/google/${PN}/* || die
+
+	dodir /etc/pam.d
+	dosym system-remote-login /etc/pam.d/${PN}
+
+	dodoc usr/share/doc/${PN}/changelog*
+
+	newinitd "${FILESDIR}"/${PN}.rc ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Two ways to launch the server:"
+		elog "(1) access an existing desktop"
+		elog "    (a) install the Chrome plugin on the server & client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) on the server, run the Chrome plugin & enable remote access"
+		elog "    (c) on the client, connect to the server"
+		elog "(2) headless system"
+		elog "    (a) install the Chrome plugin on the client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) run ${EPREFIX}opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
+		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
+		elog "    (d) run start-host again, and past the code when asked for an authorization code"
+		elog "    (e) on the client, connect to the server"
+		elog
+		elog "Configuration settings you might want to be aware of:"
+		elog "  ~/.${PN}-session - shell script to start your session"
+		elog "  /etc/init.d/${PN} - script to auto-restart server"
+	fi
+}
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch
new file mode 100644
index 000000000000..d303e5e753f9
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/541708
+
+just use `sudo` for everything
+
+--- a/opt/google/chrome-remote-desktop/chrome-remote-desktop
++++ b/opt/google/chrome-remote-desktop/chrome-remote-desktop
+@@ -1092,12 +1092,7 @@
+       logging.info("Group '%s' not found." % CHROME_REMOTING_GROUP_NAME)
+ 
+     command = [SCRIPT_PATH, '--add-user-as-root', user]
+-    if os.getenv("DISPLAY"):
+-      # TODO(rickyz): Add a Polkit policy that includes a more friendly message
+-      # about what this command does.
+-      command = ["/usr/bin/pkexec"] + command
+-    else:
+-      command = ["/usr/bin/sudo", "-k", "--"] + command
++    command = ["/usr/bin/sudo", "-k", "--"] + command
+ 
+     # Run with an empty environment out of paranoia, though if an attacker
+     # controls the environment this script is run under, we're already screwed
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d
new file mode 100644
index 000000000000..db24cdd4ab11
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d
@@ -0,0 +1,14 @@
+# /etc/conf.d/chrome-remote-desktop: config file for /etc/init.d/chrome-remote-desktop
+
+# List of users to start Chrome Remote Desktop for.
+CHROME_REMOTING_USERS=''
+
+# Options to pass to chrome-remote-desktop.  Only the -s option is interesting.
+# Note: In order to support resizing, you need to:
+# (1) Apply this patch to xorg-server (via epatch_user):
+#     http://patchwork.freedesktop.org/patch/51428/
+# (2) Create a symlink /usr/bin/Xvfb-randr -> Xvfb
+#OPTIONS='-s 1600x1200 -s 3840x1600'
+
+# Directory to use for storing log files.
+#CHROME_REMOTE_DESKTOP_LOG_DIR='/var/log'
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
new file mode 100644
index 000000000000..0604c61c78a4
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
@@ -0,0 +1,71 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="checkconfig reload"
+
+CRD=/opt/google/chrome-remote-desktop/chrome-remote-desktop
+
+depend() {
+	need net
+	use logger
+}
+
+checkconfig() {
+	local ret=0
+	if [ -z "${CHROME_REMOTING_USERS}" ] ; then
+		eerror "You must set CHROME_REMOTING_USERS in /etc/conf.d/${SVCNAME} first"
+		ret=1
+	else
+		local user
+		for user in ${CHROME_REMOTING_USERS} ; do
+			if ! id "${user}" >/dev/null ; then
+				eerror "Invalid user found in CHROME_REMOTING_USERS: ${user}"
+				ret=1
+			fi
+		done
+	fi
+	return ${ret}
+}
+
+for_users() {
+	local user ret msg log
+	msg=$1; shift
+
+	: ${CHROME_REMOTE_DESKTOP_LOG_DIR:=/var/log}
+
+	for user in ${CHROME_REMOTING_USERS} ; do
+		ebegin "${msg} ${SVCNAME} for ${user}"
+
+		log="${CHROME_REMOTE_DESKTOP_LOG_DIR}/${SVCNAME}.${user}.log"
+		checkpath -f -m 0600 -o "${user}" "${log}"
+
+		# We need to background the app as it won't fork until the network
+		# (including DNS) is available.
+		start-stop-daemon \
+			-b \
+			-u "${user}" \
+			-x "${CRD}" \
+			-e "CHROME_REMOTE_DESKTOP_LOG_FILE=${log}" \
+			-- \
+			${OPTIONS} \
+			"$@"
+		eend $?
+		: $(( ret |= $? ))
+	done
+
+	return ${ret}
+}
+
+start() {
+	checkconfig || return
+	for_users Starting --start
+}
+
+stop() {
+	for_users Stopping --stop
+}
+
+reload() {
+	for_users Reloading --reload
+}
diff --git a/net-misc/chrome-remote-desktop/metadata.xml b/net-misc/chrome-remote-desktop/metadata.xml
new file mode 100644
index 000000000000..1021f53d6e8c
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/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 type="person">
+ <email>vapier@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
new file mode 100644
index 000000000000..fceffbcd1c89
--- /dev/null
+++ b/net-misc/chrony/Manifest
@@ -0,0 +1,21 @@
+AUX chrony-2.2.logrotate 104 SHA256 9cc5fcb3e6fd6904cec42c4b9fd813a5c768b4b63d67cd2d4d7c609d02a5c098 SHA512 3bc094e6b85eb00a129deb0661d36121f51643b6542759b5402308f48384a32e4949c82e6d63437a792d52c0d1142849229a59aae67acfc952121f4b5d51428c WHIRLPOOL 1a42a2fcd9b37c6480b182cc63c328670c7915d7442143abd1261d10f68c820a732da98303fb40706e727119713599a2c15bf2305d9d0c41b9347f0d2e451363
+AUX chrony-2.4-r1.logrotate 131 SHA256 834647530769c6ae29db6a5dcdba04b97c1537f17f5908aebd7938c2140ba17e SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b WHIRLPOOL 338393e500fb49eb90ff83b66e1b1467a7e3aedf0cbc334a6d636232cbf64bff547a43917aec0192a3c1091c204344ebdbaf2eabd40cf2a180f43454fb422e47
+AUX chronyd.conf 378 SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99 SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640 WHIRLPOOL 14e6e90959e434475f8d74a144fd342588e99a7102b15cedbf7a436ca32db3e09bbe4bd2630634fac9045db4b75a6c7afcd8f91c67bd8bb4f977d821d220ced9
+AUX chronyd.init 1634 SHA256 94afbfe898daeadaa941bfff6da658fe8565ead14d69a667498d6935e3d24678 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872 WHIRLPOOL 5486203a0e3d9a04c16c78d642382598acb658dc3690af1622ce806a3776a353817338677c3c636c9a2c24e1d64cef1898dc020592b8981fc1b196565b9eba6b
+AUX chronyd.init-r1 1637 SHA256 f3c8b8dfbb1ee14b251d3502cb799411aa4fb71d107ddd90b41b4841eee22f5c SHA512 cbfafe8210cc3d86d417d590fa6c54924ef9f3487c3766a17fffb34d2421a5fc2dfb98ce53dcc33c5811e7c2fd428a235bfde68d999cb50c7d9e5100f769a37b WHIRLPOOL d1b31217ede912611bf7aec69a37d4321913cff0e41f8dfe1df1ff1a6605fd21bbfbdced53ea6e9dc0a22ff5848fe0b705ddf0a6b0e5154ddd4e9b6ed1fe656a
+AUX chronyd.service-r2 261 SHA256 d5996c6b8596e137b36099d0ce7974bfd8e36411d999712d2f0393ac738f3754 SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe WHIRLPOOL f95d9472ad30fb06e3d0014ddc2be492dd1a6d2b5590bed27214ba1b0566d83e89e108a8df3de9dade939a9feff005bfff431d796f9e813388830e3f3dfc437b
+DIST chrony-2.2.1.tar.gz 340514 SHA256 4776fa8e80d698723e9a88eb882170951f6c45860545d84ae9f9d8b9bbd73796 SHA512 caa18a22e7e64186f24f474e02862296bfa74c99671bc98e926caf27b88ce3580282543594602e76ad4be9b7f9623350888def893a7c1d96a7370d13a636442f WHIRLPOOL 77500bc25496dc15f17bce60023b86330205945999011b243272db26a924ac67193da70089c59e19bea7666c05059c8c4c1975ca19057775ec2dd8e468ab8dce
+DIST chrony-2.3.tar.gz 355113 SHA256 58bffb523012fb0fa87cc0d94d6e36de9689fe9556519cbd0d1ba254af92ccb2 SHA512 2a9cda6c2bc931438b798bd037614196bdb1533d12432467a690d57095c74013c80c92fcaadbd43fd5b0c816872822527a1ade3014add458d669d7813d5fa080 WHIRLPOOL 06864181ac74b2cf13baf7d9098404f8540c26db41035fe38005fbfea8e12f2de179008f5b1a2544e24ebb7e4cca712421746690edb7f36b90416ad87901e920
+DIST chrony-2.4.1.tar.gz 390641 SHA256 0fd59e0ef625b4459e3a9c7f221c52f56596582bce31abfae5f7369702edb6e0 SHA512 7772065103ad95706f80374d88ba452b76cf8e29689abf22b38e7eb5ad2fcc491593e11702400daa8bf908218614df21b08ff15ab2d3d2347876119cd80abc4d WHIRLPOOL ed2c2ac8e11371e009d3e96553bb73e58b410bb38e6123a9e39a3451e5dc6860d981d45e67b4e2dc47b39f616f95146feb35efd15dbaa90932f07837172c440a
+DIST chrony-3.1.tar.gz 424109 SHA256 9d9107dcdb7768a03dc129d33b2a7a25f1eea2f5620bc85eb00cfea07c1b6075 SHA512 4ba3a75c3634050bb63ba9ee80d9be7a295f44ce4d195a050e4be4738bd7dd807fe37f2289d7ead4a75272bd5ebadbd03c233c67f859e9b68871fca5a6671427 WHIRLPOOL d1b499bbcdd74a049c972c183d4b88365db4c6512d8011ca8b87f15c4e0d1bc882bde4f742591f5cfe49e820a5884f6b1960d132d5787be02a36bd57b9e2605f
+DIST chrony-3.2.tar.gz 433882 SHA256 329f6718dd8c3ece3eee78be1f4821cbbeb62608e7d23f25da293cfa433c4116 SHA512 496af5bed91600f268c1a0fa577bb8c7785e485f78598b666829c674e94770c16548cec4289a2ae9d0a51191d2705eda00886cb6cccae3828aa201a49d4783a4 WHIRLPOOL b8a9045c81970653393c2afadece1e3a5e093c893b7ac3bae061bbd40bc043439e426df8da6598e36ef9589b4dd402419199307a9bfa48df526206952814667e
+EBUILD chrony-2.2.1.ebuild 2723 SHA256 8f451ed6c9907d65d3fec6ec6765c47f3f856752d16536f76241a6ae2d9716a6 SHA512 a41cb2fc585ab76e7b323cecaf04c38c6b779dec6d20f2675d1f89a1b5e0b0688568ba9d82371209b1a75cf2e61aa8d6b2f24711680565138ef7d96f550be4f9 WHIRLPOOL e4f07fb0b8cd6302149d720eb539e3939bd170263cf8c4ec6d15d7355d9d1bb30de56ff9197f1c768a04757394af3826ffe8359bdffb88f6a2d9bb76a6dcc8c9
+EBUILD chrony-2.3.ebuild 2724 SHA256 2618ffb7591e9bbfd80fe2260e61f46418b882516bd4df791081142d78f5fcde SHA512 4509bb5db4d0f17fdb4951805b118fc044c0a79897b3b0d5522d0570cf95f6f37513dcace1b689e32127ea24a77567c3b14f7da91d9333c2fcaa76e4c2de0b24 WHIRLPOOL 7e6455db66b8c9b8f0d284e5322807b129f8a82689f99325145d29349e71b860c9be9bbe2c18569328aafaacc5b8d5d72f679ba7c011fa8afacf589e7fe403e5
+EBUILD chrony-2.4.1.ebuild 2817 SHA256 5c7cdb706c8a4b064170c0b338070effcdd78f0b1011ebddc4ba38a2f7563d17 SHA512 1bb4017e67ca5c2222a9bd6e113d2821f288fb20ddabbd7af08993ed694fb8a1a71fff260ae1718a0219ce76ae7d86521e7ab61326f5475394826dfe1550de75 WHIRLPOOL a75d31c6635effaea7b1cda46c801d222bf38253b0919f0821408c4fe4279d64e66d8e7fe6ff76ef56b6dbca847ceb27f901fc5c37244d5a0f8cf4b1dea78c61
+EBUILD chrony-3.1-r1.ebuild 2903 SHA256 edf02975eb5053380c6246d72b56624aef8f675166d63be11a76858886e0a93c SHA512 e0c298118bf7b38f975cb41d48623405e9257f4935eb1aa29f5c551b514b376caebd1d5dad6629240db4229c283bd133fd42ddd59efe278d90960b756fc810f8 WHIRLPOOL 36e316e3a21b41a4700a00c66e12f44c253e5b711a927aae45acb265362c78e2102d8f9581be7f59dbeceecd64e3f29383201b5f09424becace1b710dceff992
+EBUILD chrony-3.1.ebuild 2821 SHA256 6ca450d1b0bfae9f24994a633497eaced954e4cb7017fe256531e83ffe792ab1 SHA512 d8652f813bd2467dceab5bb59eed67db67f040d8f8cb269e0fc519f0af90b60e9f6eafe2c352860dafb7084aca4d651255aa38eb5df1a36044e9708949e1e223 WHIRLPOOL 6614bae3ee833c02fb88d26a45db06f532e24a905e0dd9e36c9245a4ecea0769e7b2cd9df4df5c11a2ca8b5e4420f1b7d7c9a728d8b0183e3742ead8a7001f39
+EBUILD chrony-3.2.ebuild 2905 SHA256 13f3645f107fa7172c2b23c3204c8f80285c27873517e9e1c962c93859210566 SHA512 4ed236451fa0f86ad04164cd3b7890ec3d205223bfd7303b8b098c4a9d68947acdc58cb108b824605343f37f1328964477087b3adb41d0b80d79667243515b4a WHIRLPOOL e3b290a3b2772156295532d33d725a89a6b650eb97653ced2adf9eba1837fe257cd7c9a83a2427a05994baea4075d44d4fa77f75745f77a3b642fc8517e45da2
+EBUILD chrony-9999.ebuild 2796 SHA256 1e256d30c13a706e7e960ff4fe19e56a03cd24bf66efb7ebeb84c52bd558daa0 SHA512 9d662c832a48613a7de249e4444cd0fc6f4440826e4d2cd0c6630927e8a1b179a21f341931899bb970addfb3c5b380738ac76f443dab665909d09925c5315f2a WHIRLPOOL 49721c152cab27028f45b5d35d956598e8d217dbcebf446ac138ba97c3ef95f33670f530caf31dc031c07545f24f3fba22c61c95f1bda89b62f37c70f4e2acca
+MISC ChangeLog 12610 SHA256 e2455ce1e59a80f5f7f1812fcb124f1a148fcf7f15f15d3a6cc35f31b2476d0a SHA512 9e9345d4e9ecdd78be040cb620db4ea424f3d321128b559a735e06104e27e29caf59f2584f8c13190379be680fc24bb139edddc1f27b52b8fd3efbebd6ed598f WHIRLPOOL eb989e70234e979bcada4304324beff1dd8a21f1b883543209556fb4d0d8d237af10b755f532b669b474bec902cb76685f30a8e2a8c87a60c2da3766c8484213
+MISC ChangeLog-2015 21319 SHA256 330649a8ee69bd8b1918b1cb1a71c3719ce076b4b6aebcde773d9c947f9364a2 SHA512 98f33ad29bda967580d13b93b4a1dec54516d661a6054d7cf4bdfd8175b4d3e76f4659016b60cee0aa8b2d995b766dbd0af44d08504a5c6f9277d5d294f6ca1d WHIRLPOOL 7d5307a81a1563e9261c5765947000a450fdf34e29509f8fdbffc2cd7f73c77e29c838d3857f82efe0bdf072fb26c00d0e4432176cdc27ef40798392f8fadd04
+MISC metadata.xml 1566 SHA256 df519c8729414da92dabce3e6fcfd98e7cbee2c3ca31c1271d280d63f39cfdc2 SHA512 bc9d33fa4f146feb7b934ffa6cf8e4d235316f23b9e08dbd6bf6d071496508a9c1dfbed2fca686244360ef848acdeec0d3b96992601aeb669c30482f9ca5ee84 WHIRLPOOL 12b3b29c032ba953e7d945d5a7cc1264e03468fe0c9c7201bc0cc82a1927c253856f714fcce957dc74eb95f23457265ac3e08925b9a4a3530e5a710d93275c96
diff --git a/net-misc/chrony/chrony-2.2.1.ebuild b/net-misc/chrony/chrony-2.2.1.ebuild
new file mode 100644
index 000000000000..d634ac9ee970
--- /dev/null
+++ b/net-misc/chrony/chrony-2.2.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86"
+IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
+REQUIRED_USE="
+	?? ( libedit readline )
+"
+
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/texinfo
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c chrony.texi.in examples/* || die
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex cmdmon '' --disable-cmdmon) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex ntp '' --disable-ntp) \
+		$(usex phc '' --disable-phc) \
+		$(usex pps '' --disable-pps) \
+		$(usex rtc '' --disable-rtc) \
+		$(usex refclock '' --disable-refclock) \
+		$(usex adns '' --disable-asyncdns) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--disable-sechash \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs
+}
+
+src_install() {
+	default
+
+	doinfo chrony.info*
+
+	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	dodoc examples/*.example*
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.2.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/chrony/chrony-2.3.ebuild b/net-misc/chrony/chrony-2.3.ebuild
new file mode 100644
index 000000000000..f37a8f2cac7e
--- /dev/null
+++ b/net-misc/chrony/chrony-2.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86"
+IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
+REQUIRED_USE="
+	?? ( libedit readline )
+"
+
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/texinfo
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c chrony.texi.in examples/* || die
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex cmdmon '' --disable-cmdmon) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex ntp '' --disable-ntp) \
+		$(usex phc '' --disable-phc) \
+		$(usex pps '' --disable-pps) \
+		$(usex rtc '' --disable-rtc) \
+		$(usex refclock '' --disable-refclock) \
+		$(usex adns '' --disable-asyncdns) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--disable-sechash \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs
+}
+
+src_install() {
+	default
+
+	doinfo chrony.info*
+
+	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	dodoc examples/*.example*
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.2.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/chrony/chrony-2.4.1.ebuild b/net-misc/chrony/chrony-2.4.1.ebuild
new file mode 100644
index 000000000000..6c4e5e3675f3
--- /dev/null
+++ b/net-misc/chrony/chrony-2.4.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="alpha ~amd64 ~arm hppa ppc ppc64"
+IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
+REQUIRED_USE="
+	?? ( libedit readline )
+"
+
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+"
+DEPEND="
+	${CDEPEND}
+	html? ( dev-ruby/asciidoctor )
+	pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c doc/*.man.in examples/* || die
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex cmdmon '' --disable-cmdmon) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex ntp '' --disable-ntp) \
+		$(usex phc '' --disable-phc) \
+		$(usex pps '' --disable-pps) \
+		$(usex rtc '' --disable-rtc) \
+		$(usex refclock '' --disable-refclock) \
+		$(usex adns '' --disable-asyncdns) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--disable-sechash \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	if use html; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/chrony/chrony-3.1-r1.ebuild b/net-misc/chrony/chrony-3.1-r1.ebuild
new file mode 100644
index 000000000000..2b465d02084e
--- /dev/null
+++ b/net-misc/chrony/chrony-3.1-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns"
+REQUIRED_USE="
+	?? ( libedit readline )
+"
+
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="
+	${CDEPEND}
+	html? ( dev-ruby/asciidoctor )
+	pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c doc/*.man.in examples/* || die
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(use_enable seccomp scfilter) \
+		$(usex adns '' --disable-asyncdns) \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex cmdmon '' --disable-cmdmon) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex ntp '' --disable-ntp) \
+		$(usex phc '' --disable-phc) \
+		$(usex pps '' --disable-pps) \
+		$(usex refclock '' --disable-refclock) \
+		$(usex rtc '' --disable-rtc) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--disable-sechash \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	if use html; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/chrony/chrony-3.1.ebuild b/net-misc/chrony/chrony-3.1.ebuild
new file mode 100644
index 000000000000..b2bec91ce760
--- /dev/null
+++ b/net-misc/chrony/chrony-3.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 arm hppa ppc ppc64 x86"
+IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
+REQUIRED_USE="
+	?? ( libedit readline )
+"
+
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+"
+DEPEND="
+	${CDEPEND}
+	html? ( dev-ruby/asciidoctor )
+	pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c doc/*.man.in examples/* || die
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex cmdmon '' --disable-cmdmon) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex ntp '' --disable-ntp) \
+		$(usex phc '' --disable-phc) \
+		$(usex pps '' --disable-pps) \
+		$(usex rtc '' --disable-rtc) \
+		$(usex refclock '' --disable-refclock) \
+		$(usex adns '' --disable-asyncdns) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--disable-sechash \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	if use html; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/chrony/chrony-3.2.ebuild b/net-misc/chrony/chrony-3.2.ebuild
new file mode 100644
index 000000000000..1a1cc1f7ccf2
--- /dev/null
+++ b/net-misc/chrony/chrony-3.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony.tuxfamily.org/"
+SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns"
+REQUIRED_USE="
+	?? ( libedit readline )
+"
+
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="
+	${CDEPEND}
+	html? ( dev-ruby/asciidoctor )
+	pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c doc/*.man.in examples/* || die
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(use_enable seccomp scfilter) \
+		$(usex adns '' --disable-asyncdns) \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex cmdmon '' --disable-cmdmon) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex ntp '' --disable-ntp) \
+		$(usex phc '' --disable-phc) \
+		$(usex pps '' --disable-pps) \
+		$(usex refclock '' --disable-refclock) \
+		$(usex rtc '' --disable-rtc) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--disable-sechash \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	if use html; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
new file mode 100644
index 000000000000..1878efaf91d0
--- /dev/null
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils git-r3 systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony.tuxfamily.org/"
+EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git/"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS=""
+IUSE="caps +cmdmon ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns"
+REQUIRED_USE="
+	?? ( libedit readline )
+"
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="
+	${CDEPEND}
+	dev-ruby/asciidoctor
+	pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+RESTRICT=test
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c doc/*.adoc examples/* || die
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(use_enable seccomp scfilter) \
+		$(usex adns '' --disable-asyncdns) \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex cmdmon '' --disable-cmdmon) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex ntp '' --disable-ntp) \
+		$(usex phc '' --disable-phc) \
+		$(usex pps '' --disable-pps) \
+		$(usex refclock '' --disable-refclock) \
+		$(usex rtc '' --disable-rtc) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--disable-sechash \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	docinto html
+	dodoc doc/*.html
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/chrony/files/chrony-2.2.logrotate b/net-misc/chrony/files/chrony-2.2.logrotate
new file mode 100644
index 000000000000..ae76c8de6af6
--- /dev/null
+++ b/net-misc/chrony/files/chrony-2.2.logrotate
@@ -0,0 +1,7 @@
+/var/log/chrony/*.log {
+	missingok
+	sharedscripts
+	postrotate
+		/usr/bin/chronyc cyclelogs
+	endscript
+}
diff --git a/net-misc/chrony/files/chrony-2.4-r1.logrotate b/net-misc/chrony/files/chrony-2.4-r1.logrotate
new file mode 100644
index 000000000000..a2cf8feb5b77
--- /dev/null
+++ b/net-misc/chrony/files/chrony-2.4-r1.logrotate
@@ -0,0 +1,7 @@
+/var/log/chrony/*.log {
+	missingok
+	sharedscripts
+	postrotate
+		/usr/bin/chronyc cyclelogs |grep -v '^200 OK'; exit 0
+	endscript
+}
diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf
new file mode 100644
index 000000000000..fc43a95c40fe
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.conf
@@ -0,0 +1,12 @@
+# /etc/conf.d/chronyd
+
+CFGFILE="/etc/chrony/chrony.conf"
+
+# Configuration dependant options :
+#      -s - Set system time from RTC if rtcfile directive present
+#      -r - Reload sample histories if dumponexit directive present
+#
+# The combination of "-s -r" allows chronyd to perform long term averaging of
+# the gain or loss rate across system reboots and shutdowns.
+
+ARGS=""
diff --git a/net-misc/chrony/files/chronyd.init b/net-misc/chrony/files/chronyd.init
new file mode 100644
index 000000000000..3a71fe748fd7
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.init
@@ -0,0 +1,65 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use dns
+}
+
+checkconfig() {
+	# Note that /etc/chrony/chrony.keys is *NOT* checked. This
+	# is because the user may have specified another key
+	# file, and we don't want to force the user to use that
+	# exact name for the key file.
+	if [ ! -f "${CFGFILE}" ] ; then
+		eerror "Please create ${CFGFILE} and the"
+		eerror "chrony key file (usually /etc/chrony/chrony.keys)"
+		eerror "by using the"
+		eerror ""
+		eerror "        chrony.conf.example"
+		eerror "        chrony.keys.example"
+		eerror ""
+		eerror "files (from the documentation directory)"
+		eerror "as templates."
+		return 1
+	else
+		# Actually, I tried it, and chrony seems to ignore the pidfile
+		# option. I'm going to leave it here anyway, since you never
+		# know if it might be handy
+		PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
+	fi
+	return 0
+}
+
+setxtrarg() {
+	if [ -c /dev/rtc ]; then
+		grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
+	fi
+	grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	setxtrarg
+
+	[ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+	ebegin "Starting chronyd"
+	start-stop-daemon --start --background --quiet \
+		--exec /usr/sbin/chronyd \
+		--pidfile "${PIDFILE}" \
+		-- -f "${CFGFILE}" ${ARGS}
+	eend $? "Failed to start chronyd"
+}
+
+stop() {
+	checkconfig || return $?
+
+	[ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+	ebegin "Stopping chronyd"
+	start-stop-daemon --stop --quiet \
+		--pidfile "${PIDFILE}"
+	eend $? "Failed to stop chronyd"
+}
diff --git a/net-misc/chrony/files/chronyd.init-r1 b/net-misc/chrony/files/chronyd.init-r1
new file mode 100644
index 000000000000..a76e2533f57d
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.init-r1
@@ -0,0 +1,69 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use dns
+}
+
+checkconfig() {
+	# Note that /etc/chrony/chrony.keys is *NOT* checked. This
+	# is because the user may have specified another key
+	# file, and we don't want to force the user to use that
+	# exact name for the key file.
+	if [ ! -f "${CFGFILE}" ] ; then
+		eerror "Please create ${CFGFILE} and the"
+		eerror "chrony key file (usually /etc/chrony/chrony.keys)"
+		eerror "by using the"
+		eerror ""
+		eerror "        chrony.conf.example"
+		eerror "        chrony.keys.example"
+		eerror ""
+		eerror "files (from the documentation directory)"
+		eerror "as templates."
+		return 1
+	else
+		# Actually, I tried it, and chrony seems to ignore the pidfile
+		# option. I'm going to leave it here anyway, since you never
+		# know if it might be handy
+		PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
+	fi
+	return 0
+}
+
+setxtrarg() {
+	if [ -c /dev/rtc ]; then
+		grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
+	fi
+	grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	setxtrarg
+
+	[ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+	ebegin "Starting chronyd"
+	start-stop-daemon \
+		--start \
+		--quiet \
+		--exec /usr/sbin/chronyd \
+		--pidfile "${PIDFILE}" \
+		-- -f "${CFGFILE}" ${ARGS}
+	eend $? "Failed to start chronyd"
+}
+
+stop() {
+	checkconfig || return $?
+
+	[ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+	ebegin "Stopping chronyd"
+	start-stop-daemon \
+		--stop \
+		--quiet \
+		--pidfile "${PIDFILE}"
+	eend $? "Failed to stop chronyd"
+}
diff --git a/net-misc/chrony/files/chronyd.service-r2 b/net-misc/chrony/files/chronyd.service-r2
new file mode 100644
index 000000000000..90255675c838
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.service-r2
@@ -0,0 +1,12 @@
+[Unit]
+Description=Chrony Network Time Service
+After=ntpdate.service sntp.service network.target
+Conflicts=ntpd.service systemd-timesyncd.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/chronyd
+PIDFile=/run/chronyd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
new file mode 100644
index 000000000000..fe0c5f66743d
--- /dev/null
+++ b/net-misc/chrony/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>jer@gentoo.org</email>
+</maintainer>
+<longdescription>
+Chrony is a pair of programs (chronyd and chronyc) which are used to maintain
+the accuracy of the system clock on a computer. chronyd has been specifically
+written to work well for systems which have only an intermittent (e.g. dial-up)
+connection to the network where the NTP servers are. It still works well
+in a "permanently connected" mode.
+</longdescription>
+<longdescription lang="ja">
+Chrony はコンピュータのシステム・クロックの精度を保つために使われるプログラムの
+ペア(chronyd と chronyc)です。chronyd は NTP サーバがあるネットワークと断続的な
+接続(e.g. dial-up)しか持たないシステムで機能するよう書かれています。ですが永続的
+な接続でも機能します。
+</longdescription>
+<use>
+<flag name="cmdmon">Support for command and monitoring</flag>
+<flag name="html">Install HTML documentation</flag>
+<flag name="ntp">Support for the Network Time Protocol (NTP)</flag>
+<flag name="phc">Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag>
+<flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag>
+<flag name="refclock">Support for reference clocks</flag>
+<flag name="rtc">Support for the Linux Real Time Clock interface</flag>
+<flag name="adns">Support for asynchronous DNS</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/clockspeed-conf/Manifest b/net-misc/clockspeed-conf/Manifest
new file mode 100644
index 000000000000..0b06e9cfe35c
--- /dev/null
+++ b/net-misc/clockspeed-conf/Manifest
@@ -0,0 +1,6 @@
+AUX clockspeed-conf-0.4.5-gentoo.patch 674 SHA256 6ff1a21eb60969f3dfce2990ef9427a57ca9f061c4c380441df107f11b020533 SHA512 8d7f45ea11a5ba7b2e724bdec6461dae462efe71bbc18e0aaaabcda2754348a517cf84a06ce4274424dbf94bde593a374b09fc7b1694f327dcea6eeb2e1b9c8e WHIRLPOOL 75c87a3cfad339978d651439d797eed44cedb14562a9eb95813ab21375594ac547edb4e067d8225d9cb4804eecedefc1c7f17c06b6cccd07bb81df48b4ec025f
+DIST clockspeed-conf-0.4.5.tar.gz 7190 SHA256 6f61d140481286637d87dc29c519b06b0716348072e3b67b3d13f87285169a86 SHA512 9f7e8dcafb5ef4ee832b9bbca8e5ee51f876678027b40df1758e2dbc784a09403e9d388acab203166743a1ef3effc20bca37fce1bc30177929936d693aa2b5b0 WHIRLPOOL eaeb62f2bb13498cd7460e814890cf3928419850f9419b842814b789ccadedb0010cc1e1dc1ca8277a69a150d83183f96c2eb1ab783b9e5a25bc2ea2bafaf5e9
+EBUILD clockspeed-conf-0.4.5-r1.ebuild 649 SHA256 9f516627efc815d2e57393d036c5c700dd1672d8abc98792a0c23c09763dd558 SHA512 16277e64cf17f5758251ceeff6c84b9a3f1b6aaa3430ba4850ef8322fd0a4b77f0d57ab8681126d6d079c15443433d54f430700a5230b37d6ad3291472c4d000 WHIRLPOOL ee1b34394d0ef322470f769b1b0091e19af70d742d25fa4c6f7f4b781cb2d5fb1a48dd76ad38f4682a9ea6b9b027e2d64f2067eec02e9bff2bcc68102b6e3804
+MISC ChangeLog 2597 SHA256 607e03a27edc14cfcbe952e0f3b8f83fbe902040f183e0a16c137cdc4e645bbe SHA512 7a56b50cdf87c18b431b0c77eb7f6cb88e74ba8d4756593fb354415f8500df94a851d48a65ad7a5fdac86e1e6152059f8cb63169defabddf2380b65dc9863fbf WHIRLPOOL 49cb8c866cdd97a06a10938cc408482cafb899ea8c32032a28c7cadbdbd66fd09a9114182f4aa402153e0ce38ef2f26827189a8622464553244b78e95b9cc0cb
+MISC ChangeLog-2015 817 SHA256 4b4dea98da389633569981290fb52c1bb4ecaea4fea1e276e5a56ed932025950 SHA512 1c3cb92cd84f0921f6e572106b115a7982eacd80c43fe345e0873b391434dc6800d299344b47774dd31cdddda6b2331a722908a93b757cc03e8aab89d0fcdf48 WHIRLPOOL 9c0d6c772b69dd83aa864764cb1312bdb63b684d3f757f1f91f7ae6e3c3c794fead99ff527a3ec090a51b720bbe18ecfbb2928a01d83563139ba876fae5a84f1
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/clockspeed-conf/clockspeed-conf-0.4.5-r1.ebuild b/net-misc/clockspeed-conf/clockspeed-conf-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..6ebfcc964714
--- /dev/null
+++ b/net-misc/clockspeed-conf/clockspeed-conf-0.4.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="scripts to setup a clockspeed client and/or a taiclockd server"
+HOMEPAGE="http://foo42.de/devel/sysutils/clockspeed-conf/"
+SRC_URI="http://foo42.de/distfiles/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-misc/clockspeed
+	virtual/daemontools"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	dobin clockspeed-conf taiclockd-conf || die "dobin"
+	doman clockspeed-conf.8 taiclockd-conf.8
+	dodoc README TODO
+}
diff --git a/net-misc/clockspeed-conf/files/clockspeed-conf-0.4.5-gentoo.patch b/net-misc/clockspeed-conf/files/clockspeed-conf-0.4.5-gentoo.patch
new file mode 100644
index 000000000000..dffbb35b08c7
--- /dev/null
+++ b/net-misc/clockspeed-conf/files/clockspeed-conf-0.4.5-gentoo.patch
@@ -0,0 +1,26 @@
+Configure for Gentoo
+
+Patch by Thilo Bangert
+http://bugs.gentoo.org/show_bug.cgi?id=90073
+
+--- clockspeed-conf
++++ clockspeed-conf
+@@ -15,6 +15,7 @@
+ #ADJUST_LOGDIR  defaults to main
+ #VA=yes   shortcut for 'ADJUST_LOGDIR=clockspeed-adjust'
+ #
++CLOCKSPEED_INSTALLATION="GENTOO"
+ [ -z "${CLOCKSPEED_INSTALLATION}" ] && CLOCKSPEED_INSTALLATION="DJB"
+ 
+ PATH=/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/command:${PATH}
+@@ -106,6 +107,10 @@
+ 	BINDIR="${PREFIX}/clockspeed/bin"
+ 	ADJUSTFILE="${PREFIX}/clockspeed/adjust"
+ 	;;
++	GENTOO)
++	ETCDIR="/var/lib/clockspeed"
++	BINDIR="/usr/bin"
++	;;
+     custom)
+         # we expect ETCDIR and BINDIR from environment !!!
+         ;;
diff --git a/net-misc/clockspeed-conf/metadata.xml b/net-misc/clockspeed-conf/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/clockspeed-conf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/clockspeed/Manifest b/net-misc/clockspeed/Manifest
new file mode 100644
index 000000000000..a8e4fa028706
--- /dev/null
+++ b/net-misc/clockspeed/Manifest
@@ -0,0 +1,8 @@
+AUX clockspeed-0.62-gentoo.patch 6605 SHA256 0bbdf6c13257322468acf5485018bf8040e64fc14e2f8a60f5c622f4514af5c9 SHA512 83a7e8ff40a0b3871256b9e151dd99bda903c8e230698d753a535d336a2d95c8514e97133dfd271a69345f4b100fb608d621b46183f082ec6f62bbf4d24d784b WHIRLPOOL 2fb8fad657fbcb77e5884ec79ac1d806c5d73c91299fad4025140654f9b1eebaa42f6f306e427258c4420bb5e261ea3b361518e373a39f361a494dd9eb56872a
+AUX ntpclockset 1100 SHA256 c3cb8901704ed41401e689dd2331a2581c1c1deb6847a8ee486a21975d61d46e SHA512 4301f84956df473aea2e13f304fc320897e680619a6933f5fe3b6fa229fc4e34dd6874bb6fa417c462f6eae2513ad7cccc843108331ee0a45fb19c7f0563dc6c WHIRLPOOL c374e655bda86daf0603311420eddad2f2ea9476586be24ed551d908b39a4e704d1dd03bda0d7b8b039072ea2d14d592cfc8f75b79cce49080d0f60ad1e95a66
+DIST clockspeed-0.62.tar.gz 25797 SHA256 43539964c4b554794b2da760d138c5975cbc850f1c8ec2ee96f5dba66e0d9eed SHA512 4dae1cfcfc5eb1398fd5a7642ff91987487d9828d314d4bd9f93cdadc60fe99889280a7f8e9192674ed19d246bd4a450ad32b1258e450216111c488074db7978 WHIRLPOOL 83ab5d7c4c7eb6c465e0e0c5c227a8eee911bdf9afdca444b5b161643ec10a8e92013560ec87d13e13770d05a2a3718fb3666644b481fd7597a9c5ed1ede0cf9
+DIST leapsecs.dat.20081114 192 SHA256 e1745c2571b5e3af38f60e1a6caf4cf02cdae103cfd52defa8dfa6d5b1fe0e22 SHA512 c85634ce30f40a03ae45983ee29483fe5859f291a0a69835dad1f50459327b212b8187a0c2c18c9a27fd74f2d69ed0d9a556349c8b2833b9a30107ed259aacc7 WHIRLPOOL e56db3fb4f30308ce7485b95bc89d2552def50fda49173661b6b16c7b55cdcee740585f21dcc620f9cb9b329cd0615e9f28445b7c40888efa032da0eca023a70
+EBUILD clockspeed-0.62-r6.ebuild 1179 SHA256 1a85dd5eca325fa08d374c763ddfed4f117a2f9100e79ac4c8855707814a4e93 SHA512 15440cd55706f54c578227c99cb1a9fffb5dcd1960e0600f0db6f6545d8f3a767a887c3c581649ee0b3c341e3acf84f112e5c8496a20802623b6138bd55d588c WHIRLPOOL 2f320920eea53e5353ad06c67d52f9682d9dae4fc6db0616abea9f1bfad2467eb89a41405e543d47f4a0debe24d92e07f3228694eb6763f5d6d948d8335f24c9
+MISC ChangeLog 2623 SHA256 a2bce4c4a12ecb19b1f194ebd1fd0a48c41350315c23ea1086559ff249fa8591 SHA512 a98f05d6f1a2c4916d50b2e4c20c74ee159f31402d8e261c5676c63d427a21a3e73deeb2c4d9b31e8782cf2bfae52c87e84f3ece5dea1c00fcff0aebdc8b9ac1 WHIRLPOOL 3f43faeefdfdb31a2688055dc9c79582dd26c57c3cc55090f672843a8fd42aff403c5b80d850b6c9f2741e309151a8114e26a8d85fad6b3e700fa53fe8e3c911
+MISC ChangeLog-2015 4515 SHA256 553596c1cbb47c713cfbbdaafdba9abf676b4a74c3e42e45daa1ed97331f5d40 SHA512 72d7c27418dadd70b272855e3302d8d4f09d4b9856fc261fea801791c11f4ddab7f7bf917b28304aca3ebe1a9a5355e9661cf4e1684d75dc9363afe12e773549 WHIRLPOOL 83959c77da15c845145e5216e9fc9d5ea62008fafc2e74ddf54d73a37462ea6fff4b94506f471fd6571aed8dbb78f9947c978f9862d0b1719e6b0d863b07d202
+MISC metadata.xml 416 SHA256 73104d23ffa4254cf5d909108df37a52d649a8b95d3b8ac306462348775a04d3 SHA512 966f4ad088720ae3da99158933a8344b9f17b7f251ae37562b99ee8cdc9e1fdbb0d530e42703208ed1373932037918e4657bd0663a42f3a3348505ccdcd39d69 WHIRLPOOL 306efb26b4d66250059e7bb7970377daa2babf8152786a32527b128c3eb6241f2ef147f273a62eb60d2da2f4ce23fa675f2cf07db37b4704cce099f8c54e5640
diff --git a/net-misc/clockspeed/clockspeed-0.62-r6.ebuild b/net-misc/clockspeed/clockspeed-0.62-r6.ebuild
new file mode 100644
index 000000000000..172b3051b388
--- /dev/null
+++ b/net-misc/clockspeed/clockspeed-0.62-r6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils flag-o-matic
+
+DESCRIPTION="A simple Network Time Protocol (NTP) client"
+HOMEPAGE="http://cr.yp.to/clockspeed.html"
+
+# this is the trailing part of the name for the latest leapseconds file.
+LEAPSECONDS_DATE="20081114"
+
+SRC_URI="http://cr.yp.to/clockspeed/${P}.tar.gz
+	https://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat."$LEAPSECONDS_DATE""
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="amd64 ~mips x86"
+IUSE="static selinux"
+RESTRICT="mirror bindist test"
+
+DEPEND="sys-apps/groff"
+RDEPEND="selinux? ( sec-policy/selinux-clockspeed )
+	net-dns/djbdns"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} ${ASFLAGS}" > conf-cc
+	use static && append-ldflags -static
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_install() {
+	dobin clockspeed clockadd clockview sntpclock taiclock taiclockd
+	dosbin "${FILESDIR}"/ntpclockset
+
+	doman *.1
+	dodoc BLURB CHANGES INSTALL README THANKS TODO
+
+	insinto /var/lib/clockspeed
+	newins "${DISTDIR}"/leapsecs.dat."$LEAPSECONDS_DATE" leapsecs.dat
+}
diff --git a/net-misc/clockspeed/files/clockspeed-0.62-gentoo.patch b/net-misc/clockspeed/files/clockspeed-0.62-gentoo.patch
new file mode 100644
index 000000000000..59c9dfcbf4ec
--- /dev/null
+++ b/net-misc/clockspeed/files/clockspeed-0.62-gentoo.patch
@@ -0,0 +1,225 @@
+--- clockspeed-0.62/INSTALL
++++ clockspeed-0.62/INSTALL
+@@ -4,8 +4,8 @@
+ 
+ Things you have to decide before starting:
+ 
+-* Where the clockspeed package will be installed, normally
+-/usr/local/clockspeed. To change this directory, edit conf-home now.
++* Where the clockspeed package will be installed, normally /usr. 
++To change this directory, edit conf-home now.
+ 
+ 
+ How to install:
+@@ -16,9 +16,9 @@
+     or with gethrtime(). The compiler must support a 64-bit type, either
+     long or long long.
+ 
+- 2. Install the programs, the man pages, and /etc/leapsecs.dat:
++ 2. Install the programs, the man pages, and /var/lib/clockspeed/leapsecs.dat:
+        # make setup check
+-    Put /usr/local/clockspeed/bin into $PATH.
++    Put /usr/bin into $PATH.
+ 
+ 
+ How to test:
+@@ -39,20 +39,20 @@
+  5. Start clockspeed:
+        # clockspeed &
+     Give clockspeed a time measurement:
+-       # sntpclock 1.2.3.4 > /usr/local/clockspeed/adjust &
++       # sntpclock 1.2.3.4 > /var/lib/clockspeed/adjust &
+ 
+  6. After a few hours, give clockspeed a second time measurement:
+-       # sntpclock 1.2.3.4 > /usr/local/clockspeed/adjust &
++       # sntpclock 1.2.3.4 > /var/lib/clockspeed/adjust &
+     You can run sntpclock as a non-root user, if you change
+-    /usr/local/clockspeed/adjust to be owned by that user. I recommend
++    /var/lib/clockspeed/adjust to be owned by that user. I recommend
+     this for security.
+ 
+  7. After a few days, check how well clockspeed has adjusted your clock:
+        % sntpclock 1.2.3.4 | clockview
+     Check how many attoseconds clockspeed thinks are in one tick:
+-       % clockview < /usr/local/clockspeed/etc/atto
++       % clockview < /var/lib/clockspeed/atto
+     Give it another time measurement:
+-       # sntpclock 1.2.3.4 > /usr/local/clockspeed/adjust &
++       # sntpclock 1.2.3.4 > /var/lib/clockspeed/adjust &
+ 
+  8. Repeat step 7 after a few weeks, then after a few months. Your clock
+     should now be synchronized to the remote clock to within a few
+@@ -70,7 +70,7 @@
+     Here 5.6.7.8 is the master's IP address. Set the client's clock:
+        # clockadd < adjustment
+     Finally, run clockspeed as in step 5, and do
+-       % taiclock 5.6.7.8 > /usr/local/clockspeed/adjust &
++       % taiclock 5.6.7.8 > /var/lib/clockspeed/adjust &
+     after a few days.
+ 
+ 
+--- clockspeed-0.62/Makefile
++++ clockspeed-0.62/Makefile
+@@ -7,8 +7,8 @@
+ auto-ccld.sh: \
+ conf-cc conf-ld warn-auto.sh
+ 	( cat warn-auto.sh; \
+-	echo CC=\'`head -1 conf-cc`\'; \
+-	echo LD=\'`head -1 conf-ld`\' \
++	echo CC=\'`head -n 1 conf-cc`\'; \
++	echo LD=\'`head -n 1 conf-ld`\' \
+ 	) > auto-ccld.sh
+ 
+ auto-str: \
+@@ -21,7 +21,7 @@
+ 
+ auto_home.c: \
+ auto-str conf-home
+-	./auto-str auto_home `head -1 conf-home` > auto_home.c
++	./auto-str auto_home `head -n 1 conf-home` > auto_home.c
+ 
+ auto_home.o: \
+ compile auto_home.c
+--- clockspeed-0.62/clockspeed.1
++++ clockspeed-0.62/clockspeed.1
+@@ -12,7 +12,7 @@
+ 
+ .B clockspeed
+ reads the real-time measurements from
+-.BR /usr/local/clockspeed/adjust .
++.BR /var/lib/clockspeed/adjust .
+ Each real-time measurement must be a single 16-byte packet,
+ expressed as a TAI64NA time adjustment to the local UNIX clock.
+ 
+@@ -24,12 +24,12 @@
+ .B clockspeed
+ can figure out the number of real attoseconds per tick.
+ It saves this number in TAI64NA format in
+-.BR /usr/local/clockspeed/etc/atto ,
++.BR /var/lib/clockspeed/atto ,
+ overwriting
+-.B /usr/local/clockspeed/etc/atto.tmp
++.B /var/lib/clockspeed/atto.tmp
+ for reliability.
+ It reads
+-.B /usr/local/clockspeed/etc/atto
++.B /var/lib/clockspeed/atto
+ when it starts up again.
+ 
+ .B clockspeed
+--- clockspeed-0.62/clockspeed.c
++++ clockspeed-0.62/clockspeed.c
+@@ -83,7 +83,7 @@
+   if (deriv <= 0) return;
+   if (deriv > 200000000) return; /* 5Hz ticks? be serious */
+ 
+-  fd = open_trunc("etc/atto.tmp");
++  fd = open_trunc("/var/lib/clockspeed/atto.tmp");
+   if (fd == -1) return;
+ 
+   buf[0] = 0;
+@@ -119,7 +119,7 @@
+   if (fsync(fd) == -1) { close(fd); return; }
+   if (close(fd) == -1) return; /* NFS stupidity */
+ 
+-  rename("etc/atto.tmp","etc/atto"); /* if it fails, bummer */
++  rename("/var/lib/clockspeed/atto.tmp","/var/lib/clockspeed/atto"); /* if it fails, bummer */
+ }
+ 
+ void main()
+@@ -136,16 +136,16 @@
+   if (chdir(auto_home) == -1) _exit(1);
+   umask(033);
+ 
+-  if (open_read("etc/atto") == 0) {
++  if (open_read("/var/lib/clockspeed/atto") == 0) {
+     r = read(0,buf,sizeof buf);
+     if (r == sizeof buf)
+       deriv = nano(buf);
+     close(0);
+   }
+ 
+-  if (fifo_make("adjust",0600) == -1) if (errno != error_exist) _exit(1);
+-  if (open_read("adjust") != 0) _exit(1);
+-  if (open_write("adjust") == -1) _exit(1);
++  if (fifo_make("/var/lib/clockspeed/adjust",0600) == -1) if (errno != error_exist) _exit(1);
++  if (open_read("/var/lib/clockspeed/adjust") != 0) _exit(1);
++  if (open_write("/var/lib/clockspeed/adjust") == -1) _exit(1);
+ 
+   now(&first);
+ 
+--- clockspeed-0.62/clockview.c
++++ clockspeed-0.62/clockview.c
+@@ -1,5 +1,5 @@
+ #include <sys/types.h>
+-#include <sys/time.h>
++#include <time.h>
+ #include "substdio.h"
+ #include "readwrite.h"
+ #include "strerr.h"
+--- clockspeed-0.62/conf-home
++++ clockspeed-0.62/conf-home
+@@ -1,4 +1,4 @@
+-/usr/local/clockspeed
++/usr
+ 
+ This is the clockspeed home directory. Programs will be installed in
+ .../bin.
+--- clockspeed-0.62/error.h
++++ clockspeed-0.62/error.h
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
+--- clockspeed-0.62/hier.c
++++ clockspeed-0.62/hier.c
+@@ -2,7 +2,9 @@
+ 
+ void hier()
+ {
+-  c("/","etc","leapsecs.dat",-1,-1,0644);
++  d("/var/lib","clockspeed",-1,-1,0755);
++  
++  c("/","var/lib/clockspeed","leapsecs.dat",-1,-1,0644);
+ 
+   h(auto_home,-1,-1,0755);
+ 
+--- clockspeed-0.62/leapsecs.3
++++ clockspeed-0.62/leapsecs.3
+@@ -52,10 +52,10 @@
+ 
+ .B leapsecs_read
+ reads the leap-second table from
+-.BR /etc/leapsecs.dat .
++.BR /var/lib/clockspeed/leapsecs.dat .
+ It returns 0 on success, -1 on error.
+ If
+-.B /etc/leapsecs.dat
++.B /var/lib/clockspeed/leapsecs.dat
+ does not exist,
+ .B leapsecs_read
+ treats it as an empty file.
+--- clockspeed-0.62/leapsecs_read.c
++++ clockspeed-0.62/leapsecs_read.c
+@@ -2,7 +2,6 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
+-extern int errno;
+ #include "tai.h"
+ #include "leapsecs.h"
+ 
+@@ -18,7 +17,7 @@
+   int i;
+   struct tai u;
+ 
+-  fd = open("/etc/leapsecs.dat",O_RDONLY | O_NDELAY);
++  fd = open("/var/lib/clockspeed/leapsecs.dat",O_RDONLY | O_NDELAY);
+   if (fd == -1) {
+     if (errno != ENOENT) return -1;
+     if (leapsecs) free(leapsecs);
diff --git a/net-misc/clockspeed/files/ntpclockset b/net-misc/clockspeed/files/ntpclockset
new file mode 100644
index 000000000000..c4c9d1b68ccb
--- /dev/null
+++ b/net-misc/clockspeed/files/ntpclockset
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# Updates by Sascha Silbe
+
+usage() {
+	cat << EOF
+Usage: ntpclockset [options] <NTP server>
+Example: ntpclockset -q 192.168.0.1
+
+Options:
+	--quiet (-q)	be quiet (only show errors)
+	--help  (-h)	show this text and exit
+EOF
+	exit 1
+}
+
+quiet=0
+
+for curArg in "$@" ; do
+	case "${curArg}" in
+	-q|--quiet) quiet=1;;
+	-h|--help) 	usage;;
+	-*)			echo "Invalid option '${curArg}'"
+				usage;;
+	*)			NTPSERVER="${curArg}";;
+	esac
+done
+
+[ -z $NTPSERVER ] && NTPSERVER=`dnsip pool.ntp.org | awk '{print $1}'`
+
+tmpfile="`mktemp`"
+# display how much your clock is off by
+if ! sntpclock $NTPSERVER > ${tmpfile} ; then
+	echo "!!! Could not contact NTP server: $NTPSERVER" >&2
+	exit 2
+fi
+
+if [ ${quiet} -eq 0 ] ; then
+	echo ">>> Current clock sync:"
+	cat ${tmpfile} | clockview
+	echo
+	echo -n ">>> Now setting clock ..."
+fi
+cat ${tmpfile} | clockadd
+if [ ${quiet} -eq 0 ] ; then
+	echo "   [ok]"
+	echo -n ">>> Writing time to hardware clock ..."
+fi
+/sbin/hwclock --systohc
+if [ ${quiet} -eq 0 ] ; then
+	echo "   [ok]"
+	echo
+	echo ">>> New clock sync:"
+	sntpclock $NTPSERVER | clockview
+fi
+rm -f ${tmpfile}
diff --git a/net-misc/clockspeed/metadata.xml b/net-misc/clockspeed/metadata.xml
new file mode 100644
index 000000000000..a12252d0f03c
--- /dev/null
+++ b/net-misc/clockspeed/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-needed -->
+<longdescription lang="en">
+clockspeed uses a hardware tick counter to compensate for a persistently fast or
+slow system clock. Given a few time measurements from a reliable source, it
+computes and then eliminates the clock skew. 
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/clusterssh/Manifest b/net-misc/clusterssh/Manifest
new file mode 100644
index 000000000000..10c819e97100
--- /dev/null
+++ b/net-misc/clusterssh/Manifest
@@ -0,0 +1,8 @@
+DIST App-ClusterSSH-4.01_05.tar.gz 71502 SHA256 e57685ce83aa74a15fef868ac6d7aed11de5c81252db7c65332ad1c9972aaa3e SHA512 4b63b91684c981a28871e5264502c66435b531ae3c4bad2eab2571f8b237d43e5f45ed93d036e7497c713f2982a110d93a3055ae0004d4f33e7786df9aa56ff8 WHIRLPOOL 96df13f6f3096829949b1db8f26d8a2de8b3568597bc1b82d4d26f0fe56a9c303651f2ab58c77fa94f0e494cb90fba9e331de9f242fb0d7bfa4a8eb7796d6c48
+DIST App-ClusterSSH-4.03_06.tar.gz 81476 SHA256 f3c5c89669deb7a579be65a0dba1e197b6d8b9f1d5b3e48b8a0646193d0bf6f0 SHA512 87dff4c0445436c10929bcf30a9295deb6ddacca16939091fdab0cf67765c77706745ce8e738145ea6c67ec06093567b7668e4387a72b48018f8e173da5709b4 WHIRLPOOL b2ff28bd660fb8fc858c79423bb206ab33b17499ce5b5c680e1757b71ebc377c7c3db682070c8829bfcc9e0757149e462cff28672a215ee1888ec3807fb8d3cf
+EBUILD clusterssh-4.03.03.ebuild 1063 SHA256 dcb6edf94f1b469227d57212fa270302cd24023c840560439ee28be42d397541 SHA512 990f533aafc4dc25e6c351150cf1633a2f27641f5ad2baebb78c719ef26f2df109c572d7231cbb6081a31ee39855eebf8b571a93cb7b544060dafa2828631a81 WHIRLPOOL 1bb76d19e816f0fa46c8dfbac1038255664dda93cf6bf562c9ed9e4676a756b34ce28f1738f326724f42e2062859aa65412f15bb506eb1e83a81bac62f42167c
+EBUILD clusterssh-4.30.600.ebuild 961 SHA256 4a7018b6ceee7131a76736c54662fd7c1968106efd4cc20db5ca6682933de7c3 SHA512 3083c5c28e51ac68f5c02496955877fc245e987149d2fa32f609e88f5f612a2415dcd48d59b7d61736b5144c54c306472c6d8e2147e6c1ba7200db1fe1be187b WHIRLPOOL 2fcd2c62ca74eb2bc08c5c830bc8622f0427e56c298cf63bc1bfaf33c20c44f20d47d03195a934437ddbeef7e8d4ce34bd03982ed528cc08b62c883cde8e970f
+EBUILD clusterssh-9999.ebuild 864 SHA256 4899972fd058edd5c3c1fd87746dba2ad6deed9a8d9d91d4aca79a1185f2d6ea SHA512 29931cdccc35a84bdded49728598741107e6c46c9203c70eba2557251d805d1a597c99a3f156744eb35b986cff4d21b9a7524408536d138deea509bfee646911 WHIRLPOOL e5718c9e9e72a22070093f5d9e8a7d9cf8ad68031b6a3b3677d236128ddc931a356e24409c22ae9ac23651c7e0d0618403981b6c7b31378793ab17fc3a677373
+MISC ChangeLog 3666 SHA256 39294f294376320bddd64eb4a70876dce3afeae792f71f748c8f70bdfa89bf81 SHA512 ee6b3a8ab0490d93ca747516463cffccfe285ede1cc3d52a8e702e693418c21b57a1b2ae67f4074d7383add62bb039af22a06ea3838bba53123bbb5567b8cdab WHIRLPOOL 2e4e354cedc3e768b3ce191f76c33d041d362622f2d2e038f7ede9fde9bc56b24503e53d5a6eae415cbc041e3538691759b49ea4aa16b7c914e34e79c9c356e4
+MISC ChangeLog-2015 8584 SHA256 1a32f0386295bb56204260cb4e76f8b1092f2a564cf7423d2c7676e7e05c691a SHA512 1ada181b57c1e021b914fc246d173fccffaccdaa68394ab4ca2194758f6abc27103fa58053bcb83aba62c9820b569350e4949e3e94f2ab664946dc5a67d71e83 WHIRLPOOL 50f5f664499338d488fe5a6d1b6c9f51ac3de7aa5554396723aa33c10c879be89786db3cd904038060137043267692d4c869b970cb9a4142aa2258d6432effd7
+MISC metadata.xml 708 SHA256 b4477a89e9dae7b6743f1c75b1997c327512d6b616a4c4815e03087107138e97 SHA512 f4033f8bfeb926bfb4a3ad935988068ed53eff91e35cb3683df27c8d56f095b7873a66fcd2e56c79df434a51fa1796c265d9d89334d3538b4f6a9f42755089f2 WHIRLPOOL f9bd10c6c0f6d76416d359616ba819195f45a75e8131bfd4f1d38e0968cbef309afc0bac3d0bf611882cbfe2ee052533f43e288a37308e8df892a9c079cbda92
diff --git a/net-misc/clusterssh/clusterssh-4.03.03.ebuild b/net-misc/clusterssh/clusterssh-4.03.03.ebuild
new file mode 100644
index 000000000000..49423a9ddc38
--- /dev/null
+++ b/net-misc/clusterssh/clusterssh-4.03.03.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="App-ClusterSSH"
+MODULE_AUTHOR="DUNCS"
+MODULE_VERSION="4.01_05"
+
+inherit eutils perl-module versionator
+
+DESCRIPTION="Concurrent Multi-Server Terminal Access"
+HOMEPAGE="http://clusterssh.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Exception-Class
+	dev-perl/Readonly
+	dev-perl/Test-Pod
+	dev-perl/Test-Pod-Coverage
+	dev-perl/Test-Trap
+	dev-perl/Test-DistManifest
+	dev-perl/Try-Tiny
+	dev-perl/Tk
+	dev-perl/Config-Simple
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	x11-apps/xlsfonts
+	x11-terms/xterm"
+DEPEND="
+	${RDEPEND}
+	dev-perl/File-Which
+	dev-perl/Module-Build
+	dev-perl/Test-Pod
+	dev-perl/Test-Differences"
+
+#S="${WORKDIR}"/${MY_P}
+
+SRC_TEST="do parallel"
+
+src_prepare() {
+	# broken test, check again for new releases
+	sed \
+		-e '/boilerplate/d' \
+		-e '/manifest.t/d' \
+		-i MANIFEST || die
+	rm t/boilerplate.t t/manifest.t || die
+
+	perl-module_src_prepare
+}
diff --git a/net-misc/clusterssh/clusterssh-4.30.600.ebuild b/net-misc/clusterssh/clusterssh-4.30.600.ebuild
new file mode 100644
index 000000000000..13ac11db5171
--- /dev/null
+++ b/net-misc/clusterssh/clusterssh-4.30.600.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="App-ClusterSSH"
+MODULE_AUTHOR="DUNCS"
+###################
+# /!\ IMPORTANT /!\
+###################
+# CHANGE ME AT EVERY VERSION BUMP
+MODULE_VERSION="4.03_06"
+
+inherit eutils perl-module
+
+DESCRIPTION="Concurrent Multi-Server Terminal Access"
+HOMEPAGE="http://clusterssh.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Config-Simple
+	dev-perl/Exception-Class
+	dev-perl/Tk
+	dev-perl/Readonly
+	dev-perl/Test-DistManifest
+	dev-perl/Test-Pod
+	dev-perl/Test-Pod-Coverage
+	dev-perl/Test-Trap
+	dev-perl/Try-Tiny
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	x11-apps/xlsfonts
+	x11-terms/xterm"
+DEPEND="
+	${RDEPEND}
+	dev-perl/CPAN-Changes
+	dev-perl/File-Slurp
+	dev-perl/File-Which
+	dev-perl/Module-Build
+	dev-perl/Test-Differences
+	dev-perl/Test-Pod"
+
+SRC_TEST="do parallel"
diff --git a/net-misc/clusterssh/clusterssh-9999.ebuild b/net-misc/clusterssh/clusterssh-9999.ebuild
new file mode 100644
index 000000000000..7d055614d0e9
--- /dev/null
+++ b/net-misc/clusterssh/clusterssh-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit git-2 perl-module
+
+EGIT_REPO_URI="git://git.code.sf.net/p/clusterssh/code"
+EGIT_PROJECT="${PN}"
+
+DESCRIPTION="Concurrent Multi-Server Terminal Access"
+HOMEPAGE="http://clusterssh.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Exception-Class
+	dev-perl/Readonly
+	dev-perl/Test-Pod
+	dev-perl/Test-Pod-Coverage
+	dev-perl/Test-Trap
+	dev-perl/Test-DistManifest
+	dev-perl/Try-Tiny
+	dev-perl/Tk
+	dev-perl/Config-Simple
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	x11-apps/xlsfonts
+	x11-terms/xterm"
+DEPEND="
+	${RDEPEND}
+	dev-perl/File-Which
+	dev-perl/Module-Build
+	dev-perl/Test-Pod
+	test? ( dev-perl/Test-Differences )"
+
+SRC_TEST="do parallel"
+
+src_unpack() {
+	git-2_src_unpack
+	perl-module_src_unpack
+}
diff --git a/net-misc/clusterssh/metadata.xml b/net-misc/clusterssh/metadata.xml
new file mode 100644
index 000000000000..bdf9d1cea7b1
--- /dev/null
+++ b/net-misc/clusterssh/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  ClusterSSH is a tool for making the same change on multiple servers 
+  at the same time. The 'cssh' command opens an administration console 
+  and an xterm to all specified hosts. Any text typed into 
+  the administration console is replicated to all windows. 
+  All windows may also be typed into directly.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">clusterssh</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
new file mode 100644
index 000000000000..abf26c4ac7a5
--- /dev/null
+++ b/net-misc/cmst/Manifest
@@ -0,0 +1,7 @@
+DIST cmst-2017.03.18.tar.gz 2554106 SHA256 6b0071d464c33406a9ad6938b04a038ddf677a0a80a9dc82a05c04afd937fec7 SHA512 af89ec2044ede191f204281279f07cf4ca7bde5d5b7409bccb150fa1ac4d1efe1dda41f6e57bff57e50ac11be25fbd1d5613acec17d198814e52b43a56dd1ea9 WHIRLPOOL b2bcdce9ae67bf4fae8297c02750c604f35a8f7f58a142a15cb471771f704010f042e3156fb38d747e928d8f777efcf7da5b80b5018dc360ebac2050ecad6fb7
+DIST cmst-2017.09.19.tar.gz 2554672 SHA256 5e0d8d1acfbe749bcdd15ff37865a4ce8d54d72fd54bfd2f60d21e9a064b8bfb SHA512 3ac92c60572526f08206b0f175ed3adea839795f69dccfe67b3a8bc3ddea82e62e46c4a1acc4283d331a3283c8c1be79b34477b2c937720b05b6ec6a07da8088 WHIRLPOOL a057655005b7e8467420a5bd3da12479922cc8fb2cb5992346cedf0569508df3b340b28c1fffbcd65ebd5d28130dc297b4d0956bd416a1d9f6f7717d0d4be506
+EBUILD cmst-2017.03.18.ebuild 799 SHA256 57438494b1648cec22758c9b34f071e6caab0d2343c735146e8bf5392184a687 SHA512 0d518e505e42d2212bb06496e32de37cafe10d48678510535ad3668c8a21d6f4b3b83561c920975e1268aa46dbac17fbc5cd4ba8fa646ca9aa0258b7b31dd4d3 WHIRLPOOL 72b5858ad709476165a202ddd0b1d5680b51b677c578dfa7aa26887b96288087c40f2fd1331410392388fcdd8b7a2a8bb08c8404ede0db69f2868fbbbb1cdc08
+EBUILD cmst-2017.09.19.ebuild 799 SHA256 57438494b1648cec22758c9b34f071e6caab0d2343c735146e8bf5392184a687 SHA512 0d518e505e42d2212bb06496e32de37cafe10d48678510535ad3668c8a21d6f4b3b83561c920975e1268aa46dbac17fbc5cd4ba8fa646ca9aa0258b7b31dd4d3 WHIRLPOOL 72b5858ad709476165a202ddd0b1d5680b51b677c578dfa7aa26887b96288087c40f2fd1331410392388fcdd8b7a2a8bb08c8404ede0db69f2868fbbbb1cdc08
+MISC ChangeLog 3369 SHA256 6127498ea77ff556913b04e1a924f2af31317d72a179b7020d30f2f62c504470 SHA512 788f24d76697ffd9dd03eab03a3881d846cbc150579e1d7f8d076193fcd72307804e442775b8ad633431e4edaf032b3b3f5d165e7363d89ab7e12ed192108726 WHIRLPOOL bfd8bd6f87e8dda711c6bd462a58eed32744ac6a5dff5eeb503eb4cffd2e9fe18bbd23b99c16f4f2213425ee89cab1f5cb20934f3919dd9bec852644a6469a4f
+MISC ChangeLog-2015 358 SHA256 a0680921eceacdf9b299585bc565eb563940cc7dcd84633e1dc183b8dbb23e83 SHA512 5e647b2147e742cd972bfa5cfb912e811c040eb7401528d4c76feaec5bbbe9240192d2a3e3c14410135148599299285b91710ea9ad942a7b9b3d248713661fbb WHIRLPOOL c4a2b05908a95d83951dbd6adc878b957a6d4a017596f38986b715d300c852c92da64f5533ad0874f3c16a30ca9b930dc3913550073539ce781a1c4180e78e86
+MISC metadata.xml 392 SHA256 a22f7be3c08263d075321a35283454aa37cdce92f51e297836c38509ce30869e SHA512 c6858ace643af313f0d47a863cbf117261f7ef419b02c874c34b3a8c64269570f6a9d4f004ee4645cc6eb673d2f5448f5fdbb291d51c322eaf806e28227ff2cd WHIRLPOOL 1cb1a9b06670d51a74a2bdf5cbf9051762ce5e258896acd6cf68f36a40e4258659778398b9f176551eb315b06c02be8ea08f14e46d1a3d10aac35e5bc92a9250
diff --git a/net-misc/cmst/cmst-2017.03.18.ebuild b/net-misc/cmst/cmst-2017.03.18.ebuild
new file mode 100644
index 000000000000..ef3e5a6c5af1
--- /dev/null
+++ b/net-misc/cmst/cmst-2017.03.18.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="Qt GUI for Connman with system tray icon"
+HOMEPAGE="https://github.com/andrew-bibb/cmst"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	net-misc/connman
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	eqmake5 DISTRO=gentoo
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	rm -r "${D}"/usr/share/licenses || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/cmst/cmst-2017.09.19.ebuild b/net-misc/cmst/cmst-2017.09.19.ebuild
new file mode 100644
index 000000000000..ef3e5a6c5af1
--- /dev/null
+++ b/net-misc/cmst/cmst-2017.09.19.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="Qt GUI for Connman with system tray icon"
+HOMEPAGE="https://github.com/andrew-bibb/cmst"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	net-misc/connman
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	eqmake5 DISTRO=gentoo
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	rm -r "${D}"/usr/share/licenses || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/cmst/metadata.xml b/net-misc/cmst/metadata.xml
new file mode 100644
index 000000000000..9bea61da3108
--- /dev/null
+++ b/net-misc/cmst/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/andrew-bibb/cmst/issues</bugs-to>
+		<remote-id type="github">andrew-bibb/cmst</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
new file mode 100644
index 000000000000..399365759002
--- /dev/null
+++ b/net-misc/cni-plugins/Manifest
@@ -0,0 +1,3 @@
+DIST cni-plugins-0.6.0.tar.gz 787756 SHA256 8589670f7f9b211a351dfcd211d4fe0b961d77283a7415443dc188f3dbf05668 SHA512 4b3c1901154eb1af86dc35888fda7b7666ee88d2cf728fb09182df5385d32b747de34c5c01598e1f37ae1e3497dbf5af2bc6ad6f737e683ccfccf9c1860cf6dc WHIRLPOOL 4e06c4b54144139509148cb851182dfa642fa4614fc392304bdc541611dc8bb34c978e9ff6507bb55a46a4d0f016feaf615abd09cdfb303e1f9e995162a19351
+EBUILD cni-plugins-0.6.0.ebuild 1043 SHA256 354dc5b4c03938ec1755cd53d025163f92b81a7c11404f7f5345a4203a38ae30 SHA512 981589a5390a63178d7a5961794e28400c0f38e3c4419797779d6256cdd7efbfdf4d35857af740b76d5af0657995ebae08b465865ed6525bbd12658eacc625f0 WHIRLPOOL ea88a932bea069bb0ffb0e59f83d102c6874c39f9c7b4c2da8462de9d34c84b655be3910ac7c317cbd601a7f821a0fb9bec67e1434ab0f26fee0586ad430a27b
+MISC metadata.xml 347 SHA256 77b36b270fcd6dbf3f95f667d3f12e1f64142bc3b517d43ef8a9bd164059bd72 SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05 WHIRLPOOL 9d434379158bf00644ffc03e6c431cfed2a5ca3ffe725511f17adf7ec1e6f2349f01fd92aa81fc1dc54c61d0f55282f4571c32f6acc917e71c5b695d1de8eed4
diff --git a/net-misc/cni-plugins/cni-plugins-0.6.0.ebuild b/net-misc/cni-plugins/cni-plugins-0.6.0.ebuild
new file mode 100644
index 000000000000..7a785167042e
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="Standard networking plugins for container networking"
+EGO_PN="github.com/containernetworking/plugins"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+src_compile() {
+	pushd src || die
+	local i
+	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}"
+	done
+	popd || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	pushd src/${EGO_PN} || die
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+	popd || die
+}
diff --git a/net-misc/cni-plugins/metadata.xml b/net-misc/cni-plugins/metadata.xml
new file mode 100644
index 000000000000..deec70d1fa6f
--- /dev/null
+++ b/net-misc/cni-plugins/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <name>Manuel Rüger</name>
+    <email>mrueg@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">containernetworking/plugins</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/cocaine-core/Manifest b/net-misc/cocaine-core/Manifest
new file mode 100644
index 000000000000..39c91f09ed31
--- /dev/null
+++ b/net-misc/cocaine-core/Manifest
@@ -0,0 +1,11 @@
+AUX cocaine-core-0.11.2.5_binutils-2.23-compat.patch 559 SHA256 391cdd9106b81cfde17b1b8c34a76acb70aa22580399dc7806468127b523c723 SHA512 b3b3dda65aab873057029bc76526e2c5f89e426788622c945888dd0005dd084f6854b0f739ee0f3f3ca6e1d41b94e1bd3b37964782b91d27a833f42ada229833 WHIRLPOOL ffc0735f7212792d398968f98c897fa2ea854aee96b7fd349ec37897cc737d1ba034d43fad5fdae0123f5669ddff55c4fa27a9776f7797f1ece275ac7dc01c36
+AUX cocaine-core-0.9.2-boost-1.53.patch 619 SHA256 4e771001ac7f32b6230faf50410a67c1705eedcbc68d8b1e6ce920403fb41d3c SHA512 1d4eebb1601fa974720d6fba2fdc21f9f99b9222df0767ea8f1c96f023c7fa3bd3862feb393242e8680b3bf970da06f01a331acf7dcacf78b6426841a73705ec WHIRLPOOL 913a580063071a099cb20bc0e9363db8fdc3ec81884ed2eca2f79b349c88b0361dab3a8cb331a9e92f48aa96fde19a793a9a4912af68fc0b8d7e3c14dc4a3020
+DIST cocaine-core-0.9.2.tar.gz 174494 SHA256 c44d99fb3771692aa2ed8b4573954d264397c18662e05c2d95e93a5027499c8d SHA512 42bf9f38311026966b11414fc9987b4fc1d30dba9360152662810ce4e49ab1c8e662b18299efe2831b1ed7ea3490a8afb36195d7e7fc609cc9527e2c71f71bd1 WHIRLPOOL 970510d9400ca86b89fac97b5504ec6de6169bdb05819926445c8a62bf0cdc4f0166de831999f41fcf39522978acf381255d3639365142e9c4f68c9748b8e6c1
+DIST cocaine-core_0.11.2.5.tar.gz 376997 SHA256 9c55c9ab4ececf00e1f71909a30e412663d72f2c8b213c01a2dceb9c1a705cf4 SHA512 f2962d41ba12ebae475cb10d501da8d7b3ca6a428b4b2e8779dd7d768cacc2e3bf9b7952354454e432e2623a00add3d7cf424b12968c0c4a905a65dbda544866 WHIRLPOOL d82de7d5ceef66f571631ba495e2bf2169265862b52811e5aaf2d60ff915d2b5cb39b744e7c1871b28f9d4a49154e7ca914e7b84808f3e1998a73ad759632ee8
+DIST cocaine-core_0.11.3.2.tar.gz 378575 SHA256 0a350f6c7b80957258be9dafc209cf54b561fc34eae781c2fbd533c17636d13f SHA512 f0a5eea827d0fbf65c484e6068a24dd1e81dfc868f38ef829003b410783a354a58886d2db972ea24adb6075b38ceb230432555b35af4aceb0193c4a12ab874cd WHIRLPOOL d302d25f552db618ceab5c17967eb16df802d2cf16e6ae0d33a5ff6835b149f98dfe1dd91ee876b5e9e8847044179242b08aeb6b420209574219fa0b432f5783
+EBUILD cocaine-core-0.11.2.5.ebuild 543 SHA256 f73459881f562c1ab300402386d679acf593ffc6e835aa3444258539e6ed9173 SHA512 26962a30a9f2e67c43b6578c448f8f53befd0ed511b8d331728871f59e384f84ba7a540447a769c181dcc107ec3ebf097f2f3c5433cec8087e04f40a245566cb WHIRLPOOL dc4d0df04c9cf516aa5cf44d2752b703ad813ea23cc1f1cfef6d008b43243d13b93bc8099d6a0a455f9cc7f709612b41bed374498ca39310439c8e0eb9cefdad
+EBUILD cocaine-core-0.11.3.2.ebuild 553 SHA256 6791cac456f73bc573008b15eb71cbef87308da20fdc4c78c6d0e70c5f141c68 SHA512 7a184d39ebcb27dc22d322f76ad8d271e69611707e799b88f87f906871ea3b1c3415773947b430ab9ced98928e2ee85dc52571105864bcd8eead84385fb2faf3 WHIRLPOOL 3778d7aa61beefc40e938d53af7db5244d9dcbdb4d16945e533580e8662cfcb19a58fa45438c1715b671b5a1d6b651a23b655871ff2abf2e81eccb24e055a307
+EBUILD cocaine-core-0.9.2-r1.ebuild 528 SHA256 cb79ebc66bd306c5f085e0a91ab520652740fa065980c2b0d18e1cf867833193 SHA512 dcfeb606d1b82536484d624bc92131edaaaff812ad2e80e2c36eeb0f5acb04c0e602b06b9ad73493bb17029dca49f38efbd125a4e1d8ff96a7120db019d2aa78 WHIRLPOOL 67f1cdf6c2b660d5ac288c094f8d510a7b9fc08271b7dcece01a24da0a79aab12f1b33ee2b3a219cc773277149f5b26e559c17a5f43844105cb435152932e4fc
+MISC ChangeLog 2586 SHA256 83e56fee2c4c44bb6fb4d889fe153ae8fee14cfa98a8a480894829f5dfad642b SHA512 676886bd3813a4d00944d276e75479c53fa0f98a02d5a174de8f8d1b61e7c22d5abddfc2cbeadcd80fe3952e956f0f334e8113a7cda597efaa17ed779347e454 WHIRLPOOL 06d83b77fd2b5d544028a4e5d6652c9fc0017f8ebeab3b5b8846d09a4bed502080616e1433d030fb94b1a1263dd29b8301b21f5f3dc0b8362064103c6c0bc223
+MISC ChangeLog-2015 1106 SHA256 4743191baacd5a99f01d5ac85d0d5ae941cb7cf4c6f41246f76b7f88a7bd9bbe SHA512 99a597bc53b57643598852b5e9cdc6bfb220e52320375c766706feda330012c7140758ce2040fd2e2d8e0818b8ec3282685c7e3f693d1e34415a92b5a30dd700 WHIRLPOOL 2ddf61b80d18a8188feca0a0541a66864acf488d00e19cdaa8b349410a1817d2ff73d05cd4c46fbcb55963af75edf5df6c062563785e246e6d97256d2751e433
+MISC metadata.xml 332 SHA256 58af90c04412b94072abe82c529927b50c38b0008d539e2508689aae50df4444 SHA512 6beef52c2b282b0a6776e941c33706a803a8ec277de300ce701cb45179d916af221ea9cb190d0f3194dd75ca89366834a39a8d26a0bc145844b460fcca910764 WHIRLPOOL c484de4bf7bcd827d36347754761cfaca61ed54cf555a5aac5efb666f50ff5a18ea8a56ce724b0399db05f150376c5af7c62dc2f123686913e54bcaea745f261
diff --git a/net-misc/cocaine-core/cocaine-core-0.11.2.5.ebuild b/net-misc/cocaine-core/cocaine-core-0.11.2.5.ebuild
new file mode 100644
index 000000000000..61e561d2f622
--- /dev/null
+++ b/net-misc/cocaine-core/cocaine-core-0.11.2.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Cloud platform, core parts"
+HOMEPAGE="http://reverbrain.com/cocaine/"
+SRC_URI="http://repo.reverbrain.com/precise/current/source/${PN}_${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/boost:=
+	<net-libs/zeromq-3
+	dev-libs/libev
+	<dev-libs/msgpack-0.6
+	dev-libs/libcgroup
+	"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}_binutils-2.23-compat.patch" )
diff --git a/net-misc/cocaine-core/cocaine-core-0.11.3.2.ebuild b/net-misc/cocaine-core/cocaine-core-0.11.3.2.ebuild
new file mode 100644
index 000000000000..6e8a93a96f9e
--- /dev/null
+++ b/net-misc/cocaine-core/cocaine-core-0.11.3.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Cloud platform, core parts"
+HOMEPAGE="http://reverbrain.com/cocaine/"
+SRC_URI="http://repo.reverbrain.com/precise/current/source/${PN}_${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/boost:=
+	<net-libs/zeromq-3
+	dev-libs/libev
+	<dev-libs/msgpack-0.6
+	dev-libs/libcgroup
+	"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.11.2.5_binutils-2.23-compat.patch" )
diff --git a/net-misc/cocaine-core/cocaine-core-0.9.2-r1.ebuild b/net-misc/cocaine-core/cocaine-core-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..491ca2cd0a9b
--- /dev/null
+++ b/net-misc/cocaine-core/cocaine-core-0.9.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Cloud platform, core parts"
+HOMEPAGE="http://reverbrain.com/cocaine/"
+SRC_URI="https://github.com/cocaine/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/boost:=
+	<net-libs/zeromq-3
+	dev-libs/libev
+	dev-libs/msgpack
+	dev-libs/libcgroup
+	"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-boost-1.53.patch" )
diff --git a/net-misc/cocaine-core/files/cocaine-core-0.11.2.5_binutils-2.23-compat.patch b/net-misc/cocaine-core/files/cocaine-core-0.11.2.5_binutils-2.23-compat.patch
new file mode 100644
index 000000000000..532700bec70b
--- /dev/null
+++ b/net-misc/cocaine-core/files/cocaine-core-0.11.2.5_binutils-2.23-compat.patch
@@ -0,0 +1,19 @@
+commit 771bc9f8055e7baf58011ff7514827b6212f9f51
+Author: Andrey Sibiryov <me@kobology.ru>
+Date:   Fri Dec 6 12:51:59 2013 +0400
+
+    Added binutils 2.23 compatibility.
+
+diff --git a/config.hpp.in b/config.hpp.in
+index a73fa48..651aa3c 100644
+--- a/config.hpp.in
++++ b/config.hpp.in
+@@ -8,5 +8,8 @@
+ #define COCAINE_VERSION \
+ 	COCAINE_MAKE_VERSION(COCAINE_VERSION_MAJOR, COCAINE_VERSION_MINOR, COCAINE_VERSION_RELEASE)
+ 
++#define PACKAGE "cocaine-core"
++#define PACKAGE_VERSION COCAINE_VERSION
++
+ #cmakedefine COCAINE_DEBUG
+ #cmakedefine COCAINE_ALLOW_CGROUPS
diff --git a/net-misc/cocaine-core/files/cocaine-core-0.9.2-boost-1.53.patch b/net-misc/cocaine-core/files/cocaine-core-0.9.2-boost-1.53.patch
new file mode 100644
index 000000000000..2f03a328e0a9
--- /dev/null
+++ b/net-misc/cocaine-core/files/cocaine-core-0.9.2-boost-1.53.patch
@@ -0,0 +1,13 @@
+Nur in cocaine-core-0.9.2: build.
+Nur in cocaine-core-0.9.2/include/cocaine: config.hpp.
+diff -ru cocaine-core-0.9.2_org/include/cocaine/interfaces/storage.hpp cocaine-core-0.9.2/include/cocaine/interfaces/storage.hpp
+--- cocaine-core-0.9.2_org/include/cocaine/interfaces/storage.hpp	2012-08-29 15:54:35.000000000 +0200
++++ cocaine-core-0.9.2/include/cocaine/interfaces/storage.hpp	2014-07-29 13:49:40.130375695 +0200
+@@ -22,6 +22,7 @@
+ #define COCAINE_STORAGE_INTERFACE_HPP
+ 
+ #include <boost/thread/mutex.hpp>
++#include <boost/thread/lock_guard.hpp>
+ #include <boost/tuple/tuple.hpp>
+ 
+ #include "cocaine/common.hpp"
diff --git a/net-misc/cocaine-core/metadata.xml b/net-misc/cocaine-core/metadata.xml
new file mode 100644
index 000000000000..13f626e87155
--- /dev/null
+++ b/net-misc/cocaine-core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cocaine/cocaine-core</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/connect/Manifest b/net-misc/connect/Manifest
new file mode 100644
index 000000000000..3cac5e55a635
--- /dev/null
+++ b/net-misc/connect/Manifest
@@ -0,0 +1,7 @@
+DIST connect-1.100.tar.bz2 21588 SHA256 e34be67caefc38f9b48fba1b5cbce9b0978fc4d33e2640d5d287789a14cb9ccd SHA512 e0bb106ae7270ff0352c2c5167fd47d6d9ac787f08b3019fd9dabe0636606709bc1caf696f6c87699e146eee0cb81db229f9202654f006c12321208c22832108 WHIRLPOOL af15bf382f84742618df9d42de14410f9ca4f6a888835cf4a28f2f5f20d2ec962b52f188a787fb9244f95e5b41f9bcfe6b465a1a5a7dd456d0592bbcd69b1b23
+DIST connect-1.103.tar.bz2 37980 SHA256 d4ea2e1c2831f7578c264196bfeb6285618cc1d50660aa923b91145282ac3155 SHA512 6de32aa48171b1528abe12c1044e1d498cd10c3ef7b4652318402b7bc12bbb50ce0f9eab10408dc3cc26c1c0d56804bd088fbedae688f921c84c40d1aa0ae4d9 WHIRLPOOL 2007c2bcf9460d948554f1b53a389c7f70f2135647b629290c9cd21f11f5f3a647c5d28389b7c20f7e8f4d7c4b9e1c1eec82d7306db3831c31eb1728a9dc79cc
+EBUILD connect-1.100.ebuild 864 SHA256 3722257bb3dbac15d1af5932ef3930dfc4e4483c41dd31d76974072f18b85011 SHA512 c7e995e746d6ddfef831f6b98595e51f44c6f17eb309898fe58467391a8908d143546c7292861f0882cf5bbe1addaeba9d7af5880ecf88b03d1253d09e8390b8 WHIRLPOOL 41ced4480f8613637cec9cc9df05071f9315e4bb7366078de056193ab46a6123c4d23c3662dc0f1dd7da1feb40e8932d278255db1efb559463e21e5861b9de39
+EBUILD connect-1.103.ebuild 873 SHA256 ef7d8f8006b02e33fd7b865cd008cb997c7e631a2d1b741d378a8f032e14618f SHA512 b147b2c4ebb2a133cb29e38b1a8d493afc371c261ad5cf4a0585c6985907816cf9c7af25746acccde88a94997238ff381461837678e23734245b8fc0f1b23ce9 WHIRLPOOL 147b2636edaec1047dc36b2b8b3292ce2b1bc448afde68d88344908784eca0786612c66f6ccad478aa9bbe9e466e737c65ffc032cd269f9af2a6801a29200cc8
+MISC ChangeLog 2544 SHA256 d204bb4f5f6fe4023210be91320c1cc22890d204b8712cd13936a58c06fa8c34 SHA512 92abdcd08b466d9ffc583d2c28cdee3fe3770b25c5720b9c4f3f90aae742c03064da2bdcc1524ec8d92e1e605f3e584f0241f4fa529e5ffc5eb0e634a4811c90 WHIRLPOOL 26c76e8c6c3a8f15d1e330038da8903113e56eea29aefb70b4d56d943ad730567e91df7ab89ea045281ca0eb14102a0227b531412013c9cdc3efa1a66472611d
+MISC ChangeLog-2015 2243 SHA256 c561dae57facd40fea88acb931c3005041abf9af3a1abc20cdf00f245d184748 SHA512 206d2d378079895f6c10e7a5cd2fccfd92f3c66e2fc5a64a5f1a2f48e9bea08448b324f944c0593e81919d36f238c3c353dcd3e98bb174ee714f4daaa7e087ca WHIRLPOOL 1ecdea47be61096f1dd9bd0a6f6f837c0fdfe242540ee595c28cfe8304b67bd4e261826fd11199126d5d3bf596219f6a9436bb8a5707d6e3f1022625ce1a2770
+MISC metadata.xml 848 SHA256 2b360f4f97639d3627b5dbcfeaf0d5fa082b2467cb0b2660f2fcda2208b959a1 SHA512 2a444387c110c5850d73dbb8b7b94c52ba93225cdfe7a569d0f17f300c11c589d211cf795d895c022fe9e6e939c2fdfe19edbcc84b87193692caa726f6c3b969 WHIRLPOOL b37083750ce8a2bf294710ed03d070bcf5c1242b228ba06eda47dc6b626bb3f0da8917a1ae491683f70016f74df032c53304441f18dccc0ca65ef8832fb98dd4
diff --git a/net-misc/connect/connect-1.100.ebuild b/net-misc/connect/connect-1.100.ebuild
new file mode 100644
index 000000000000..9179d07d4678
--- /dev/null
+++ b/net-misc/connect/connect-1.100.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+inherit toolchain-funcs
+
+IUSE=""
+DESCRIPTION="network connection relaying command (proxy)"
+HOMEPAGE="https://bitbucket.org/gotoh/connect"
+HG_COMMIT_ID="7c036cbffb61" # bitbucket commit id
+#SRC_URI="https://www.bitbucket.org/gotoh/connect/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="https://bitbucket.org/gotoh/connect/get/${HG_COMMIT_ID}.tar.bz2 -> ${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+DEPEND=""
+RDEPEND=""
+S="${WORKDIR}/gotoh-connect-${HG_COMMIT_ID}"
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c || die "compilation failed"
+}
+
+src_install() {
+	dobin ${PN}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "There is no manpage."
+	einfo "Please see https://bitbucket.org/gotoh/connect/wiki/Home for details."
+	einfo
+}
diff --git a/net-misc/connect/connect-1.103.ebuild b/net-misc/connect/connect-1.103.ebuild
new file mode 100644
index 000000000000..5158dff54002
--- /dev/null
+++ b/net-misc/connect/connect-1.103.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+IUSE=""
+DESCRIPTION="network connection relaying command (proxy)"
+HOMEPAGE="https://bitbucket.org/gotoh/connect"
+HG_COMMIT_ID="ee1fbc21da4b" # bitbucket commit id
+#SRC_URI="https://www.bitbucket.org/gotoh/connect/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="https://bitbucket.org/gotoh/connect/get/${HG_COMMIT_ID}.tar.bz2 -> ${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+DEPEND=""
+RDEPEND=""
+S="${WORKDIR}/gotoh-connect-${HG_COMMIT_ID}"
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c || die "compilation failed"
+}
+
+src_install() {
+	dobin ${PN}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "There is no manpage."
+	einfo "Please see https://bitbucket.org/gotoh/connect/wiki/Home for details."
+	einfo
+}
diff --git a/net-misc/connect/metadata.xml b/net-misc/connect/metadata.xml
new file mode 100644
index 000000000000..2f7884dc6edd
--- /dev/null
+++ b/net-misc/connect/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<longdescription>
+connect is the simple relaying command to make network connection via
+SOCKS and https proxy. It is mainly intended to be used as proxy
+command of OpenSSH.
+</longdescription>
+	<longdescription lang="ja">
+Connect は SOCKS 経由のネットワーク接続と HTTP プロクシを実現する単純な
+中継用コマンドです。主に OpenSSH のプロクシ・コマンドとして利用されるこ
+とを想定してます。
+</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">gotoh/connect</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/connman-gtk/Manifest b/net-misc/connman-gtk/Manifest
new file mode 100644
index 000000000000..851e14e9a03b
--- /dev/null
+++ b/net-misc/connman-gtk/Manifest
@@ -0,0 +1,7 @@
+DIST connman-gtk-1.0.tar.gz 50428 SHA256 50ae5498f3a5c2714dca47cf21c197b6272b14ae0bef5e68cc1ffc78f2ea0b93 SHA512 61f3004950f5905c62ff8c71afffbba9797e398b332679d495846ecfd2adce693b4ce7026adc72676868a3bdefbf3df5be93090abca215d4b0baf784324c5577 WHIRLPOOL 04870c5cd4bd85fd438df7275dd7bb343cb8a1c883cf34515ec597cae0b4dbec0e899def9b13d491d5e23b797ffab397428f5f2d27ac04473a303b9d211d7fb9
+DIST connman-gtk-1.1.1.tar.gz 61789 SHA256 fc1da266c4216d34db7c38f7329c698b42666389ce32a8df58a818af9eee2262 SHA512 78fd41a37370c76f118e3fb8a707b96fd6bf1234a8832d047302d4b0fa350f87316f6e2e749860b2cdf0ff6e6eb76e4d7d398dc7fc084403ca2f8682d2907553 WHIRLPOOL a21f2662bb4e95a8a633bcb553fa404a17787778298c3aa0e06709bd28bbaa2a8bf2810fe93d9ab7fd9cdc260c2380da7f01e3298abe74b05abf907f4ddb0752
+EBUILD connman-gtk-1.0-r1.ebuild 696 SHA256 f160dcea2282d26c7ffa9f34bad30de4b4e7f33fb6b6501b66d75159c6d505d6 SHA512 e4e2c69a7fdfa74ed3e9d1cc7e402f5fd2dc4b56c56d3d31511659c2bf47d0cdc92703eef408470d8bde951a22969ef21766ab0b061b472bc64996b3681732d3 WHIRLPOOL 939ba4da20e4ae02b50ea418373b5691c264725407199047c2bba81f477d3e84c2aa6a49a922aa2fa7d3ed35f088fc5272a37be72cdbce1c7f713405984a3d85
+EBUILD connman-gtk-1.0.ebuild 687 SHA256 0f79db95e7929b57eb6c8464cfd730251cdcfa4b9dcff65599fc23215d14fb6f SHA512 4175ab3408837d4af115877ad6336ebf489aeb6c0aa39bc8786ae81602f85cd7824246d018e5d7d38fbf3eb812028c6126845d8ba83d3ae0620e7d177a9a4382 WHIRLPOOL 0c3f67cfb1737fcbf66536a691458481d14b1586eaa8c267f8c006bfb4103c3668e48ab593a208bbc4506cb477cdb989ab4748a1f7e48401b50db810c3b27126
+EBUILD connman-gtk-1.1.1.ebuild 941 SHA256 09b9d598fe505998b8dbc79aee216e14081679e0fb636c151683d8e09d56a3c1 SHA512 adb12aaf2403f91d3fc61a59437bbbbcddabc6da5025b11e3c26e722d1d1b30e4f285aadf693bfcf7ab3a31c98d6082b486dd4c3ac0b60b55c2aee5a4a37d7de WHIRLPOOL 08e432cec3d3aad7adc6c41dc7ab99d05da3e33de725589c4c881798e8f71ee1e58105b4435116cf0b19dc02f423fffeaaa226474bc39f7ca5a410de8074f2c2
+MISC ChangeLog 1693 SHA256 417762bd8bed3cafee3837a114c0df17d8b80ece20cea9a74a37de03cbd26ae6 SHA512 83b7f7456017312f1de384cdbccf02671fb880d5760177d4e05b5eb8499690930c88ab77637825e1811df70a3ad1bb0340f0b2f9748382df169749897e6b7acb WHIRLPOOL dbd98a6fa4c896665f06adce83c60562ca83de710496a34fc21ef7071aad0358b1fd232793ac9ccaa383fd76f2cd4cec10b83a32809f2302892fcd09c8a26ac4
+MISC metadata.xml 488 SHA256 acce02fa7d6634eedf5c209c7b4f8f5488beaca5a0a07925642b9e2275adb32a SHA512 f84f35958b032afd49633c59fac3474148d01becdf968d62747c8a2d99aeec4f90cae7242b7f7fc00cee2903a9188bdc206308a7d692e136317959ebf9019867 WHIRLPOOL 92c73f1f886b370dcfb629d03bf834c1d9618b02441df12baae4fe44d153909902d69bd8063d6425f43c9ab7e90a2e6947e8bd6e38c7dbbecef74af02487dd77
diff --git a/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild b/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild
new file mode 100644
index 000000000000..aec310f408f8
--- /dev/null
+++ b/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="GTK GUI for Connman"
+HOMEPAGE="https://github.com/jgke/connman-gtk"
+SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openconnect"
+
+CDEPEND="
+	>=dev-libs/glib-2.0:2
+	>=x11-libs/gtk+-3.10:3
+	openconnect? ( >=net-vpn/openconnect-5.99 )
+"
+RDEPEND="${CDEPEND}
+	net-misc/connman
+"
+DEPEND="${CDEOEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with openconnect)
+}
diff --git a/net-misc/connman-gtk/connman-gtk-1.0.ebuild b/net-misc/connman-gtk/connman-gtk-1.0.ebuild
new file mode 100644
index 000000000000..3b4065d4628f
--- /dev/null
+++ b/net-misc/connman-gtk/connman-gtk-1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="GTK GUI for Connman"
+HOMEPAGE="https://github.com/jgke/connman-gtk"
+SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openconnect"
+
+CDEPEND="
+	>=dev-libs/glib-2.0:2
+	>=x11-libs/gtk+-3.10:3
+	openconnect? ( >=net-vpn/openconnect-5.99 )
+"
+RDEPEND="${CDEPEND}
+	net-misc/connman
+"
+DEPEND="${CDEOEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with openconnect)
+}
diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild
new file mode 100644
index 000000000000..dae310961eab
--- /dev/null
+++ b/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="GTK GUI for Connman"
+HOMEPAGE="https://github.com/jgke/connman-gtk"
+SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openconnect"
+
+CDEPEND="
+	>=dev-libs/glib-2.0:2
+	>=x11-libs/gtk+-3.10:3
+	openconnect? ( >=net-vpn/openconnect-5.99 )
+"
+RDEPEND="${CDEPEND}
+	net-misc/connman
+"
+DEPEND="${CDEOEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i -e '/^Categories/ s/$/;/' connman-gtk.desktop.in || die
+	eautoreconf
+}
+
+src_configure() {
+	default
+	econf \
+		--disable-schemas-compile \
+		$(use_with openconnect)
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/net-misc/connman-gtk/metadata.xml b/net-misc/connman-gtk/metadata.xml
new file mode 100644
index 000000000000..eec5cdbc20da
--- /dev/null
+++ b/net-misc/connman-gtk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<use>
+		<flag name="openconnect">Support easier authentication to AnyConnect VPNs</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/jgke/connman-gtk/issues</bugs-to>
+		<remote-id type="github">jgke/connman-gtk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/connman-ui/Manifest b/net-misc/connman-ui/Manifest
new file mode 100644
index 000000000000..4abd9430c2e5
--- /dev/null
+++ b/net-misc/connman-ui/Manifest
@@ -0,0 +1,3 @@
+EBUILD connman-ui-9999.ebuild 578 SHA256 57335c3644108da1acc3a4c357221b78fa9fe7dea8bad5dc8f83c300324f00c6 SHA512 2d0373cc51dea97eb2fe0898c5a80ab0c736305975ae19f5cc081f52aaeb190261281eb66148f7056a57a0aaf3003eb8bed024f538ad5922fb4f5454351eda12 WHIRLPOOL 097f42a80912733f025be3be86313e46b5097b3af47faeba7f881550f8f0abca1326fdf3a511d27f1d3f41885488ebc74acb2cf732c3597f62c38f22059cc0d3
+MISC ChangeLog 1231 SHA256 d6383778eaff374cae91609917df3926284db9545aa742531556d85d182c3cbd SHA512 f1ce43d6b7f8ca8baf07d8477e3ff69c6d2c3f4b76e7a2af3cfc7dd59c4defd06a719a830e25337ccc144711d2b1f0130acd455dad00a78d7cf6ebf0dea0d7fb WHIRLPOOL 526d6a9eaf8f3c0c3dafe783ace59a607559e9b2bcab7720cc2b7cb2b18f4e88b5144bdc729b74075da063d6eb3eca6eff56338c8abb24a1f829531ad49aa170
+MISC metadata.xml 999 SHA256 56246c10997b811263ce194c80b377b587c90caa7ed1d2e7a23a83783f95f28d SHA512 f2ee1dff0f52ba40b32b987ec10d561e0761768253ba48152e1f189a362b2f2f6f2a15a81f63dd972765bb397976f618cc3899178de304f9e645a987e59a46da WHIRLPOOL 59d2c487fc6704f049861c969a9d90e00360f7139da6f9059524561c12807e11ac26e3f6331ff257b64fe03348143ef65d1923a0f2c2c847e18aa1aca227ed93
diff --git a/net-misc/connman-ui/connman-ui-9999.ebuild b/net-misc/connman-ui/connman-ui-9999.ebuild
new file mode 100644
index 000000000000..67ca7343806a
--- /dev/null
+++ b/net-misc/connman-ui/connman-ui-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools git-r3
+
+DESCRIPTION="A full-featured GTK based trayicon UI for ConnMan"
+HOMEPAGE="https://github.com/tbursztyka/connman-ui"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/tbursztyka/connman-ui.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+CDEPEND="
+	dev-libs/glib:2
+	sys-apps/dbus
+	x11-libs/gtk+:3
+"
+RDEPEND="${CDEPEND}
+	net-misc/connman
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-misc/connman-ui/metadata.xml b/net-misc/connman-ui/metadata.xml
new file mode 100644
index 000000000000..4788bbcee525
--- /dev/null
+++ b/net-misc/connman-ui/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+	A full-featured GTK based trayicon UI for ConnMan.
+
+	It targets all WM/DM users but Gnome3 ones*. It works on any Linux WM/DM
+	which provides a freedesktop compliant system tray. (kde, awesome, ...)
+
+	It exposes almost all features provided by ConnMan API (small features are
+	missing, see TODO for more information). You can enable/disable a technology
+	(wired, wifi, cellular, bt, ...), connect/disconnect a service, configure a
+	service (IPv4, IPv6, DNS, Timeservers, etc...), share your current connection
+	(tethering) and so on. Everything is accessible through the mouse via the
+	trayicon, all with left and right click.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/tbursztyka/connman-ui/issues</bugs-to>
+		<remote-id type="github">tbursztyka/connman-ui</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
new file mode 100644
index 000000000000..b8546449e95a
--- /dev/null
+++ b/net-misc/connman/Manifest
@@ -0,0 +1,18 @@
+AUX connman-1.16-execinfo-assumptions.patch 1391 SHA256 12c9a6073dddceb5d2088be95143f5f0624f992aab8737d63839c1bc506f0d7d SHA512 5fb6e36e36147d9bda1e78b7d9c9bbc169965578b45295e65dd8d4922a7ef13a2854d4b14fb9db9d005ce6d59e8334b0e51b01f472227c4c1f1dbfbcc2004d7d WHIRLPOOL 9a3ae8f19100b1a4ccf39cd69ed1138ded9cd31c8d1e57764a1451a2e099e66a95cbc8b456406761b9504e2ac7c18190ed4bef12a0724990d87fd86fca2a5658
+AUX connman-1.31-xtables.patch 1367 SHA256 bcd01d1051bb7979a3a9f098bdbb027b3bd243f2e24a404bb57f1d62742c4108 SHA512 681615666a535fe0a60f1472768f63ecfadd974e2a39d38b1e229be00449d0acd24902fb674f6b6567bb0915c5b59adc0d76d5b886d50d59c776b239ecbb7c4d WHIRLPOOL 7b97159120f0bae83b5791a63c84bf1ce4b04a36f732f405af4dd57c5a0a70168226802cedc57c2f9f57e9e24f0fcf6d8b3e625dd5b055adad6cb20bbd6e6c17
+AUX connman-1.33-polkit-configure-check-fix.patch 665 SHA256 fb8397d2819948bbf2d72b231e7e74464c42fb9b4fa3face544a174ce4be7d59 SHA512 630ac9d147046f084a960795de87183c5c446006df7a6a74c02416e972a3bd55390e1ab9c3f0ea4449324d0fb7c271ebd6b64727ede834128ca8515853a9e905 WHIRLPOOL 179d83d01ccfedfcbfbdd6f8e425627fb865b4d4b2bfd1813af0950152bb922860fcb3b79047cf126d506eca36abc165d8df4dceb9ddd3e7ac719a6393283910
+AUX connman-1.33-resolv-conf-overwrite.patch 354 SHA256 97685a61de4081369a6422ba2cfe3a03dee3d2a8c4237c9016ea7ba35ba8d8dc SHA512 1998d0d2923f8dca3706c7c75ad87ffa2570a785ed3e5ec1c85cc539bbfb7ea9173dae5320c3f95fbeee9c9c72870607b8eb4b3fd2c36a1962ad8925d72e24e2 WHIRLPOOL 2429f8333d6f72197de3cfd7e6b752e5726d43c0bff84c264f82948724c1c3e28a978f133f126add5bd1cc6540588672413d00ecd01d6aa58ebebb80301cc49e
+AUX connman.confd 728 SHA256 767a160c1b3392f0a12d3908a937548a2f604a9a121e744c309ee6f478420b02 SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969 WHIRLPOOL 06098d2fcc27c1bf7dcf73167273cea5e83cc6a4bd5b4ce369974b7295fef6a8c268ea1f548b958c35a569c9c0634cb8ba1c1bc6386d02d02abb76ac396d385a
+AUX connman.initd2 483 SHA256 4c018df1b53b142a2e26c456b0bf6cc7039fb3851bc5f567e59654117930a78b SHA512 a9999849f1e9b7c8c44db5aebbc5d2e615ff191da582333c3a575f594b99a6324469525a2937a98ccc444fcb42cf0131b2067263451273c6e093b22cb746306b WHIRLPOOL fa9f958e2cbf88a8659c89f16131c4ff81d9020c679856904c155227fe917e97adf116b40b2597020e3da74a28d0511eaa623fb8c8222d4fcdce1f7f3d55807d
+AUX connman.service 198 SHA256 746a4cb3d4a7083b3165dd69285df4a3f85ec5fd4556d805428b1c13dcd8f0d2 SHA512 a769961922c40b5ed3e5a09d08262b20b84aa27fc278678063b348431ba2976de9f2ebcd9f9b0afa6241540d255ba4cdf7120b75184510d41444b7dd3209b825 WHIRLPOOL 6c91e3fe0045eec718328c5eed31d6109485c41c46ebadf392ecad3c41e97d19e5430b3eaead45844e2364cb3fa9aad2aa904b2b345657f0531c4fc51ea294aa
+DIST connman-1.29.tar.xz 653324 SHA256 2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594 SHA512 19f623dd23c6312f29bbd570dcb22d31154ffcd16ee66ed2280df3d9d844301f18538418363222d99eabdc33da0021488ed66ba2e4f88df30646004b724538ee WHIRLPOOL 9439cadeb20b72c922b1426da213f8567fe7b0da45f9a4abf270c38687a9d9161a8ee14250623344864d612e130e6f28926918468aaf4346a9e5ff41e6ad22bb
+DIST connman-1.33.tar.xz 669800 SHA256 bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0 SHA512 5670124d2e17ffde4bd5fb878198843b712a31f5840e8523e8247373c8547619e32a4d6dda9cf993eebd5c65bdd256cfc570708a79da1d10f969662b5b750566 WHIRLPOOL eda8176d0d6137b0b94581c9ace23367d7af5722b7d7ea53e173e9466b555f26c9a18a05a07c1533ab11e3197e4303c6c77685a214c3dec2de926d7924f019f2
+DIST connman-1.34.tar.xz 684992 SHA256 a9a0808c729c1f348fc36d8cecb52d19b72bc34cb411c502608cb0e0190fc71e SHA512 732669648936630ae5895cba8bcccc69757ab594bc31ee8e4925b0e402d190939891fac61136f3f086ce708b8d576136f0947914c0cc07427c170cbf9b85a308 WHIRLPOOL bf349ff1f8709e2325d0c316cef922358115c1e9b340b27866d19e03dad98a563f20405ef8290610960b8a33b6de6fbdc717bf958322553fa02da0fba76b3a3a
+DIST connman-1.35.tar.xz 686092 SHA256 66d7deb98371545c6e417239a9b3b3e3201c1529d08eedf40afbc859842cf2aa SHA512 2234b4d18b038f9a33939035cddebd31c74ce962e5616c2c30b2912476612ef3f7d5b9edca64bf6e69fa358252ed432124e036ac3516b291b86695cb9a96c6a8 WHIRLPOOL 6fcb9f78d10cda7e5e143eb5b626c4395671a20b6a00b213757c311702c4386122f08ac3df31fdd13c6137be087b35a9dd213cb360f928725acd7ce3166f6d41
+EBUILD connman-1.29.ebuild 2013 SHA256 ad17727b0ae8e64e5ab1c3b8b0c703478d66e59e706a044bafbeb8ca910634de SHA512 e77846ca1759957f4d898fd76b06f126d6181c85384eed8f6ffee4d9e6845eb43f831a0db1ea349b387392e60e43dda8c364f87b1f98c5ca84652e2fa858e35b WHIRLPOOL ec43b983ec1783efb5550f9a79638d40ca367456d7b7d6e153a8cc6611151ed3a21439353a62b3d85a889faf31add4694c1e7e69931c7947e9e6823514fec64e
+EBUILD connman-1.33-r1.ebuild 2280 SHA256 a7885ad550fdac86e3d541e7498b168b63fc1c756830475b2b81c1137637a0ac SHA512 8c396fa66e67a4519d2fe067e43f11cff3cb751e7f610e6ccb2cc75836cf74784fde1f8ae291b4b2189e92c941885b3c67e55556807eb1c9fdf619c9bc247ce0 WHIRLPOOL 30b138b15c18ea13dc31a5ab652560c3a78a2197ddeec140d7314e267ab1536de596845f530965e88031b437f858fbfe8814d4f36b4c27641a4cf8e0c4ab8fb1
+EBUILD connman-1.34.ebuild 2490 SHA256 42e3495aaf082a1a2854ee1a2a170c2906b22d88676398b3497581b1ca3c6d83 SHA512 51b456ca18a681392a9ffdc44ca31d1838cfe597e43ecef28b5202f69415465ee29a70d26a6ead153acaf7028b3da18049ab7d2c465b21fffd443c8b07afe302 WHIRLPOOL bf5bde68411fb8add701602e00196fb9d9e226243b82eaf93ba406d0720b710781c779537dc9dc9f338406561cd4c08d71742392656c889b372450c4175ba351
+EBUILD connman-1.35.ebuild 2490 SHA256 42e3495aaf082a1a2854ee1a2a170c2906b22d88676398b3497581b1ca3c6d83 SHA512 51b456ca18a681392a9ffdc44ca31d1838cfe597e43ecef28b5202f69415465ee29a70d26a6ead153acaf7028b3da18049ab7d2c465b21fffd443c8b07afe302 WHIRLPOOL bf5bde68411fb8add701602e00196fb9d9e226243b82eaf93ba406d0720b710781c779537dc9dc9f338406561cd4c08d71742392656c889b372450c4175ba351
+MISC ChangeLog 8119 SHA256 381c030744556e3d11ecd4ecf2042c63b5641be71fbe19112779e585c0bccb8e SHA512 a10468b98027b1e847ea2ea665a2f56415279bb3dcfd6cc04f33bd19a342d5e586ce28da1963a1dd6af3845a5e4a0bad84e3723ef6533a71a1e4e79634d89545 WHIRLPOOL d763544ef27f8741d1138834dca76ee9d48fb312eb643637b34eff96d236bea7f3368555fd18822c23e631ab56f536bee66fa8b6c552539a669fb14ed8276f5f
+MISC ChangeLog-2015 17832 SHA256 679dbb203e1a94d59ea486874f1a91031a972c5d68ecc8e126eb111aa05133ca SHA512 1de0542901b13ac1d4c8bd36d89477e42a7bfc7222fb503b3adbb7a16317b923616f6a674b9c478cba735c16ffadbc4f540a2fdcbd58cb9cd4875f138cee16f4 WHIRLPOOL b73fbce83f9883ddc90e4346b44a7adce8410182ae7b2074ca0b54c4019c28c45c04ddfe1be724995d301221ea19a4d3fb4c26ce9162c5fb8828a02a21202bf9
+MISC metadata.xml 1087 SHA256 386df42a5334cd2f73807ba47bb6c72c81dc56d05f9834d8022e884d97eec679 SHA512 8f02d9cf4194c9e24edaa9a0427d63db483bbf559ea119a043a70a759f583aec42203bedd12c91364e1c24850e9cb6b1831054294c3837a0c3a50cb75dc1de42 WHIRLPOOL 53aa8b09358eff213671e99fb00d331ee253a710a58dd81902bbe7960daac50c2bcef77b22ccb371c7fe7f1e1a5b80c0e5092254475048b39be90c08b5c8e5f5
diff --git a/net-misc/connman/connman-1.29.ebuild b/net-misc/connman/connman-1.29.ebuild
new file mode 100644
index 000000000000..329ac55f1db8
--- /dev/null
+++ b/net-misc/connman/connman-1.29.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit base systemd
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://01.org/connman"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86"
+IUSE="bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	>=net-firewall/iptables-1.4.8
+	bluetooth? ( net-wireless/bluez )
+	l2tp? ( net-dialup/xl2tpd )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39"
+
+PATCHES=( "${FILESDIR}/${PN}-1.16-execinfo-assumptions.patch" )
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable examples test) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wispr wispr builtin) \
+		$(use_enable debug) \
+		$(use_enable tools) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin client/connmanctl || die "client installation failed"
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	systemd_dounit "${FILESDIR}"/connman.service
+}
diff --git a/net-misc/connman/connman-1.33-r1.ebuild b/net-misc/connman/connman-1.33-r1.ebuild
new file mode 100644
index 000000000000..b3c1d52bbc4c
--- /dev/null
+++ b/net-misc/connman/connman-1.33-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit autotools systemd
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://01.org/connman"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	>=net-firewall/iptables-1.4.8
+	bluetooth? ( net-wireless/bluez )
+	l2tp? ( net-dialup/xl2tpd )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.31-xtables.patch"
+	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
+	"${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable examples test) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wispr wispr builtin) \
+		$(use_enable debug) \
+		$(use_enable tools) \
+		$(use_enable networkmanager nmcompat) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-misc/connman/connman-1.34.ebuild b/net-misc/connman/connman-1.34.ebuild
new file mode 100644
index 000000000000..12b9cd9901a4
--- /dev/null
+++ b/net-misc/connman/connman-1.34.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit autotools systemd
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://01.org/connman"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables l2tp nftables"
+IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
+
+REQUIRED_USE="|| ( iptables nftables )"
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	bluetooth? ( net-wireless/bluez )
+	l2tp? ( net-dialup/xl2tpd )
+	nftables? (
+		>=net-libs/libnftnl-1.0.4
+		>=net-libs/libmnl-1.0.0 )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
+	"${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable examples test) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wispr wispr builtin) \
+		$(use_enable debug) \
+		$(use_enable tools) \
+		$(use_enable networkmanager nmcompat) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-iwd \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-misc/connman/connman-1.35.ebuild b/net-misc/connman/connman-1.35.ebuild
new file mode 100644
index 000000000000..12b9cd9901a4
--- /dev/null
+++ b/net-misc/connman/connman-1.35.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit autotools systemd
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://01.org/connman"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables l2tp nftables"
+IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
+
+REQUIRED_USE="|| ( iptables nftables )"
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	bluetooth? ( net-wireless/bluez )
+	l2tp? ( net-dialup/xl2tpd )
+	nftables? (
+		>=net-libs/libnftnl-1.0.4
+		>=net-libs/libmnl-1.0.0 )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
+	"${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable examples test) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wispr wispr builtin) \
+		$(use_enable debug) \
+		$(use_enable tools) \
+		$(use_enable networkmanager nmcompat) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-iwd \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch b/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch
new file mode 100644
index 000000000000..5404414fc0ea
--- /dev/null
+++ b/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch
@@ -0,0 +1,54 @@
+diff -uNr a/config.h.in b/config.h.in
+--- a/config.h.in	2013-07-02 17:41:03.715261748 +0000
++++ b/config.h.in	2013-07-02 17:41:21.707260667 +0000
+@@ -3,6 +3,9 @@
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #undef HAVE_DLFCN_H
+ 
++/* Define to 1 if you have the <execinfo.h> header file. */
++#undef HAVE_EXECINFO_H
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
+diff -uNr a/configure.ac b/configure.ac
+--- a/configure.ac	2013-07-02 17:41:03.715261748 +0000
++++ b/configure.ac	2013-07-02 17:41:21.719260666 +0000
+@@ -181,6 +181,8 @@
+ AC_CHECK_FUNC(signalfd, dummy=yes,
+ 			AC_MSG_ERROR(signalfd support is required))
+ 
++AC_CHECK_HEADERS([execinfo.h], [], [])
++
+ AC_CHECK_LIB(dl, dlopen, dummy=yes,
+ 			AC_MSG_ERROR(dynamic linking loader is required))
+ 
+diff -uNr a/src/log.c b/src/log.c
+--- a/src/log.c	2013-07-02 17:41:03.727261747 +0000
++++ b/src/log.c	2013-07-02 17:42:12.717257603 +0000
+@@ -30,7 +30,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <syslog.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ #include <dlfcn.h>
+ 
+ #include "connman.h"
+@@ -112,6 +114,7 @@
+ 
+ static void print_backtrace(unsigned int offset)
+ {
++#ifdef HAVE_EXECINFO_H
+ 	void *frames[99];
+ 	size_t n_ptrs;
+ 	unsigned int i;
+@@ -210,6 +213,7 @@
+ 
+ 	close(outfd[1]);
+ 	close(infd[0]);
++#endif
+ }
+ 
+ static void signal_handler(int signo)
diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch
new file mode 100644
index 000000000000..84f4445e8da1
--- /dev/null
+++ b/net-misc/connman/files/connman-1.31-xtables.patch
@@ -0,0 +1,54 @@
+--- connman-1.31/src/iptables.c.old	2016-03-22 20:12:47.829460752 -0700
++++ connman-1.31/src/iptables.c	2016-03-22 21:33:36.835384724 -0700
+@@ -28,11 +28,11 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/errno.h>
+ #include <sys/socket.h>
+-#include <xtables.h>
++#include "connman_xtables.h"
+ #include <inttypes.h>
+ 
+ #include <linux/netfilter_ipv4/ip_tables.h>
+ 
+ #include "connman.h"
+--- connman-1.31/src/firewall.c.old	2016-03-22 21:29:01.959472262 -0700
++++ connman-1.31/src/firewall.c	2016-03-22 21:33:53.048144181 -0700
+@@ -23,11 +23,11 @@
+ #include <config.h>
+ #endif
+ 
+ #include <errno.h>
+ 
+-#include <xtables.h>
++#include "connman_xtables.h"
+ #include <linux/netfilter_ipv4/ip_tables.h>
+ 
+ #include "connman.h"
+ 
+ #define CHAIN_PREFIX "connman-"
+--- /dev/null	2016-03-18 06:21:16.372989086 -0700
++++ connman-1.31/include/connman_xtables.h	2016-03-22 21:32:21.349504786 -0700
+@@ -0,0 +1,21 @@
++#ifndef CONNMAN_XTABLES_H
++#define CONNMAN_XTABLES_H
++
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) || \
++    LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
++#include <xtables.h>
++#else
++#ifdef __USE_MISC
++#define GENTOO_USE_MISC __USE_MISC
++#undef __USE_MISC
++#endif
++
++#include <xtables.h>
++
++#ifdef GENTOO_USE_MISC
++#define __USE_MISC GENTOO_USE_MISC
++#undef GENTOO_USE_MISC
++#endif
++#endif
++#endif
diff --git a/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch b/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch
new file mode 100644
index 000000000000..57ef5e8ccbac
--- /dev/null
+++ b/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch
@@ -0,0 +1,15 @@
+--- connman-1.33/configure.ac.old	2016-10-09 11:26:43.137856416 -0700
++++ connman-1.33/configure.ac	2016-10-09 11:26:52.819722799 -0700
+@@ -281,11 +281,11 @@ AM_CONDITIONAL(NMCOMPAT, test "${enable_
+ 
+ AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit],
+ 				[enable PolicyKit support]),
+ 			[enable_polkit=${enableval}], [enable_polkit="no"])
+ if (test "${enable_polkit}" != "no"); then
+-	POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit`"
++	POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit-gobject-1`"
+ 	POLKIT_DATADIR=""
+ 	if (test -z "${POLKIT_DATADIR}"); then
+ 		POLKIT_DATADIR="${datadir}/polkit-1/actions"
+ 	fi
+ 	AC_SUBST(POLKIT_DATADIR)
diff --git a/net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch b/net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch
new file mode 100644
index 000000000000..49bb8ba3c5a1
--- /dev/null
+++ b/net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch
@@ -0,0 +1,6 @@
+--- connman-1.33/scripts/connman_resolvconf.conf.in.old	2016-10-09 11:27:20.425341843 -0700
++++ connman-1.33/scripts/connman_resolvconf.conf.in	2016-10-09 11:27:10.662476565 -0700
+@@ -1,2 +1,2 @@
+ d	@runstatedir@/connman	- - - -
+-L+	/etc/resolv.conf	- - - -	@runstatedir@/connman/resolv.conf
++L	/etc/resolv.conf	- - - -	@runstatedir@/connman/resolv.conf
diff --git a/net-misc/connman/files/connman.confd b/net-misc/connman/files/connman.confd
new file mode 100644
index 000000000000..6d0c399e544c
--- /dev/null
+++ b/net-misc/connman/files/connman.confd
@@ -0,0 +1,15 @@
+# conf.d file for connman
+#
+# Please check connmand --help for more information.
+# Useful options are:
+#    -c, --compat: enable NetworkManager compatibility mode.
+#    -W, --wifi=NAME: select wpa_supplicant wifi driver to use.
+#                     This is useful if your wpa_supplicant is < 0.7
+#                     since connmand by default gives wpa_supplicant a
+#                     comma separated list of values and < 0.7 does not
+#                     understand or accept it.
+#    -i, --device=DEV: force use of given interface name.
+#    -I, --nodevice=DEV: force ignore of given interface name.
+#    -p, --plugin=NAME: specify plugins to load.
+#    -P, --noplugin=NAME: specify plugins not to load.
+CONNMAN_OPTS=""
diff --git a/net-misc/connman/files/connman.initd2 b/net-misc/connman/files/connman.initd2
new file mode 100644
index 000000000000..428245d7f6e2
--- /dev/null
+++ b/net-misc/connman/files/connman.initd2
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Purpose License v2
+
+depend() {
+   need dbus
+   provide net
+}
+
+start() {
+   ebegin "Starting Connection Manager"
+   start-stop-daemon --start --quiet --exec /usr/sbin/connmand -- ${CONNMAN_OPTS}
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping Connection Manager"
+   start-stop-daemon --stop --quiet --exec /usr/sbin/connmand
+   eend $?
+}
+
+# vim: set ft=gentoo-init-d ts=3 sw=3 et:
diff --git a/net-misc/connman/files/connman.service b/net-misc/connman/files/connman.service
new file mode 100644
index 000000000000..ece38a716e96
--- /dev/null
+++ b/net-misc/connman/files/connman.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Network Connection Manager Daemon
+
+[Service]
+Type=dbus
+BusName=net.connman
+ExecStart=/usr/sbin/connmand --nodaemon
+
+[Install]
+WantedBy=multi-user.target
+Alias=net.connman.service
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
new file mode 100644
index 000000000000..a4bbe92fa34b
--- /dev/null
+++ b/net-misc/connman/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<use>
+		<flag name="ethernet">Enable ethernet support.</flag>
+		<flag name="l2tp">Use <pkg>net-dialup/xl2tpd</pkg> for L2TP VPN support.</flag>
+		<flag name="iptables">Use <pkg>net-firewall/iptables</pkg> as firewall.</flag>
+		<flag name="nftables">Use <pkg>net-firewall/nftables</pkg> as firewall.</flag>
+		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
+		<flag name="openconnect">Use <pkg>net-vpn/openconnect</pkg> for VPN support.</flag>
+		<flag name="openvpn">Use <pkg>net-vpn/openvpn</pkg> for openvpn support.</flag>
+		<flag name="pptp">Use <pkg>net-dialup/pptpclient</pkg> for PPTP VPN support.</flag>
+		<flag name="tools">Enable testing tools.</flag>
+		<flag name="vpnc">Use <pkg>net-vpn/vpnc</pkg> for cisco VPN support.</flag>
+		<flag name="wispr">Enable support for WISPr hotspot logins.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/crossbar/Manifest b/net-misc/crossbar/Manifest
new file mode 100644
index 000000000000..d1383dcef3f5
--- /dev/null
+++ b/net-misc/crossbar/Manifest
@@ -0,0 +1,13 @@
+AUX confd 310 SHA256 381c2cabc2bf2186453abd2aae19fc93b80e3fcb62acb66c8e99fa21f419b207 SHA512 52d0b222101ea129588d8a4721011feeb935784ca2bbe462a808e3b1083405ef9fee852ed7f5f4461c6108b0b2e273c75f2546a9d5cbc32a46a17b8bcf19c5cf WHIRLPOOL cc898562a6f76e0c55935483db21177b02ce83d781204444de5a3c865385cc7afef28399712e6b262fe621264ef1e5aecedf8f63a3f27ddaad3dbac4afc6a254
+AUX config.json.sample 1952 SHA256 94f73275df14ddcd1be7f1da9790428c482d185ff7cead2e3d59ed61b1d1b959 SHA512 fa70eacdfb24842002c4318a12ad25cc413a0f217fb58560f5d9a3d06cc1b175872ae8fc68b0644c97c5fe15446ea847f333527d843022f18fc777b483362e20 WHIRLPOOL 9bdc2573c9289f0e8dfc3dec9dda24faa345004cc1cdb5d3c1ac2f055f28c134452f3edace60e5b6ad6fbf9f66c83a93c916624c5f3ffa0226aca495e145446c
+AUX crossbar-17.8.1-Revert-Torservices.patch 9679 SHA256 78065647af4a3c9ab801c62d50a7256183257c1527d84277cb2947558d33a0c0 SHA512 084c7a4f16ebc5e75fd1fca48f9df7edb78f65dd5e1402d993235e491c649f769eb5d26701ba651fb0f7e3b0d3c75fabdf649586bf0542ac890aa2671c6e99ae WHIRLPOOL f38b6ff325ffadf0a414302c9707a334b60b47e2822ed5e9013a8d60b4f82f6fba89e43f5e74a344ec89682891e4c4f8870947223668a7ff4ff33d4d20761f77
+AUX crossbar-17.9.1-Revert-Torservices.patch 10253 SHA256 fe7828a6f2c72acfb1bc486ed950d7f4f7e39ed38828bbe3aa8b79404a53e4b8 SHA512 a550382b89dc7aa673ee1f2d90eda9cbc5006fa6a112aae70dc82863ec248300189a90ce6195b5fea755ad723e8a4a448762813a8e4c9d7d50bac404f72633ed WHIRLPOOL 5b3f2f00badd55401cd899951f60b9c274caeafe252b940992ecd544589d007371a4c6fe3ab1ae9ce073bcbe594ac14b0f2362a9c23e5adb6960376e237009a0
+AUX crossbar.service 265 SHA256 ccadbfab4e751fd98adf6bc41a36694cd39adf2cc15a9a010a6c157e5dda9d12 SHA512 85613679cb8a3e15d4b85283ff34b9de5fcc3abdc80747d9cb5392786935e6c7bbb6f0dca2c7e9cd44ac20f13ef2db218cc1b82a15b2806f7686539b4458d592 WHIRLPOOL d30165246b191c4dacc3759c5615d4b51008223b8c6fb932d1d6b14562915f9c72c22f40fd2e83eb09bf1cd4ef293ea62d92376767eb187b2ada6bdcf6deb393
+AUX initd 788 SHA256 c401f97c941d89bdb41192e9dd1ce6bc5def42e6408fe705f9fbf3ef00495896 SHA512 1675727c294354ccc7e2582ea16be9d1f8b0f9c110a8f8e34aab03e052d54ed9134d801a123b5a82d6b40ec65c47cd925a1f7ef9dd91af75b1b12c4b7c19ad38 WHIRLPOOL 031e44e6bbb98ee68d662247dc634817edff850104f5c413f31e4bf084f42ffda245a9fe5b739b59674d70ad79a4ad1acd4fc744e48dfe7b42ac1e3010ad4168
+DIST crossbar-17.6.1.post3.tar.gz 725054 SHA256 8d023af0a772404f4e57add5888583fc0068d62a7a2249bea4539a6d7b70fbd9 SHA512 c3efac2c7f7a41e6544eb98057afb249908453d6ddfb81c514f0705ed967374d50f844fe1a80395652b81a7c23abc90a03a0d6c88287f10cbfe99e64cb70919d WHIRLPOOL 08555f6cecbc57ab447569864cec75993fb8aea485ce7c85aefb1530b950b5913371e73d384e15ce539445f759c4f74a35457ef4ef2fc8791c0802325cebdc7b
+DIST crossbar-17.8.1.tar.gz 1545668 SHA256 ba970b12c7b57c993739088248cf36d74aab12dda87cc906e25da96101344580 SHA512 21ed2031ddebe93fcd4fcd01243b2aa8979444e833386db83b10d032cfc3c3f9d47cf638d4cf26eb2801e91892c85115fec91e0a6f071a619f014132663f6c32 WHIRLPOOL fae59dc7ed9a2baddc203fad8109344d67925ef6c6e4d3751a2389f38b0dc058109f556074e8c25fb528107793e79a4380c121e451f2cb35c48c26d1aef64f58
+DIST crossbar-17.9.1.tar.gz 730753 SHA256 717cdd2177e77eb85e615de2b857ac3dfc0079a10e7a349027aa3a556abb2611 SHA512 fee96e1c900c756536dc9bf6088c512a50accbae0e8010b7e058de8ed2ebb2f366e5d5051ab2f07517dd642f4d65c65e9b701b00d7bca1b9352c58f38f892563 WHIRLPOOL e9f6192aecb9c34e715686b1f7543d4a395bdb06aa48fd914115f32bfb2170830549e418ca256d85e7806550504ab3e35a208bde1e64bfee7ee7393378bd0f7b
+EBUILD crossbar-17.6.1_p3-r1.ebuild 6035 SHA256 cca01211087259190fc99999b74a151e934b1a83d87af617c7e5dda88b6277a9 SHA512 1d1b77f2774ce292744ad2475970fc8e14e07e2a8ecf5fe2452af1b59fd40b99a1ff035757435bfd4a192688d7a2005ce1f7e3087e9f7c34a312760a53fcacc3 WHIRLPOOL 75fb12dcefcdbf3d7b946851a08b89476a0e4e760b83302b23868b7bdfed0c41ffc00eb8d0e2055f49ae34ddd8b9e2131fc413c49534862c82f50a06177a73c2
+EBUILD crossbar-17.8.1.ebuild 6442 SHA256 07977e419e1d6d72e7f7975e57d5229bb03ac039955033ad48ffb63916b235b6 SHA512 bcb29637b0171887e4b6088449b7ddc6cb7fdc4f072b9fbe0dbe4fe76b65f5ab87d03def949864650fe7a2397b5f99a0306a13b86e8bd607c3d0a25a77a42a13 WHIRLPOOL ea01e1f104f52c09c380b6b3d93c5aa6e6856967235b7953bfe4bbd94feeb597dba420f07e08f39764b52e26ca249bdc355523699cb25e716752897bc2606e02
+EBUILD crossbar-17.9.1.ebuild 6392 SHA256 e644c41b0e72bc29b2821459e33c705bc0ffadf1a7dda5de974b8def7cc68c5d SHA512 50af397430d523c69880a16ea37ca0c412927109532f04e10c0a7743ad0b06b1200cbc13a33b45f2965c4558539d124c58a12dfda09110ea310de034dd7abd63 WHIRLPOOL 4ee2cad54a5bc3c8bae85b5da07d0cdc067edb0243cb753697ae3eaf992b8e52fb4865f0d1c83a94629c992d6a0d7d8405c718a5eb17c902a020d9c638e16033
+MISC metadata.xml 909 SHA256 be86a4c8962e536282999286568b586ff2aba21f88a77d1de080da08e750a13d SHA512 a1cb6f8d48cc7d0c417894b8f69faad0d896c1288c08932a40a87b8ccca1a0bb1fe5d8f2a8592911870ef5b71aeadc76dd2963238e6e85355f0df11eec0cbf68 WHIRLPOOL c287a1a2c704df42b82c6442d2589526f3fe96c1ee9c38655d3a5f530faa4e02eacdc09c2c019e83d37d24798dd3ea219a18bf3b686b0c1f1839415573b62ed9
diff --git a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild b/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild
new file mode 100644
index 000000000000..d320ae179088
--- /dev/null
+++ b/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# Not quite ready for py3, unconditionally deps on too many backported
+# pkgs installed in newer pythons that shouldn't need them.
+PYTHON_COMPAT=( python2_7 )
+
+inherit  user systemd distutils-r1
+
+MY_PV="17.6.1.post3"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework"
+HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.python.org/pypi/crossbar"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/txaio-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}]
+	>=dev-python/incremental-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+	<dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/priority-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-17.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.9.6[${PYTHON_USEDEP}]
+	>=dev-python/treq-17.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytrie-0.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.2.2[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/lmdb-0.92[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
+	>=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	!dev-python/crossbar
+	>=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+DOCS=(
+	README.rst LICENSE-FOR-API LICENSE COPYRIGHT
+)
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	# don't install the copyright, license... let dodoc do it
+	sed -e "s/^    data_files=.*//" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_setup() {
+	enewuser crossbar
+}
+
+python_test() {
+	pushd "${TEST_DIR}" > /dev/null || die
+	/usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	keepdir /var/lib/crossbar
+	insinto /var/lib/crossbar
+	doins "${FILESDIR}/config.json.sample"
+
+	newconfd "${FILESDIR}/confd" crossbar
+	newinitd "${FILESDIR}/initd" crossbar
+}
+
+pkg_posinst() {
+	einfo "For exapmle configurations and scripts"
+	einfo "See: https://github.com/crossbario/crossbar-examples"
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file"
+		ewarn "is the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance"
+		ewarn "    rc-update add crossbar.myinstance default"
+		ewarn "    /etc/init.d/crossbar.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable crossbar@myinstance.service"
+		ewarn "    systemctl enable crossbar.target"
+		ewarn "    systemctl start crossbar.target"
+	fi
+}
+
+pkg_config() {
+	local crossbar_path="/var/lib/crossbar"
+	local log_path="/var/log/crossbar"
+	einfo "This will prepare a new crossbar instance in ${crossbar_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${crossbar_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}"
+	fi
+	chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+	fi
+	ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a crossbar instance at ${instance_path}."
+	einfo "To change the default settings edit the config.json file in this directory."
+}
diff --git a/net-misc/crossbar/crossbar-17.8.1.ebuild b/net-misc/crossbar/crossbar-17.8.1.ebuild
new file mode 100644
index 000000000000..27ba86e8835c
--- /dev/null
+++ b/net-misc/crossbar/crossbar-17.8.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit  user systemd distutils-r1
+
+MY_PV="${PV}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework"
+HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.python.org/pypi/crossbar"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/crossbario/crossbar/archive/v17.8.1.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test tor"
+
+RDEPEND="
+	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-17.7.1[${PYTHON_USEDEP}]
+	>=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}]
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/incremental-17.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/jinja-2.9.6[${PYTHON_USEDEP}]
+	>=dev-python/lmdb-0.92[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/priority-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pytrie-0.3[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}]
+	>=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/treq-17.3.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+	tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	!dev-python/crossbar
+	>=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+DOCS=(
+	README.rst LICENSE-FOR-API LICENSE COPYRIGHT
+)
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	# don't install the copyright, license... let dodoc do it
+	sed -e "s/^    data_files=.*//" -i setup.py || die
+
+	if ! use tor; then
+		eapply "${FILESDIR}/${PN}-17.8.1-Revert-Torservices.patch"
+		sed -e "s/^txtorcon.*//" -i requirements-min.txt || die
+	fi
+	# remove these py2 deps from setuptools install_requires
+	# it is not filtered out for >=py3.4 and results in test fails
+	sed -e "s/^ipaddress.*//" -i requirements-min.txt || die
+	sed -e "s/^enum34.*//" -i requirements-min.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_setup() {
+	enewuser crossbar
+}
+
+python_test() {
+	pushd "${TEST_DIR}" > /dev/null || die
+	/usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	keepdir /var/lib/crossbar
+	insinto /var/lib/crossbar
+	doins "${FILESDIR}/config.json.sample"
+
+	newconfd "${FILESDIR}/confd" crossbar
+	newinitd "${FILESDIR}/initd" crossbar
+}
+
+pkg_posinst() {
+	einfo "For exapmle configurations and scripts"
+	einfo "See: https://github.com/crossbario/crossbar-examples"
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file"
+		ewarn "is the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance"
+		ewarn "    rc-update add crossbar.myinstance default"
+		ewarn "    /etc/init.d/crossbar.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable crossbar@myinstance.service"
+		ewarn "    systemctl enable crossbar.target"
+		ewarn "    systemctl start crossbar.target"
+	fi
+}
+
+pkg_config() {
+	local crossbar_path="/var/lib/crossbar"
+	local log_path="/var/log/crossbar"
+	einfo "This will prepare a new crossbar instance in ${crossbar_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${crossbar_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}"
+	fi
+	chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+	fi
+	ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a crossbar instance at ${instance_path}."
+	einfo "To change the default settings edit the config.json file in this directory."
+}
diff --git a/net-misc/crossbar/crossbar-17.9.1.ebuild b/net-misc/crossbar/crossbar-17.9.1.ebuild
new file mode 100644
index 000000000000..5597bd6ef26d
--- /dev/null
+++ b/net-misc/crossbar/crossbar-17.9.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit  user systemd distutils-r1
+
+MY_PV="${PV}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework"
+HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.python.org/pypi/crossbar"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test tor"
+
+RDEPEND="
+	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
+	~dev-python/autobahn-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}]
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}]
+	=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/incremental-17.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/jinja-2.9.6[${PYTHON_USEDEP}]
+	>=dev-python/lmdb-0.92[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/priority-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pytrie-0.3[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}]
+	>=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/treq-17.3.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+	tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	!dev-python/crossbar
+	>=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+DOCS=(
+	README.rst LICENSE-FOR-API LICENSE COPYRIGHT
+)
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	# don't install the copyright, license... let dodoc do it
+	sed -e "s/^    data_files=.*//" -i setup.py || die
+
+	if ! use tor; then
+		eapply "${FILESDIR}/${PN}-17.9.1-Revert-Torservices.patch"
+		sed -e "s/^txtorcon.*//" -i requirements-min.txt || die
+	fi
+	# remove these py2 deps from setuptools install_requires
+	# it is not filtered out for >=py3.4 and results in test fails
+	sed -e "s/^ipaddress.*//" -i requirements-min.txt || die
+	sed -e "s/^enum34.*//" -i requirements-min.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_setup() {
+	enewuser crossbar
+}
+
+python_test() {
+	pushd "${TEST_DIR}" > /dev/null || die
+	/usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	keepdir /var/lib/crossbar
+	insinto /var/lib/crossbar
+	doins "${FILESDIR}/config.json.sample"
+
+	newconfd "${FILESDIR}/confd" crossbar
+	newinitd "${FILESDIR}/initd" crossbar
+}
+
+pkg_posinst() {
+	einfo "For exapmle configurations and scripts"
+	einfo "See: https://github.com/crossbario/crossbar-examples"
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file"
+		ewarn "is the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance"
+		ewarn "    rc-update add crossbar.myinstance default"
+		ewarn "    /etc/init.d/crossbar.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable crossbar@myinstance.service"
+		ewarn "    systemctl enable crossbar.target"
+		ewarn "    systemctl start crossbar.target"
+	fi
+}
+
+pkg_config() {
+	local crossbar_path="/var/lib/crossbar"
+	local log_path="/var/log/crossbar"
+	einfo "This will prepare a new crossbar instance in ${crossbar_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${crossbar_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}"
+	fi
+	chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+	fi
+	ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a crossbar instance at ${instance_path}."
+	einfo "To change the default settings edit the config.json file in this directory."
+}
diff --git a/net-misc/crossbar/files/confd b/net-misc/crossbar/files/confd
new file mode 100644
index 000000000000..e4a914f640fd
--- /dev/null
+++ b/net-misc/crossbar/files/confd
@@ -0,0 +1,11 @@
+# Path to the wamp router basedir.
+BASEDIR="/var/lib/crossbar"
+
+# User account for the crossbar router.
+# The basedir should be owned by this user.
+USERNAME="crossbar"
+
+#  loglevel {none,error,warn,info,debug,trace}
+#  How much Crossbar.io should log to the terminal, in
+#  order of verbosity.
+LOGLEVEL="info"
diff --git a/net-misc/crossbar/files/config.json.sample b/net-misc/crossbar/files/config.json.sample
new file mode 100644
index 000000000000..d7b7d6af7300
--- /dev/null
+++ b/net-misc/crossbar/files/config.json.sample
@@ -0,0 +1,60 @@
+{
+    "version": 2,
+    "controller": {},
+    "workers": [
+        {
+            "type": "router",
+            "realms": [
+                {
+                    "name": "realm1",
+                    "roles": [
+                        {
+                            "name": "anonymous",
+                            "permissions": [
+                                {
+                                    "uri": "",
+                                    "match": "prefix",
+                                    "allow": {
+                                        "call": true,
+                                        "register": true,
+                                        "publish": true,
+                                        "subscribe": true
+                                    },
+                                    "disclose": {
+                                        "caller": false,
+                                        "publisher": false
+                                    },
+                                    "cache": true
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "transports": [
+                {
+                    "type": "universal",
+                    "endpoint": {
+                        "type": "tcp",
+                        "port": 8080
+                    },
+                    "rawsocket": {
+                    },
+                    "websocket": {
+                        "ws": {
+                            "type": "websocket"
+                        }
+                    },
+                    "web": {
+                        "paths": {
+                            "/": {
+                                "type": "static",
+                                "directory": "../web"
+                            }
+                        }
+                    }
+                }
+            ]
+        }
+    ]
+}
diff --git a/net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch b/net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch
new file mode 100644
index 000000000000..3a83bdf8fc69
--- /dev/null
+++ b/net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch
@@ -0,0 +1,246 @@
+From 97a2d923dff32397c9df5adb95ecb84bcd95d83d Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 19 Sep 2017 17:44:08 -0700
+Subject: [PATCH] Revert "Add built-in Tor services and connection support"
+
+This reverts commit f75db17642845f46bebd2f6f1d6a092974b9b390.
+---
+ crossbar/common/checkconfig.py                     | 60 +--------------
+ crossbar/twisted/endpoint.py                       | 83 +--------------------
+ .../router/transport/Transport-Endpoints.md        | 85 +---------------------
+ requirements-dev.txt                               |  1 -
+ requirements-min.txt                               |  1 -
+ 5 files changed, 4 insertions(+), 226 deletions(-)
+
+diff --git a/crossbar/common/checkconfig.py b/crossbar/common/checkconfig.py
+index a8e84d45..1f5d9c91 100644
+--- a/crossbar/common/checkconfig.py
++++ b/crossbar/common/checkconfig.py
+@@ -867,31 +867,6 @@ def check_listening_endpoint_twisted(endpoint):
+     # should/can we ask Twisted to parse it easily?
+ 
+ 
+-def check_listening_endpoint_onion(endpoint):
+-    """
+-    :param endpoint: The onion endpoint
+-    :type endpoint: dict
+-    """
+-    for k in endpoint:
+-        if k not in ['type', 'port', 'private_key_file', 'tor_control_endpoint']:
+-            raise InvalidConfigException(
+-                "encountered unknown attribute '{}' in onion endpoint".format(k)
+-            )
+-
+-    check_dict_args(
+-        {
+-            u"type": (True, [six.text_type]),
+-            u"port": (True, [int, long]),
+-            u"private_key_file": (True, [six.text_type]),
+-            u"tor_control_endpoint": (True, [Mapping])
+-        },
+-        endpoint,
+-        "onion endpoint config",
+-    )
+-
+-    check_connecting_endpoint(endpoint[u"tor_control_endpoint"])
+-
+-
+ def check_connecting_endpoint_tcp(endpoint):
+     """
+     Check a TCP connecting endpoint configuration.
+@@ -978,33 +953,6 @@ def check_connecting_endpoint_twisted(endpoint):
+         check_endpoint_timeout(endpoint['timeout'])
+ 
+ 
+-def check_connecting_endpoint_tor(endpoint):
+-    """
+-    :param endpoint: The Tor connecting endpoint to check.
+-    :type endpoint: dict
+-    """
+-    for k in endpoint:
+-        if k not in ['type', 'host', 'port', 'tor_socks_port', 'tls']:
+-            raise InvalidConfigException(
+-                "encountered unknown attribute '{}' in connecting endpoint".format(k)
+-            )
+-
+-    if 'host' not in endpoint:
+-        raise InvalidConfigException("missing mandatory attribute 'host' in connecting endpoint item\n\n{}".format(pformat(endpoint)))
+-
+-    if 'port' not in endpoint:
+-        raise InvalidConfigException("missing mandatory attribute 'port' in connecting endpoint item\n\n{}".format(pformat(endpoint)))
+-
+-    if 'tor_socks_port' not in endpoint:
+-        raise InvalidConfigException("missing mandatory attribute 'tor_socks_port' in connecting endpoint item\n\n{}".format(pformat(endpoint)))
+-
+-    check_endpoint_port(endpoint['port'])
+-    check_endpoint_port(endpoint['tor_socks_port'])
+-
+-    if 'tls' in endpoint:
+-        check_connecting_endpoint_tls(endpoint['tls'])
+-
+-
+ def check_listening_endpoint(endpoint):
+     """
+     Check a listening endpoint configuration.
+@@ -1022,7 +970,7 @@ def check_listening_endpoint(endpoint):
+         raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint)))
+ 
+     etype = endpoint['type']
+-    if etype not in ['tcp', 'unix', 'twisted', 'onion']:
++    if etype not in ['tcp', 'unix', 'twisted']:
+         raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint)))
+ 
+     if etype == 'tcp':
+@@ -1031,8 +979,6 @@ def check_listening_endpoint(endpoint):
+         check_listening_endpoint_unix(endpoint)
+     elif etype == 'twisted':
+         check_listening_endpoint_twisted(endpoint)
+-    elif etype == 'onion':
+-        check_listening_endpoint_onion(endpoint)
+     else:
+         raise InvalidConfigException('logic error')
+ 
+@@ -1054,7 +1000,7 @@ def check_connecting_endpoint(endpoint):
+         raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint)))
+ 
+     etype = endpoint['type']
+-    if etype not in ['tcp', 'unix', 'twisted', 'tor']:
++    if etype not in ['tcp', 'unix', 'twisted']:
+         raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint)))
+ 
+     if etype == 'tcp':
+@@ -1063,8 +1009,6 @@ def check_connecting_endpoint(endpoint):
+         check_connecting_endpoint_unix(endpoint)
+     elif etype == 'twisted':
+         check_connecting_endpoint_twisted(endpoint)
+-    elif etype == 'tor':
+-        check_connecting_endpoint_tor(endpoint)
+     else:
+         raise InvalidConfigException('logic error')
+ 
+diff --git a/crossbar/twisted/endpoint.py b/crossbar/twisted/endpoint.py
+index 483e5a39..251bfa5c 100644
+--- a/crossbar/twisted/endpoint.py
++++ b/crossbar/twisted/endpoint.py
+@@ -33,7 +33,7 @@ from __future__ import absolute_import, division
+ import six
+ import os
+ from os import environ
+-from os.path import join, abspath, isabs, exists
++from os.path import join, abspath
+ 
+ from twisted.internet import defer
+ from twisted.internet._sslverify import OpenSSLCertificateAuthorities
+@@ -48,11 +48,7 @@ from twisted.internet.endpoints import TCP4ServerEndpoint, \
+     UNIXClientEndpoint, \
+     serverFromString,   \
+     clientFromString
+-from twisted.internet.interfaces import IStreamServerEndpoint
+ from twisted.python.filepath import FilePath
+-from zope.interface import implementer
+-
+-import txtorcon
+ 
+ from crossbar.twisted.sharedport import SharedPort, SharedTLSPort
+ 
+@@ -318,12 +314,6 @@ def _create_tls_client_context(config, cbdir, log):
+     return ctx
+ 
+ 
+-def _ensure_absolute(fname, cbdir):
+-    if isabs(fname):
+-        return fname
+-    return abspath(join(cbdir, fname))
+-
+-
+ def create_listening_endpoint_from_config(config, cbdir, reactor, log):
+     """
+     Create a Twisted stream server endpoint from a Crossbar.io transport configuration.
+@@ -431,59 +421,6 @@ def create_listening_endpoint_from_config(config, cbdir, reactor, log):
+     elif config['type'] == 'twisted':
+         endpoint = serverFromString(reactor, config['server_string'])
+ 
+-    # tor endpoint
+-    elif config['type'] == 'onion':  # or "tor"? r "tor_onion"?
+-        port = config['port']
+-        private_key_fname = _ensure_absolute(config[u'private_key_file'], cbdir)
+-        tor_control_ep = create_connecting_endpoint_from_config(
+-            config[u'tor_control_endpoint'], cbdir, reactor, log
+-        )
+-
+-        try:
+-            with open(private_key_fname, 'r') as f:
+-                private_key = f.read().strip()
+-        except (IOError, OSError):
+-            private_key = None
+-
+-        @implementer(IStreamServerEndpoint)
+-        class _EphemeralOnion(object):
+-
+-            @defer.inlineCallbacks
+-            def listen(self, proto_factory):
+-                # we don't care which local TCP port we listen on, but
+-                # we do need to know it
+-                local_ep = TCP4ServerEndpoint(reactor, 0, interface=u"127.0.0.1")
+-                target_port = yield local_ep.listen(proto_factory)
+-                tor = yield txtorcon.connect(
+-                    reactor,
+-                    tor_control_ep,
+-                )
+-
+-                # create and add the service
+-                hs = txtorcon.EphemeralHiddenService(
+-                    ports=["{} 127.0.0.1:{}".format(port, target_port.getHost().port)],
+-                    key_blob_or_type=private_key if private_key else "NEW:BEST",
+-                )
+-                log.info("Uploading descriptors can take more than 30s")
+-                yield hs.add_to_tor(tor.protocol)
+-
+-                # if it's new, store our private key
+-                # XXX better "if private_key is None"?
+-                if not exists(private_key_fname):
+-                    with open(private_key_fname, 'w') as f:
+-                        f.write(hs.private_key)
+-                    log.info("Wrote private key to '{fname}'", fname=private_key_fname)
+-
+-                addr = txtorcon.TorOnionAddress(hs.hostname, port)
+-                log.info(
+-                    "Listening on Tor onion service {addr.onion_uri}:{addr.onion_port}"
+-                    " with local port {local_port}",
+-                    addr=addr,
+-                    local_port=target_port.getHost().port,
+-                )
+-                defer.returnValue(addr)
+-        endpoint = _EphemeralOnion()
+-
+     else:
+         raise Exception("invalid endpoint type '{}'".format(config['type']))
+ 
+@@ -656,24 +593,6 @@ def create_connecting_endpoint_from_config(config, cbdir, reactor, log):
+     elif config['type'] == 'twisted':
+         endpoint = clientFromString(reactor, config['client_string'])
+ 
+-    elif config['type'] == 'tor':
+-        host = config['host']
+-        port = config['port']
+-        socks_port = config['tor_socks_port']
+-        tls = config.get('tls', False)
+-        if not tls and not host.endswith(u'.onion'):
+-            log.warn("Non-TLS connection traversing Tor network; end-to-end encryption advised")
+-
+-        socks_endpoint = TCP4ClientEndpoint(
+-            reactor, "127.0.0.1", socks_port,
+-        )
+-        endpoint = txtorcon.TorClientEndpoint(
+-            host, port,
+-            socks_endpoint=socks_endpoint,
+-            reactor=reactor,
+-            use_tls=tls,
+-        )
+-
+     else:
+         raise Exception("invalid endpoint type '{}'".format(config['type']))
+ 
+-- 
+2.14.1
+
diff --git a/net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch b/net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch
new file mode 100644
index 000000000000..dd4b2b58e455
--- /dev/null
+++ b/net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch
@@ -0,0 +1,270 @@
+From 97a2d923dff32397c9df5adb95ecb84bcd95d83d Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 19 Sep 2017 17:44:08 -0700
+Subject: [PATCH] Revert "Add built-in Tor services and connection support"
+
+This reverts commit f75db17642845f46bebd2f6f1d6a092974b9b390.
+---
+ crossbar/common/checkconfig.py                     | 60 +--------------
+ crossbar/twisted/endpoint.py                       | 83 +--------------------
+ .../router/transport/Transport-Endpoints.md        | 85 +---------------------
+ requirements-dev.txt                               |  1 -
+ requirements-min.txt                               |  1 -
+ 5 files changed, 4 insertions(+), 226 deletions(-)
+
+diff --git a/crossbar/common/checkconfig.py b/crossbar/common/checkconfig.py
+index a8e84d45..1f5d9c91 100644
+--- a/crossbar/common/checkconfig.py
++++ b/crossbar/common/checkconfig.py
+@@ -867,31 +867,6 @@ def check_listening_endpoint_twisted(endpoint):
+     # should/can we ask Twisted to parse it easily?
+ 
+ 
+-def check_listening_endpoint_onion(endpoint):
+-    """
+-    :param endpoint: The onion endpoint
+-    :type endpoint: dict
+-    """
+-    for k in endpoint:
+-        if k not in ['type', 'port', 'private_key_file', 'tor_control_endpoint']:
+-            raise InvalidConfigException(
+-                "encountered unknown attribute '{}' in onion endpoint".format(k)
+-            )
+-
+-    check_dict_args(
+-        {
+-            u"type": (True, [six.text_type]),
+-            u"port": (True, six.integer_types),
+-            u"private_key_file": (True, [six.text_type]),
+-            u"tor_control_endpoint": (True, [Mapping])
+-        },
+-        endpoint,
+-        "onion endpoint config",
+-    )
+-    check_endpoint_port(u"port")
+-    check_connecting_endpoint(endpoint[u"tor_control_endpoint"])
+-
+-
+ def check_connecting_endpoint_tcp(endpoint):
+     """
+     Check a TCP connecting endpoint configuration.
+@@ -978,33 +953,6 @@ def check_connecting_endpoint_twisted(endpoint):
+         check_endpoint_timeout(endpoint['timeout'])
+ 
+ 
+-def check_connecting_endpoint_tor(endpoint):
+-    """
+-    :param endpoint: The Tor connecting endpoint to check.
+-    :type endpoint: dict
+-    """
+-    for k in endpoint:
+-        if k not in ['type', 'host', 'port', 'tor_socks_port', 'tls']:
+-            raise InvalidConfigException(
+-                "encountered unknown attribute '{}' in connecting endpoint".format(k)
+-            )
+-
+-    if 'host' not in endpoint:
+-        raise InvalidConfigException("missing mandatory attribute 'host' in connecting endpoint item\n\n{}".format(pformat(endpoint)))
+-
+-    if 'port' not in endpoint:
+-        raise InvalidConfigException("missing mandatory attribute 'port' in connecting endpoint item\n\n{}".format(pformat(endpoint)))
+-
+-    if 'tor_socks_port' not in endpoint:
+-        raise InvalidConfigException("missing mandatory attribute 'tor_socks_port' in connecting endpoint item\n\n{}".format(pformat(endpoint)))
+-
+-    check_endpoint_port(endpoint['port'])
+-    check_endpoint_port(endpoint['tor_socks_port'])
+-
+-    if 'tls' in endpoint:
+-        check_connecting_endpoint_tls(endpoint['tls'])
+-
+-
+ def check_listening_endpoint(endpoint):
+     """
+     Check a listening endpoint configuration.
+@@ -1022,7 +970,7 @@ def check_listening_endpoint(endpoint):
+         raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint)))
+ 
+     etype = endpoint['type']
+-    if etype not in ['tcp', 'unix', 'twisted', 'onion']:
++    if etype not in ['tcp', 'unix', 'twisted']:
+         raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint)))
+ 
+     if etype == 'tcp':
+@@ -1031,8 +979,6 @@ def check_listening_endpoint(endpoint):
+         check_listening_endpoint_unix(endpoint)
+     elif etype == 'twisted':
+         check_listening_endpoint_twisted(endpoint)
+-    elif etype == 'onion':
+-        check_listening_endpoint_onion(endpoint)
+     else:
+         raise InvalidConfigException('logic error')
+ 
+@@ -1054,7 +1000,7 @@ def check_connecting_endpoint(endpoint):
+         raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint)))
+ 
+     etype = endpoint['type']
+-    if etype not in ['tcp', 'unix', 'twisted', 'tor']:
++    if etype not in ['tcp', 'unix', 'twisted']:
+         raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint)))
+ 
+     if etype == 'tcp':
+@@ -1063,8 +1009,6 @@ def check_connecting_endpoint(endpoint):
+         check_connecting_endpoint_unix(endpoint)
+     elif etype == 'twisted':
+         check_connecting_endpoint_twisted(endpoint)
+-    elif etype == 'tor':
+-        check_connecting_endpoint_tor(endpoint)
+     else:
+         raise InvalidConfigException('logic error')
+ 
+diff --git a/crossbar/twisted/endpoint.py b/crossbar/twisted/endpoint.py
+index 483e5a39..251bfa5c 100644
+--- a/crossbar/twisted/endpoint.py
++++ b/crossbar/twisted/endpoint.py
+@@ -33,7 +33,7 @@ from __future__ import absolute_import, division
+ import six
+ import os
+ from os import environ
+-from os.path import join, abspath, isabs, exists
++from os.path import join, abspath
+ 
+ from twisted.internet import defer
+ from twisted.internet._sslverify import OpenSSLCertificateAuthorities
+@@ -48,11 +48,7 @@ from twisted.internet.endpoints import TCP4ServerEndpoint, \
+     UNIXClientEndpoint, \
+     serverFromString,   \
+     clientFromString
+-from twisted.internet.interfaces import IStreamServerEndpoint
+ from twisted.python.filepath import FilePath
+-from zope.interface import implementer
+-
+-import txtorcon
+ 
+ from crossbar.twisted.sharedport import SharedPort, SharedTLSPort
+ 
+@@ -318,12 +314,6 @@ def _create_tls_client_context(config, cbdir, log):
+     return ctx
+ 
+ 
+-def _ensure_absolute(fname, cbdir):
+-    if isabs(fname):
+-        return fname
+-    return abspath(join(cbdir, fname))
+-
+-
+ def create_listening_endpoint_from_config(config, cbdir, reactor, log):
+     """
+     Create a Twisted stream server endpoint from a Crossbar.io transport configuration.
+@@ -431,59 +421,6 @@ def create_listening_endpoint_from_config(config, cbdir, reactor, log):
+     elif config['type'] == 'twisted':
+         endpoint = serverFromString(reactor, config['server_string'])
+ 
+-    # tor endpoint
+-    elif config['type'] == 'onion':  # or "tor"? r "tor_onion"?
+-        port = config['port']
+-        private_key_fname = _ensure_absolute(config[u'private_key_file'], cbdir)
+-        tor_control_ep = create_connecting_endpoint_from_config(
+-            config[u'tor_control_endpoint'], cbdir, reactor, log
+-        )
+-
+-        try:
+-            with open(private_key_fname, 'r') as f:
+-                private_key = f.read().strip()
+-        except (IOError, OSError):
+-            private_key = None
+-
+-        @implementer(IStreamServerEndpoint)
+-        class _EphemeralOnion(object):
+-
+-            @defer.inlineCallbacks
+-            def listen(self, proto_factory):
+-                # we don't care which local TCP port we listen on, but
+-                # we do need to know it
+-                local_ep = TCP4ServerEndpoint(reactor, 0, interface=u"127.0.0.1")
+-                target_port = yield local_ep.listen(proto_factory)
+-                tor = yield txtorcon.connect(
+-                    reactor,
+-                    tor_control_ep,
+-                )
+-
+-                # create and add the service
+-                hs = txtorcon.EphemeralHiddenService(
+-                    ports=["{} 127.0.0.1:{}".format(port, target_port.getHost().port)],
+-                    key_blob_or_type=private_key if private_key else "NEW:BEST",
+-                )
+-                log.info("Uploading descriptors can take more than 30s")
+-                yield hs.add_to_tor(tor.protocol)
+-
+-                # if it's new, store our private key
+-                # XXX better "if private_key is None"?
+-                if not exists(private_key_fname):
+-                    with open(private_key_fname, 'w') as f:
+-                        f.write(hs.private_key)
+-                    log.info("Wrote private key to '{fname}'", fname=private_key_fname)
+-
+-                addr = txtorcon.TorOnionAddress(hs.hostname, port)
+-                log.info(
+-                    "Listening on Tor onion service {addr.onion_uri}:{addr.onion_port}"
+-                    " with local port {local_port}",
+-                    addr=addr,
+-                    local_port=target_port.getHost().port,
+-                )
+-                defer.returnValue(addr)
+-        endpoint = _EphemeralOnion()
+-
+     else:
+         raise Exception("invalid endpoint type '{}'".format(config['type']))
+ 
+@@ -656,24 +593,6 @@ def create_connecting_endpoint_from_config(config, cbdir, reactor, log):
+     elif config['type'] == 'twisted':
+         endpoint = clientFromString(reactor, config['client_string'])
+ 
+-    elif config['type'] == 'tor':
+-        host = config['host']
+-        port = config['port']
+-        socks_port = config['tor_socks_port']
+-        tls = config.get('tls', False)
+-        if not tls and not host.endswith(u'.onion'):
+-            log.warn("Non-TLS connection traversing Tor network; end-to-end encryption advised")
+-
+-        socks_endpoint = TCP4ClientEndpoint(
+-            reactor, "127.0.0.1", socks_port,
+-        )
+-        endpoint = txtorcon.TorClientEndpoint(
+-            host, port,
+-            socks_endpoint=socks_endpoint,
+-            reactor=reactor,
+-            use_tls=tls,
+-        )
+-
+     else:
+         raise Exception("invalid endpoint type '{}'".format(config['type']))
+ 
+diff --git a/requirements-dev.txt b/requirements-dev.txt
+index fa75074a..d68d1e89 100644
+--- a/requirements-dev.txt
++++ b/requirements-dev.txt
+@@ -4,7 +4,6 @@ colorama>=0.3.3
+ mock>=1.3.0
+ wheel>=0.26.0
+ hashin>=0.4.1
+-txtorcon>=0.19.3
+ 
+ # docs
+ flask
+diff --git a/requirements-min.txt b/requirements-min.txt
+index 38ee5a71..83c8d802 100644
+--- a/requirements-min.txt
++++ b/requirements-min.txt
+@@ -6,7 +6,6 @@ Twisted>=17.5.0
+ h2>=3.0.1
+ priority>=1.3.0
+ txaio>=2.8.2
+-txtorcon>=0.19.3
+ autobahn>=17.9.1
+ netaddr>=0.7.19
+ PyTrie>=0.3
+-- 
+2.14.1
+
diff --git a/net-misc/crossbar/files/crossbar.service b/net-misc/crossbar/files/crossbar.service
new file mode 100644
index 000000000000..915974751f8e
--- /dev/null
+++ b/net-misc/crossbar/files/crossbar.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=crossbar wamp router instances
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+User=crossbar
+ExecStart=/usr/bin/crossbar start /var/lib/crossbar
+ExecStop=/usr/bin/crossbar stop /var/lib/crossbar
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/crossbar/files/initd b/net-misc/crossbar/files/initd
new file mode 100644
index 000000000000..565dfb304aea
--- /dev/null
+++ b/net-misc/crossbar/files/initd
@@ -0,0 +1,35 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+NODE=${RC_SVCNAME:9}
+
+command=/usr/bin/crossbar
+command_args="start --cbdir=${BASEDIR}/${NODE} --logtofile --colour=false --loglevel=${LOGLEVEL}"
+command_background=true
+description="start crossbar wamp router for ${NODE}"
+pidfile="${BASEDIR}/${NODE}/crossbar.pid"
+
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ -z "${BASEDIR}" ]; then
+		eerror "BASEDIR not set"
+		return 1
+	fi
+	if [ -z "${USERNAME}" ]; then
+		eerror "USERNAME not set"
+		return 1
+	fi
+	if [ ! -d "${BASEDIR}" ]; then
+		eerror "${BASEDIR} is not a directory"
+		return 1
+	fi
+	if [ ! -e "${BASEDIR}/${NODE}" ]; then
+		eerror "${BASEDIR} does not contain a ${NODE} sub directory"
+		return 1
+	fi
+}
diff --git a/net-misc/crossbar/metadata.xml b/net-misc/crossbar/metadata.xml
new file mode 100644
index 000000000000..54a0a68272dc
--- /dev/null
+++ b/net-misc/crossbar/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<name>Crossbar.io Technologies GmbH</name>
+		</maintainer>
+		<remote-id type="pypi">crossbar</remote-id>
+		<remote-id type="github">crossbariocrossbar</remote-id>
+	</upstream>
+	<longdescription>
+		Crossbar.io is an open source networking platform
+		for distributed and microservice applications. It implements the
+		open Web Application Messaging Protocol (WAMP), is feature rich,
+		scalable, robust and secure. Let Crossbar.io take care of the
+		hard parts of messaging so you can focus on your app's features.
+	</longdescription>
+	<use>
+		<flag name="tor">include tor services connections support</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
new file mode 100644
index 000000000000..c0b173ca4458
--- /dev/null
+++ b/net-misc/csync/Manifest
@@ -0,0 +1,5 @@
+DIST csync-0.50.0.tar.xz 2705992 SHA256 c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86 SHA512 babe44af3a4f0bf58e011f1c33c7a6df9bc7751e03714dd64d8269c7c51bcc7f2ab32c4d286e5a11465c9498c988d1812c426a4f415f1138a4fb9fa341e1e29a WHIRLPOOL 956442a098be232415d987583157f0b4c47b3293b4c4d4ca6248264f40a614adad922cb6c7e59f168de447b72cdd7c0151a498cd344fd6289b9d7faa39254d77
+EBUILD csync-0.50.0.ebuild 1197 SHA256 351f877fdf2118c4016dad69134a11934c5a51fb5600c5aea635f8bc7c841f3f SHA512 48e914abb6744fba051f82ffab50db54f7e963fe21fcc3a0125941c333e96a2539fe2cafaba672caa86c0679c588ba4568e6e8aaa87b7fd410b433fa6de451b7 WHIRLPOOL 1c3e0bd66ae839e7366f882a92f4caacc016b981dd28cb29ca227c7a4a114784dfcaacccc02cfd5dbf959b296fb903166c7d52181735cb91789c2917c429b698
+MISC ChangeLog 2372 SHA256 f70b052efa3c9163a1770fcb6ea6be9cbb4344eaf0c7173d2ca6ee20dcf9d98f SHA512 bd296687f4d1d4b5f34d691b14e2e74d90e165e199ed52ba435dba6d0799697b13c44672f08a5410370db4603165a6a2528ed4de372f7b1aec21dec263cc7540 WHIRLPOOL 9e8ec19af403ded4d76c3c9dd183464b1bf5d49d8c1bfb5f6d921137e695cc03e64d0934d7519dac0fee7ec45fa8f5237a5ae6139d736972173ac5684ee3ffed
+MISC ChangeLog-2015 4351 SHA256 e836587b42db42a4fd8001f7e3a04f024c0c8b3eabaa0168a4a28168b285aa2c SHA512 aa4826893330f22a2882e12493cb5d08ac7e3a796e73aedb282a43f35590e74d64031fc8b7d2efd5e60a4d2d0137b1914382d64c93c4c749d0b14553ba21fac5 WHIRLPOOL d3e9ff1bb09c3cc4de4049205d29f47299444f479f08d54642c6a3d7b2aa4488084e579ba4655c95d8c7d0c6a2108e17dd7eaaf8c63fdaa56bc86b9635bdf70b
+MISC metadata.xml 354 SHA256 c342fa5fe8dd1da0a9fe79f8016aac15c7a9fc8d145af9647346da0e2659180e SHA512 513b19184444fb46882523fc160043d7d530d202aa253f44ace9fc97fad8dda7748083bd992921d93ebd62a12397e69a086932818e317f75fb7dfa478ab3f1ba WHIRLPOOL 23f78df92693c38a084c749999d5a23f7d85748b74f94454e2231171a5748f3a5b38e085b49ca1d969abd61f9a18283ad684cf9e9a735e53d812028536d53a89
diff --git a/net-misc/csync/csync-0.50.0.ebuild b/net-misc/csync/csync-0.50.0.ebuild
new file mode 100644
index 000000000000..89a33ce131c1
--- /dev/null
+++ b/net-misc/csync/csync-0.50.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="lightweight file synchronizer utility"
+HOMEPAGE="http://csync.org/"
+SRC_URI="https://open.cryptomilk.org/attachments/download/27/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc iconv samba +sftp test"
+
+RDEPEND=">=dev-db/sqlite-3.4:3
+	net-libs/neon[ssl]
+	iconv? ( virtual/libiconv )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	!net-misc/ocsync"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cmocka )"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s/__FUNCTION__/__func__/" -i \
+		src/csync_log.h tests/csync_tests/check_csync_log.c || die
+	# proper docdir
+	sed -e "s:/doc/${PN}:/doc/${PF}:" \
+		-i doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		$(cmake-utils_use_with iconv ICONV)
+		$(cmake-utils_use test UNIT_TESTING)
+		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake-utils_use_find_package samba Libsmbclient)
+		$(cmake-utils_use_find_package sftp LibSSH)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/csync/metadata.xml b/net-misc/csync/metadata.xml
new file mode 100644
index 000000000000..4ce4054df697
--- /dev/null
+++ b/net-misc/csync/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<use>
+		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
new file mode 100644
index 000000000000..39c78e9b28aa
--- /dev/null
+++ b/net-misc/curl/Manifest
@@ -0,0 +1,11 @@
+AUX curl-7.30.0-prefix.patch 880 SHA256 12204b7a522edbb133a3143b40b25805654d937e27ae66ba5d566a99afaa809a SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f WHIRLPOOL 6b60261dee31643b5db41c449ae6db14666f696470180c543ea39c3a11d7d6323057409be18a0a48a3335226ed5f78cee9fc2948dce9644e52481423147b49e5
+AUX curl-7.55.1-fix-build.patch 604 SHA256 a53b4c6ca4e1022577c399a32bb139e2d5a6556d5ecaa354d5e2411b899c7b4d SHA512 9c0aa85219052d7f85be45510f66e49d2dc344b6652d4e8d9c3e2ef583fa90b0e857b285a336a318ca8402b998556bdbc9cdec08973cc4f57c4b9fed1789fdcf WHIRLPOOL 3c6bc908dab6a707970f5e02dba20bb853c27d93fe8a5c6a3a6a1a574a8d707fff64b7d43bbbdaf91192f2ccc068e4385c4d3b5a80fa8bbf1cc89868e50becb5
+AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
+AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
+DIST curl-7.55.1.tar.bz2 2786830 SHA256 e5b1a92ed3b0c11f149886458fa063419500819f1610c020d62f25b8e4b16cfb SHA512 bfeb39e94b8378519b2efba0a476636b80dbee3434104b98464ee81ce3871eb134e065f52abe8bedb69681b43576cb30655c8be0be6115386859d0cb426d745b WHIRLPOOL 287f6f4f5464a780c338755e4e9870381937768c9f4c9545436856ea690ae6bf4d3f886dd816cf080d2ee84e2a3fbf1a0a5a78e5fbc9d9d18bde428458819a8e
+DIST curl-7.56.0.tar.bz2 2838517 SHA256 de60a4725a3d461c70aa571d7d69c788f1816d9d1a8a2ef05f864ce8f01279df SHA512 ba17a9fdc4b540d6053fa542bd875f321d009b9ba0cb56b16fe6c217f3856ab061f2a6c735771a0eadc28338889d071884680b4d4c243b4179872abb29915e3b WHIRLPOOL 89bdd5fdf4c99fd30bd7a63ad19d2285591b19134911160c94bf46bb4cdf6156544142b47e29d7c0c9cf06536215604cfc6bc59a5ba570dc16b23626fd1b44b2
+EBUILD curl-7.55.1.ebuild 7028 SHA256 74a04321cd4ea3deb75fb08cd7c822ba28f4dac5add2eff3797c33e849bb5606 SHA512 84861e9e5edb6622c58c1a68f44365026ce328fbf26cab05948fdb7e6b7975328b0f46cbf18a2f749dfdb93727981d1147680d5235af0a36aebd6be74da666c6 WHIRLPOOL 6fecd0fee9c91312cff60846ccdff16038ace4de168d5b20d6005f5f1f5f2c2f3df15e83dd3f00a565b9d3a61cae983554c98034d44a52fce43f478e0c76c182
+EBUILD curl-7.56.0.ebuild 6968 SHA256 ace2b5c63d00b56f37f2469cd49daccef912b81a8e7fe0df52a81ca78ab59637 SHA512 a5d04df77ee897e1f516a9ae885dc76a5a575ab29afa6d5396d6667e5a081399c3dd6f2961464eb0a50dfa1cfdc72f4ae4eaf30b9fa9d85e152516aed39f2df5 WHIRLPOOL 622377aa37b18a90f5e32a82cbf910c2c16ec39e4e969f6171d962677d1dd80374a3589ef42038d9bad613c733c633f129afd169d32427ff847807537080582a
+MISC ChangeLog 16015 SHA256 d7818e6e555538c789a1e06565284ef0aa229a2eb019fa2f4b667f961c919853 SHA512 76b6eb67198e504b72b2367929edcbb90cf252c0b26cf0526a3145a99d3a6004aed57761770675558a9f1445ee796d80cab12d647aea2676b21eb5acae8a9f97 WHIRLPOOL ac33e39317b19015bc478210a9ceaac3d8fd6497bc6217cd3c11b60e442e7f58e693690b8d22498b0862d703174ce72487f879639a7298459945cb680ba1a566
+MISC ChangeLog-2015 61885 SHA256 8589ecee2da6b3ef8823e053b3522234733a2273e7a6b18f0b47aaa9e678a1cd SHA512 d44de33943e2a8ed1eabc0bece3203f1794ffcc4d0a19898b67f82c2dfb54906ea3c09053421e13610218619577fd2b67e726a9cc5895e162a1ebf0a58038124 WHIRLPOOL 73c5089f0bdb1ca427591584ee4253e40418ed8a967f5e9f60775ec4d652868925c599f36f1708d39f8663fb734b74a301e4ea82050805639ed5a45cf45e6fd7
+MISC metadata.xml 837 SHA256 950e71139d4fc99ff18c0ec34b2ced72e933c6e311f0bbdb599fbc944db509e2 SHA512 27e75529e492f897705e249135c7ed661de04eef216fe62669fce544b8c318e44c5435b884fb8f206433293be894bbe1b6214b6cf1a394c9cb907dad48db00a0 WHIRLPOOL 93920381ae926c74157e2a0486cee5630789ce66b1aec25ead41a45f911ac7b2f87ad604f249c4ef03f2b7f19dfe567628140d34e753ea0fca10d2a3af3151e7
diff --git a/net-misc/curl/curl-7.55.1.ebuild b/net-misc/curl/curl-7.55.1.ebuild
new file mode 100644
index 000000000000..83451ec25baa
--- /dev/null
+++ b/net-misc/curl/curl-7.55.1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_axtls? (
+			net-libs/axtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+	eapply "${FILESDIR}"/${P}-fix-build.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			myconf+=( --with-axtls )
+		elif use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-soname-bump \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		--without-spnego \
+		--without-winidn \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/curl/curl-7.56.0.ebuild b/net-misc/curl/curl-7.56.0.ebuild
new file mode 100644
index 000000000000..862f9c9b1bf0
--- /dev/null
+++ b/net-misc/curl/curl-7.56.0.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_axtls? (
+			net-libs/axtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			myconf+=( --with-axtls )
+		elif use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		--without-spnego \
+		--without-winidn \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/curl/files/curl-7.30.0-prefix.patch b/net-misc/curl/files/curl-7.30.0-prefix.patch
new file mode 100644
index 000000000000..fd495c49b132
--- /dev/null
+++ b/net-misc/curl/files/curl-7.30.0-prefix.patch
@@ -0,0 +1,21 @@
+diff -Naur curl-7.30.0.orig/curl-config.in curl-7.30.0/curl-config.in
+--- curl-7.30.0.orig/curl-config.in	2013-02-06 09:44:37.000000000 -0500
++++ curl-7.30.0/curl-config.in	2013-04-17 18:43:56.000000000 -0400
+@@ -134,7 +134,7 @@
+         else
+           CPPFLAG_CURL_STATICLIB=""
+         fi
+-        if test "X@includedir@" = "X/usr/include"; then
++        if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
+           echo "$CPPFLAG_CURL_STATICLIB"
+         else
+           echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
+@@ -142,7 +142,7 @@
+         ;;
+ 
+     --libs)
+-        if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
++        if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
+            CURLLIBDIR="-L@libdir@ "
+         else
+            CURLLIBDIR=""
diff --git a/net-misc/curl/files/curl-7.55.1-fix-build.patch b/net-misc/curl/files/curl-7.55.1-fix-build.patch
new file mode 100644
index 000000000000..b9749d59c7f3
--- /dev/null
+++ b/net-misc/curl/files/curl-7.55.1-fix-build.patch
@@ -0,0 +1,22 @@
+index d77a884..6dcd0f1 100644
+--- a/m4/curl-confopts.m4
++++ b/m4/curl-confopts.m4
+@@ -37,14 +37,14 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver])
+ AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
+   OPT_THRES=$enableval)
+   case "$OPT_THRES" in
+-    *)
+-      dnl configure option not specified
+-      want_thres="yes"
+-      ;;
+     no)
+       dnl --disable-threaded-resolver option used
+       want_thres="no"
+       ;;
++    *)
++      dnl configure option not specified
++      want_thres="yes"
++      ;;
+   esac
+   AC_MSG_RESULT([$want_thres])
+ ])
diff --git a/net-misc/curl/files/curl-fix-gnutls-nettle.patch b/net-misc/curl/files/curl-fix-gnutls-nettle.patch
new file mode 100644
index 000000000000..fbacb7748bdc
--- /dev/null
+++ b/net-misc/curl/files/curl-fix-gnutls-nettle.patch
@@ -0,0 +1,27 @@
+diff -Naur curl-7.25.0.orig//configure.ac curl-7.25.0/configure.ac
+--- curl-7.25.0.orig//configure.ac	2012-04-04 17:24:48.000000000 -0400
++++ curl-7.25.0/configure.ac	2012-04-04 17:23:07.000000000 -0400
+@@ -1823,20 +1823,9 @@
+ 
+ if test "$GNUTLS_ENABLED" = "1"; then
+   USE_GNUTLS_NETTLE=
+-  # First check if we can detect either crypto library via transitive linking
+-  AC_CHECK_LIB(gnutls, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
+-  if test "$USE_GNUTLS_NETTLE" = ""; then
+-    AC_CHECK_LIB(gnutls, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
+-  fi
+-  # If not, try linking directly to both of them to see if they are available
+-  if test "$USE_GNUTLS_NETTLE" = ""; then
+-    AC_CHECK_LIB(nettle, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
+-  fi
+-  if test "$USE_GNUTLS_NETTLE" = ""; then
+-    AC_CHECK_LIB(gcrypt, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
+-  fi
+-  if test "$USE_GNUTLS_NETTLE" = ""; then
+-    AC_MSG_ERROR([GnuTLS found, but neither gcrypt nor nettle found])
++  AC_ARG_WITH(nettle)
++  if test "x$withval" = "xyes"; then
++    USE_GNUTLS_NETTLE=1
+   fi
+   if test "$USE_GNUTLS_NETTLE" = "1"; then
+     AC_DEFINE(USE_GNUTLS_NETTLE, 1, [if GnuTLS uses nettle as crypto backend])
diff --git a/net-misc/curl/files/curl-respect-cflags-3.patch b/net-misc/curl/files/curl-respect-cflags-3.patch
new file mode 100644
index 000000000000..4a4a614ee49a
--- /dev/null
+++ b/net-misc/curl/files/curl-respect-cflags-3.patch
@@ -0,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index e9b49c7..e374ab6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -280,9 +280,6 @@ dnl **********************************************************************
+ 
+ CURL_CHECK_COMPILER
+ CURL_SET_COMPILER_BASIC_OPTS
+-CURL_SET_COMPILER_DEBUG_OPTS
+-CURL_SET_COMPILER_OPTIMIZE_OPTS
+-CURL_SET_COMPILER_WARNING_OPTS
+ 
+ if test "$compiler_id" = "INTEL_UNIX_C"; then
+   #
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
new file mode 100644
index 000000000000..8e1f6ab88a34
--- /dev/null
+++ b/net-misc/curl/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name="http2">Enabled HTTP/2.0 support</flag>
+		<flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
+		<flag name="metalink">Enable metalink support</flag>
+		<flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
+		<flag name="rtmp">Enable RTMP Streaming Media support</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:curl:curl</remote-id>
+		<remote-id type="cpe">cpe:/a:curl:libcurl</remote-id>
+		<remote-id type="cpe">cpe:/a:haxx:curl</remote-id>
+		<remote-id type="cpe">cpe:/a:haxx:libcurl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
new file mode 100644
index 000000000000..077a79a09ef4
--- /dev/null
+++ b/net-misc/dahdi-tools/Manifest
@@ -0,0 +1,20 @@
+AUX dahdi-autoconf.conf2 1067 SHA256 c364b784aa0e273165c3d4b989d8ccbd44ae97502e45de5434a415065b7b8cfa SHA512 7de2ad496a48da487b0f54b0d3c98681e72ebb86107bdf091c74f410d0e2598fe21e1b876eea81d72ef5250570a67a2ece19de6d003b9bbc3def5fae9173189a WHIRLPOOL d3db6a1e11736e7230064df44c99bf187dcf7919f210e7a67c6afc4cf696fe2e169f9e1e4ded36b141660b076b614fe601061991a1e7821c903af2fb9328e926
+AUX dahdi-autoconf.init2 5817 SHA256 71f7a102bfa547739664a0fa5d692d364c5ef3e87d6cc9645bf85e4bb1d7d3d3 SHA512 0201e4555a8c3ccaceb4cfe1fe004dada847608ad6d8ad031f788f72b056e0d0ef0bdad653eb2f492ae08444c2094dc00ac73180a4107eaabc5f5258a91fa50d WHIRLPOOL 436dc4aae738a10c06e66e47ee97422fc919f075c9657ab5233e99214853dd738fc994811dd2f967033eb2b4de33edf6ed1a3526f5004c554255ac601ca74686
+AUX dahdi.init2 582 SHA256 a1a5d928bda2b5c5315d8652506f939283185fad130c3a22bf62e13a94ba07d1 SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb WHIRLPOOL 885df52066d6a154c12bb64b6b3699e3cc4daa8648e7c6c6a1e97dcd90909502f1398338c121aeefbd7a7ba076894a2f1927e0c8f9387b82457f1a9980ebd517
+DIST dahdi-tools-2.10.0.tar.gz 655475 SHA256 fc70c4677cf251abaa16c74adb0f5ee13361be6b463b048f95cf061739f15bcd SHA512 cf84d1117ac6b4dbd87db4a6ec072e945e64677fbd5dca169e06d954c599ce4ff9a80254aa3027bcc02f7770a5e0a3bcaca075aacfd28c62870d011801d0d225 WHIRLPOOL 19ebf4ddf12e7267d5fe2f35bf43d4ae60fe7c9e69edd4991ad5bbce7a2af5b2dbf0f4e1dc4f8e078749f7b8c98b0c0b70a1cd61c844955cceacc24fd971ebe2
+DIST dahdi-tools-2.10.1.tar.gz 656275 SHA256 eac80535a0fa4f61fc7ba767bbbd726e0ad769e3d22c207e75d381fe578a6c21 SHA512 856116119336b1d51da1c263c95e361c379d61b672db69703f48fb260d570f9335169b8c53daf7d6b18725eb3112539fd9e229b257ff6e9d76a00e74a859da66 WHIRLPOOL 661e821bb6c7ee1b7243ec1893850d9a67085da2c9f74651be9b87871d97b6c7893ab1524df188c8e1dbcd8bacf9be9350a61da3ebff0fc9143f2006211224f6
+DIST dahdi-tools-2.10.2.tar.gz 656284 SHA256 9e904815dedab231084c542d2d7d5dcc832ebec4b5d5d999a5d757df8b2d571a SHA512 5030e5b5fee3ca7853da07a907a4a9e4e72b06d62cb315cf80c0978eac27d70d86024c32f0fc08e8f667f5d7c039968c862631cc310ce30008d52cd121c61004 WHIRLPOOL f07bcac099eeafe1512370f9e06940d546eb1e98b98caef1df7a4bdb865500c864207912c2151116a037eabaa060b72f7751c2b06dc1351004303bdfb7773ff0
+DIST dahdi-tools-2.6.2.tar.gz 843572 SHA256 1c000b31acee6e26187b72800b38325bf419e8eb95063e24b327030f2e8d63c5 SHA512 3e0abb7cdfff072720bf48ccdb5cc43d183e0c3217b1eadfee7920f5b29cfe31f3b79d981516ae95232065c7686a87f169835802788cb1185c3c947feff275c3 WHIRLPOOL 47c381abdbe63224308cf315cee0dc4ee48f65538bbe4f42f5edd409683fc18b9e0c66ec1548b9d853681c45bd3559c1eb47ff6a0874d8699aabf0ae061a71ca
+DIST dahdi-tools-2.8.0.tar.gz 642755 SHA256 bcc8b1fd90a0230489a818a185fcbc3d22b8acbf5d94981501ffa5290981732b SHA512 983e1dfe9bda130c3d0e60f44a79ebb75ae8ab9f27bd77d0355c58e901012465a37411fb1cdc97a131ac01ac892f37729f5853439aaba4ba5a4927c7a7997f81 WHIRLPOOL 14fbf62685cc3a135c2455905a5167e340b6d56202a403510736f00686c3093acbca341f22f9f897004670d4c68132a3fc064cd64922a9bff30bb908f9c40f8e
+DIST dahdi-tools-2.9.0.1.tar.gz 649990 SHA256 023bb55905dc7bddb682773369e1abe21e8bc4f86f96d54e43462a12c9b6530c SHA512 2e16312d4f44aa50cbd7d843514aca06b8f1019b114a00ca5a76cf40ea9b8e937766e70c7628a76a991fa3ad8a12d36782c378a2ad783f9882f0225429794494 WHIRLPOOL 120cd5aff2347848f70c3f364e44f4e26a48d40632214c12861ce563c91b9254cca80d56b833900def2efbcf18f8cf9c4911e58a80b8771c61233cfebf6eb221
+DIST gentoo-dahdi-tools-patchset-0.3.tar.bz2 2250 SHA256 2fce2849d6746db1256ee824d974c74f571a2d70a11246c3301c0ade6de43974 SHA512 15bba73140ede20f49f69419d9ef9a4f242d18ad2da6edee6e91c44fad7ddaf5aa7d6d9e5127c0af0f384d81b4bc8c3fae9e5504d13279abb7ac3db2d01b6a43 WHIRLPOOL a4642ab37673f0470631c3c330b89449f823f270d7266adf0f4bc77366d3bed085969fbc30534c6742b48f8a7f901a7e749021a4a406d2073c83db7e469f06e2
+DIST gentoo-dahdi-tools-patchset-0.4.tar.bz2 2665 SHA256 71642a87e566220c7e7f908adb25dadcf87ff62a23150a6e6074708fd91297b1 SHA512 e48797bd5e741ba94bfd2b19c088ae51812272dc67e7fac04a0c52df9a8371443112d0385e31fe0b812acfc4c912c8cc38e9c632131d5ede55afc43301e2c2be WHIRLPOOL c4704d6ba82a6c020632380507d4435d0c2af4d9c61ed753957bb0ca8ce50ee955526d13497e34db2b4f61a4160db2bc51e5df82fc2f49bc88d857041669f82b
+EBUILD dahdi-tools-2.10.0.ebuild 1143 SHA256 778e817eaee02cfbf406232485feec1510a59623e41fc582b1f21c101a909899 SHA512 a676b96671665a7e02bf92e89c301da1c870a19bfc2659dbeeeb756603d7919e497740e895dd12b308f477c8c5cec1f834ab937160c9d37849777bfbc665b8ba WHIRLPOOL 604e1bab09a934af782579d3b89528da0a7d49e4c2aa31f0e2bfdf812958615286b6fcdc0dc57f33ee1a383d4f610a89d3fcb7274e7f440e1b61a502c4eb4d10
+EBUILD dahdi-tools-2.10.1.ebuild 1241 SHA256 68c277b65502dd2ab4d33248cd939a02d66f4ef2c46e93f93189383cc54b40f6 SHA512 10ee288134f70d7dd6d1ca4a96dde8e292120832e4f77ce9523ef0efac9df2dfa19b7fe8e45949b6dcf4aedcda4f5790c717d128cc367c8e165a8f6ef33a6660 WHIRLPOOL 64fd9300060d5acea74dabcb87293cf193030e95f363a3349cc005a498da3851bc315f44ea6def962190e3ffcbddf792460f251754ec87846d27225604f4d09d
+EBUILD dahdi-tools-2.10.2.ebuild 1255 SHA256 8ecd8741fa40d4463602698c5da1c3fdbf93eab2195e51831d40c272ac4152c1 SHA512 220622c8f5cf526481d605b9176f36145a9e4dce3df365a869714a674834d309cba09d3350ef0f17cc3cddd714a613999d50922e8c1a66d13fcd1c1f73aa7f89 WHIRLPOOL 134b6fc9597181bbe9002baef7a9d8f82c27ae13fa76b3b0abdf35d783ac8d5012f50dcdcc07470a532390c3605880647af81b790c6f38cde1a33d0d1e546d29
+EBUILD dahdi-tools-2.6.2.ebuild 1142 SHA256 3e1fab207a591595b6d45a8a99b65f437d9dcb08abf05270c7401ea71ac5933c SHA512 0a40014c9fc78a7242c871d4aeaa01e401ef5d1d97b16597c655cdcf97bc0315932b633cf13e6f3ccddfcea4f60d0e0a71d294e57e6be84eeeedacb61ee06307 WHIRLPOOL a8ce45657a05e11762587908b62daf67859633f3f4888295e27f671deaca453d8508eb9f588c52910138c4c581682dd4f9b6dabec24eabc57aa671cd730ea65e
+EBUILD dahdi-tools-2.8.0.ebuild 1142 SHA256 c25d6c1c0eddc4e2cd3d04edd9140fc5892dd9c9ead10ec3ba5f12742d1c7fb5 SHA512 2ce2e7f671fe45402bea42733b98c663de58f8197a2fdbf5b089aa57a8958115ed297ee89ca265566bd3e5af10763a1a38069322f9f3e0705cadd121f4e19feb WHIRLPOOL 9180210fc83c3851a3e11e1e0af11eab0f0b37a01b7822cd737a92d871b1c7d97b0e666056a27a50cc90ea820d9e75aaed1f77444e76c87a7943580fc2bd29e1
+EBUILD dahdi-tools-2.9.0.1.ebuild 1142 SHA256 c25d6c1c0eddc4e2cd3d04edd9140fc5892dd9c9ead10ec3ba5f12742d1c7fb5 SHA512 2ce2e7f671fe45402bea42733b98c663de58f8197a2fdbf5b089aa57a8958115ed297ee89ca265566bd3e5af10763a1a38069322f9f3e0705cadd121f4e19feb WHIRLPOOL 9180210fc83c3851a3e11e1e0af11eab0f0b37a01b7822cd737a92d871b1c7d97b0e666056a27a50cc90ea820d9e75aaed1f77444e76c87a7943580fc2bd29e1
+MISC ChangeLog 2799 SHA256 570f12fa786d1e9f9de9e91e1040eb19aaff1879b89bd1ff94d8daca282cd852 SHA512 91a46a17e5ba27878756a81d53fe1686b2a85702c5d4fd62d7578d94d46fc0d16122e8f023b9169843f5ddcce7f811a0f6b3d0c87fe7419b17cb42491a3be8bd WHIRLPOOL d245cb7577aa8d486c520c9a08d70c0aaa6b478822957fa976d426f567f36238170219a77282b303601d129372d1c6753c24ca1ae863c2692a81738c4ef91486
+MISC ChangeLog-2015 8250 SHA256 ff0d907f5b6773d4d3e48de68906ceafdc3a881138bb8459edb88b2b98b5312a SHA512 dbf9ca359dd28f1bf958d57c975c60b07adb4f091ed5617e2f0d98f834cb6241aedf35e6ea77b20190bb960816391cf4de1b500c09fefa98a8467f0644d7a529 WHIRLPOOL 47221870914e4be43c977ebf34f320c721a0abcf47e9a6dd60e7c5f15920a88196a1b1d6bc12ebfd66ee883e219e04e2b96c771ff36eaa6df2baa9903f929079
+MISC metadata.xml 325 SHA256 ee37d06f3b2f1be46f6fed0a88930f3b1ede5e5d0701ca712a70f6c6612cb07c SHA512 ee8b15b61b0a2bcd1b11fdd55a4c034d1a0f10eaa02b78d6df11af4c5e8f0976fe8bb8f9583caf38a9594ec75e69c76506ba9655baad66a646fb74809dbc2e42 WHIRLPOOL 9855d9aaf7ea48c697d9ac09d18afa9947dd7a7f10e541ed7cfa2214b7444a08731224b39f49d4ea6a9f5be47743aeb5e008a3d5977ce13e496e2f5f4d51fd24
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.10.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.10.0.ebuild
new file mode 100644
index 000000000000..2cd4f8637a63
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-2.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base
+
+DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
+	mirror://gentoo/gentoo-${PN}-patchset-0.4.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="ppp"
+
+DEPEND="dev-libs/newt
+	ppp? ( net-dialup/ppp )
+	>=net-misc/dahdi-2.5.0
+	!net-misc/zaptel
+	>=sys-kernel/linux-headers-2.6.35
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/${PN}-patchset" )
+
+src_compile() {
+	default_src_compile
+	emake tests
+	use ppp && emake -C ppp
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use ppp && emake DESTDIR="${D}" -C ppp install
+	emake DESTDIR="${D}" config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+
+	# install init scripts
+	newinitd "${FILESDIR}"/dahdi.init2 dahdi
+	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
+	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
+}
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.10.1.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.10.1.ebuild
new file mode 100644
index 000000000000..e10a51efa950
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-2.10.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base
+
+DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
+	mirror://gentoo/gentoo-${PN}-patchset-0.4.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ppp"
+
+DEPEND="dev-libs/newt
+	ppp? ( net-dialup/ppp )
+	>=net-misc/dahdi-2.5.0
+	!net-misc/zaptel
+	>=sys-kernel/linux-headers-2.6.35
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/${PN}-patchset" )
+
+src_prepare() {
+	base_src_prepare
+	sed -i \
+		-e 's:-Werror::' \
+		Makefile xpp/Makefile || die
+}
+
+src_compile() {
+	default_src_compile
+	emake tests
+	use ppp && emake -C ppp
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use ppp && emake DESTDIR="${D}" -C ppp install
+	emake DESTDIR="${D}" config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+
+	# install init scripts
+	newinitd "${FILESDIR}"/dahdi.init2 dahdi
+	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
+	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
+}
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.10.2.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.10.2.ebuild
new file mode 100644
index 000000000000..9978107d9226
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-2.10.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base
+
+DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
+	mirror://gentoo/gentoo-${PN}-patchset-0.4.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ppp"
+
+DEPEND="dev-libs/newt
+	ppp? ( net-dialup/ppp )
+	>=net-misc/dahdi-2.5.0
+	!net-misc/zaptel
+	>=sys-kernel/linux-headers-2.6.35
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/${PN}-patchset" )
+
+src_prepare() {
+	base_src_prepare
+	sed -i \
+		-e 's:-Werror::' \
+		Makefile xpp/Makefile || die
+}
+
+src_compile() {
+	default_src_compile
+	emake tests
+	use ppp && emake -C ppp
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use ppp && emake DESTDIR="${D}" -C ppp install
+	emake DESTDIR="${D}" config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+
+	# install init scripts
+	newinitd "${FILESDIR}"/dahdi.init2 dahdi
+	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
+	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
+}
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.6.2.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.6.2.ebuild
new file mode 100644
index 000000000000..324114b2375e
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-2.6.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base
+
+DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
+	mirror://gentoo/gentoo-${PN}-patchset-0.3.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ppp"
+
+DEPEND="dev-libs/newt
+	ppp? ( net-dialup/ppp )
+	>=net-misc/dahdi-2.5.0
+	!net-misc/zaptel
+	>=sys-kernel/linux-headers-2.6.35
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/${PN}-patchset" )
+
+src_compile() {
+	default_src_compile
+	emake tests
+	use ppp && emake -C ppp
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use ppp && emake DESTDIR="${D}" -C ppp install
+	emake DESTDIR="${D}" config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+
+	# install init scripts
+	newinitd "${FILESDIR}"/dahdi.init2 dahdi
+	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
+	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
+}
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.8.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.8.0.ebuild
new file mode 100644
index 000000000000..d828ff6f45dd
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-2.8.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base
+
+DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
+	mirror://gentoo/gentoo-${PN}-patchset-0.4.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ppp"
+
+DEPEND="dev-libs/newt
+	ppp? ( net-dialup/ppp )
+	>=net-misc/dahdi-2.5.0
+	!net-misc/zaptel
+	>=sys-kernel/linux-headers-2.6.35
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/${PN}-patchset" )
+
+src_compile() {
+	default_src_compile
+	emake tests
+	use ppp && emake -C ppp
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use ppp && emake DESTDIR="${D}" -C ppp install
+	emake DESTDIR="${D}" config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+
+	# install init scripts
+	newinitd "${FILESDIR}"/dahdi.init2 dahdi
+	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
+	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
+}
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.9.0.1.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.9.0.1.ebuild
new file mode 100644
index 000000000000..d828ff6f45dd
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-2.9.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base
+
+DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
+	mirror://gentoo/gentoo-${PN}-patchset-0.4.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ppp"
+
+DEPEND="dev-libs/newt
+	ppp? ( net-dialup/ppp )
+	>=net-misc/dahdi-2.5.0
+	!net-misc/zaptel
+	>=sys-kernel/linux-headers-2.6.35
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/${PN}-patchset" )
+
+src_compile() {
+	default_src_compile
+	emake tests
+	use ppp && emake -C ppp
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use ppp && emake DESTDIR="${D}" -C ppp install
+	emake DESTDIR="${D}" config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+
+	# install init scripts
+	newinitd "${FILESDIR}"/dahdi.init2 dahdi
+	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
+	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
+}
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 b/net-misc/dahdi-tools/files/dahdi-autoconf.conf2
new file mode 100644
index 000000000000..a46545231911
--- /dev/null
+++ b/net-misc/dahdi-tools/files/dahdi-autoconf.conf2
@@ -0,0 +1,40 @@
+# Global settings
+# Set this to your country code.
+DAHDI_ZONE=za
+DAHDI_ECHOCAN=oslec # mg2,jpah,kb1,sec,sec2 (there may be more, we recommend oslec)
+
+# Settings for analog
+#Analog signal types, one of:
+# ks - KewlStart (recommended, default)
+# ls - LoopStart
+# gs - GroundStart
+
+# Signalling to be used on FXO ports
+DAHDI_FXO_SIGNALLING=ks
+
+# Signalling to be used on FXS ports
+DAHDI_FXS_SIGNALLING=ks
+
+# Whether or not to echocan:
+DAHDI_FXO_ECHOCAN=yes
+DAHDI_FXS_ECHOCAN=yes
+
+# These settings will be used for BRI cards.
+# Known options: B8ZS,AMI,HDB3
+DAHDI_BRI_CODING=AMI
+
+# Known options: ESF,D4,CCS,CRC4
+DAHDI_BRI_FRAMING=CCS
+
+# Our experience is that it's not required (still defaults to yes)
+DAHDI_BRI_NT_ECHOCAN=yes
+DAHDI_BRI_TE_ECHOCAN=yes
+
+# These settings are for PRI cards.  Note that only E1 currently supported.
+DAHDI_E1_CPE_ECHOCAN=yes
+DAHDI_E1_NET_ECHOCAN=yes
+
+# PRI will default to CPE mode (remote end provides signalling).
+# If you really want to provide signalling set the appropriate spans
+# here (eg, set span 1 to NET mode).
+#PRI_SPAN_1_NET=yes
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init2 b/net-misc/dahdi-tools/files/dahdi-autoconf.init2
new file mode 100644
index 000000000000..9e3de84bac26
--- /dev/null
+++ b/net-misc/dahdi-tools/files/dahdi-autoconf.init2
@@ -0,0 +1,225 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Ultimate Linux Solutions CC
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	before dahdi
+}
+
+dahdi_load_modules() {
+	local hwlist loc status mod mod_vname pciid desc
+
+	hwlist=$(/usr/sbin/dahdi_hardware)
+
+	if [ -z "${hwlist}" ]; then
+		einfo "No digium hardware found."
+		ebegin "Loading module dahdi_dummy"
+		/sbin/modprobe dahdi_dummy
+		eend $?
+		return
+	fi
+
+	echo "${hwlist}" | while read loc mod pciid desc; do
+		status="${mod:${#mod}-1:1}"
+		mod="${mod%[+-]}"
+		mod_vname="mod_${mod}"
+
+		einfo "Found $desc at $loc (module: $mod)"
+
+		if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then
+			ebegin "Loading module $mod"
+			/sbin/modprobe $mod
+			eend
+
+			[ $? -eq 0 ] && eval "$mod_vname=loaded"
+		fi
+	done
+}
+
+dahdi_module_unload() {
+	local mod=$1 s
+	[ -d /sys/module/${mod} ] || return 0
+
+	for s in $(find /sys/module/${mod}/holders -type l); do
+		dahdi_module_unload $(basename $s)
+	done
+
+	ebegin "Removing dahdi module: $mod"
+	/sbin/rmmod $mod
+	eend $?
+}
+
+dahdi_gen_fxo_config() {
+	local port=$1
+
+	echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}"
+	[ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
+}
+
+dahdi_gen_fxs_config() {
+	local port=$1
+
+	echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}"
+	[ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
+}
+
+dahdi_gen_bri_te_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
+	echo "bchan=${basechan}-$(( basechan + 1 ))"
+	echo "hardhdlc=$(( basechan + 2 ))"
+	[ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
+}
+
+dahdi_gen_bri_nt_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
+	echo "bchan=${basechan}-$(( basechan + 1 ))"
+	echo "hardhdlc=$(( basechan + 2 ))"
+	[ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
+}
+
+dahdi_gen_e1_cpe_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
+	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
+	echo "bchan=${bchans}"
+	echo "dchan=$(( basechan + 15 ))"
+	[ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
+}
+
+dahdi_gen_e1_net_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
+	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
+	echo "bchan=${bchans}"
+	echo "dchan=$(( basechan + 15 ))"
+	[ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
+}
+
+dahdi_conf_span() {
+	local span=$1
+	local type=$2
+	local desc=$3
+	local port=$4
+	local basechan=$5
+	local vname=""
+
+	# Analog we need to deal with on a port-by-port basis.
+	[ "${type}" = "analog" ] && return 0
+
+	echo -e "\n# ${desc}"
+	case "${type}" in
+		digital-TE)
+			dahdi_gen_bri_te_config "${span}" "${port}" "${basechan}"
+		;;
+		digital-NT)
+			dahdi_gen_bri_nt_config "${span}" "${port}" "${basechan}"
+		;;
+		digital-E1)
+			# Use CPE by default.  Unfortunately there is no easy
+			# way to detect CPE vs NET as far as I know and specifying
+			# in a config that you want NET mode seems the sanest way.
+			vname="PRI_SPAN_${span}_NET"
+			if [[ "${!vname}" = [Yy][Ee][Ss] ]]; then
+				dahdi_gen_e1_net_config "${span}" "${port}" "${basechan}"
+			else
+				dahdi_gen_e1_cpe_config "${span}" "${port}" "${basechan}"
+			fi
+		;;
+		*)
+			echo "# Don't know how to configure this (type=${type})."
+			echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC."
+		;;
+	esac
+}
+
+dahdi_gen_config() {
+	local type manufacturer devicetype basechan aport atype
+	local span=
+	local tfile="$(mktemp)"
+	local sfile="$(mktemp)"
+	local plocation=""
+	local isdnport=0
+
+	/usr/sbin/dahdi_scan > "${sfile}" 
+	exec 3<"${sfile}"
+
+	echo "# Automatically dahdi-autoconf generated file ($(date))." >> "${tfile}"
+	echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >> "${tfile}"
+
+	while read LINE <&3; do
+		case "$LINE" in
+			[[]*[]])
+				[ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}"
+				span="${LINE%?}"
+				span="${span#?}"
+			;;
+			type=*|manufacturer=*|devicetype=*|basechan=*|name=*)
+				eval "${LINE%%=*}='${LINE#*=}'"
+			;;
+			location=*)
+				eval "${LINE%%=*}='${LINE#*=}'"
+				if [ "${location}" == "${plocation}" ]; then
+					(( ++isdnport ))
+				else
+					plocation="${location}"
+					isdnport=1
+				fi
+			;;
+			port=*)
+				# For analog cards only.
+				aport="${LINE#*=}"; aport="${aport%,*}"
+				atype="${LINE#*,}"
+				[ "${aport}" -eq "${basechan}" ] && echo -e "\n# ${manufacturer} ${devicetype} (${name})" >> "${tfile}"
+				case "${atype}" in
+					FXO)
+						dahdi_gen_fxo_config $aport >> "${tfile}"
+					;;
+					FXS)
+						dahdi_gen_fxs_config $aport >> "${tfile}"
+					;;
+				esac
+			;;
+		esac
+	done
+	
+	[ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}"
+
+	echo -e "\nloadzone = ${DAHDI_ZONE}\ndefaultzone = ${DAHDI_ZONE}\n## END OF AUTOCONFIGURED FILE ##" >> "${tfile}"
+
+	exec 3<&-
+
+	rm -f "${sfile}"
+	mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck
+	mv "${tfile}" /etc/dahdi/system.conf
+}
+
+start() {
+	dahdi_load_modules
+
+	if [ ! -r /dev/dahdi/ctl ]; then
+		eerror "No DAHDI compatible cards detected."
+		return 1
+	fi
+
+	ebegin "Generating DAHDI Configuration"
+	dahdi_gen_config
+	eend $?
+}
+
+stop() {
+	dahdi_module_unload dahdi
+}
diff --git a/net-misc/dahdi-tools/files/dahdi.init2 b/net-misc/dahdi-tools/files/dahdi.init2
new file mode 100644
index 000000000000..d3abf3c4e61e
--- /dev/null
+++ b/net-misc/dahdi-tools/files/dahdi.init2
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -f /etc/dahdi/system.conf ]; then
+		eerror "/etc/dahdi/system.conf not found. Nothing to do."
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting DAHDI"
+	/usr/sbin/dahdi_cfg
+	eend $?
+
+	if [ $? -eq 0 -a -r /etc/fxotune.conf ]; then
+		ebegin "Loading DAHDI fxotune.conf"
+		/usr/sbin/fxotune -s
+		eend $?
+	fi
+}
+
+stop() {
+	ebegin "Stopping DAHDI"
+	/usr/sbin/dahdi_cfg -s
+	eend 
+}
diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml
new file mode 100644
index 000000000000..42f88a34db7c
--- /dev/null
+++ b/net-misc/dahdi-tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <use>
+    <flag name="ppp">Enables PPP/DAHDIRAS support</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
new file mode 100644
index 000000000000..90dcc38b0955
--- /dev/null
+++ b/net-misc/dahdi/Manifest
@@ -0,0 +1,37 @@
+DIST dahdi-fw-a4a-a0017.tar.gz 181429 SHA256 d5b6ab6851e431afcfec2ecc39d95fa88fe3939ffdb2e3d4f28a43cabf30e95b SHA512 e42cb83e05edb359949acd888a743c665d228cd3b9424fc8f3b60676d6799f4455e65cc269d1e2ac0e3bb5613607dad4fb37c433067832fb68b15bfddf6f4a2a WHIRLPOOL a827109db967c716734f5100173a50343c1384da775d188ba103d6f673fde2c61e0404eb0dfb6a06884648f1ffb3045bb9c1ef0871a91fb0f6b8cadd2791cceb
+DIST dahdi-fw-a4b-b0019.tar.gz 228785 SHA256 84bf8a1a9f61598b3261a6d737529837ca0f56ace77b56467d701e6aa22c04bd SHA512 1c3be1f01f005bb7c315ffec42656a72d6a5f762806d39551ff0282b0f55e99744e9ad8a9b6da7cf0a384ad5ecbbf6430561466ad3a8a6e4a412ed870c69b218 WHIRLPOOL 06921af5e321037f5d13e3e2ee4be48bb4231a13365ea4c25ce4691c9faf281a79bf8ee18bb47c5ffe12ad253d61e5daf127174194cb83cd4c41b083a7d0e395
+DIST dahdi-fw-a4b-d001e.tar.gz 239591 SHA256 e039af8bec36407b74e1dd9ebdd49ba077469eda79d4e6093721ed2836d4536f SHA512 ab72cf6d469e44f3a8b9dda5e7acae9ae435b6f12b1491079155b8df4c9cf83aed48ccbda4acb4a9943dd6228846f5b82998a0bf575d454ac3b81b72c585d58c WHIRLPOOL b1b7013631ca14ce74790299e8d1ab45ebf13d3db6578bc66ece784803891ba31413f0db3fda5fbc103d68217ae6304614cd5b78facc282aafd7fc806f2ffa43
+DIST dahdi-fw-a8a-1d0017.tar.gz 181958 SHA256 5064f9877b8aec99b19fd57988216fe1a9c0b7c07853dd3b32b5a55ab7b418e6 SHA512 2f80d24170f0efdebc318f238abb04664dfa97e3ca47a330b5a5e1d695c8ba5c535ad1302bf338667912b46cd5b4bbb76ab5bdbe6e736edd4f0e9239d818d05d WHIRLPOOL b80bda38f5c3c7b464e38aab6f2b74e1ea0159ac07b321ca165659b21f1ef4791360224c3790839f961e889923ce69b64114fb5e3356da387d6e97eb3e0fb462
+DIST dahdi-fw-a8b-1d0019.tar.gz 228054 SHA256 65817314ea97ec17520296ec78691bbe6da35b1a43051caae2d8b544f9efd011 SHA512 d802b5e61e8ba2ddec1d86a26f11753d3cb627d9248df414d93595afac28e0257dad7313af5e721762ae309f34791a2e705d4fc357ef64eedb0c9369e133f79a WHIRLPOOL 1157efb1f0635a0e215e5177b5e3ceb1ef80c30c3055b7f54b641ead720eff4d0accf4b0948123ce2b845543a57ac2d2a30799e9b2399a38c837474e4e2cc2db
+DIST dahdi-fw-a8b-1f001e.tar.gz 236508 SHA256 09a8992786309e025aa60b400a2c7d21226ac9bb6f1b66f562a5e7e9dc892b03 SHA512 68041e5cb53d8ff6beb9f667abca5a5a1c752357c224f5c7cfcb81732bd417671cf6dc03b5c5bafd6a0864f6c5451165c0f26908b0f40ed3408961f448f2a9a4 WHIRLPOOL da39b08698a84fc152b7f0e8b7b3f2ddb853812197425d7d86f9bad0864157a2e9ed8cfb1502d8fd235b6a1dc5b6ccc0c64818716d1b4954709fee4ef80bcd5e
+DIST dahdi-fw-hx8-2.06.tar.gz 29252 SHA256 449ab3fd03d55d808e999efb7677cd04de202b92c9fcb039539a7e48a39a80f5 SHA512 d113d2bd10d5a851087e04fadb3427ec07634960d47e2292320f0d195c65075fb24ab173e0985c257eaf8e46f595f29af034fb380382cdbff7bfbc7381dff4ae WHIRLPOOL aafcc1469e07e77883ab5aa54cdc563dae2e954c8695ce5742c34e1317f43f6d15c4c1c4458effdc8451d37d2f1d26071fd28b524ac9ca0b88ac6bb1b9e33899
+DIST dahdi-fw-oct6114-032-1.05.01.tar.gz 165866 SHA256 7a006073202d67e45f1d5ff1e9c6e8663e6056cef9dc4c5abae86a1018db349c SHA512 ec47a7aac6a6abc73fe0c7ec3b31eebc868c516aeb1bb584f145f36c28abec21afa12dcec554bceb914c058c83255e32fb8d967ef4d8a5d0161b6053af464a24 WHIRLPOOL a162d82265a4e965de156f3367c14e94b906f71f33a0c6f7836ceb1223b65abda168c0c4f66eb6b6eddd794b2c89c36d931aba8033e713cad3072400537b186c
+DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 SHA256 56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91 SHA512 6dcc6a3413c6c0561b08c4949a746cbebc58b8a068481f568007fdc663cfc6ef90417fbd81398055a781367e7db57f0a694745cddcd3c697a4f857be15981549 WHIRLPOOL 0b8b3f853b07e90c6f42e78fb328d57c2f8126db9930f8998547e8acfc39fdbcb5f91565604a58133ff6db2ea3beea19864554d9768c86358d4f868446fdfc77
+DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 SHA256 e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775 SHA512 17e83aa57ea8e9d3353027184adb48f664b177a528006d67112a53127fcb19c1011d4f44c2980ab77d27b3bf7f7a74d44f15aaf115e05fa3df8e16d3c30fc267 WHIRLPOOL 3464b86fb656f4a3c470a2752f63b5848ee8e08f12862ca2d8b3460231b9c15c15e270e4e8b85db16fe99cf92ecac1077d85383cd04157177749d5b6e310f8ad
+DIST dahdi-fw-oct6114-256-1.05.01.tar.gz 171685 SHA256 5fe5036a2766cf0e8a968b0c58b700507d86e1cde9296ca437170cc626a9c79c SHA512 e447fe8d24963892339d895450cf7a04da3bdcf1de22630dea68119dbd9da84878478adf8ce0e5ef859e6d677c2a051aa6272de4e0692f5ce0e8b5d0fba4096b WHIRLPOOL 9f1ad0284668833e61f387070062b66369c61e3afc7b867a06db6697c9841bd1f5efd541c6eb3616625b9c82d0dd95f6e2e7e02b787b90e91fe4ad6de08777a3
+DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 SHA256 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774 SHA512 88a986d22ead41a3dabc320e13f7a3e6e6ab9e2752aca2cc940ad9c1ec570d4f01e82c46d0ec1b6dc1a87a1df7e94cfb8aa638b44b4fe2254af8962f1fdbac86 WHIRLPOOL a6334940cd3927003fef425685c9389c64530dd4bab1337863283a3d02144d44bf601292179d8354b3d283af19c53d142f1c3b31d1468012297b876954b6dc8b
+DIST dahdi-fw-te133-780019.tar.gz 229578 SHA256 6a255642301ab46f0bcccf4671ce41096c4733b7308719474e9c6fbcff77cc0e SHA512 0883ec2607754d06b365a245234c6d6f4e1877ed54040c22534e144a153315e90c5657e2aa0e715f3f6899f9a54b653065fa0641c5c6b8c4efebc3b9d112305e WHIRLPOOL 4582c2fd8e4ae9d32f04108d482ff9cf771c3d956492dfff82ba2ca30f4abeb1066fa3701c4f8a358362172c605cb5b3ed7f49aac3843353f3940499615e5a1f
+DIST dahdi-fw-te133-7a001e.tar.gz 242987 SHA256 511c1966295a20df673bb87af30245f0ad165efd6ccb92b4d8ed535ca7f5ac65 SHA512 acd273bcf9b8e009b986e2c9f068121fad8b9cf8f500b79fd5456225ec4ef81d22f32960246a1e9b49ca7f47efb2f7d346c8727fe3b7b80c700d2dc609784acc WHIRLPOOL f8ae0b98d217d4dbb0ff5c291cf71c226604b9ee6a724fef25b43316d381a5ce1d3052864d4bc814ac3c6dd9bcc629dfc594825dd6e3a4ce4bc3dade1d23fcbf
+DIST dahdi-fw-te134-780017.tar.gz 185478 SHA256 99f7c410bf47d2a5ae687d717e51448ce5b52aca902830bf39bffe683150fa2d SHA512 b6f93ff060512b15bb8462805d8f8a435e56a83be362770d2c3b39b876d2171c5e1e6c1bc42c893eaa382ccd2f19534536612618c4ef4ff8c25976cf3719d4fb WHIRLPOOL a93efb2405019418e542f817b64fc0aa76bda55f74f4ceec9815c3c4350d9ec31ac3bd47c900659e11a0d0131cadfedf99dde508eb7da71a7b276f98ae5e921a
+DIST dahdi-fw-te435-13001e.tar.gz 238504 SHA256 c8f55d57cc0bf332e8d96cdf9ff6dd0e322f33581e1efc24c2b9a0e0c5eb7ee4 SHA512 1cd5c191db62f87f87c9f6913bcbc3ed9f3d77a51578cd0bc5fdb9d17e128bcaf66d04c5a9e6417e9d7543fc8f18b6f635f0e8c1cb1bc19b11bc8ddffaa6be08 WHIRLPOOL 518f74ddc3ce99b6809128c9e619c2f2bc56b03347e594a347c8f5d1c97537c481cc774a5f6f9d262e80518389e129f65be42a9972b230d8eef12e9c7dd10463
+DIST dahdi-fw-te435-e0019.tar.gz 231242 SHA256 0084354638b86666b685a48201791c85639280901519f54a79d586aedb848a3b SHA512 ccbc4fbc184704ca3ea12311b1d4f719330321773a9480d731c5fb669a37166d10aa6e704d363bb0a41d9bde6bf119b3e7bd4072ab49b864fea6391b429f99bb WHIRLPOOL 249650d59f4bbdadc8ebf055aeda35f050081dc01bfc458bf68380686edef42d30ef7082cc1cd6fb250b1965bb2ec52544c7f43a3ab0b6948f5262f8e2ebb0b1
+DIST dahdi-fw-te436-10017.tar.gz 210601 SHA256 0980f4a8d191c6872aa27d971758046f0e7827ac161549f2cc1b0eeab0ae9333 SHA512 56e8a26a737ac45e137324b635e5f489fe05a5939324af038f881b64ddabf486eb3830ff0ada1561ffedb3d6bc8338b11f4dccbc9b2ca9e00cd2bcc85abf83c0 WHIRLPOOL 12bea61e15f1f54031e5e9345658a1a58053039c36660342d515ff6584a078150fe447ffb5e33b393278e6ef212fa566c0e289f155e6d05572a038eeb4d39e8d
+DIST dahdi-fw-te820-1.76.tar.gz 54303 SHA256 5b823e25828e2c1c6548886ad408b2e31dbc8cd17170c52592792d9c754a199c SHA512 3189df3dd680353d5520773ac8ea7fe638ea05e3c656379c1a245bd3ab8a6ae0c8a1c22c2068be9c758996e5993b0d19376b159b4e868ebc3d817dcce3b9aec7 WHIRLPOOL 4eb4a3a4d5b8a2cdd4422d41b17427624ca668ba400fe908e03d1cdd317c5e5bb9993bafe8c4a36ee44554ff6acadd45c4baba4d23c3f06f4765da31c545dafa
+DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 SHA256 6b199cf836f150f9cb35f763f0f502fb52cfa2724a449b500429c746973904ad SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3 WHIRLPOOL 9dc3e1bdfdb458eca3e943b89c64460af13c7aa8ca0e6fb56228df54520979c47659828f199c10c2359804156955b9fb956ade47b50f46adb60e10a8bddc125f
+DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 SHA256 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1 SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047 WHIRLPOOL 0151914828f6cee593905ef6ce81e66da32f1c7752900332f10907638c2a37e331606215152e846a58ee3f1031a7c162eeb1bf0c17691e8dd66add79dcd8e015
+DIST dahdi-linux-2.10.0.1.tar.gz 2042867 SHA256 7b129903c517fbcb74e9600cd2baaf1721d8684c53525314620db7c0410055fe SHA512 7d03717947063a037e83fc13ab42e4ecc4aeb12a2d8e1f0cae5b491d2dcd948aa51381f0111e5013f355faf4d6ff00df8238e19be91852e99040a836fbf51318 WHIRLPOOL 6fcb613fbaf20a4a664a0f20c15c31b2ac8c4c54bf6c40ee951e61b0600f9700f61d73005b8ba6e34b75c62ffbc1cfc97af9d926ce3caa04e420e84212df1edb
+DIST dahdi-linux-2.10.1.tar.gz 2044847 SHA256 94c532e190fc6372f9731df71f8c590fc6f6f184d5394339ce892ac6788843aa SHA512 3ef877ba104e720f3292fc95450968ec1d46cc54f807492a2d41fe768e9dde554a420928f45b7244647b5bf2300863e150ee23c9920fbfb7afa6cb46a77a2087 WHIRLPOOL e114b8e200aaa94283bcf57f54e6e0be33fe7bbb5680acba43b5704733cd7e6c27eae5a6fbb9cc0314ac022c1b2892839da5b710b21991247944847e3819b0c8
+DIST dahdi-linux-2.10.2.tar.gz 2044873 SHA256 6270444cb9b345941267b162038cc45f5ef4485139176e88e2c4d22fa35a2c59 SHA512 b585a408ffb7b95a5e1a47dff14be93e2ce7420e5b3b3160ccfc0ca8df153ec1f36c56c96bc4f7b20bebda0559ec03481e1307feb8e10eace68737e8f8783537 WHIRLPOOL 2c640728a31cdd45a34cf78b1f07587242fc3e68eeb37de006bba237cbc89ea7ea4fa9ad568775761225dbdefdaff1de152bbfd05dfbbbc693efdf723835d162
+DIST dahdi-linux-2.11.1.tar.gz 2045435 SHA256 f59f382365118205e77d2874f1c0e1546e936247bcc45f07a43bc21778bee9df SHA512 db15d9237f157b5349de8f4cdb45573ed42e1dd25c83f900835c7e15637a19e1e95c7c990dc786c1e3f37f32419f3d009e179d27b5d16421789ff9bc76f54224 WHIRLPOOL 4380cfb695097b40df3b6a46296406bae8db5c19a397d5f9a3c5ef8d93f7d7529fdd09070ccb5bfdd3c6077cd1bffbfaf5ee8f4f68f1065ed2adfc0dec656e8b
+DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 SHA256 31efbb79403c57e095bd032939d65b3c15eb5964e837476b1ade42cea9c2b9f7 SHA512 63378c916af787549d3d092ed9532ebdb6106675d96cb124eaeff8e70bdf28751f30745a6e6f78176bf8411031fcfac6bec4f38e18e48ca0b363ef815bae4770 WHIRLPOOL f6aba2558bd8a0bb3998977187d50ea95b0e169aadb18372ee8d7d5df8624e5d2c40e3ae98bcf2c5ed9680920f5d813563d15bdab6c3d167bb1539ba4efe6500
+DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 SHA256 00dcc6ac490f6d56c806bde06b9fb76ed09555cb879880d48f8087f50adfbb31 SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04 WHIRLPOOL 4ce8e9930c59da65fe66250009dea21a7bbed4b654d9f6aed832525a56c5265c20acfbcbf38a58a0ce190df3bac66080d4513dcdf796c4823fa6ceefafa51c96
+DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 SHA256 4bd57ffa61d718b847080af274fdf2414bf83a6567dffa05786e3e9b900cdf5f SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517 WHIRLPOOL fbf86b33f7961cdd8053fe7898908088fb1579705915e5cddee01d5bae3cc996a061af622d4868e5b82270b22043529f69a50580d45451a3400b664835965760
+DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 SHA256 c71d1ac29c78511b59914cc9aa1798529ae7b344cdc8403a797dbcddbe486974 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 WHIRLPOOL 15c34f728806f5f94d64c791491b4928342a0df94a336c8c09a26ec020245dd8e13722d73779cce3cd73029c07be68c2d440be51407b83d56ce5a8645b6bfb24
+EBUILD dahdi-2.10.0.1-r1.ebuild 3619 SHA256 2e2b4d49845eb7d428c8d30a3b8916ea38d52e940170cbbda60b0be2635ba2ae SHA512 94273131542d58fcaec97471fd65a9503f1fffd833ef7632503a776c10805cda1f7da6163d2d5683adfbb47085fa920b8a527e37ee867df0ffac320d252fe8f9 WHIRLPOOL 337e9862f7656c6c6724be9378a9c3632bc25c1433d56c6ca1be3240ef79db36da6f9d4b01244955f4c78073c8f33e4b68c92a1017443d33e626a5ebf193d05d
+EBUILD dahdi-2.10.0.1.ebuild 3617 SHA256 c8aba78d93d0865c6cc73b45d398c112c6a7f04b176c741a306d0283a5928990 SHA512 a9acaac3ac0d81b07f96c7d30ea2bf41e950dde07b53d2e800e792720ce82317f481322bdb472b10fc78aad7a28f5dc91b1d170025c185b4a0301e0a11f28d07 WHIRLPOOL b4b4d465acc3034f5be784f10da697814a0a1a04b4b2d15ed61ba967779fdf36588ed41aad586e54a55b7beb050516027bd6fb16564a6b01eb574ee4cbd60d15
+EBUILD dahdi-2.10.1.ebuild 3617 SHA256 c8aba78d93d0865c6cc73b45d398c112c6a7f04b176c741a306d0283a5928990 SHA512 a9acaac3ac0d81b07f96c7d30ea2bf41e950dde07b53d2e800e792720ce82317f481322bdb472b10fc78aad7a28f5dc91b1d170025c185b4a0301e0a11f28d07 WHIRLPOOL b4b4d465acc3034f5be784f10da697814a0a1a04b4b2d15ed61ba967779fdf36588ed41aad586e54a55b7beb050516027bd6fb16564a6b01eb574ee4cbd60d15
+EBUILD dahdi-2.10.2-r2.ebuild 3618 SHA256 9b881a32b86ddf0dce923e757b6b55529ccb85bdc079de8a977d1fa20c5083e0 SHA512 73784dc279ce84937e52cdf2df7df9da91af842944bf2dffbabf780da04d5477067f791aee701b4b3615a14a667520fee602f601021304d06b1154e401e0ba4f WHIRLPOOL 46d0e72f69d24317ce7e81a4c65209cfe5479d250a3f5242bcd4682a35a1b47b17f620a82eccd507ce4f827f88082ca892d1034e4d8f0d109d571163a83c18bc
+EBUILD dahdi-2.11.1.ebuild 3682 SHA256 7f4477250f586dfd6101dcef82d59cbada07b9b22ae0f8815de5488de253b8bc SHA512 6434e30a359f02afcade7384dfe2511ae3ca829abb7553be74bfd6cbe9be27e98be73eec7cdf5af70a082110dcae9585cf4d94b58f924b00d6e33dbe37c9df4e WHIRLPOOL 4e0da671a4ec37a938cdfdac58595ae7fd17f532649bef5bc8418d07bdd22b0f85ff774d1b5c1fb2a8ef92419692f5da05c47b43c87cea4d6c91d7e210bf8294
+MISC ChangeLog 2883 SHA256 7f1bb353c2993d2de6025c3b17905964e3a4ac29ed07e89241285a0f750c4f6c SHA512 1d704b1fb355f531b6769807f5b1d3e6f9fd8993cdcfc63a5dadcb7e9e0c5dfc5e6a8b97bf6b82d857816bae73ca5e24f66214389d3d26c1aa2b98a95743a9e4 WHIRLPOOL b551eef3b4538fa0659938c3a2d74d7ad909d3a3c71558b568b975b24a3fda3d2114c6fe0dfab6ff9bbde3296c4af1dc6c5d321da869fda1381ba6f4eb38f258
+MISC ChangeLog-2015 17223 SHA256 cf56ce5050e717e29debe7c9f38f5fa00f71ea7c7396da46ef49a20ea9317d26 SHA512 ede12caf4ce9c72a7f60d509a7c036914e488e0a07d68998e7ded8334c513f1f91b80edc5edefe26d871303f2c2966c8c792b877598955dcb3381868f9db7ebf WHIRLPOOL 4801f0d4e288cfdcb37d0c8f8e4cdda14446a5985794b8047fab291d01d124f7c722d46fb15e2ae7c1a8504c1bf2b752d78dc32e08d8a8b72ce3518a3ee50cc4
+MISC metadata.xml 327 SHA256 b2a4ac0d010b5296dea0a69d6032d2564aa726419a3b0cafbaae9f4f8a326e32 SHA512 ee6a6009392a739eb25095468f78d7c76a09d49141faf8444e2c6e9969f05e4b1748a4f518127c8b14298746515c0606a6949d4629d75b5343ba56f72dc2eb9a WHIRLPOOL 2d05465db9120c40c8cd751538971d1dfdedbbdb1a1e5568d927e0a885699c6439f4d05b4179a0ffb9c9eb4e66855398ad217448a849b4eb537459657107c04e
diff --git a/net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild b/net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild
new file mode 100644
index 000000000000..24e2e57ed3c6
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=1.2.0
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	base_src_prepare
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}
diff --git a/net-misc/dahdi/dahdi-2.10.0.1.ebuild b/net-misc/dahdi/dahdi-2.10.0.1.ebuild
new file mode 100644
index 000000000000..c139e5feaf66
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.10.0.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=1.1.9
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	base_src_prepare
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}
diff --git a/net-misc/dahdi/dahdi-2.10.1.ebuild b/net-misc/dahdi/dahdi-2.10.1.ebuild
new file mode 100644
index 000000000000..c139e5feaf66
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.10.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=1.1.9
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0019.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	base_src_prepare
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}
diff --git a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
new file mode 100644
index 000000000000..4278be9bd69e
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=1.2.3
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	base_src_prepare
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}
diff --git a/net-misc/dahdi/dahdi-2.11.1.ebuild b/net-misc/dahdi/dahdi-2.11.1.ebuild
new file mode 100644
index 000000000000..a5e7bbf38923
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.11.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=1.2.3
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	base_src_prepare
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}
diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
new file mode 100644
index 000000000000..f804fe3a2199
--- /dev/null
+++ b/net-misc/dahdi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <use>
+    <flag name="flash">Support (short) flash on FXS</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/datapipe/Manifest b/net-misc/datapipe/Manifest
new file mode 100644
index 000000000000..7e0eb3388c85
--- /dev/null
+++ b/net-misc/datapipe/Manifest
@@ -0,0 +1,5 @@
+DIST datapipe-1.0.tar.gz 3129 SHA256 8bb5e5669228ce546914ce419c0d24a795ed56924639f2a7dd9d09b0f142fc19 SHA512 d5bcd774f41fe465cf104bcb4128fa980967823ff0adc55fa7e145ba736c058a6b25ff519d18963d54ecdc2431510b6e290b44a2c1c202182efceb93e3532df7 WHIRLPOOL b35ede0b5d994587d6e23fa4bc94cb4c4f120f258386dc38a6d193e5fc43ac662ba82c959e8dea95de284f0f3b2cfd9b7f4b94ce96d93521b45148fa54bca063
+EBUILD datapipe-1.0-r1.ebuild 596 SHA256 ace8bbed9abb948b3a75889e8020538774065158abcafaaf71975a2b984b2f7a SHA512 75e5a0467e29f9fdfb51e769dd18ef0653027b08d776ff5dd838815cc2684cbfdda9fe10337deb8a999b800e8cfce4444eb0b39c293b259cb088e7330f2c624e WHIRLPOOL 2f94bd2702b3b6f6acb0388417be57900b3bac4ba05a62e8404e8f3de0901a7f81b3c2df8bb2cb9b71fad3b8db9f0f7646358ec486f2b5b24d0025bc53fcc1cf
+MISC ChangeLog 2527 SHA256 882bdb94ae6a3623ed7e2642f92f84774f1c79b4879dddf15d8b3b0288cd2ffe SHA512 96cce77452eced4e789735cd9183f0a39fe35c8c9d26d72f4abb35c966d104dea63e8f7f444c694de3a0e489eebcec65a0179a482b3a36cbb592d9fd2cfe43d5 WHIRLPOOL 0125c52cec77b9c82c2c98c8b447058aa3d84e5c0e20e6953d69603750ef70f420b3b0bee0306fad354d950d69d8143c952dafa92e41eeee05ef2c3af63714b2
+MISC ChangeLog-2015 1355 SHA256 8f89a6148f9b8a0181fc1fb8634bcf3269a15db084a7ba83f5743ed99be18d81 SHA512 c939313743ef1260eb89b0fb0eed5a25ccee02b9e5d4f3a58520f1d93d4c4ca4fe9f37dbcc1ea541d7b216ebd25a9d30c28d45b85b7141b45be26eabfc1432db WHIRLPOOL c46bb1c4ac4c45a36e33dcbb29deefd29e8209758e9a9283bdb1402cefb3b19610a5abe69d508b5bfad4892ad50f3563a88a857edce338315437675a96315c3e
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/datapipe/datapipe-1.0-r1.ebuild b/net-misc/datapipe/datapipe-1.0-r1.ebuild
new file mode 100644
index 000000000000..d9b75f5f575c
--- /dev/null
+++ b/net-misc/datapipe/datapipe-1.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+IUSE=""
+DESCRIPTION="bind a local port and connect it to a remote socket"
+HOMEPAGE="http://http.distributed.net/pub/dcti/unsupported/"
+SRC_URI="ftp://ftp.distributed.net/pub/dcti/unsupported/${P}.tar.gz http://http.distributed.net/pub/dcti/unsupported/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~arm ~amd64"
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o datapipe datapipe.c
+}
+
+src_install() {
+	dobin datapipe
+	dodoc datapipe.txt
+}
diff --git a/net-misc/datapipe/metadata.xml b/net-misc/datapipe/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/datapipe/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/dcetest/Manifest b/net-misc/dcetest/Manifest
new file mode 100644
index 000000000000..c0e1412844e2
--- /dev/null
+++ b/net-misc/dcetest/Manifest
@@ -0,0 +1,5 @@
+DIST dcetest.tar 133120 SHA256 4333d421c941d6b48df6307e2796b222ddd745db69e345f2a299af1babe04408 SHA512 ac14f753fbd88be14a4d060f24773200967228154be0d3eb19becb38fd90093e0feca0d9a43873ffad59f5ea2489d35de5e4958f72c2064f98506954b698afdf WHIRLPOOL a504e32175123ec0ab36fb83a2a57a479e730c8d5d3828766817a0c941bd0ec526350034b5f01d7209c721bdac2d08a37140c6159d6e92f431da53a45d44349f
+EBUILD dcetest-2.0.ebuild 742 SHA256 1cc6a6759e63cd971553efdeff57fc8c030b26577686c2feb2d0ed8815e070f6 SHA512 f2dcd5e3d1902c18bb8fb14ac2793204657d94bec404bd6b26fd683f1fcbc01dc2babb6c6aad0f4dfe1e097f0f891c0518d8957077f854145664e6fe05612ecc WHIRLPOOL ac03bf14a81a57a9a789c2d334a7f1f796021e6d2630ae33e1e4c53dd7ea13d6937d930727650743b89650d8764523763f5946f8387b3fb12647a699e3747f36
+MISC ChangeLog 2172 SHA256 d6a48c384e33857988eb1e7bdd6ddda4f65ea4fe6d5f78b019d40127c98443dd SHA512 513dd1cd5074d15f708c30693eb54f152b5f3654d4f1a9e088dfcdfd2f64263659f0a9ba75afacfb145ceebbdd233d5d80b834182348a0c77ca8dbb19bcdce8a WHIRLPOOL 8d11f18c666b4f6172cf45a00fdc21144e71d6522f74653c7d813b33475bf88d587b648f35cd75561e59c64cdfdda8a89f297b0b148530d952bd424cb02f54bb
+MISC ChangeLog-2015 982 SHA256 138bb34caab1f3f80c1572b83db0cb02678ef27eaca2d4ca5e1a97ff51dfe080 SHA512 6e7bae5ac7f5481b1190159494685e914d43c079cdc2d7931df4d988199c96ab48fd83e2113ddda461d83d75207a6a47af3f19a185ba2f684bc688a2f0389aec WHIRLPOOL d0d11a1f1fbb422eb6428776143f3009a9b6cd5565fc1f42e3dcc8521901eacf4b071ebaa33b2ab57925bb488d6516dbff3f72bae11a7de90ad6d98440ffa742
+MISC metadata.xml 1150 SHA256 46c993217988a87c172d20d1333922c5e9b349ca541c6f74b0f7b76609676499 SHA512 b145c72107ab8df8b6f04c72ab71a3604a9f8447080b82266e79173f8a7dba8df65e9c2cc8731667663a31dddc60b62f6c7cd1e0c4e772791bfddbd9f5bb11e2 WHIRLPOOL d37e9f81c693845b26247eac61bbda88f96073a1a1c06e6de546a76decc90cd8251eebca33ed98b7b34619587f94a4d5a1cd129d6018115fa93320b9312b94e7
diff --git a/net-misc/dcetest/dcetest-2.0.ebuild b/net-misc/dcetest/dcetest-2.0.ebuild
new file mode 100644
index 000000000000..64d606b19783
--- /dev/null
+++ b/net-misc/dcetest/dcetest-2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="dcetest is a clone of the Windows rpcinfo"
+HOMEPAGE="http://www.atstake.com/research/tools/info_gathering/"
+SRC_URI="http://www.atstake.com/research/tools/info_gathering/dcetest.tar"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE=""
+DEPEND="sys-apps/sed"
+RDEPEND=""
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# cleanup the makefile a little
+	sed -e '/^CC/d' -i Makefile
+	sed -e 's/CFLAGS.*/CFLAGS += -Wall -funsigned-char -fPIC/g' -i Makefile
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dobin dcetest || die
+	dodoc CHANGELOG README VERSION nt4sp6adefault.txt out out.txt out2.txt w2ksp0.txt
+}
diff --git a/net-misc/dcetest/metadata.xml b/net-misc/dcetest/metadata.xml
new file mode 100644
index 000000000000..8d1c5a827b9d
--- /dev/null
+++ b/net-misc/dcetest/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<longdescription>This little utility dumps MSRPC endpoint information from
+    Windows systems. Similar to the rpcdump program from Microsoft, but does
+    not need a DCE stack and so runs on Unixes. dcetest can be very useful once
+    inside a DMZ to fingerprint Windows machines on the network. dcetest
+    operates over TCP port 135. (Think of it as rpcinfo -p against
+    Windows.)
+</longdescription>
+<longdescription lang="ja">
+これは Windows システムからの MSRPC エンドポイント情報をダンプする小さな
+ユーティリティです。Microsoft 社の rpcdump プログラムに似ていますが、DCE
+スタックを必要とせず、何より Unix 系で動きます。Dcetest は DMZ 内の 
+Windows マシンの指紋を一度に取るのに便利です。Dcetest はポート番号135で
+作動します。(Windows マシンへ向けて rpcinfo -p を実行したと考えます)
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/dhcdrop/Manifest b/net-misc/dhcdrop/Manifest
new file mode 100644
index 000000000000..be4fd3a1d6dc
--- /dev/null
+++ b/net-misc/dhcdrop/Manifest
@@ -0,0 +1,5 @@
+DIST dhcdrop-0.5.tar.bz2 279218 SHA256 719f83b40a41075b9ef64269ecf03dbfc5d1ba014c0248486e668b087047ae97 SHA512 11ac0ca6dcb65f696936e47e43cfbdd59083b607b26b5d12274cc04577be257dda94e9c27eb0c4aebb40f5f572693478cceb04cc4b5b06bf8882c3001fc46142 WHIRLPOOL e08587e3beba8baf0a9c6383a8e722805dd0d8169640e66f739572d9470db8b8c15aa3bc01dd660a55bef0d8abed72c6be6c41dad2d8ff30d7e20aa974989558
+EBUILD dhcdrop-0.5.ebuild 639 SHA256 a790dd9ad0cbf7c7227a1c6eae07410cc5ea3993e7884216830efdac2e61e310 SHA512 2aa7f96f2c53b11a276726e2d1e6398c43493f8e39724ec4195378f788117b8fd2b528845949066a2c878b81f960bdbbbf9a36b6ae23601a88303f0f503791fd WHIRLPOOL 00247147cfdfb418a00c4c02d1474a0a1f9e271ab5d4747b4a0ba40c49f96155afec2aabb6df19d462c8dab66d059c19a2de65b3923d4f4382a236f9a9bf08d6
+MISC ChangeLog 2423 SHA256 925e7629502a91e1bc2bee21ee2b428782cf90e094570445938c9dd6368a71d0 SHA512 447b2f15a715708f0ab65bf36b3ccf4754f09ed2e3503c1e40967b3c9c1610cfbf54710ac28163ec99addee8b2f0bf8201f64f8352fbd6af91d3673f3a90e4e7 WHIRLPOOL 197c7ab7c6ba0a2d4cc068758286908701af95ba3718d5b8daf669c2cb4e2b9549eee9d7a293a3dc7a1e3ee30f12fbfd0cf6248cebc4b97a956686aaebb358a2
+MISC ChangeLog-2015 467 SHA256 a6f64996617eb257367dd548ef6b391a11b9038876073134dfd45f4c32cae18e SHA512 05ba8df32c407eef80e33010eded7c38aa428eb6a7e8bb25c0fcb9b01d61f204f27b4fb36be85a4c1fb7a4fda810220718488ac84487610d5845780a75880ade WHIRLPOOL 3907bcf89b699def057547045007b75ad25622ceec1f9488ff3a36fb72ffd0515baa06459f2bb9ba99941903c7bb53ac2693858602fb051ddf1584760f2c2c2e
+MISC metadata.xml 1118 SHA256 b8ba0a7ddf3e97648b784876db8ebfaadffbd0e4d20e811d7299930b7613b5d3 SHA512 5b75dd67e39e70e9ed6495d979d18cea0f279abaca919da0dfa1daf8bcaff2c304d1f1ab2c47d1f0988aae5fec705b1154e78282e4627d4e2f080fa1629f0402 WHIRLPOOL 24dc572e395dcef05977961a223f0be5275c55aa77437a8d1a1639a743d0d8e626fafda83a2bb8e6d84763de772be59d334b83c66a023b491aa995d8eebd1862
diff --git a/net-misc/dhcdrop/dhcdrop-0.5.ebuild b/net-misc/dhcdrop/dhcdrop-0.5.ebuild
new file mode 100644
index 000000000000..db32686b5063
--- /dev/null
+++ b/net-misc/dhcdrop/dhcdrop-0.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Effectively suppresses illegal DHCP servers on the LAN"
+HOMEPAGE="http://www.netpatch.ru/dhcdrop.html"
+SRC_URI="http://www.netpatch.ru/projects/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+
+IUSE="static"
+
+RDEPEND="!static? ( net-libs/libpcap )"
+DEPEND="static? ( net-libs/libpcap[static-libs] )
+	${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README )
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	econf $(use static && echo "--enable-static-build")
+}
diff --git a/net-misc/dhcdrop/metadata.xml b/net-misc/dhcdrop/metadata.xml
new file mode 100644
index 000000000000..201ea4947cad
--- /dev/null
+++ b/net-misc/dhcdrop/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Uility for tracing and neutralizing(blocking) fake DHCP
+		servers in Ethernet. Supports various modes. Theres possibility
+		to set outgoing MAC addresses and optional settings in generated
+		DHCP requests. Supports legal DHCP servers list. One can run it
+		in interactive mode under users control or fully automatic mode for
+		start up from script.
+	</longdescription>
+	<upstream>
+		<doc>http://www.netpatch.ru/en/dhcdrop.html</doc>
+		<bugs-to>mailto:roma@ultranet.ru</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
new file mode 100644
index 000000000000..8f10b0f66678
--- /dev/null
+++ b/net-misc/dhcp/Manifest
@@ -0,0 +1,42 @@
+AUX dhcp-3.0-fix-perms.patch 417 SHA256 eb16050fcd672a4e37122e65b41d4fe57498c117a219d5c9dd671cc9b5405daa SHA512 7b5b607f62dae3075c9126ce0055b649a9c1fc5c0d591f40208d0c951c2a921ced63c7a4c7b78e82e463c57cffc90734b23ef51b69fe70ecb8ad366ddca97cc7 WHIRLPOOL bf8fed0bcbf43becc20e0256abee087fdba1a2903d225969cd4c83ecb8ec5e537dce0fae4a1bf9cbc66c130c0961b9d2c24ada890a00593a917b6c163bd4632c
+AUX dhcp-3.0.3-dhclient-no-down.patch 2336 SHA256 c1cdbe23cd29674668769cef8107d7a580c8d733a74b2b15dd96f21c5810c7cd SHA512 3e08934aba6397503b7440465d123694506236856e607cb2dca42cc0122f96c87664bb28f608a908fe4edfdb49f7434720749ae253c7f6b9d78abb318cc318b2 WHIRLPOOL 0d0a330f1adc184b756ef481015a016c4ec2c9fbc3b5d8571688e1f1f6947b930b6fea644e8dab9e88ad8b6427120042bd1c2feece185df769c02b64d102df30
+AUX dhcp-4.2.2-bind-build-flags.patch 476 SHA256 a16d9da5fc29c95c46cf7e2401744292b898f692d49dea4753991505e03c1ca8 SHA512 f552f2b8b1e13e22636f8e4548557801273b0ab38f076a141adb72584ad55b4da156401d94abd12e9364b8632a6e75ecbf3cd90af3b6dbad88627ad3f9658059 WHIRLPOOL 3202f614747eaa9b533e36495bfa862eb96b3e884cb4939a8406fdbded56061aabea20e9249d647e6aa8ed5ed5547d5c8f14c46af193c248239a2734dc79411a
+AUX dhcp-4.2.2-bind-parallel-build.patch 304 SHA256 cff322da581742ef1a8019641ee9689c588c3f9fef883b55e28af52823f08838 SHA512 3dee3b0ae5bd512bd7be6d5be7b8cfca8077065f6a3463089bf9ff5fcb556b3333fb8d3aeadf25ea7125fb6eff2ef6967b2878c9312046fa378c8acf0c9cf9d2 WHIRLPOOL 4dbc45c32b7da7cb6f591356290f598308083af3df309cd8e6908b586cbec3dfa6d7d582a3f3675112ff46a15db9c0e1abe727b8b8b4c2168c21a97905f9fb13
+AUX dhcp-4.2.2-dhclient-stdin-conf.patch 3017 SHA256 701da4d022490bf9e1cfd946c752a00a2d2ab9a1fd5030281c1608f367cc68fe SHA512 1adfa938e5531040008981dd4dcba37219bce0794524d3c3530eff527528ef7b22aa6fd540f9ac175339372e98347c0a91b86b4bb5f2aa93f04217b9902c3388 WHIRLPOOL c42b3880b5cf710613021c192fc5bc1290bd04db9d79b991bac9e361f58fd84514044a19a5eff82695845e017c996cd46b29b697bfe718e51fba413caf925096
+AUX dhcp-4.2.2-nogateway.patch 1671 SHA256 3fed5823812c134e1819c8ac10c5fc718df86f4013ffc7505efbbe692319480e SHA512 fefbb402020dfdc3eff75da50bfaed0f30c5b90facd4b4ca25ac38d62f14bb85b18028261b32ac3f4654afc8e6915fcdd6f5e580444f2efe882f6f75ea10be0c WHIRLPOOL 91d38301aaecc4a2199ffd0be19d5c2b36531446524aeb65e743adb82220d20b18f53f3e740b5286bdf578f8fd35b2511f52747406b914d1c4d2841d1677e1bd
+AUX dhcp-4.2.4-always-accept-4.patch 907 SHA256 2a876b92ff385e97955279eab8d7658b9a323cdf16c4a162ba649166cae10194 SHA512 682583d3a68b9609b16ba5029fb14a068c5e4ba1134b91e3c5c91f8cfa0d97d68e7b0fec2aa3d4e224bef9e97765971ca423e54f853a74ff6a2e24715ce17a2c WHIRLPOOL 27516c02bcece28eac935f2a6fbfbf64e3b31b75206151ec618daa906b21a40b62497cefe2e793c1ae74b0b4ee5decde363c9908a632bb38513e14cbb64347e5
+AUX dhcp-4.2.4-quieter-ping.patch 2771 SHA256 8acf6266190a76f13c942da5c0a52c38421259f3fd63426134ad245e65081db0 SHA512 1a17a7ca52aa2a56e483e5f70e9878d7472f8eb3982b4f04c6cb3c32f839fa3972f79f632f99f47196a7e7b9fd8826392b94daaa074691d26636b793fcd40e73 WHIRLPOOL aa0b2bc3f3c539eaa6de27f9ce98525c5342af9a257cf36b8889b40455b3264f7b824a615146539ab012bcf4e5a55a7f1992cfc6222ce77976709c1a88dc907b
+AUX dhcp-4.2.5-bindtodevice-inet6.patch 826 SHA256 482dea1517e3d7a22c0469908c41c0595455b654968e24a31e2053af8b11aa30 SHA512 74d9d30b4803d10a63843d474dda92f019e4b7b9d7a9f4e32a49a1c261c1bb7238cd13f9b91c2bf8cf7f3ce5a5c665ef1d32998b06ca1439b30785d33827fe67 WHIRLPOOL 78b09180b95a4629c383d4347dd6ae55c83987f3c8946eb71a7643a442d59bfb63b3decbdc3fa3bc4e608c6d8ab59c3904eb027e97dcdbba169ca51ff0ced6c2
+AUX dhcp-4.2.5-iproute2-path.patch 340 SHA256 a6c25d408ca1bac5180151ff2955807017c386c06fc162395dcd71040900f59b SHA512 4a5c4f3b1af93fa137d94fd860689919b83de5885198e48eb89678379a59a7c9d90f8a3f558ddf9d442130abb127a460928a85c0646c4ad0984827ccd9e08852 WHIRLPOOL d54ba0f4c3da34375ab0f1fa98368ad4ec4f6ff79a131638a3d6540a4c2fa62e83cb45f946518b114793ad8e868b6cef9ec9338a4930080623439e7692386d77
+AUX dhcp-4.3.1-dhclient-resolvconf.patch 14574 SHA256 9f1d8d987e62679d246c70dbc5149090ce1c382b7256c003f2852dd6617a335b SHA512 0cad400e5517ad9b66fc9aa09b2455809205eeb686dce6c7cc4efb8ea655d8de436f47b91ccf8fbd2c4286ecbb2b9d761b7e60e72ab7456794f3028739d80efe WHIRLPOOL 3a021da8fd0069e668ea79d13e496f40976202dcdfa95e78ef3182a6aafa787cd1cafaaa99c1a8e3655f8d15e989d771173c8add54f93b4b332426cd5863e63f
+AUX dhcp-4.3.3-ldap-ipv6-client-id.patch 2095 SHA256 8f075b1744ae66a27823d318dee04311aef193db026225edb897c84cb71077ed SHA512 c8e48bc405d75281790c44c48d89c27b9ec7dd7273c41cacdc0e5e3b08648ae0eda1bd9b308a19667f11703b4bb25fc94911036bcca11f1197f87ec265b0c35a WHIRLPOOL 5066ae69710003aefcfad223b6363b0b1957bcc67c48116053c3dd9c9b4b85b7fc23630578236aa47c3fe8c842c59fd97454699eb1033511272b81f1c12cacad
+AUX dhcp-4.3.4-bind-disable.patch 1300 SHA256 31930e11715d665a9737eb3e3e3386b7af999e2b4c7b62240c8e929eb57aab61 SHA512 0684b6150a14d3ed5bbf1282cd22c4a03a761dc5197e5ada713c32fc821014279ddd8bd64e9ba46fef1b333f5a3b52e20b9a349311be49402b0942681f934f1e WHIRLPOOL a65827f869866edbfc309e0fa24264455ec0171284b4d785a7f745087b43f670dba8d762b26e6d125e76b53759b2162dd70a4bcd0196c3454b79dc6907f45a31
+AUX dhcp-4.3.4-dhclient-ntp.patch 6883 SHA256 e4abe9a120d18b490d482c2df5e5a0f4a62ce4b8e4669a4d9896e601ffd6d169 SHA512 48d45b6550667f0b6dbba1c1e0bb57c509ace03f056fe3857096aac854bce121f52b499e5f4f1cce29a5104ed737e0ed8836b008da465d58d246799d9780fa74 WHIRLPOOL 28590808e0f436d45175c9849e92d944240f82229263556ec920f85844f5917a428a20852211412d21c8b8820ea43a205213a7efede39a4e6ad340347a1d62cb
+AUX dhcp-4.3.6-dhclient-ntp.patch 6810 SHA256 1a0cf7025ab5fdb75f79137963842f736d1e7a020750c7d8f75501f0486afaf5 SHA512 13e4215c4fe02ea8d17a1559b2653de1bb72675eb72ae7b17707c2cf138fd620406f1d57eea3812f491df475f942e2f44b9b784d5ad5a2f352d455bef3df771e WHIRLPOOL 3bd720923a04437a8bcac29570fdf193efa647c57fc0cbabd4ecf512eb3ce7dcd840a44805e667d7fbed3310e0a0c337ea38bc70cc74616489fff298871596a5
+AUX dhcp-4.3.6-dhclient-resolvconf.patch 15340 SHA256 41d64994fcb2ccd8a2bb7a4a1970fff26612818e77286babb5a9a66b120bb36a SHA512 264a2e073a80109c9dced6a3f7834f958990a15e578dd1435128e7ef9335b0b9751020166fbb0e1b01193c19eb28322648226fc5a1b07dc0b9452b702903cc8d WHIRLPOOL 2f65303ef291c2be8e602259599498effda034ea63b5f77775bad978151bbf08658fb33f4c1ced6459e44f4d037d26a318ec8d4226995d7b587fe3191db2de49
+AUX dhcp-4.3.6-iproute2-path.patch 451 SHA256 168f0a66b6c6a7a61e352ef522b2331700f5ef82d481b06003388b2577960ec7 SHA512 91f20102e41cef81253617c80ba4d8193f35f51419606ab62e01f07153f1f616c70e0c43838c3d83913402f8d02ff333e4e36e08efd50aa8f8fe83939f91ae3e WHIRLPOOL b18790dccfe68e84786430d1476e7d5ba6e85185ace55786f686109d0906e0f77504a0cd208236c76f26199408c670cfd2d4a2d0c3b4c9161166705f3a615660
+AUX dhcp-4.3.6-lmdb-removal.patch 569 SHA256 e40b183fb23e9b72c75c5697a3945fa7a31cc33ba863ea19dc0d0e81b49e6e71 SHA512 802be48012a627fb83114fee9cd0d2ec7f161955f19aa9ec0d51279208c4e8dd99f2a24d5132631cc5f45c17732971f7abd3f6d292b6c4e865645a3469a5c08a WHIRLPOOL c0ae6ff367f20ffe5438d37b1f71cb707c92739827e90d655d2dcb9d2e00a0b4d33ef4ececd9aa1f0a03385f665e2c18104d278e32186cd800968e086fb1b8fc
+AUX dhcp-4.3.6-nogateway.patch 1904 SHA256 5c07496cbfaf767747416108a5ee55d278f64034009f9a3591bff1f048e68304 SHA512 571320f652ba5b24813ce9707f333f1d44d09c046c6371c86d011bd9d1c3c1288918851df336a881a62c6c095b6ac3bd9699f022e6f30dbb2542157b10ec20f7 WHIRLPOOL 5eddedeaaefee7a84271174c3e258016133822c383cdce439a2ff578bd9fa29c9075e29d5983a128bdeecdafc2a71be8365b2ca3560f4d61b487ebf6ecde4a6d
+AUX dhcp-4.3.6-quieter-ping.patch 2622 SHA256 74406d7ce442d50652ef91ed1494ed18c4896699bbc855222193f5854f52a9e5 SHA512 4338ca0fd733676ed6ecc790cd5305b9eca468a9be206f0a1d195d024974aabdb7def81d2181261d3b6033fd4e9b5461c07adfb3b16d1df1dc2e5f819c90ba47 WHIRLPOOL 292ee1783ae3da66d5b255d1cca0b44d5291eb10a3fbf1946ac9a7b777fbc2205e37ea9953611b2a84347856c02cf72addd2526caed7332d6f204d2ef0b8351d
+AUX dhcpd.conf2 1068 SHA256 e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d WHIRLPOOL eef0331ee019b561de2f3e46860d2c470f6de05be9104f46316d61b09bad9687d916af94eb4b399612bfd05340cda5f68f87886200801de485bd3665cc0886b9
+AUX dhcpd.init5 2882 SHA256 974fcd6c3c7d49cf350a53df56c0f73fc64fa14d1516d50dee1316e577ab6450 SHA512 0cf238f3e79ee5d1ba059331664fd092d025ecb8fdb3f1d428713d7cd81ad4efe10ad7ad4ef48146aa6c9763293c1641057a257480e58a639fc6cc20e623f4c1 WHIRLPOOL 275f885c0bc5d49a60cc80c3814feb7d5789e23a3a27c89cbb5909e5c20fe1e057f7a0df714c21c63c3d69e8f235226a559e9da71fcae1e4af4543e4034b1cca
+AUX dhcpd.tmpfiles 75 SHA256 bb344a11fadedaec33ba3c504cc04adba34b15aeb07a640dab6da255de97728a SHA512 0c34ab0ef8618e6792ba8bda797877ce2e6c4fa433b4944dbc03cc4fc69efe26ce4b5e4dec661fbb2b7ae4173d908de02f4e86f8539364789a23f36cfd8edacb WHIRLPOOL fd4450a697cfbdca4db49eb433c7f67e7a9051541f4ab6e2633659435a504b051aad6338257ece4e5fc950c46f9fa7d5c5820f750440325fc62cae79dff2cfb0
+AUX dhcpd4.service 264 SHA256 174e1a7dab5b23bbbd73a9fe16d3907923c21d2802c51dc1096c9e24bfa9fda3 SHA512 e340311fb890c5fc2f5836cc8d10ea3e4bb34bb5e96e7231798e7d960f05886478bf28305828fbd851080baadafe7d3fd2c7f30a81dcbc68d6368e8b4bd0de71 WHIRLPOOL 121ed7c50b179a7d09f53c758e5d44cd9e91451ca7b577d9b058d8097473df421715018986c314d633a599541d422cbda276831ba8c192c2a8762608fc5f2a3b
+AUX dhcpd6.service 270 SHA256 82efa0887779b8c0f5c33ab77274ff9617f8cca0f59816e0e9425e368f1a1824 SHA512 2898f0dfa56ecb590c25a1f0e44446a83d1d9118e691c9a7680250a9e47f4dec2b36195dbda8259292d93a31bf0e1230b9f39ad93f2b0a9280e8cc4d77b50bae WHIRLPOOL 3040add013f776f1c91624c916456f68307321bd2e2cf69616ac2343743d65dfb9e940bffff089c0c45912d7498c666fcff77b4250ef3c533e1028270d9a4c55
+AUX dhcrelay.conf 547 SHA256 a157630c3bdc9565cca8240ee1e6539fc9cbc1e4642c40e0965e3609d1021bac SHA512 af94d679c5b7652a770d4acb96f5f12fd9dc99f4e8e26b10fab67514693f63392bc8033a6e5e6c1967d7004decc72b810462e1fe92c1d4808606e48086dea00b WHIRLPOOL 344ce23b6b6c8e5d87306dd6052036656d202149a7b65245e7eb010236abf43b60b0c4b999df4080c5d9a8fd9315f068cac4184680a023f1b5f5461937d45763
+AUX dhcrelay.init3 701 SHA256 87082ebc37a969d2b7e658f155f96990c57ecb60c5fc23edee25afa9d247bd68 SHA512 ab4c38c53bf21dccee252358f0ecece81829048a546f380cb1e3552804e412c38dac09805fb7f9520531d48d3d79b3dd228ffdba7203b89ac30a778a579ddbda WHIRLPOOL 09357e2ef5f540bcf1c86f81b7516b96b376e47aa1d0061c9adaba7448cd169eff0c64b54d52287c93e711401efa2692d4058a3b434e4af83b44710cfdf41880
+AUX dhcrelay4.service 202 SHA256 9c10299c70c9c63ebe8e1a58c73dfb78f08732f0da1bb3265f1ad6e80f7d79ec SHA512 fcc41f7bc055a3f32f288536d93447c1d0b9f112196a3864e12668a9c844d60f99f01f991846196ec53034d65da076276fa633069308b8f674e9a2af20e107e4 WHIRLPOOL 88a8260d057965965173c7f5efdeb26730c3bc4c6bd09bb675db122972a0c545ace05e44df538ab8e05b7c0ff3fbbdd42f148541f8a50eafff29423c52e8455b
+AUX dhcrelay4.service.conf 105 SHA256 c47b40a940fef418941168d72345576a336d1caf42504256400fbcc421ee9e8a SHA512 e4dcde2fe30e26b0f24102c63a6204cf9e98924246609a957b4881c1cedc6a30500511b1c107f8cc1e5f6d5afbd28468bd47f12d38000d25605a982e15027f8f WHIRLPOOL fc8c7dc20a3b2b2355c1561c1627265340b6bbe356cb96291ad8b2e306c34d308e3371ecd58336003b932e583a68ba25541eb2d687177b5101e8da6927769f17
+AUX dhcrelay6.conf 325 SHA256 099f668e1ad42ed9446b15675032a1186715d1fe9e4a1b24dfb787e68495d2b6 SHA512 40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9 WHIRLPOOL 7fcb1b63d12b066c6fc2668497d18ae33b739cca4dbcbc95530d762c7152c410a0af76e65ebb21f3c9c4a837b999799da4a766315e5eb667ccde64100b66b6fd
+AUX dhcrelay6.service 237 SHA256 5406caf5355a71396895a3ef49c3a0af29aa9b982cb10541590fd55dbc1c878a SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d WHIRLPOOL 4dc79fd4fbdea4ea585f6df777e24591876fe8fef21defcaeac676e384137f43695d69fc8ddb5f91d233f47481349e2951fd3c9411aafb00d2fcf161025192ac
+AUX dhcrelay6.service.conf 220 SHA256 c8ef2c5d930ad0addd1a4a10576db271f50cc3e81ac8f87b8b56fb759ab65bdd SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9 WHIRLPOOL 70bba913342e6a1b492eda9799146e48c612175f227b1337874b904bcf22251389d10a4b79c90519b248cdd594288f8d31396e2e8475bb8e28d019c9e9382a88
+DIST dhcp-4.3.4.tar.gz 9302513 SHA256 f5115aee3dd3e6925de4ba47b80ab732ba48b481c8364b6ebade2d43698d607e SHA512 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706 WHIRLPOOL ea283592268c8efabd7fec430bd21c45306822b9275c91ee1e604d09e92f9eb3c50941ea11ecd9dcb230caec3b8e6ee94958e8eb6375e0ca0e7a64a8aaf63bce
+DIST dhcp-4.3.5.tar.gz 10075147 SHA256 eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954 SHA512 aba0e1d361eb9e7ed33fc48c0b0b9288057af9ec51775e40e27feb9ababc182506706fcf39079236ce36b0f7ded391e107474dc29de2e60ed45d37753505e1f0 WHIRLPOOL 85012016d81efb7654ec417e7a0f1a6145e8e143b13d6d9470d0fb7caf37c035441d5b2b8849d332f8ad0a9a6509bb0b931ac8f207f7ba9104e96811c0360124
+DIST dhcp-4.3.6.tar.gz 10182593 SHA256 a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b SHA512 de4962dc2aa174df17a3a1456719a777a42d238c3d6ad1771ccc460fa70c9e9cefcce52c7437f7acde61b9c3a2e84e9d49fd2dc33c7e9243053ceed5b247be03 WHIRLPOOL 1617687cd2144a09e2fe32b6e9bf49fcdb32f96c2979051f4c0826860eb59572c64c821d8de119f40e5546bc6132773a01702ba76c11be28a28c2926d9ed5c98
+EBUILD dhcp-4.3.4.ebuild 7926 SHA256 ea2a3dd582f2b81f7bf310620f830eb27cd44b7b54ed058f1c5b791617a07d7f SHA512 e31df7b37c57c8f9557f965b5ad9763252ead3b1911a56938c6a007fea84726e09eae935ea13a682e09cd0c06af11fa8b5f07f568829f4dc8aa7ed2279488967 WHIRLPOOL 9b0ef5b2ef945a7a5b888a900ea3828224c4c6aa8181f8c99002db8b661e261b015fae71bf12d5b067730c03f93d9cd2be972d490ab29aa5b69bb59f8b9935b2
+EBUILD dhcp-4.3.5.ebuild 7897 SHA256 623f8b8867335dcf63b0823a5663085ae228ecd551f2f6a28f4c791e04fdf0bb SHA512 b9ff72caaaf65cf208c42fa0ab21974a90d72bd16a598d274c3b6f681e3b0f916de1dd2a8efa6543d955aa64f831591856257932d7e754313d2217a2be79705f WHIRLPOOL 78272e51cf2906f43fba6ff19e36fc26a4e600312d32b37dff2f207c1adaf8d21423547c15e26d674d9cd4c5c86fdfcc8936ebe709b13499b0ee922a02685b5b
+EBUILD dhcp-4.3.6-r1.ebuild 7835 SHA256 28b710b208cdcca9a1a1303a51db6dbb86d54ca8a2983320c44bc3e3a1859729 SHA512 43dfbe8d6cad25a4a579a107d99495ee0fe053c0f8b6209a1332599d9f88cb44efa66a8dac9c050796af510525109fc2baff0dd8431f7eb30f84356fba2337e0 WHIRLPOOL 387b35fa10da044afa238df0b9440c9455ca3de503781434644235ee58369bca566a235347f495273aa9ceddffc646a0ead1b78d3a34da0715354c74bd3be267
+EBUILD dhcp-4.3.6.ebuild 7781 SHA256 de01f9ffbed3483790f3e13578c3b970e698b4b5453ac27d2d04f90f2ded44dc SHA512 a1c76b0b661232b5f9da69aaf399a82581f0c782f85d3c54270b7b9f21aed44a248ce79e6cf516b4755a758dfc418f5b4bc1fc1dc8f68bdaebb1d01e54ea09b0 WHIRLPOOL 2df302edd1a11010dbaaf74720a34a8aa845b0c6f23979388d6c6831062552be5557eb574978fbe3509f0d0f84da2ca6166d810b974bb59b181d6151e7c78990
+MISC ChangeLog 8845 SHA256 3a93dc77c940ccf89ce2007c88120bbb3897d8c407606a2820bc676269170a0f SHA512 ec67e3a954f541b77505964b66b33432f282bc01e6b0e3e9ed87f3befbec8da0115e94faabec0caaf6f522b07c49d098044e541ef2c3bd80aa999634e20f005f WHIRLPOOL 0d89b1bdd32a974e5d93d24db5c1ad88fd152fa80466fa755f0ed25432e2347a4c8eaef0bb7bcf187097859b1062007c96ca00f0ebfd3533fdfedaa362fa75ee
+MISC ChangeLog-2015 45869 SHA256 4ecdf10709b9f18ac882964016845fb0ab6301b371737bac00f16e502e2e5cbb SHA512 8bf8c70ae26a84c12a3fed004988e326156489b71bcd58fdc8280bc850579bd2effaeade32d5f7b2211fab166735c6150c42216c142fe725ffa700a8cf4787da WHIRLPOOL e60841911423b37e2f09f31a5e3e767654021a8698f4780a806e492bf9076b70c34af838d55d099a43094882286db2445dce18777da27a8397cc5d168ee82783
+MISC metadata.xml 669 SHA256 cbcded236fe8be217623e19c58fb5d9d6871df496cf6d53909dd033092b26fff SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd WHIRLPOOL 10cb7de7f46793fad8ff9c42c21aa3bc5c571258251997ca3e9f26cfd804eeddf07faf45f8a38287c184f5f47f8de96ea9fa56d198d1424249b42de8a16af06f
diff --git a/net-misc/dhcp/dhcp-4.3.4.ebuild b/net-misc/dhcp/dhcp-4.3.4.ebuild
new file mode 100644
index 000000000000..85c68bfb0f31
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.4.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
+
+DEPEND="
+	client? (
+		kernel_linux? (
+			ipv6? ( sys-apps/iproute2 )
+			sys-apps/net-tools
+		)
+	)
+	ldap? (
+		net-nds/openldap
+		ssl? (
+			!libressl? ( dev-libs/openssl:0 )
+			libressl? ( dev-libs/libressl )
+		)
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-dhcp )
+	vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind
+	unpack ./bind.tar.gz
+}
+
+PATCHES=(
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
+
+	# Enable dhclient to equery NTP servers
+	"${FILESDIR}/${PN}-4.3.4-dhclient-ntp.patch"
+	"${FILESDIR}/${PN}-4.3.1-dhclient-resolvconf.patch"
+
+	# Stop downing the interface on Linux as that breaks link daemons
+	# such as wpa_supplicant and netplug
+	"${FILESDIR}/${PN}-3.0.3-dhclient-no-down.patch"
+
+	# Enable dhclient to get extra configuration from stdin
+	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+	"${FILESDIR}/${PN}-4.2.2-nogateway.patch" #265531
+	"${FILESDIR}/${PN}-4.2.4-quieter-ping.patch" #296921
+	"${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
+	"${FILESDIR}/${PN}-4.2.5-iproute2-path.patch" #480636
+	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
+	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# Change the hook script locations of the scripts
+	sed -i \
+		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash #158540
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i -r \
+		-e "/(script|host-name|domain-name) /d" \
+		client/dhclient.conf.example || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client
+			cp doc/ja_JP.eucJP/dhcp* common
+		fi
+	fi
+	# Now remove the non-english docs so there are no errors later
+	rm -rf doc/ja_JP.eucJP
+
+	# make the bind build work
+	binddir=${S}/bind
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
+	binddir=${binddir}
+	GMAKE=${MAKE:-gmake}
+	EOF
+	epatch "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
+	cd bind-*/
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
+}
+
+src_configure() {
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
+
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
+	# Use FHS sane paths ... some of these have configure options,
+	# but not all, so just do it all here.
+	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+	cat <<-EOF >> includes/site.h
+	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
+	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
+	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
+	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
+	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
+	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
+	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
+	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
+	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
+	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
+	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
+	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
+	EOF
+
+	econf \
+		--enable-paranoia \
+		--enable-early-chroot \
+		--sysconfdir=${e} \
+		$(use_enable ipv6 dhcpv6) \
+		$(use_with ldap) \
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+	# configure local bind cruft.  symtable option requires
+	# perl and we don't want to require that #383837.
+	cd bind/bind-*/ || die
+	eval econf \
+		$(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
+		--disable-symtable \
+		--without-make-clean
+}
+
+src_compile() {
+	# build local bind cruft first
+	emake -C bind/bind-*/lib/export install
+	# then build standard dhcp code
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	dohtml doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# move the client to /
+		dodir /sbin
+		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script
+		fi
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.*
+			dosbin contrib/ldap/dhcpd-conf-to-ldap
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+		systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+		systemd_dounit "${FILESDIR}"/dhcpd4.service
+		systemd_dounit "${FILESDIR}"/dhcpd6.service
+		systemd_dounit "${FILESDIR}"/dhcrelay4.service
+		systemd_dounit "${FILESDIR}"/dhcrelay6.service
+		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+	fi
+
+	# the default config files aren't terribly useful #384087
+	local f
+	for f in "${ED}"/etc/dhcp/*.conf.example ; do
+		mv "${f}" "${f%.example}" || die
+	done
+	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
+		if [ -e "${EROOT}"${f} ] ; then
+			case $(md5sum "${EROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${EROOT}"${f} "${ED}"${f};;
+			esac
+		fi
+	done
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+}
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
new file mode 100644
index 000000000000..aff36679d428
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.5.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
+
+DEPEND="
+	client? (
+		kernel_linux? (
+			ipv6? ( sys-apps/iproute2 )
+			sys-apps/net-tools
+		)
+	)
+	ldap? (
+		net-nds/openldap
+		ssl? (
+			!libressl? ( dev-libs/openssl:0 )
+			libressl? ( dev-libs/libressl )
+		)
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-dhcp )
+	vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind
+	unpack ./bind.tar.gz
+}
+
+PATCHES=(
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
+
+	# Enable dhclient to equery NTP servers
+	"${FILESDIR}/${PN}-4.3.4-dhclient-ntp.patch"
+	"${FILESDIR}/${PN}-4.3.1-dhclient-resolvconf.patch"
+
+	# Stop downing the interface on Linux as that breaks link daemons
+	# such as wpa_supplicant and netplug
+	"${FILESDIR}/${PN}-3.0.3-dhclient-no-down.patch"
+
+	# Enable dhclient to get extra configuration from stdin
+	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+	"${FILESDIR}/${PN}-4.2.2-nogateway.patch" #265531
+	"${FILESDIR}/${PN}-4.2.4-quieter-ping.patch" #296921
+	"${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
+	"${FILESDIR}/${PN}-4.2.5-iproute2-path.patch" #480636
+	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
+	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# Change the hook script locations of the scripts
+	sed -i \
+		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash #158540
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i -r \
+		-e "/(script|host-name|domain-name) /d" \
+		client/dhclient.conf.example || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client || die
+			cp doc/ja_JP.eucJP/dhcp* common || die
+		fi
+	fi
+	# Now remove the non-english docs so there are no errors later
+	rm -r doc/ja_JP.eucJP || die
+
+	# make the bind build work
+	binddir=${S}/bind
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
+	binddir=${binddir}
+	GMAKE=${MAKE:-gmake}
+	EOF
+	epatch "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
+	cd bind-*/ || die
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+}
+
+src_configure() {
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
+
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
+	# Use FHS sane paths ... some of these have configure options,
+	# but not all, so just do it all here.
+	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+	cat <<-EOF >> includes/site.h
+	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
+	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
+	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
+	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
+	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
+	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
+	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
+	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
+	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
+	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
+	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
+	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
+	EOF
+
+	econf \
+		--enable-paranoia \
+		--enable-early-chroot \
+		--sysconfdir=${e} \
+		$(use_enable ipv6 dhcpv6) \
+		$(use_with ldap) \
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+	# configure local bind cruft.  symtable option requires
+	# perl and we don't want to require that #383837.
+	cd bind/bind-*/ || die
+	eval econf \
+		$(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
+		--disable-symtable \
+		--without-make-clean
+}
+
+src_compile() {
+	# build local bind cruft first
+	emake -C bind/bind-*/lib/export install
+	# then build standard dhcp code
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	dohtml doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# move the client to /
+		dodir /sbin
+		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script
+		fi
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.*
+			dosbin contrib/ldap/dhcpd-conf-to-ldap
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+		systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+		systemd_dounit "${FILESDIR}"/dhcpd4.service
+		systemd_dounit "${FILESDIR}"/dhcpd6.service
+		systemd_dounit "${FILESDIR}"/dhcrelay4.service
+		systemd_dounit "${FILESDIR}"/dhcrelay6.service
+		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+	fi
+
+	# the default config files aren't terribly useful #384087
+	local f
+	for f in "${ED}"/etc/dhcp/*.conf.example ; do
+		mv "${f}" "${f%.example}" || die
+	done
+	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
+		if [ -e "${EROOT}"${f} ] ; then
+			case $(md5sum "${EROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${EROOT}"${f} "${ED}"${f};;
+			esac
+		fi
+	done
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+}
diff --git a/net-misc/dhcp/dhcp-4.3.6-r1.ebuild b/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
new file mode 100644
index 000000000000..32b0629c9379
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
+
+DEPEND="
+	client? (
+		kernel_linux? (
+			ipv6? ( sys-apps/iproute2 )
+			sys-apps/net-tools
+		)
+	)
+	ldap? (
+		net-nds/openldap
+		ssl? (
+			!libressl? ( dev-libs/openssl:0 )
+			libressl? ( dev-libs/libressl )
+		)
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-dhcp )
+	vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind
+	unpack ./bind.tar.gz
+}
+
+PATCHES=(
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
+
+	# Enable dhclient to equery NTP servers
+	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
+	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
+
+	# Enable dhclient to get extra configuration from stdin
+	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+	"${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
+	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
+	"${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
+	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
+	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
+	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
+	"${FILESDIR}/${PN}-4.3.6-lmdb-removal.patch" #628598
+)
+
+src_prepare() {
+	default
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# Change the hook script locations of the scripts
+	sed -i \
+		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash #158540
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i -r \
+		-e "/(script|host-name|domain-name) /d" \
+		client/dhclient.conf.example || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client || die
+			cp doc/ja_JP.eucJP/dhcp* common || die
+		fi
+	fi
+	# Now remove the non-english docs so there are no errors later
+	rm -r doc/ja_JP.eucJP || die
+
+	# make the bind build work
+	binddir="${S}/bind"
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
+	binddir=${binddir}
+	GMAKE=${MAKE:-gmake}
+	EOF
+	eapply -p2 "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
+	cd bind-*/ || die
+	eapply -p2 "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+}
+
+src_configure() {
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
+
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
+	# Use FHS sane paths ... some of these have configure options,
+	# but not all, so just do it all here.
+	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+	cat <<-EOF >> includes/site.h
+	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
+	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
+	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
+	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
+	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
+	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
+	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
+	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
+	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
+	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
+	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
+	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
+	EOF
+
+	local myeconfargs=(
+		--enable-paranoia
+		--enable-early-chroot
+		--sysconfdir=${e}
+		$(use_enable ipv6 dhcpv6)
+		$(use_with ldap)
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+	)
+	econf "${myeconfargs[@]}"
+
+	# configure local bind cruft.  symtable option requires
+	# perl and we don't want to require that #383837.
+	cd bind/bind-*/ || die
+	eval econf \
+		$(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
+		--disable-symtable \
+		--without-make-clean
+}
+
+src_compile() {
+	# build local bind cruft first
+	emake -C bind/bind-*/lib/export install
+	# then build standard dhcp code
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	docinto html
+	dodoc doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# move the client to /
+		dodir /sbin
+		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script
+		fi
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.*
+			dosbin contrib/ldap/dhcpd-conf-to-ldap
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+		systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+		systemd_dounit "${FILESDIR}"/dhcpd4.service
+		systemd_dounit "${FILESDIR}"/dhcpd6.service
+		systemd_dounit "${FILESDIR}"/dhcrelay4.service
+		systemd_dounit "${FILESDIR}"/dhcrelay6.service
+		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+	fi
+
+	# the default config files aren't terribly useful #384087
+	local f
+	for f in "${ED}"/etc/dhcp/*.conf.example ; do
+		mv "${f}" "${f%.example}" || die
+	done
+	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
+		if [ -e "${EROOT}"${f} ] ; then
+			case $(md5sum "${EROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${EROOT}"${f} "${ED}"${f};;
+			esac
+		fi
+	done
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+}
diff --git a/net-misc/dhcp/dhcp-4.3.6.ebuild b/net-misc/dhcp/dhcp-4.3.6.ebuild
new file mode 100644
index 000000000000..2404129b81ee
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.6.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
+
+DEPEND="
+	client? (
+		kernel_linux? (
+			ipv6? ( sys-apps/iproute2 )
+			sys-apps/net-tools
+		)
+	)
+	ldap? (
+		net-nds/openldap
+		ssl? (
+			!libressl? ( dev-libs/openssl:0 )
+			libressl? ( dev-libs/libressl )
+		)
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-dhcp )
+	vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind
+	unpack ./bind.tar.gz
+}
+
+PATCHES=(
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
+
+	# Enable dhclient to equery NTP servers
+	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
+	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
+
+	# Enable dhclient to get extra configuration from stdin
+	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+	"${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
+	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
+	"${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
+	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
+	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
+	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
+)
+
+src_prepare() {
+	default
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# Change the hook script locations of the scripts
+	sed -i \
+		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash #158540
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i -r \
+		-e "/(script|host-name|domain-name) /d" \
+		client/dhclient.conf.example || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client || die
+			cp doc/ja_JP.eucJP/dhcp* common || die
+		fi
+	fi
+	# Now remove the non-english docs so there are no errors later
+	rm -r doc/ja_JP.eucJP || die
+
+	# make the bind build work
+	binddir="${S}/bind"
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
+	binddir=${binddir}
+	GMAKE=${MAKE:-gmake}
+	EOF
+	eapply -p2 "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
+	cd bind-*/ || die
+	eapply -p2 "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+}
+
+src_configure() {
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
+
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
+	# Use FHS sane paths ... some of these have configure options,
+	# but not all, so just do it all here.
+	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+	cat <<-EOF >> includes/site.h
+	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
+	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
+	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
+	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
+	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
+	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
+	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
+	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
+	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
+	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
+	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
+	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
+	EOF
+
+	local myeconfargs=(
+		--enable-paranoia
+		--enable-early-chroot
+		--sysconfdir=${e}
+		$(use_enable ipv6 dhcpv6)
+		$(use_with ldap)
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+	)
+	econf "${myeconfargs[@]}"
+
+	# configure local bind cruft.  symtable option requires
+	# perl and we don't want to require that #383837.
+	cd bind/bind-*/ || die
+	eval econf \
+		$(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
+		--disable-symtable \
+		--without-make-clean
+}
+
+src_compile() {
+	# build local bind cruft first
+	emake -C bind/bind-*/lib/export install
+	# then build standard dhcp code
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	docinto html
+	dodoc doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# move the client to /
+		dodir /sbin
+		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script
+		fi
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.*
+			dosbin contrib/ldap/dhcpd-conf-to-ldap
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+		systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+		systemd_dounit "${FILESDIR}"/dhcpd4.service
+		systemd_dounit "${FILESDIR}"/dhcpd6.service
+		systemd_dounit "${FILESDIR}"/dhcrelay4.service
+		systemd_dounit "${FILESDIR}"/dhcrelay6.service
+		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+	fi
+
+	# the default config files aren't terribly useful #384087
+	local f
+	for f in "${ED}"/etc/dhcp/*.conf.example ; do
+		mv "${f}" "${f%.example}" || die
+	done
+	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
+		if [ -e "${EROOT}"${f} ] ; then
+			case $(md5sum "${EROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${EROOT}"${f} "${ED}"${f};;
+			esac
+		fi
+	done
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+}
diff --git a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
new file mode 100644
index 000000000000..f4b3fd18e167
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
@@ -0,0 +1,15 @@
+--- a/server/dhcpd.c
++++ b/server/dhcpd.c
+@@ -602,6 +602,12 @@
+ 	if (lftest)
+ 		exit (0);
+ 
++#if defined (PARANOIA)
++	/* Set proper permissions... */
++	if (lchown (path_dhcpd_db, set_uid, set_gid))
++		log_fatal ("lchown(%s, %d, %d): %m", path_dhcpd_db, (int) set_uid, (int) set_gid);
++#endif /* PARANOIA */
++
+ 	/* Discover all the network interfaces and initialize them. */
+ 	discover_interfaces (DISCOVER_SERVER);
+ 
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
new file mode 100644
index 000000000000..3a3b956e3616
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
@@ -0,0 +1,70 @@
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -118,9 +118,9 @@
+ if [ x$reason = xPREINIT ]; then
+   if [ x$alias_ip_address != x ]; then
+     # Bring down alias interface. Its routes will disappear too.
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+-  ifconfig $interface 0 up
++  ifconfig $interface 0.0.0.0 up
+ 
+   # We need to give the kernel some time to get the interface up.
+   sleep 1
+@@ -145,12 +145,12 @@
+   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+ 		[ x$alias_ip_address != x$old_ip_address ]; then
+     # Possible new alias. Remove old alias.
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+     # IP address changed. Bringing down the interface will delete all routes,
+     # and clear the ARP cache.
+-    ifconfig $interface inet 0 down
++    ifconfig $interface inet 0.0.0.0
+ 
+   fi
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+@@ -171,7 +171,7 @@
+   fi
+   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+    then
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+     ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+     route add -host $alias_ip_address $interface:0
+   fi
+@@ -183,11 +183,11 @@
+    || [ x$reason = xSTOP ]; then
+   if [ x$alias_ip_address != x ]; then
+     # Turn off alias interface.
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+   if [ x$old_ip_address != x ]; then
+     # Shut down interface, which will delete routes and clear arp cache.
+-    ifconfig $interface inet 0 down
++    ifconfig $interface inet 0.0.0.0
+   fi
+   if [ x$alias_ip_address != x ]; then
+     ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+@@ -198,7 +198,7 @@
+ 
+ if [ x$reason = xTIMEOUT ]; then
+   if [ x$alias_ip_address != x ]; then
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+   ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+@@ -223,7 +223,7 @@
+     make_resolv_conf
+     exit_with_hooks 0
+   fi
+-  ifconfig $interface inet 0 down
++  ifconfig $interface inet 0.0.0.0
+   exit_with_hooks 1
+ fi
+ 
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch
new file mode 100644
index 000000000000..ae33638284b8
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch
@@ -0,0 +1,14 @@
+bind sets up BUILD_XXX vars for building native tools, but then
+doesn't use them for the "gen" tool
+
+--- a/bind/lib/export/dns/Makefile.in
++++ b/bind/lib/export/dns/Makefile.in
+@@ -166,7 +166,7 @@
+ 	./gen -s ${srcdir} > code.h
+ 
+ gen: ${srcdir}/gen.c
+-	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
++	${BUILD_CC} ${BUILD_CFLAGS} ${CINCLUDES} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
+ 
+ #We don't need rbtdb64 for this library
+ #rbtdb64.@O@: rbtdb.c
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch
new file mode 100644
index 000000000000..6136154f65a0
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch
@@ -0,0 +1,14 @@
+fix the bind subdir parallel builds
+
+https://bugs.gentoo.org/380717
+
+--- a/bind/lib/export/isc/Makefile.in
++++ b/bind/lib/export/isc/Makefile.in
+@@ -114,6 +114,7 @@
+ 		-DLIBAGE=${LIBAGE} \
+ 		-c ${srcdir}/version.c
+ 
++${OBJS}: | subdirs
+ libisc.@SA@: ${OBJS}
+ 	${AR} ${ARFLAGS} $@ ${OBJS}
+ 	${RANLIB} $@
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch
new file mode 100644
index 000000000000..bf5a54c32153
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch
@@ -0,0 +1,113 @@
+--- dhcp-4.2.2/client/clparse.c
++++ dhcp-4.2.2/client/clparse.c
+@@ -182,6 +182,10 @@ isc_result_t read_client_conf ()
+ #endif
+ 	}
+ 
++	/* Read any extra configuration from stdin */
++	extern int read_client_conf_stdin (struct interface_info *ip, struct client_config *client);
++	read_client_conf_stdin (NULL, &top_level_config);
++
+ 	/* Set up state and config structures for clients that don't
+ 	   have per-interface configuration statements. */
+ 	config = (struct client_config *)0;
+@@ -211,23 +215,13 @@ isc_result_t read_client_conf ()
+ 	return status;
+ }
+ 
+-int read_client_conf_file (const char *name, struct interface_info *ip,
++int read_client_conf_actual (struct parse *cfile, struct interface_info *ip,
+ 			   struct client_config *client)
+ {
+-	int file;
+-	struct parse *cfile;
+ 	const char *val;
+ 	int token;
+ 	isc_result_t status;
+ 
+-	if ((file = open (name, O_RDONLY)) < 0)
+-		return uerr2isc (errno);
+-
+-	cfile = NULL;
+-	status = new_parse(&cfile, file, NULL, 0, path_dhclient_conf, 0);
+-	if (status != ISC_R_SUCCESS || cfile == NULL)
+-		return status;
+-
+ 	do {
+ 		token = peek_token (&val, (unsigned *)0, cfile);
+ 		if (token == END_OF_FILE)
+@@ -238,10 +232,74 @@ int read_client_conf_file (const char *name, struct interface_info *ip,
+ 	status = (cfile -> warnings_occurred
+ 		  ? DHCP_R_BADPARSE
+ 		  : ISC_R_SUCCESS);
++	return status;
++}
++
++int read_client_conf_file (const char *name, struct interface_info *ip,
++			   struct client_config *client)
++{
++	int file;
++	struct parse *cfile;
++	isc_result_t status;
++	
++	if ((file = open (name, O_RDONLY)) < 0)
++		return uerr2isc (errno);
++
++	cfile = (struct parse *)0;
++	new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0);
++	status = read_client_conf_actual(cfile, ip, client);
+ 	end_parse (&cfile);
+ 	return status;
+ }
+ 
++int read_client_conf_stdin (struct interface_info *ip,
++			    struct client_config *client)
++{
++	int file;
++	char *buffer = NULL, *p;
++	unsigned buflen, len = 0;
++	struct parse *cfile;
++	size_t bytes;
++	isc_result_t status;
++
++	file = fileno(stdin);
++	if (isatty (file))
++		return ISC_R_NOTFOUND;
++	if (fcntl (file, F_SETFL, O_NONBLOCK) < 0)
++		log_fatal ("could not set stdin to non blocking!");
++
++	buflen = BUFSIZ;
++	buffer = malloc (BUFSIZ + 1);
++	p = buffer;
++	do {
++		bytes = read (file, p, BUFSIZ);
++		if (bytes == 0)
++			break;
++		if (bytes == -1)
++			log_fatal ("failed to read stdin!");
++		if (bytes >= BUFSIZ) {
++			buflen += BUFSIZ;
++			len += BUFSIZ;
++			buffer = realloc (buffer, buflen + 1);
++			if (!buffer)
++				log_fatal ("not enough buffer to read stdin!");
++			p = buffer + len;
++		} else {
++			len += bytes;
++			break;
++		}
++	} while(1);
++	buffer[len] = '\0';
++
++	cfile = (struct parse *)0;
++	status = new_parse (&cfile, -1, buffer, len, "stdin", 0);
++	if (status == ISC_R_SUCCESS) {
++		status = read_client_conf_actual (cfile, ip, client);
++		end_parse (&cfile);
++	}
++	free(buffer);
++	return status;
++}
+ 
+ /* lease-file :== client-lease-statements END_OF_FILE
+    client-lease-statements :== <nil>
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-nogateway.patch b/net-misc/dhcp/files/dhcp-4.2.2-nogateway.patch
new file mode 100644
index 000000000000..27fb2b0e6025
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.2-nogateway.patch
@@ -0,0 +1,46 @@
+http://bugs.gentoo.org/265531
+
+--- dhcp-4.2.2/client/scripts/linux
++++ dhcp-4.2.2/client/scripts/linux
+@@ -193,12 +193,14 @@
+     ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+     # Add a network route to the computed network address.
+-    for router in $new_routers; do
+-      if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	route add -host $router dev $interface
+-      fi
+-      route add default gw $router $metric_arg dev $interface
+-    done
++    if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then
++      for router in $new_routers; do
++        if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
++	  route add -host $router dev $interface
++        fi
++        route add default gw $router $metric_arg dev $interface
++      done
++    fi
+   else
+     # we haven't changed the address, have we changed other options           
+     # that we wish to update?
+@@ -244,12 +246,14 @@
+       ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+       route add -host $alias_ip_address dev $interface:0
+     fi
+-    for router in $new_routers; do
+-      if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	route add -host $router dev $interface
+-      fi
+-      route add default gw $router $metric_arg dev $interface
+-    done
++    if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then
++      for router in $new_routers; do
++        if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
++	  route add -host $router dev $interface
++        fi
++        route add default gw $router $metric_arg dev $interface
++      done
++    fi
+     make_resolv_conf
+     exit_with_hooks 0
+   fi
diff --git a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
new file mode 100644
index 000000000000..6cec86c9d9c4
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/437108
+
+always accept the -4 option even if we don't have IPv6 support enabled.
+the relay code does this already.
+
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -170,8 +170,8 @@ main(int argc, char **argv) {
+ 		if (!strcmp(argv[i], "-r")) {
+ 			release_mode = 1;
+ 			no_daemon = 1;
+-#ifdef DHCPv6
+ 		} else if (!strcmp(argv[i], "-4")) {
++#ifdef DHCPv6
+ 			if (local_family_set && local_family != AF_INET)
+ 				log_fatal("Client can only do v4 or v6, not "
+ 					  "both.");
+--- a/server/dhcpd.c
++++ b/server/dhcpd.c
+@@ -373,8 +373,8 @@ main(int argc, char **argv) {
+ 		} else if (!strcmp (argv [i], "-q")) {
+ 			quiet = 1;
+ 			quiet_interface_discovery = 1;
+-#ifdef DHCPv6
+ 		} else if (!strcmp(argv[i], "-4")) {
++#ifdef DHCPv6
+ 			if (local_family_set && (local_family != AF_INET)) {
+ 				log_fatal("Server cannot run in both IPv4 and "
+ 					  "IPv6 mode at the same time.");
diff --git a/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch
new file mode 100644
index 000000000000..66a1fcd79461
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch
@@ -0,0 +1,72 @@
+https://bugs.gentoo.org/296921
+
+`ping -q` will still print out summary information.  send that to /dev/null.
+
+patch by Martin Mokrejš
+
+--- a/client/scripts/bsdos
++++ b/client/scripts/bsdos
+@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+-    if ping -q -c 1 -w 1 $1; then
++    if ping -q -c 1 -w 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- a/client/scripts/freebsd
++++ b/client/scripts/freebsd
+@@ -284,7 +284,7 @@ if [ x$reason = xTIMEOUT ]; then
+   if [ -n "$new_routers" ]; then
+     $LOGGER "New Routers: $new_routers"
+     set -- $new_routers
+-    if ping -q -c 1 $1; then
++    if ping -q -c 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -253,7 +253,7 @@ if [ x$reason = xTIMEOUT ]; then
+   ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+   set $new_routers
+-  if ping -q -c 1 $1; then
++  if ping -q -c 1 $1 >/dev/null; then
+     if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+       ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+--- a/client/scripts/netbsd
++++ b/client/scripts/netbsd
+@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+-    if ping -q -c 1 -w 1 $1; then
++    if ping -q -c 1 -w 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- a/client/scripts/openbsd
++++ b/client/scripts/openbsd
+@@ -245,7 +245,7 @@ if [ x$reason = xTIMEOUT ]; then
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+-    if ping -q -c 1 -w 1 $1; then
++    if ping -q -c 1 -w 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- a/client/scripts/openwrt
++++ b/client/scripts/openwrt
+@@ -186,7 +186,7 @@ if [ x$reason = xTIMEOUT ]; then
+   ifconfig $interface $new_ip_address $new_subnet_arg \
+ 				$new_broadcast_arg $mtu_arg $metric_arg
+   set $new_routers
+-  if ping -q -c 1 $1; then
++  if ping -q -c 1 $1 >/dev/null; then
+     if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+       ifconfig $interface:0 $alias_ip_address $alias_subnet_arg
diff --git a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch b/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch
new file mode 100644
index 000000000000..77254c32e2b0
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/471142
+
+snipped from fedora
+
+# dhclient -6: bind socket to interface (#1001742)
+# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #34784])
+
+diff -up dhcp-4.2.5/common/socket.c.bindtodevice_inet6 dhcp-4.2.5/common/socket.c
+--- dhcp-4.2.5/common/socket.c.bindtodevice_inet6	2013-09-17 16:47:05.000000000 +0200
++++ dhcp-4.2.5/common/socket.c	2013-09-17 16:48:18.975997842 +0200
+@@ -245,7 +245,7 @@ if_register_socket(struct interface_info
+ 
+ #if defined(SO_BINDTODEVICE)
+ 	/* Bind this socket to this interface. */
+-	if ((local_family != AF_INET6) && (info->ifp != NULL) &&
++	if (((do_multicast == 0)||(*do_multicast == 0)) && (info->ifp != NULL) &&
+ 	    setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE,
+ 			(char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
+ 		log_fatal("setsockopt: SO_BINDTODEVICE: %m");
diff --git a/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch b/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch
new file mode 100644
index 000000000000..ea223ed38b6e
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch
@@ -0,0 +1,15 @@
+find `ip` via $PATH and not hardcoded path
+
+https://bugs.gentoo.org/480636
+
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -23,7 +23,7 @@
+ # of the $1 in its args.
+ 
+ # 'ip' just looks too weird.  /sbin/ip looks less weird.
+-ip=/sbin/ip
++ip=ip
+ 
+ make_resolv_conf() {
+   if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
diff --git a/net-misc/dhcp/files/dhcp-4.3.1-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.3.1-dhclient-resolvconf.patch
new file mode 100644
index 000000000000..71d3f2c69dc5
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.1-dhclient-resolvconf.patch
@@ -0,0 +1,411 @@
+resolvconf support in dhclient-script
+
+--- a/client/scripts/bsdos
++++ b/client/scripts/bsdos
+@@ -1,40 +1,46 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+     if [ "x$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_search}\n"
+     elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >> /etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     for nameserver in ${new_dhcp6_name_servers} ; do
+       # If the nameserver has a link-local address
+       # add a <zone_id> (interface name) to it.
+       case $nameserver in
+ 	  fe80:*) zone_id="%$interface";;
+ 	  FE80:*) zone_id="%$interface";;
+ 	  *)      zone_id="";;
+       esac
+-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}$zone_id\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
+ }
+ 
+--- a/client/scripts/freebsd
++++ b/client/scripts/freebsd
+@@ -11,73 +11,45 @@
+ fi
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    ( cat /dev/null > /etc/resolv.conf.dhclient )
+-    exit_status=$?
+-    if [ $exit_status -ne 0 ]; then
+-      $LOGGER "Unable to create /etc/resolv.conf.dhclient: Error $exit_status"
+-    else
+-      if [ "x$new_domain_search" != x ]; then
+-	( echo search $new_domain_search >> /etc/resolv.conf.dhclient )
+-	exit_status=$?
+-      elif [ "x$new_domain_name" != x ]; then
+-	# Note that the DHCP 'Domain Name Option' is really just a domain
+-	# name, and that this practice of using the domain name option as
+-	# a search path is both nonstandard and deprecated.
+-	( echo search $new_domain_name >> /etc/resolv.conf.dhclient )
+-	exit_status=$?
+-      fi
+-      for nameserver in $new_domain_name_servers; do
+-	if [ $exit_status -ne 0 ]; then
+-	  break
+-	fi
+-	( echo nameserver $nameserver >>/etc/resolv.conf.dhclient )
+-	exit_status=$?
+-      done
+-
+-      # If there were no errors, attempt to mv the new file into place.
+-      if [ $exit_status -eq 0 ]; then
+-	( mv /etc/resolv.conf.dhclient /etc/resolv.conf )
+-	exit_status=$?
+-      fi
+-
+-      if [ $exit_status -ne 0 ]; then
+-	$LOGGER "Error while writing new /etc/resolv.conf."
+-      fi
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
++      # Note that the DHCP 'Domain Name Option' is really just a domain
++      # name, and that this practice of using the domain name option as
++      # a search path is both nonstandard and deprecated.
++      conf="${conf}search ${new_domain_name}\n"
+     fi
++    for nameserver in $new_domain_name_servers; do
++      conf="${conf}nameserver ${nameserver}\n"
++    done
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    ( cat /dev/null > /etc/resolv.conf.dhclient6 )
+-    exit_status=$?
+-    if [ $exit_status -ne 0 ] ; then
+-      $LOGGER "Unable to create /etc/resolv.conf.dhclient6: Error $exit_status"
+-    else
+-      if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-	( echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 )
+-	exit_status=$?
+-      fi
+-      for nameserver in ${new_dhcp6_name_servers} ; do
+-	if [ $exit_status -ne 0 ] ; then
+-	  break
+-	fi
+ 	# If the nameserver has a link-local address
+ 	# add a <zone_id> (interface name) to it.
+ 	case $nameserver in
+ 	    fe80:*) zone_id="%$interface";;
+ 	    FE80:*) zone_id="%$interface";;
+ 	    *)      zone_id="";;
+ 	esac
+-	( echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 )
+-	exit_status=$?
+-      done
+-
+-      if [ $exit_status -eq 0 ] ; then
+-        ( mv /etc/resolv.conf.dhclient6 /etc/resolv.conf )
+-	exit_status=$?
+-      fi
++    if [ "x${new_dhcp6_domain_search}" != x ] ; then
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
++    fi
++    for nameserver in ${new_dhcp6_name_servers} ; do
++      conf="${conf}nameserver ${nameserver}$zone_id\n"
++    done
++  fi
+ 
+-      if [ $exit_status -ne 0 ] ; then
+-	$LOGGER "Error while writing new /etc/resolv.conf."
+-      fi
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
+     fi
+   fi
+ }
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -26,44 +26,49 @@
+ ip=/sbin/ip
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    chmod 644 /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     shopt -s nocasematch 
+     for nameserver in ${new_dhcp6_name_servers} ; do
+       # If the nameserver has a link-local address
+       # add a <zone_id> (interface name) to it.
+       if  [[ "$nameserver" =~ ^fe80:: ]]
+       then
+ 	zone_id="%$interface"
+       else
+ 	zone_id=
+       fi
+-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}$zone_id\n"
+     done
+     shopt -u nocasematch 
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
+ }
+ 
+--- a/client/scripts/netbsd
++++ b/client/scripts/netbsd
+@@ -1,40 +1,46 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
+-  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ "x$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ "x$new_domain_name" != x ]; then
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
++  if [ x"$new_domain_name_servers" != x ]; then
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     for nameserver in ${new_dhcp6_name_servers} ; do
+       # If the nameserver has a link-local address
+       # add a <zone_id> (interface name) to it.
+       case $nameserver in
+ 	fe80:*) zone_id="%$interface";;
+ 	FE80:*) zone_id="%$interface";;
+ 	*)      zone_id="";;
+       esac
+-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}$zone_id\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
+ }
+ 
+--- a/client/scripts/openbsd
++++ b/client/scripts/openbsd
+@@ -1,40 +1,46 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
+-  if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
++  if [ x"$new_domain_name_servers" != x ]; then
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     for nameserver in ${new_dhcp6_name_servers} ; do
+       # If the nameserver has a link-local address
+       # add a <zone_id> (interface name) to it.
+       case $nameserver in
+ 	fe80:*) zone_id="%$interface";;
+ 	FE80:*) zone_id="%$interface";;
+ 	*)      zone_id="";;
+       esac
+-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}$zone_id\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
+ }
+ 
+--- a/client/scripts/solaris
++++ b/client/scripts/solaris
+@@ -1,21 +1,39 @@
+ #!/bin/sh  
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
++    done
++  elif [ "x${new_dhcp6_name_servers}" != x ] ; then
++    if [ "x${new_dhcp6_domain_search}" != x ] ; then
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
++    fi
++    for nameserver in ${new_dhcp6_name_servers} ; do
++      conf="${conf}nameserver ${nameserver}\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
+ }
+ 
diff --git a/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch b/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch
new file mode 100644
index 000000000000..2a7f8183d4e0
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch
@@ -0,0 +1,81 @@
+https://bugs.gentoo.org/559832
+
+the get_client_id func is used outside of IPv6 code, so don't store it in the
+IPv6-specific dhcpv6.c file.  otherwise, building w/out IPv6 & w/ldap yields:
+dhcpd-ldap.o: In function 'find_client_in_ldap':
+ldap.c:(.text+0x4774): undefined reference to 'get_client_id'
+
+--- a/server/dhcpleasequery.c
++++ b/server/dhcpleasequery.c
+@@ -33,6 +33,34 @@
+  *       DoS'ed by DHCPLEASEQUERY message.
+  */
+ 
++/*
++ * Get the client identifier from the packet.
++ */
++isc_result_t
++get_client_id(struct packet *packet, struct data_string *client_id) {
++	struct option_cache *oc;
++
++	/*
++	 * Verify our client_id structure is empty.
++	 */
++	if ((client_id->data != NULL) || (client_id->len != 0)) {
++		return DHCP_R_INVALIDARG;
++	}
++
++	oc = lookup_option(&dhcpv6_universe, packet->options, D6O_CLIENTID);
++	if (oc == NULL) {
++		return ISC_R_NOTFOUND;
++	}
++
++	if (!evaluate_option_cache(client_id, packet, NULL, NULL,
++				   packet->options, NULL,
++				   &global_scope, oc, MDL)) {
++		return ISC_R_FAILURE;
++	}
++
++	return ISC_R_SUCCESS;
++}
++
+ /* 
+  * If you query by hardware address or by client ID, then you may have
+  * more than one IP address for your query argument. We need to do two
+--- a/server/dhcpv6.c
++++ b/server/dhcpv6.c
+@@ -392,34 +392,6 @@ generate_new_server_duid(void) {
+ }
+ 
+ /*
+- * Get the client identifier from the packet.
+- */
+-isc_result_t
+-get_client_id(struct packet *packet, struct data_string *client_id) {
+-	struct option_cache *oc;
+-
+-	/*
+-	 * Verify our client_id structure is empty.
+-	 */
+-	if ((client_id->data != NULL) || (client_id->len != 0)) {
+-		return DHCP_R_INVALIDARG;
+-	}
+-
+-	oc = lookup_option(&dhcpv6_universe, packet->options, D6O_CLIENTID);
+-	if (oc == NULL) {
+-		return ISC_R_NOTFOUND;
+-	}
+-
+-	if (!evaluate_option_cache(client_id, packet, NULL, NULL,
+-				   packet->options, NULL,
+-				   &global_scope, oc, MDL)) {
+-		return ISC_R_FAILURE;
+-	}
+-
+-	return ISC_R_SUCCESS;
+-}
+-
+-/*
+  * Message validation, defined in RFC 3315, sections 15.2, 15.5, 15.7:
+  *
+  *    Servers MUST discard any Solicit messages that do not include a
diff --git a/net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch
new file mode 100644
index 000000000000..be0c032ae763
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch
@@ -0,0 +1,38 @@
+--- dhcp-4.3.4/bind/Makefile.in
++++ dhcp-4.3.4/bind/Makefile.in
+@@ -40,6 +40,7 @@
+ @BIND_ATF_TRUE@all: bind1 atf bind2
+ 
+ bind1:
++disable:
+ # Extract the source from the tarball, if it hasn't been already.
+ 	@if test -d ${bindsrcdir} ; then                    \
+ 		echo ${bindsrcdir} already unpacked... ;    \
+@@ -68,6 +69,7 @@
+ 	fi
+ 
+ atf:
++disable:
+ # Build and copy the ATF support if not yet installed.
+ 	@if test -d ./atf ; then				      \
+ 		echo ATF support already installed ;		      \
+@@ -82,6 +84,7 @@
+ @CROSS_COMPILING_TRUE@bind2: bind2-hostgen
+ 
+ bind2-noguest:
++disable:
+ # Build and install the export libraries
+ # No need to do anything if we already have something installed.
+ 	@if test -d ${binddir}/lib ; then                                    \
+@@ -98,6 +101,7 @@
+ 	fi
+ 
+ bind2-hostgen:
++disable:
+ # Build and install the export libraries
+ # No need to do anything if we already have something installed.
+ 	@if test -d ${binddir}/lib ; then                                    \
+--- dhcp-4.3.4/bind/test
++++ dhcp-4.3.4/bind/test
+@@ -0,0 +1 @@
++--disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --with-gssapi=no --enable-threads=no @BINDCONFIG@ --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib
diff --git a/net-misc/dhcp/files/dhcp-4.3.4-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.3.4-dhclient-ntp.patch
new file mode 100644
index 000000000000..207631710e75
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.4-dhclient-ntp.patch
@@ -0,0 +1,209 @@
+--- dhcp-4.3.4/client/clparse.c
++++ dhcp-4.3.4/client/clparse.c
+@@ -31,7 +31,7 @@
+ 
+ struct client_config top_level_config;
+ 
+-#define NUM_DEFAULT_REQUESTED_OPTS	9
++#define NUM_DEFAULT_REQUESTED_OPTS	10
+ /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */
+ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 2 + 1];
+ 
+@@ -107,15 +107,20 @@
+ 				dhcp_universe.code_hash, &code, 0, MDL);
+ 
+ 	/* 8 */
+-	code = D6O_NAME_SERVERS;
++	code = DHO_NTP_SERVERS;
+ 	option_code_hash_lookup(&default_requested_options[7],
+-				dhcpv6_universe.code_hash, &code, 0, MDL);
++				dhcp_universe.code_hash, &code, 0, MDL);
+ 
+ 	/* 9 */
+-	code = D6O_DOMAIN_SEARCH;
++	code = D6O_NAME_SERVERS;
+ 	option_code_hash_lookup(&default_requested_options[8],
+ 				dhcpv6_universe.code_hash, &code, 0, MDL);
+ 
++	/* 10 */
++	code = D6O_DOMAIN_SEARCH;
++	option_code_hash_lookup(&default_requested_options[9],
++				dhcpv6_universe.code_hash, &code, 0, MDL);
++
+ 	for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
+ 		if (default_requested_options[code] == NULL)
+ 			log_fatal("Unable to find option definition for "
+--- dhcp-4.3.4/client/scripts/bsdos
++++ dhcp-4.3.4/client/scripts/bsdos
+@@ -36,6 +36,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ x$new_ntp_servers != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- dhcp-4.3.4/client/scripts/freebsd
++++ dhcp-4.3.4/client/scripts/freebsd
+@@ -80,6 +80,26 @@
+       fi
+     fi
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- dhcp-4.3.4/client/scripts/linux
++++ dhcp-4.3.4/client/scripts/linux
+@@ -65,6 +65,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- dhcp-4.3.4/client/scripts/netbsd
++++ dhcp-4.3.4/client/scripts/netbsd
+@@ -36,6 +36,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- dhcp-4.3.4/client/scripts/openbsd
++++ dhcp-4.3.4/client/scripts/openbsd
+@@ -36,6 +36,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- dhcp-4.3.4/client/scripts/solaris
++++ dhcp-4.3.4/client/scripts/solaris
+@@ -17,6 +17,26 @@
+ 
+     mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch
new file mode 100644
index 000000000000..a504840dd5ab
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch
@@ -0,0 +1,210 @@
+--- dhcp-4.3.6/client/clparse.c
++++ dhcp-4.3.6/client/clparse.c
+@@ -31,7 +31,7 @@
+ 
+ struct client_config top_level_config;
+ 
+-#define NUM_DEFAULT_REQUESTED_OPTS	9
++#define NUM_DEFAULT_REQUESTED_OPTS	10
+ /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */
+ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 2 + 1];
+ 
+@@ -107,15 +107,20 @@
+ 				dhcp_universe.code_hash, &code, 0, MDL);
+ 
+ 	/* 8 */
+-	code = D6O_NAME_SERVERS;
++	code = DHO_NTP_SERVERS;
+ 	option_code_hash_lookup(&default_requested_options[7],
+-				dhcpv6_universe.code_hash, &code, 0, MDL);
++				dhcp_universe.code_hash, &code, 0, MDL);
+ 
+ 	/* 9 */
+-	code = D6O_DOMAIN_SEARCH;
++	code = D6O_NAME_SERVERS;
+ 	option_code_hash_lookup(&default_requested_options[8],
+ 				dhcpv6_universe.code_hash, &code, 0, MDL);
+ 
++	/* 10 */
++	code = D6O_DOMAIN_SEARCH;
++	option_code_hash_lookup(&default_requested_options[9],
++				dhcpv6_universe.code_hash, &code, 0, MDL);
++
+ 	for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
+ 		if (default_requested_options[code] == NULL)
+ 			log_fatal("Unable to find option definition for "
+--- dhcp-4.3.6/client/scripts/bsdos
++++ dhcp-4.3.6/client/scripts/bsdos
+@@ -36,6 +36,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ x$new_ntp_servers != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- dhcp-4.3.6/client/scripts/freebsd
++++ dhcp-4.3.6/client/scripts/freebsd
+@@ -80,6 +80,26 @@
+       fi
+     fi
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- dhcp-4.3.6/client/scripts/linux
++++ dhcp-4.3.6/client/scripts/linux
+@@ -106,6 +106,27 @@
+ 	fi
+         mv -f $new_resolv_conf /etc/resolv.conf
+     fi
++
++    # If we're making confs, may as well make an ntp.conf too
++    make_ntp_conf
++}
++
++make_ntp_conf() {
++    if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++	if [ "x$new_ntp_servers" != x ]; then
++	    conf="# Generated by dhclient for interface $interface\n"
++	    conf="${conf}restrict default noquery notrust nomodify\n"
++	    conf="${conf}restrict 127.0.0.1\n"
++	    for ntpserver in $new_ntp_servers; do
++		conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++		conf="${conf}server $ntpserver\n"
++	    done
++	    conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++	    conf="${conf}logfile /var/log/ntp.log\n"
++	    printf "${conf}" > /etc/ntp.conf
++	    chmod 644 /etc/ntp.conf
++	fi
++    fi
+ }
+ 
+ # set host name
+--- dhcp-4.3.6/client/scripts/netbsd
++++ dhcp-4.3.6/client/scripts/netbsd
+@@ -36,6 +36,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- dhcp-4.3.6/client/scripts/openbsd
++++ dhcp-4.3.6/client/scripts/openbsd
+@@ -36,6 +36,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- dhcp-4.3.6/client/scripts/solaris
++++ dhcp-4.3.6/client/scripts/solaris
+@@ -17,6 +17,26 @@
+ 
+     mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch
new file mode 100644
index 000000000000..ccfdbcf4a206
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch
@@ -0,0 +1,422 @@
+--- dhcp-4.3.6/client/scripts/bsdos
++++ dhcp-4.3.6/client/scripts/bsdos
+@@ -1,27 +1,25 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+     if [ "x$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_search}\n"
+     elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >> /etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     for nameserver in ${new_dhcp6_name_servers} ; do
+       # If the nameserver has a link-local address
+@@ -31,10 +29,18 @@
+ 	  FE80:*) zone_id="%$interface";;
+ 	  *)      zone_id="";;
+       esac
+-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}$zone_id\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
+ }
+ 
+--- dhcp-4.3.6/client/scripts/freebsd
++++ dhcp-4.3.6/client/scripts/freebsd
+@@ -11,54 +11,23 @@
+ fi
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    ( cat /dev/null > /etc/resolv.conf.dhclient )
+-    exit_status=$?
+-    if [ $exit_status -ne 0 ]; then
+-      $LOGGER "Unable to create /etc/resolv.conf.dhclient: Error $exit_status"
+-    else
+-      if [ "x$new_domain_search" != x ]; then
+-	( echo search $new_domain_search >> /etc/resolv.conf.dhclient )
+-	exit_status=$?
+-      elif [ "x$new_domain_name" != x ]; then
+-	# Note that the DHCP 'Domain Name Option' is really just a domain
+-	# name, and that this practice of using the domain name option as
+-	# a search path is both nonstandard and deprecated.
+-	( echo search $new_domain_name >> /etc/resolv.conf.dhclient )
+-	exit_status=$?
+-      fi
+-      for nameserver in $new_domain_name_servers; do
+-	if [ $exit_status -ne 0 ]; then
+-	  break
+-	fi
+-	( echo nameserver $nameserver >>/etc/resolv.conf.dhclient )
+-	exit_status=$?
+-      done
+-
+-      # If there were no errors, attempt to mv the new file into place.
+-      if [ $exit_status -eq 0 ]; then
+-	( mv /etc/resolv.conf.dhclient /etc/resolv.conf )
+-	exit_status=$?
+-      fi
+-
+-      if [ $exit_status -ne 0 ]; then
+-	$LOGGER "Error while writing new /etc/resolv.conf."
+-      fi
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
++      # Note that the DHCP 'Domain Name Option' is really just a domain
++      # name, and that this practice of using the domain name option as
++      # a search path is both nonstandard and deprecated.
++      conf="${conf}search ${new_domain_name}\n"
+     fi
++    for nameserver in $new_domain_name_servers; do
++      conf="${conf}nameserver ${nameserver}\n"
++    done
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    ( cat /dev/null > /etc/resolv.conf.dhclient6 )
+-    exit_status=$?
+-    if [ $exit_status -ne 0 ] ; then
+-      $LOGGER "Unable to create /etc/resolv.conf.dhclient6: Error $exit_status"
+-    else
+-      if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-	( echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 )
+-	exit_status=$?
+-      fi
+-      for nameserver in ${new_dhcp6_name_servers} ; do
+-	if [ $exit_status -ne 0 ] ; then
+-	  break
+-	fi
+ 	# If the nameserver has a link-local address
+ 	# add a <zone_id> (interface name) to it.
+ 	case $nameserver in
+@@ -66,18 +35,21 @@
+ 	    FE80:*) zone_id="%$interface";;
+ 	    *)      zone_id="";;
+ 	esac
+-	( echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 )
+-	exit_status=$?
+-      done
+-
+-      if [ $exit_status -eq 0 ] ; then
+-        ( mv /etc/resolv.conf.dhclient6 /etc/resolv.conf )
+-	exit_status=$?
+-      fi
++    if [ "x${new_dhcp6_domain_search}" != x ] ; then
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
++    fi
++    for nameserver in ${new_dhcp6_name_servers} ; do
++      conf="${conf}nameserver ${nameserver}$zone_id\n"
++    done
++  fi
+ 
+-      if [ $exit_status -ne 0 ] ; then
+-	$LOGGER "Error while writing new /etc/resolv.conf."
+-      fi
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
+     fi
+   fi
+ }
+--- dhcp-4.3.6/client/scripts/linux
++++ dhcp-4.3.6/client/scripts/linux
+@@ -35,16 +35,16 @@
+ # update /etc/resolv.conf based on received values
+ # This updated version mostly follows Debian script by Andrew Pollock et al.
+ make_resolv_conf() {
+-    local new_resolv_conf
++    if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++	return 0
++    fi
++    local conf
+ 
+     # DHCPv4
+     if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
+        [ -n "$new_domain_name_servers" ]; then
+-        new_resolv_conf=/etc/resolv.conf.dhclient-new
+-        rm -f $new_resolv_conf
+-
+         if [ -n "$new_domain_name" ]; then
+-            echo domain ${new_domain_name%% *} >>$new_resolv_conf
++            conf="${conf}domain ${new_domain_name%% *}\n"
+         fi
+ 
+         if [ -n "$new_domain_search" ]; then
+@@ -60,31 +60,23 @@
+                     new_domain_search="$new_domain_name $new_domain_search"
+                 fi
+             fi
+-            echo "search ${new_domain_search}" >> $new_resolv_conf
++            conf="${conf}search ${new_domain_search}\n"
+         elif [ -n "$new_domain_name" ]; then
+-            echo "search ${new_domain_name}" >> $new_resolv_conf
++            conf="${conf}search ${new_domain_name}\n"
+         fi
+ 
+         if [ -n "$new_domain_name_servers" ]; then
+             for nameserver in $new_domain_name_servers; do
+-                echo nameserver $nameserver >>$new_resolv_conf
++                conf="${conf}nameserver $nameserver\n"
+             done
+         else # keep 'old' nameservers
+-            sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf
++            conf="${conf}$(sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf)\n"
+         fi
+ 
+-	if [ -f /etc/resolv.conf ]; then
+-	    chown --reference=/etc/resolv.conf $new_resolv_conf
+-	    chmod --reference=/etc/resolv.conf $new_resolv_conf
+-	fi
+-        mv -f $new_resolv_conf /etc/resolv.conf
+     # DHCPv6
+     elif [ -n "$new_dhcp6_domain_search" ] || [ -n "$new_dhcp6_name_servers" ]; then
+-        new_resolv_conf=/etc/resolv.conf.dhclient-new
+-        rm -f $new_resolv_conf
+-
+         if [ -n "$new_dhcp6_domain_search" ]; then
+-            echo "search ${new_dhcp6_domain_search}" >> $new_resolv_conf
++            conf="${conf}search ${new_dhcp6_domain_search}\n"
+         fi
+ 
+         if [ -n "$new_dhcp6_name_servers" ]; then
+@@ -94,17 +86,21 @@
+                    [ "${nameserver##FE80::}" != "$nameserver" ]; then
+                     nameserver="${nameserver}%${interface}"
+                 fi
+-                echo nameserver $nameserver >>$new_resolv_conf
++                conf="${conf}nameserver $nameserver\n"
+             done
+         else # keep 'old' nameservers
+-            sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf
++            conf="${conf}$(sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf)\n"
+         fi
++    fi
+ 
+-	if [ -f /etc/resolv.conf ]; then
+-            chown --reference=/etc/resolv.conf $new_resolv_conf
+-            chmod --reference=/etc/resolv.conf $new_resolv_conf
++    if [ x"$conf" != x ]; then
++	conf="# Generated by dhclient or interface $interface\n${conf}"
++	if type resolvconf >/dev/null 2>&1; then
++	    printf "${conf}" | resolvconf -a $interface
++	else
++	    printf "${conf}" > /etc/resolv.conf
++	    chmod 644 /etc/resolv.conf
+ 	fi
+-        mv -f $new_resolv_conf /etc/resolv.conf
+     fi
+ }
+ 
+--- dhcp-4.3.6/client/scripts/netbsd
++++ dhcp-4.3.6/client/scripts/netbsd
+@@ -1,27 +1,25 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
+-  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
++  if [ x"$new_domain_name_servers" != x ]; then
+     if [ "x$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_search}\n"
+     elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     for nameserver in ${new_dhcp6_name_servers} ; do
+       # If the nameserver has a link-local address
+@@ -31,10 +29,18 @@
+ 	FE80:*) zone_id="%$interface";;
+ 	*)      zone_id="";;
+       esac
+-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}$zone_id\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
+ }
+ 
+--- dhcp-4.3.6/client/scripts/openbsd
++++ dhcp-4.3.6/client/scripts/openbsd
+@@ -1,27 +1,25 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     for nameserver in ${new_dhcp6_name_servers} ; do
+       # If the nameserver has a link-local address
+@@ -31,10 +29,18 @@
+ 	FE80:*) zone_id="%$interface";;
+ 	*)      zone_id="";;
+       esac
+-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}$zone_id\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
+ }
+ 
+--- dhcp-4.3.6/client/scripts/solaris
++++ dhcp-4.3.6/client/scripts/solaris
+@@ -1,21 +1,39 @@
+ #!/bin/sh  
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
++    done
++  elif [ "x${new_dhcp6_name_servers}" != x ] ; then
++    if [ "x${new_dhcp6_domain_search}" != x ] ; then
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
++    fi
++    for nameserver in ${new_dhcp6_name_servers} ; do
++      conf="${conf}nameserver ${nameserver}\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
+ }
+ 
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch b/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch
new file mode 100644
index 000000000000..18b04e620c14
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch
@@ -0,0 +1,11 @@
+--- dhcp-4.3.6/client/scripts/linux
++++ dhcp-4.3.6/client/scripts/linux
+@@ -30,7 +30,7 @@
+ # 'ip' just looks too weird. Also, we now have unit-tests! Those unit-tests
+ # overwirte this line to use a fake ip-echo tool. It's also convenient
+ # if your system holds ip tool in a non-standard location.
+-ip=/sbin/ip
++ip=ip
+ 
+ # update /etc/resolv.conf based on received values
+ # This updated version mostly follows Debian script by Andrew Pollock et al.
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-lmdb-removal.patch b/net-misc/dhcp/files/dhcp-4.3.6-lmdb-removal.patch
new file mode 100644
index 000000000000..6f80d7401f57
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.6-lmdb-removal.patch
@@ -0,0 +1,12 @@
+diff -uNr dhcp-4.3.6.ORIG/bind/Makefile.in dhcp-4.3.6/bind/Makefile.in
+--- dhcp-4.3.6.ORIG/bind/Makefile.in	2017-09-19 23:37:59.459485673 +0100
++++ dhcp-4.3.6/bind/Makefile.in	2017-09-19 23:38:19.970484566 +0100
+@@ -28,7 +28,7 @@
+ 
+ bindconfig = --disable-kqueue --disable-epoll --disable-devpoll \
+ 	--without-openssl --without-libxml2 --enable-exportlib \
+-	--with-gssapi=no --enable-threads=no --without-lmdb @BINDCONFIG@ \
++	--with-gssapi=no --enable-threads=no @BINDCONFIG@ \
+ 	--with-export-includedir=${binddir}/include \
+ 	--with-export-libdir=${binddir}/lib
+ 
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch b/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch
new file mode 100644
index 000000000000..d299cc503f60
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch
@@ -0,0 +1,66 @@
+--- dhcp-4.3.6/client/scripts/linux
++++ dhcp-4.3.6/client/scripts/linux
+@@ -242,20 +242,22 @@
+ 			if_metric=${if_metric:-1}
+ 		    fi
+ 
+-		    for router in $new_routers; do
+-			if [ "$new_subnet_mask" = "255.255.255.255" ]; then
+-			    # point-to-point connection => set explicit route
+-			    ${ip} -4 route add ${router} dev $interface >/dev/null 2>&1
+-			fi
+-
+-			# set default route
+-			${ip} -4 route add default via ${router} dev ${interface} \
+-			    ${if_metric:+metric $if_metric} >/dev/null 2>&1
+-
+-			if [ -n "$if_metric" ]; then
+-			    if_metric=$((if_metric+1))
+-			fi
+-		    done
++		    if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then
++			for router in $new_routers; do
++			    if [ "$new_subnet_mask" = "255.255.255.255" ]; then
++				# point-to-point connection => set explicit route
++				${ip} -4 route add ${router} dev $interface >/dev/null 2>&1
++			    fi
++
++			    # set default route
++			    ${ip} -4 route add default via ${router} dev ${interface} \
++				${if_metric:+metric $if_metric} >/dev/null 2>&1
++
++			    if [ -n "$if_metric" ]; then
++				if_metric=$((if_metric+1))
++			    fi
++			done
++		    fi
+ 	    fi
+         fi
+ 
+@@ -330,15 +332,17 @@
+ 			if_metric=${if_metric:-1}
+ 		    fi
+ 
+-		    # set default route
+-		    for router in $new_routers; do
+-			${ip} -4 route add default via ${router} dev ${interface} \
+-			    ${if_metric:+metric $if_metric} >/dev/null 2>&1
+-
+-			if [ -n "$if_metric" ]; then
+-			    if_metric=$((if_metric+1))
+-			fi
+-		    done
++		    if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then
++			# set default route
++			for router in $new_routers; do
++			    ${ip} -4 route add default via ${router} dev ${interface} \
++				${if_metric:+metric $if_metric} >/dev/null 2>&1
++
++			    if [ -n "$if_metric" ]; then
++				if_metric=$((if_metric+1))
++			    fi
++			done
++		    fi
+ 	    fi
+ 
+             # update /etc/resolv.conf
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch
new file mode 100644
index 000000000000..3efb6459ebf9
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch
@@ -0,0 +1,66 @@
+--- dhcp-4.3.6/client/scripts/bsdos
++++ dhcp-4.3.6/client/scripts/bsdos
+@@ -220,7 +220,7 @@
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+-    if ping -q -c 1 -w 1 $1; then
++    if ping -q -c 1 -w 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- dhcp-4.3.6/client/scripts/freebsd
++++ dhcp-4.3.6/client/scripts/freebsd
+@@ -287,7 +287,7 @@
+   if [ -n "$new_routers" ]; then
+     $LOGGER "New Routers: $new_routers"
+     set -- $new_routers
+-    if ping -q -c 1 $1; then
++    if ping -q -c 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- dhcp-4.3.6/client/scripts/linux
++++ dhcp-4.3.6/client/scripts/linux
+@@ -311,7 +311,7 @@
+         fi
+ 
+         # if there is no router recorded in the lease or the 1st router answers pings
+-        if [ -z "$new_routers" ] || ping -q -c 1 "${new_routers%% *}"; then
++        if [ -z "$new_routers" ] || ping -q -c 1 "${new_routers%% *}" >/dev/null; then
+ 	    # if we have $new_rfc3442_classless_static_routes then we have to
+ 	    # ignore $new_routers entirely
+ 	    if [ ! "$new_rfc3442_classless_static_routes" ]; then
+--- dhcp-4.3.6/client/scripts/netbsd
++++ dhcp-4.3.6/client/scripts/netbsd
+@@ -220,7 +220,7 @@
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+-    if ping -q -c 1 -w 1 $1; then
++    if ping -q -c 1 -w 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- dhcp-4.3.6/client/scripts/openbsd
++++ dhcp-4.3.6/client/scripts/openbsd
+@@ -214,7 +214,7 @@
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+-    if ping -q -c 1 -w 1 $1; then
++    if ping -q -c 1 -w 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- dhcp-4.3.6/client/scripts/openwrt
++++ dhcp-4.3.6/client/scripts/openwrt
+@@ -190,7 +190,7 @@
+   ifconfig $interface $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+   set $new_routers
+-  if ping -q -c 1 $1; then
++  if ping -q -c 1 $1 >/dev/null; then
+     if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+       ifconfig $interface:0 $alias_ip_address $alias_subnet_arg
diff --git a/net-misc/dhcp/files/dhcpd.conf2 b/net-misc/dhcp/files/dhcpd.conf2
new file mode 100644
index 000000000000..5cd2eeca3f71
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.conf2
@@ -0,0 +1,28 @@
+# /etc/conf.d/dhcpd: config file for /etc/init.d/dhcpd
+
+# If you require more than one instance of dhcpd you can create symbolic
+# links to dhcpd service like so
+#   cd /etc/init.d
+#   ln -s dhcpd dhcpd.foo
+#   cd ../conf.d
+#   cp dhcpd dhcpd.foo
+# Now you can edit dhcpd.foo and specify a different configuration file.
+# You'll also need to specify a pidfile in that dhcpd.conf file.
+# See the pid-file-name option in the dhcpd.conf man page for details.
+
+# If you wish to run dhcpd in a chroot, uncomment the following line
+# DHCPD_CHROOT="/var/lib/dhcp/chroot"
+
+# All file paths below are relative to the chroot.
+# You can specify a different chroot directory but MAKE SURE it's empty.
+
+# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf
+# DHCPD_CONF="/etc/dhcp/dhcpd.conf"
+
+# Configure which interface or interfaces to for dhcpd to listen on.
+# List all interfaces space separated. If this is not specified then
+# we listen on all interfaces.
+# DHCPD_IFACE=""
+
+# Insert any other dhcpd options - see the man page for a full list.
+# DHCPD_OPTS=""
diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5
new file mode 100644
index 000000000000..f0ea9b0c7904
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.init5
@@ -0,0 +1,119 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+
+: ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf}
+
+depend() {
+	need net
+	use logger dns #@slapd@
+}
+
+get_var() {
+	local var="$(sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' "${chroot}${DHCPD_CONF}")"
+	echo ${var:-$2}
+}
+
+setup_opts() {
+	DHCPD_CHROOT=${DHCPD_CHROOT%/}
+
+	# Work out our cffile if it's in our DHCPD_OPTS
+	case " ${DHCPD_OPTS} " in
+		*" -cf "*)
+			DHCPD_CONF=" ${DHCPD_OPTS} "
+			DHCPD_CONF="${DHCPD_CONF##* -cf }"
+			DHCPD_CONF="${DHCPD_CONF%% *}"
+			;;
+		*)	DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}"
+			;;
+	esac
+}
+
+checkconfig() {
+	set -- ${DHCPD_OPTS} -chroot "${DHCPD_CHROOT:-/}" -t
+
+	dhcpd "$@" 1>/dev/null 2>&1
+	local ret=$?
+	if [ ${ret} -ne 0 ] ; then
+		eerror "${SVCNAME} has detected a syntax error in your configuration files:"
+		dhcpd "$@"
+	fi
+
+	return ${ret}
+}
+
+configtest() {
+	setup_opts
+
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
+start() {
+	setup_opts
+	local chroot="${DHCPD_CHROOT}"
+
+	if [ -n "${chroot}" ] ; then
+		# the config test want's these to exist
+		mkdir -p \
+			"${chroot}"/var/run/dhcp \
+			"${chroot}"/var/lib/dhcp \
+			"${chroot}"/etc/dhcp
+	fi
+
+	# see comment in get_var() above
+	if [ ! -f "${chroot}${DHCPD_CONF}" ] ; then
+		eerror "${chroot}${DHCPD_CONF} does not exist"
+		return 1
+	fi
+
+	checkconfig || return 1
+
+	checkpath -d -o dhcp:dhcp "${chroot}"/var/run/dhcp "${chroot}"/var/lib/dhcp
+
+	local leasefile="$(get_var lease-file-name /var/lib/dhcp/${SVCNAME}.leases)"
+	checkpath -f -o dhcp:dhcp "${chroot}${leasefile}"
+
+	# Setup LD_PRELOAD so name resolution works in our chroot.
+	if [ -n "${chroot}" ] ; then
+		checkpath -d -o root:root -m 755 "${chroot}"/dev "${chroot}"/etc "${chroot}"/proc
+		cp -pP /etc/localtime /etc/resolv.conf "${chroot}"/etc/
+		export LD_PRELOAD="${LD_PRELOAD} libresolv.so libnss_dns.so"
+		if ! mountinfo -q "${chroot}/proc" ; then
+			mount --bind /proc "${chroot}/proc"
+		fi
+	fi
+
+	local pidfile="$(get_var pid-file-name /var/run/dhcp/${SVCNAME}.pid)"
+
+	ebegin "Starting ${chroot:+chrooted }${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dhcpd \
+		--pidfile "${chroot}/${pidfile}" \
+		-- ${DHCPD_OPTS} -q -pf "${pidfile}" -lf "${leasefile}" \
+		-user dhcp -group dhcp \
+		-chroot "${chroot:-/}" ${DHCPD_IFACE}
+	eend $? \
+		&& save_options dhcpd_chroot "${chroot}" \
+		&& save_options pidfile "${pidfile}"
+}
+
+stop() {
+	local chroot="$(get_options dhcpd_chroot)"
+	[ -z "${chroot}" ] && chroot="$(get_options chroot)"
+
+	ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/dhcpd \
+		--pidfile "${chroot}/$(get_options pidfile)"
+	res=$?
+
+	if [ ${res} -eq 0 ] && [ -n "${chroot}" ] ; then
+		if mountinfo -q "${chroot}/proc" ; then
+			umount "${chroot}/proc"
+		fi
+	fi
+
+	eend ${res}
+}
diff --git a/net-misc/dhcp/files/dhcpd.tmpfiles b/net-misc/dhcp/files/dhcpd.tmpfiles
new file mode 100644
index 000000000000..ee2f4deeaadf
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.tmpfiles
@@ -0,0 +1,2 @@
+d /var/lib/dhcp/ 0755 dhcp dhcp
+f /var/lib/dhcp/dhcpd.leases 0644 dhcp dhcp
\ No newline at end of file
diff --git a/net-misc/dhcp/files/dhcpd4.service b/net-misc/dhcp/files/dhcpd4.service
new file mode 100644
index 000000000000..b064bd9b57df
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd4.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=DHCPv4 Server Daemon
+Documentation=man:dhcpd(8) man:dhcpd.conf(5)
+After=network.target
+After=time-sync.target
+
+[Service]
+ExecStart=/usr/sbin/dhcpd -f -cf /etc/dhcp/dhcpd.conf -user dhcp -group dhcp --no-pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dhcp/files/dhcpd6.service b/net-misc/dhcp/files/dhcpd6.service
new file mode 100644
index 000000000000..603cacd8eb89
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd6.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=DHCPv6 Server Daemon
+Documentation=man:dhcpd(8) man:dhcpd.conf(5)
+After=network.target
+After=time-sync.target
+
+[Service]
+ExecStart=/usr/sbin/dhcpd -f -s -6 -cf /etc/dhcp/dhcpd.conf -user dhcp -group dhcp --no-pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf
new file mode 100644
index 000000000000..44699682d42d
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay.conf
@@ -0,0 +1,16 @@
+# /etc/conf.d/dhcrelay: config file for /etc/init.d/dhcrelay
+
+# Configure which interface or interfaces to for dhcrelay to listen on
+# and send to.
+# List all interfaces space separated. If this is not specified then
+# we use all interfaces.
+#IFACE=""
+# If you have split net interfaces, you might want to depend on them
+# explicitly here.
+#rc_need=$(printf 'net.%s ' ${IFACE})
+
+# Insert any other options needed.  See dhcrelay(8) for details.
+#DHCRELAY_OPTS=""
+
+# Space separated list of IPs to forward BOOTP/DHCP packets to.
+DHCRELAY_SERVERS=""
diff --git a/net-misc/dhcp/files/dhcrelay.init3 b/net-misc/dhcp/files/dhcrelay.init3
new file mode 100644
index 000000000000..a08ba8850740
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay.init3
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use logger #@slapd@
+}
+
+start() {
+	if [ -z "${DHCRELAY_SERVERS}" ] ; then
+		eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/${SVCNAME}"
+		return 1
+	fi
+
+	checkpath -d /var/run/dhcp
+
+	local iface_opts
+	if [ -n "${IFACE}" ] ; then
+		iface_opts=$(printf -- '-i %s ' ${IFACE})
+	fi
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dhcrelay \
+		-- -q ${iface_opts} ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile /var/run/dhcp/${SVCNAME}.pid
+	eend $?
+}
diff --git a/net-misc/dhcp/files/dhcrelay4.service b/net-misc/dhcp/files/dhcrelay4.service
new file mode 100644
index 000000000000..09e835d43357
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay4.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=DHCP Relay Agent Daemon
+Documentation=man:dhcrelay(8)
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/dhcrelay -d --no-pid $DHCRELAY_SERVERS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dhcp/files/dhcrelay4.service.conf b/net-misc/dhcp/files/dhcrelay4.service.conf
new file mode 100644
index 000000000000..1a0465b767d6
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay4.service.conf
@@ -0,0 +1,3 @@
+# Space separated list of IPs to forward BOOTP/DHCP packets to.
+[Service]
+Environment="DHCRELAY_SERVERS="
\ No newline at end of file
diff --git a/net-misc/dhcp/files/dhcrelay6.conf b/net-misc/dhcp/files/dhcrelay6.conf
new file mode 100644
index 000000000000..4e8b8c6fea39
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay6.conf
@@ -0,0 +1,8 @@
+# /etc/conf.d/dhcrelay6: config file for /etc/init.d/dhcrelay6
+
+# Insert any other options needed.  See dhcrelay(8) for details.
+# Make sure you specify the lower (-l)/upper (-u) interfaces.
+DHCRELAY_OPTS="-6 -l lower-iface -u upper-iface"
+
+# Space separated list of IPs to forward BOOTP/DHCP packets to.
+DHCRELAY_SERVERS=""
diff --git a/net-misc/dhcp/files/dhcrelay6.service b/net-misc/dhcp/files/dhcrelay6.service
new file mode 100644
index 000000000000..1e5e49888d61
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay6.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=DHCP Relay Agent Daemon
+Documentation=man:dhcrelay(8)
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/dhcrelay -d --no-pid -6 -l $lower-iface -u $upper-iface $DHCRELAY_SERVERS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dhcp/files/dhcrelay6.service.conf b/net-misc/dhcp/files/dhcrelay6.service.conf
new file mode 100644
index 000000000000..ae293ab4ff28
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay6.service.conf
@@ -0,0 +1,6 @@
+[Service]
+# Space separated list of IPs to forward BOOTP/DHCP packets to
+Environment="DHCRELAY_SERVERS="
+# Make sure you specify the lower (-l)/upper (-u) interfaces
+Environment="lower-iface="
+Environment="upper-iface="
diff --git a/net-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml
new file mode 100644
index 000000000000..ec94f20ac1f1
--- /dev/null
+++ b/net-misc/dhcp/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription lang="en">The ISC DHCP client/server package.</longdescription>
+	<longdescription lang="ja">ISC DHCP クライアント/サーバ・パッケージです。</longdescription>
+	<use>
+		<flag name="client">Install the dhclient program</flag>
+		<flag name="server">Install the dhcpd and dhcrelay programs</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:isc:dhcp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
new file mode 100644
index 000000000000..e8fcf29d381a
--- /dev/null
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -0,0 +1,5 @@
+DIST dhcpcd-ui-0.7.5.tar.bz2 209112 SHA256 2dae2108605867aba78d98cc9e56e22d7b751eedc3f7e6d689d42d08e706aaf3 SHA512 78dba758f7cee825a1618c33b1fff9549c4e51e19fd5eebd1ae5d6a4686726ec8ad86dc1ec5384238b43589dd700979c694f48bc94e2844f1ef898292660a5d2 WHIRLPOOL bf76d3973f7e5ff03207c1a9fa7f4ec0992c54abc3696bd4fb69630cb992aba46c86aec8f9c973772eba10af6346dfd35a71c3f1043305e033302c60fbbdb840
+EBUILD dhcpcd-ui-0.7.5-r1.ebuild 1168 SHA256 b39a72066a3c160b56869f187459b7f06506ef374cacf1c1149c4afe0dd3ad03 SHA512 9a89b625ccd2b930266a5767f38a6e3f42389ddd2a3b9312564a3782948598d251ed957c33a0be852e754445c6574dc566c1ccd47eb5ae734d0053b618124526 WHIRLPOOL 93d27586aac6a14cc755643ccce8cac41a75136a1afe3f13b40de0d7dff787aabad9c12c991e75c3d3d44629ab2d8fc8d0e770229ab2f511c762b37a7caa7252
+MISC ChangeLog 3596 SHA256 31da7d349cdb023092a2f084154da6eb49572f9588aad803318010ce7bd68b46 SHA512 bf3fd6d144f69ef267274c26b05716ddfe81f38169d341b45bf6323a04c7fd2913f65d7fbd2b9fd6e4c5b9389852f988784d6097f315dafefc4dbe0f3351b75c WHIRLPOOL 53470dc4cbc8e8403587b7cf280419077f018dffb50e1a235d7ba7bd31e5b754fa26244b93dc78e89e1824cfe3c7d8003c0d1d35b68af6fdce4402a1fd075cbe
+MISC ChangeLog-2015 2712 SHA256 60367831766bf92e39c338c9a6401b4c061ea94021ba306225fdf45f69f3a688 SHA512 eaeccdcf4e83db5e6e68ea1cfde9dca0136736db577aaea8ab1f879059c2377904fa952fcb16349764b78f71be08caa63b813c8010d5b2f7b1ede833baf0b1bf WHIRLPOOL e784481c7fcb2bf5b9471d54adc9443d324d78228951427eae394279c2fa48fccd0da0d5d6999e1165e8d46cc78f1b2bffdd6bc0d6d2c54ff4fc5ec15ab90829
+MISC metadata.xml 500 SHA256 9e90e3e1a8378dc7ddc60d4185578144a4fb01c8b85b56210385e123e0615fea SHA512 bbbd496a9d3181f23663a69b3a11f2b48725533da0e72dc77041a69741792f5268593c3d930dc956bedef415316b4c8e61ee675f60ce36d96c53d0b192c81196 WHIRLPOOL 68970b7ed47fd4ed890684afdec8379684e4ce8fe852296caf2195a45f1ec4cdda0b209779525c9617dcdf8255dc4d9aea195d64ac96ce4aa353a27c5d3e81e2
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild
new file mode 100644
index 000000000000..a89c1a8d7012
--- /dev/null
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Desktop notification and configuration for dhcpcd"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd-ui/"
+SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug gtk gtk3 libnotify"
+
+REQUIRED_USE="
+	?? ( gtk gtk3 )
+	libnotify? ( || ( gtk gtk3 ) )"
+
+DEPEND="
+	virtual/libintl
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	gtk3? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+	)
+	libnotify? ( x11-libs/libnotify )"
+
+RDEPEND="${DEPEND}
+	>=net-misc/dhcpcd-6.4.4"
+
+src_configure() {
+	local myeconfargs=(
+		--without-qt
+		$(use_enable debug)
+		$(usex gtk  '--with-gtk=gtk+-2.0 --with-icons' '')
+		$(usex gtk3 '--with-gtk=gtk+-3.0 --with-icons' '')
+		$(use_enable libnotify notification)
+		$(use gtk || use gtk3 || echo '--without-icons --without-gtk')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+
+	systemd_dounit src/dhcpcd-online/dhcpcd-wait-online.service
+}
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
new file mode 100644
index 000000000000..08e902a88a8f
--- /dev/null
+++ b/net-misc/dhcpcd-ui/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tokiclover@gmail.com</email>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+<use>
+	<flag name="gtk3">
+		Add support for <pkg>x11-libs/gtk+</pkg> (The GIMP Toolkit)
+	</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
new file mode 100644
index 000000000000..d9d0ace2b6eb
--- /dev/null
+++ b/net-misc/dhcpcd/Manifest
@@ -0,0 +1,23 @@
+AUX dhcpcd-6.11.1-arp-conflict.patch 1765 SHA256 ce0e410aa8cff0ede38a1650212e519231dd808f5004cff60a0fc001eb8b3cb7 SHA512 f0b7f53f30d178a4536113fb01efe177db73f609cf1cbba2fe603a619c7417067ad070318c50c363a30f4c87315aac27118ad088cdbeed3575fb640c9632ad95 WHIRLPOOL 1154437944c33ae1338360414953e44d839f621595d2d0e985542a93048ed8d34a6daff175c7e7db081969e4f5fcfd571f17dccacef32dc59fdb0fb2ca54817a
+AUX dhcpcd.initd 328 SHA256 6bb9b8b0075e45e63e898ed043f3c5951dc3e95c1fa62d22cc6e0616c792ecd1 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde WHIRLPOOL bc35a41feb9dc60c3dcd7bc5c453edb65047a87bf93c774d243d41ff6d9fc1bbc28ad2ce9067e152447d58502f8ee07b9917a46ec9fbe03b5df083eae0d5ac3e
+AUX dhcpcd.service 227 SHA256 289432e64108196c9e9c99b5ce77d3c46c75fc3e8f6f4ae1a19066dba46a3517 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e WHIRLPOOL 46e457cf6843bf6dca31c2dd08bce431efa966ccd802a206e8a933f2c9e46c91b713ed2422f42284b5f65e5e8e44e9177ae307877a6243c321758e38c85a9ecc
+DIST dhcpcd-6.10.1.tar.xz 180112 SHA256 284abf8c3be0580bbac5eaca95359346ab0d78d4072317b6ce87cc68f2e8ae7b SHA512 f323c155cff47f21dde181c216408b79f10e6ed923aa3d1f3482feff47a1e88e02193ec82f831da4ef63d3703ca1837715c36a47cf3f5d09f117f6eb53bfcf67 WHIRLPOOL 805e8a1b4dad400825197dae7918a2172093d152986d5d97f4d1993f2c27cf3fbe097a5dc4f7a5292e98676b5d7fad6079ed64e4bffabeb7ccf9d91f4db80de9
+DIST dhcpcd-6.11.1.tar.xz 190956 SHA256 5c823d607ed1d7513d16ec51c54e21657f1324899e0ba333a497682d88a8c6ee SHA512 50ef755b13a96fe484623d9f2dbd91407fbea5ca728fd05dbf4259a61611a07cf3ffad7e8d20ecd513dbef80602074809abd1f5177daaa51ceccc2af5c88269f WHIRLPOOL a32350beee83184fc9d0dec5cd65f265a83aa95177b8ff700fcce2aaf2ac6c2600c322e3d8c65f1d2e9d3a2cbe71bc00b3a6efbf045fa9c805b76a3a1fca0de5
+DIST dhcpcd-6.11.3.tar.xz 194892 SHA256 5abd12c4df2947d608f60a35227f9bf8ae8ab9de06ce975cdab1144d8f229b06 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70 WHIRLPOOL 66eebad0ceabf07324f41b7c5861b13f233d6cf3fb4f7c82804b6391594595cda8c981cec088aa75242a04614a7228be7400171d32c68ee6be354bf976a237d5
+DIST dhcpcd-6.11.5.tar.xz 198080 SHA256 6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e SHA512 a23d5dde66567c4addbc86c8b3fbf2c5d4dba3b463659729778a310306ab0e949be8998154ef15401ac2d289bde2f090d44492bba6a1becd2f01890d4efe7051 WHIRLPOOL 1b4bdd56112db20a0c6b0c843549f7c9cd8c534a9353df026d2c63a4b4bfd624f7fbc68282e04fd4f4c7c257d996e5019d3aa624f01b532074311d63b151164f
+DIST dhcpcd-7.0.0-beta3.tar.xz 203440 SHA256 ba8af748d0d1aa8daa8ba6813c1cf395f517bb51fe4274309170af9d2f1a89ef SHA512 b71154fa2596826e23820df984992e8786a6b89588648db60e9340a383b67fdb555307e9a47b7c33097ed4191fdb911e443c6bf9fc76b0194770e66e2de64b95 WHIRLPOOL 211564a4c218853bf3c6f219ffa36ef3d14fe3cc355bb5931bb98d5461717d0145145511540ab93ad4dcf99640c48ddcb1d82fc56361c329764c0756c12881a6
+DIST dhcpcd-7.0.0-rc1.tar.xz 204496 SHA256 8d4134596f1c8a647d94291fea0ed6f39dad648a4822472b481dfe48407b1cd3 SHA512 536ed4c09638a7a0fb16ad6a4a16fd74242ffbe2fe53e183c6756d2c62c94ce02869c95e828fbf3aa49aca06a129ab710195bf3d1dc9c9b52ac550ec51f68a1e WHIRLPOOL ec6898bbba3f4f2f42f9b8f16dd60f8b4b64170e4ad6c7e1326a80afd32241ad6b3ea941bfeb4e7113bd26ecb597fa04aebd1e1626c214ee10e48011251b065f
+DIST dhcpcd-7.0.0-rc2.tar.xz 206108 SHA256 ddae2ccf7c41a3ea5508e8adb2b7b9bbcd2b8a1ebe20871982243e513e83101a SHA512 a3e596c605c8ffe9f87f7113522f460d24a639b54dcc31182c70c3d0589d34d8c1cc765d5dfcfc6fd026697846866f7aa5714ef0d0d9eb049404973ef21f8ec7 WHIRLPOOL 46da14e26fb62320051e3457476d506847fa5630b898d01af14c7726175cfa9fcb01f505af5fe1668a89a2972f9ae40d46aad2918065c3f994c064a9b17dcb05
+DIST dhcpcd-7.0.0-rc3.tar.xz 207164 SHA256 14ba0873e6b67a8c85ed5bfb1428bbe887259d0477703e49d629e1a5d9e6300f SHA512 982c4c65ea45391e31170b592ce680c6cf5f4069b00decff3a299db23cede3e2521c66df7754a7a2379d5688f113553fe34e2fde825d6d9b83836a9e6d69fba9 WHIRLPOOL aeafeb61c783a0e3b99748ed465fe823678d1eb8f1068544e49e9d7dc3da31abad49944cb9aca8c3f469d960df26910ccfd3900cf683935d87d9b9026efbe5a7
+EBUILD dhcpcd-6.10.1.ebuild 3324 SHA256 7ccdc711dbd09ae4529a2bc8b7a008886527d693ae38bd5b328f4cebfb78948f SHA512 474bad588f8a25a8af13426175509d774af3b91c6ef919af59faedd0d5efbe7e0b9bbff01fa5f9ec6514e84dda61b5f94a37487344544dab281cbc3ee90125aa WHIRLPOOL 30418c232231daa2e5688c9e013315ecda6f95cdd9fb9af3251ee38d282ed441fd1e14eb10f96402e464634f2a44bc37dd62ad341d92e294a7ea10ffd4e9004d
+EBUILD dhcpcd-6.11.1-r1.ebuild 3341 SHA256 1b7c4efcf5bb884259fcd0fd0952a509e549d0f8096bb29dba7b5c160dbebe16 SHA512 ccadcb290e5c2a5440b497880d4a31e1d6f97484f67b1ba5b67e68f9734c5a8504c7d96a172330debba9cdf7156c2f6f953cf81cbf375b8e687c5225a6c69000 WHIRLPOOL 471636257a2376ec86967431285bac07e2adcc25420703271f264f47e0a06dfc0cd85c21562aa063d27995f2e5ef311248c4f5e5e3c8e275e346df184689261a
+EBUILD dhcpcd-6.11.3.ebuild 3289 SHA256 222eccb6087bf96ecbf5b489e8e37745f5660fecaa1ee74c15ebff406b2fd923 SHA512 8f59ca94b55d15f29a175fd9cdf5b3bba57d9e06980c11f030dfae4ee0f0630e791b5efeb4480117865aa680b0631843a1479cd077fd0c63508ae14977dd30c0 WHIRLPOOL d25e69c1b0d74dc67b6e01c733bcee65bac00d4c13cf4046fe4b13752cfe843e73d7ed78d6c82dc2ec6e2205663bba74edc446adb46a67ff1c29e035ecc827fc
+EBUILD dhcpcd-6.11.5.ebuild 3301 SHA256 7f5bb7b14a1c3a11ecf5cfe72fcfb6342f0aff47916c566f3987176bd5e86863 SHA512 de0c7852d42908d9a2f5a77db39d145b6711c1378d5db7e458469f9db7fae68eb23653eb56dccfcab042055ae30170d9bf93e062085bfcbaad58fca206a993db WHIRLPOOL 0655744e24a9eff6c59514917fc0c88932bbd464ef17e98cd250444874ae0983ebe41a4758dab1f07649f6cddf38684857c27905a849f8b6dd694862acf1ec98
+EBUILD dhcpcd-7.0.0_beta3.ebuild 4459 SHA256 48f4e1144c7bbe97c182146107148453cab44e2d9718868f9aa705fac3356080 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c WHIRLPOOL da685090ed66e3279ab7367791099df30f4850db058222dfdfe37abf56bf838206f4cd8a34435c309464934cfaf11f1d80ddefc4cd7d19ca97ae2a354f87d7b2
+EBUILD dhcpcd-7.0.0_rc1.ebuild 4459 SHA256 48f4e1144c7bbe97c182146107148453cab44e2d9718868f9aa705fac3356080 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c WHIRLPOOL da685090ed66e3279ab7367791099df30f4850db058222dfdfe37abf56bf838206f4cd8a34435c309464934cfaf11f1d80ddefc4cd7d19ca97ae2a354f87d7b2
+EBUILD dhcpcd-7.0.0_rc2.ebuild 4459 SHA256 48f4e1144c7bbe97c182146107148453cab44e2d9718868f9aa705fac3356080 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c WHIRLPOOL da685090ed66e3279ab7367791099df30f4850db058222dfdfe37abf56bf838206f4cd8a34435c309464934cfaf11f1d80ddefc4cd7d19ca97ae2a354f87d7b2
+EBUILD dhcpcd-7.0.0_rc3.ebuild 4459 SHA256 48f4e1144c7bbe97c182146107148453cab44e2d9718868f9aa705fac3356080 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c WHIRLPOOL da685090ed66e3279ab7367791099df30f4850db058222dfdfe37abf56bf838206f4cd8a34435c309464934cfaf11f1d80ddefc4cd7d19ca97ae2a354f87d7b2
+EBUILD dhcpcd-9999.ebuild 4459 SHA256 48f4e1144c7bbe97c182146107148453cab44e2d9718868f9aa705fac3356080 SHA512 1f630ae795fd011cc96d7a5cb254989c72d94a81b579d00b6bb63fe59e27a54a8aaeed8ee94721acae5511c09617abc48d23d583eba2229cd8b435f214fa3f6c WHIRLPOOL da685090ed66e3279ab7367791099df30f4850db058222dfdfe37abf56bf838206f4cd8a34435c309464934cfaf11f1d80ddefc4cd7d19ca97ae2a354f87d7b2
+MISC ChangeLog 9817 SHA256 68d97fcda53da5d73e77f4e4eb399348eb7de580f0e52f957393c9ad298ce55b SHA512 9aef46737ece7ee36a7ee6a5dafc92f54a0e9ce0bb92baf498df830f1ac692be4b39fa881e3d41970f629d11a427249ed58286efd212a44c47a606528a90aff2 WHIRLPOOL ac5979fe735f29e6ef715570d6c63f8b056ba72fe0ead5f17947dc7d05c6144f6b42d79cd83e178f97b9c12ced69e102d6deddfbdd8a1208c1d2cb39b16f9a06
+MISC ChangeLog-2015 64856 SHA256 2e43801d14158185ea967ef6244822bdb5ae254107c6abf6c50ec158b49c6731 SHA512 c9517777fb5a465b80905424ae65c34790a705a6097359273308e0085ffaed58a4a2a98a53ae3ba7a614f463b6d67a26234fb401699fcd85b9656d56c46a353c WHIRLPOOL ce99d0920143d62127371dbdc2eab7682e3aee4617792805fd48fbafe3621203abf06c80eecd6793ddc8fca00d262c095cf6e6f9c204956005eda462771fbf19
+MISC metadata.xml 569 SHA256 d3ec9490e6d0e1a1b7661f7096b842852f41d20d76334385841a743195b4b2a2 SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a WHIRLPOOL f1525e8ff521e65ff2c6df6ddd8f2b2f7cc557cc09d01ec8f0a0c88c6452aa1096c6d6f1f1ecd9b5aff2c4b4fd3d20b42af0bbb90a9fcb5ccfa480800e553e41
diff --git a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild b/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild
new file mode 100644
index 000000000000..06ab906419ef
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]]; then
+	FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" dev-vcs/fossil"
+
+	src_unpack()
+	{
+		local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
+		local repo=${distdir}/fossil/${PN}.fossil
+
+		addwrite "${distdir}"
+
+		if [[ -e "${repo}" ]]; then
+			fossil pull "${FOSSIL_URI}" -R "${repo}" || die
+		else
+			mkdir -p "${distdir}/fossil" || die
+			fossil clone "${FOSSIL_URI}" "${repo}" || die
+		fi
+
+		mkdir -p "${S}" || die
+		cd "${S}" || die
+		fossil open "${repo}" || die
+	}
+fi
+
+src_prepare()
+{
+	epatch_user
+}
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	# Upgrade the duid file to the new format if needed
+	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local new_duid="${ROOT}"/etc/dhcpcd.duid
+	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
+		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
+	fi
+
+	# Move the duid to /etc, a more sensible location
+	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
+		cp -p "${old_duid}" "${new_duid}"
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+	 elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild
new file mode 100644
index 000000000000..be9c260de63f
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-6.11.1-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" dev-vcs/fossil"
+
+	src_unpack()
+	{
+		local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
+		local repo=${distdir}/fossil/${PN}.fossil
+
+		addwrite "${distdir}"
+
+		if [[ -e "${repo}" ]]; then
+			fossil pull "${FOSSIL_URI}" -R "${repo}" || die
+		else
+			mkdir -p "${distdir}/fossil" || die
+			fossil clone "${FOSSIL_URI}" "${repo}" || die
+		fi
+
+		mkdir -p "${S}" || die
+		cd "${S}" || die
+		fossil open "${repo}" || die
+	}
+fi
+
+PATCHES=(
+"${FILESDIR}"/${P}-arp-conflict.patch
+)
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	# Upgrade the duid file to the new format if needed
+	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local new_duid="${ROOT}"/etc/dhcpcd.duid
+	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
+		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
+	fi
+
+	# Move the duid to /etc, a more sensible location
+	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
+		cp -p "${old_duid}" "${new_duid}"
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+	 elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
new file mode 100644
index 000000000000..88168bc80242
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" dev-vcs/fossil"
+
+	src_unpack()
+	{
+		local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
+		local repo=${distdir}/fossil/${PN}.fossil
+
+		addwrite "${distdir}"
+
+		if [[ -e "${repo}" ]]; then
+			fossil pull "${FOSSIL_URI}" -R "${repo}" || die
+		else
+			mkdir -p "${distdir}/fossil" || die
+			fossil clone "${FOSSIL_URI}" "${repo}" || die
+		fi
+
+		mkdir -p "${S}" || die
+		cd "${S}" || die
+		fossil open "${repo}" || die
+	}
+fi
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	# Upgrade the duid file to the new format if needed
+	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local new_duid="${ROOT}"/etc/dhcpcd.duid
+	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
+		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
+	fi
+
+	# Move the duid to /etc, a more sensible location
+	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
+		cp -p "${old_duid}" "${new_duid}"
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+	 elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
new file mode 100644
index 000000000000..1cc4a590d36a
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" dev-vcs/fossil"
+
+	src_unpack()
+	{
+		local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
+		local repo=${distdir}/fossil/${PN}.fossil
+
+		addwrite "${distdir}"
+
+		if [[ -e "${repo}" ]]; then
+			fossil pull "${FOSSIL_URI}" -R "${repo}" || die
+		else
+			mkdir -p "${distdir}/fossil" || die
+			fossil clone "${FOSSIL_URI}" "${repo}" || die
+		fi
+
+		mkdir -p "${S}" || die
+		cd "${S}" || die
+		fossil open "${repo}" || die
+	}
+fi
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	# Upgrade the duid file to the new format if needed
+	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local new_duid="${ROOT}"/etc/dhcpcd.duid
+	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
+		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
+	fi
+
+	# Move the duid to /etc, a more sensible location
+	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
+		cp -p "${old_duid}" "${new_duid}"
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+	 elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_beta3.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_beta3.ebuild
new file mode 100644
index 000000000000..deffde72be07
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0_beta3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_rc1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc1.ebuild
new file mode 100644
index 000000000000..deffde72be07
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0_rc1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_rc2.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc2.ebuild
new file mode 100644
index 000000000000..deffde72be07
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0_rc2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0_rc3.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0_rc3.ebuild
new file mode 100644
index 000000000000..deffde72be07
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0_rc3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
new file mode 100644
index 000000000000..deffde72be07
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch b/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch
new file mode 100644
index 000000000000..ae7da3fbd8a9
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch
@@ -0,0 +1,61 @@
+Index: ipv4ll.c
+==================================================================
+--- a/ipv4ll.c
++++ b/ipv4ll.c
+@@ -242,31 +242,33 @@
+ 	assert(astate != NULL);
+ 	assert(astate->iface != NULL);
+ 	ifp = astate->iface;
+ 	state = IPV4LL_STATE(ifp);
+ 	assert(state != NULL);
+-	assert(state->addr != NULL);
+ 
+ 	fail = 0;
+ 	/* RFC 3927 2.2.1, Probe Conflict Detection */
+ 	if (amsg == NULL ||
+ 	    (amsg->sip.s_addr == astate->addr.s_addr ||
+ 	    (amsg->sip.s_addr == 0 && amsg->tip.s_addr == astate->addr.s_addr)))
+ 		fail = astate->addr.s_addr;
+ 
+ 	/* RFC 3927 2.5, Conflict Defense */
+-	if (IN_LINKLOCAL(ntohl(state->addr->addr.s_addr)) &&
++	if (state->addr != NULL &&
++	    IN_LINKLOCAL(ntohl(state->addr->addr.s_addr)) &&
+ 	    amsg && amsg->sip.s_addr == state->addr->addr.s_addr)
+ 		fail = state->addr->addr.s_addr;
+ 
+ 	if (fail == 0)
+ 		return;
+ 
+ 	astate->failed.s_addr = fail;
+ 	arp_report_conflicted(astate, amsg);
+ 
+-	if (astate->failed.s_addr == state->addr->addr.s_addr) {
++	if (state->addr != NULL &&
++	    astate->failed.s_addr == state->addr->addr.s_addr)
++	{
+ 		struct timespec now, defend;
+ 
+ 		/* RFC 3927 Section 2.5 says a defence should
+ 		 * broadcast an ARP announcement.
+ 		 * Because the kernel will also unicast a reply to the
+@@ -378,16 +380,18 @@
+ 	astate->conflicted_cb = ipv4ll_conflicted;
+ 	astate->free_cb = ipv4ll_arpfree;
+ 
+ 	/* Find an existing IPv4LL address and ensure we can work with it. */
+ 	ia = ipv4_iffindlladdr(ifp);
++
+ #ifdef IN_IFF_TENTATIVE
+ 	if (ia != NULL && ia->addr_flags & IN_IFF_DUPLICATED) {
+ 		ipv4_deladdr(ia, 0);
+ 		ia = NULL;
+ 	}
+ #endif
++
+ 	if (ia != NULL) {
+ 		astate->addr = ia->addr;
+ #ifdef IN_IFF_TENTATIVE
+ 		if (ia->addr_flags & (IN_IFF_TENTATIVE | IN_IFF_DETACHED)) {
+ 			logger(ifp->ctx, LOG_INFO,
+
diff --git a/net-misc/dhcpcd/files/dhcpcd.initd b/net-misc/dhcpcd/files/dhcpcd.initd
new file mode 100644
index 000000000000..d3f4d76b4c90
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
+
+command=/sbin/dhcpcd
+pidfile=/var/run/dhcpcd.pid
+command_args=-q
+name="DHCP Client Daemon"
+
+depend()
+{
+	provide net
+	need localmount
+	use logger network
+	after bootmisc modules
+	before dns
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd.service b/net-misc/dhcpcd/files/dhcpcd.service
new file mode 100644
index 000000000000..8430214d59b4
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightweight DHCP client daemon
+Wants=network.target
+Before=network.target network-online.target
+
+[Service]
+Type=forking
+ExecStart=/sbin/dhcpcd -q
+PIDFile=/run/dhcpcd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dhcpcd/metadata.xml b/net-misc/dhcpcd/metadata.xml
new file mode 100644
index 000000000000..783090038eda
--- /dev/null
+++ b/net-misc/dhcpcd/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:roy_marples:dhcpcd</remote-id>
+	</upstream>
+	<use>
+		<flag name="embedded">
+			Embed the definitions of dhcp options in the dhcpcd executable
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/dhcpd-pools/Manifest b/net-misc/dhcpd-pools/Manifest
new file mode 100644
index 000000000000..510160df8a54
--- /dev/null
+++ b/net-misc/dhcpd-pools/Manifest
@@ -0,0 +1,5 @@
+DIST dhcpd-pools-2.21.tar.xz 544940 SHA256 c444dffee4626216190f85e28ef43e97611058ba9b3e6ce9c563f91bc2de011c SHA512 33c89dd7eb23b3df6e454cd75051f3d842cc265e8596f5657a9e72ae485befbe78655eb682cab10c14973286b85f2b174c2f23b88c5142b63589ca9ec0a9d975 WHIRLPOOL d681d8d461dd515944c5e4f8f326e2f7e93901e6ac049c85a3e2857f51e25d8c8599c7afe04daa48d1ae7350ee5baef85fea0c2e69f27237d747478d74d0e443
+EBUILD dhcpd-pools-2.21.ebuild 466 SHA256 bf747b77d3f9ff9debadddd64f945c66012f909ee3c46688d5b33b48ac3ee8ef SHA512 5af5975d4ee19f1127834f3757efbd6938776694f56f20622c4d7689c65f88c1a7b05cc7248ccca0b70558e688312cbe6a3e3465961a8cbb312948cb30d68269 WHIRLPOOL b659752130da1a1bb02cc36fbab8ac96ca464068238147212c3f1ce33b1157b8b0ff40f55dc146957cc2b81dffe3959966e617e472fb64659050fb273a8749c3
+MISC ChangeLog 2186 SHA256 d0f7e11f92f8cd97a0784704e50ffd5c86756c8ceefdb733e14b0f4f66ddd760 SHA512 26bd1a8917c4d8c2279e9977c8f8ce07ee1d2b5fe59e32c7f4b247c39e9cbf6c2d8c98dd14eba9dfed87c9872c0792146c5e4e6aceb69acec1c217c3de1d8732 WHIRLPOOL b3431a873588f5db39195947a756b8b0be3792d2485cc603d339a7ccf7729a31d4fdbe48cf6e3c3e241b9d7daa64eac94f3089a68bfc72d473ebbeac3c113489
+MISC ChangeLog-2015 362 SHA256 96bc2a48e6fc1ff059f0676e5b3fcb70e259a9d830c6cfda60f5348228142f6f SHA512 9a0f9c417e3ccca813f7a0e01cb3c54704a0d49d76c16fc33e8db1703abba1f9e189de65b1c53113204043e84d34231ea9a39e41a2f95652986b80f77a870689 WHIRLPOOL d621a155ff01170837de0cff92e6bc8a71454a623141fc239bf8edc9e2dfca81078d004c58e28b226170471b6b160d2c9145c18fa218f867c63e52f643a6b804
+MISC metadata.xml 328 SHA256 28dfbbc0364d52e4f36fcd4009e901f29587d1fc3d87ee45eacd6702a56f569f SHA512 19d9fe46aaa5e2e71587e28bc964194f6699b36782588cb384290646b208941320afc00512082bd216f43370a7df5313e96a99783c843d12c6f53f813875744f WHIRLPOOL a00455a4cde14eb0b9b233d85cb6c57684ed7bf1cac2b5c31a9b49ed31004467cc6c59f0b65a6ef49ba18892be31deb0125219768938c0972c896dae8eba9daa
diff --git a/net-misc/dhcpd-pools/dhcpd-pools-2.21.ebuild b/net-misc/dhcpd-pools/dhcpd-pools-2.21.ebuild
new file mode 100644
index 000000000000..0a5975331137
--- /dev/null
+++ b/net-misc/dhcpd-pools/dhcpd-pools-2.21.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="ISC dhcpd lease analysis and reporting"
+HOMEPAGE="http://dhcpd-pools.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND="dev-libs/uthash
+	doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_configure() {
+	econf $(use_enable doc doxygen) --with-dhcpd-conf=/etc/dhcp/dhcpd.conf
+}
diff --git a/net-misc/dhcpd-pools/metadata.xml b/net-misc/dhcpd-pools/metadata.xml
new file mode 100644
index 000000000000..8577945b03ba
--- /dev/null
+++ b/net-misc/dhcpd-pools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dhcpd-pools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/dhcping/Manifest b/net-misc/dhcping/Manifest
new file mode 100644
index 000000000000..e8269cd12b31
--- /dev/null
+++ b/net-misc/dhcping/Manifest
@@ -0,0 +1,5 @@
+DIST dhcping-1.2.tar.gz 75485 SHA256 32ef86959b0bdce4b33d4b2b216eee7148f7de7037ced81b2116210bc7d3646a SHA512 84ead27ba07f7ecc1e8cf6d95b40c98ee20a39ce54386249f403120beac70c45d765d5268b4968dbfbbb92790adcc1eb648c3a87071d215ad64bcd23aec818d3 WHIRLPOOL dc10802b54e9b2f75751d0bfaff81a25694c0d6a98e093e0b048465459a0f7040a7917e92b06eef35162932c11037edf5b1a15354dd9aaa97f40b9f2176db11c
+EBUILD dhcping-1.2.ebuild 379 SHA256 beae33e36d6c005af29991427da5b76bc153e66754af59ec7a88c52180ad5690 SHA512 0be179a011010e6a35bb9d94518219e79296acea7cacecd3749cce12fd8e1ccaf03869eff2d3576dc3f931eef1a081ab6a3600de8db7c49edd4a149ad6e6eac8 WHIRLPOOL c5207224bc371a1d5030b950e5326bf0bf07d2006ec68228063d5bd65bfed342a341401f7d7984f9e6d6669b4b9f5aa3b694e113e5b7a18fae664736859bbb7b
+MISC ChangeLog 2172 SHA256 7aa03ed6dd7afc629bd9e50786d25a84eda5004df551cde693e9d60a8b9ebdcf SHA512 46c5aedd1a122e39a52241d7a0de6c7cd429a57d0fa8dd002aacd04215864b3a408f95171d0109b3691e95798d583ea5407d1f2e7cc11ab2dd7e3b9f2bc80d38 WHIRLPOOL d9b7a007eebfbf51742b7480518c942e12b201f5553d6a69c55225e8ab2a80eea2d9c20d47a9694e56d1a6a1a5d366a0b5bc0a9ddb983a1aab741c4b7b312c28
+MISC ChangeLog-2015 1140 SHA256 9c6675721ab8970d0aa81b8d0204f1d21ad56510d6ccd51cb2b2dbcbf7aa9253 SHA512 24e213c280b6ce79ba5555bf4ef22a4ea306ba11318fa18117a79cf3f9016c801aca5614131b54ecd0b9b48dfdd6997445d8a7a6ef8e7779428477c55793fea6 WHIRLPOOL 826bccb622c029dc4f555b23db0a82d3ec62f438e1ce9931ed8d08e77b8125b349537bf1ed35aa78f1e2a5255f9a7d5779c49fb16226f972be674f2800046668
+MISC metadata.xml 218 SHA256 69dab01037c01cd95fa0e6d10f5f960cf953c2ef6c3831a089e43926b34fe72e SHA512 603ad05330f07596dedb6477c2c36ce6d982fe1415f64d82593c913343fc6227e1e741104a520b1d130ec846ee6083f1dedace7e9b4aa109cc4aae6b3863c6c5 WHIRLPOOL b675caafca8a7f50527f34e05a5ca09e9bdb55aede6b0054a41928911b705111cdbfb58223ff0f1d8b69cc2e94c35abdf423015813427daa643dc58d92568da3
diff --git a/net-misc/dhcping/dhcping-1.2.ebuild b/net-misc/dhcping/dhcping-1.2.ebuild
new file mode 100644
index 000000000000..d59841b42347
--- /dev/null
+++ b/net-misc/dhcping/dhcping-1.2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Utility for sending a dhcp request to a dhcp server to see if it is responding"
+HOMEPAGE="http://www.mavetju.org/unix/general.php"
+SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
diff --git a/net-misc/dhcping/metadata.xml b/net-misc/dhcping/metadata.xml
new file mode 100644
index 000000000000..1e878c532c32
--- /dev/null
+++ b/net-misc/dhcping/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 type="project">
+		<email>netmon@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
new file mode 100644
index 000000000000..a75862f7b7f0
--- /dev/null
+++ b/net-misc/dibbler/Manifest
@@ -0,0 +1,9 @@
+AUX dibbler-client 354 SHA256 9c9b7edb4091121e84fde41bb631a48938f1c8ebf2c85a373fbac9c8f9349f4a SHA512 2ef18db1cd172f40291573a6f34209d6841f39f90b14a0731abf54cae6fbf90850d1cbeb3d6d985f0f9957c5a4228c794fc9b8d69c716bf0df7ee857b510de66 WHIRLPOOL 8a98e300d5e5a925d6993493a64379fa70a46fdc7253b23840f0b78a7774abca1cc100744e849f41470927eaa1ba2a71ef766c24f1961819f2c2c2ad55e244dc
+AUX dibbler-client.service 134 SHA256 1f5d6ef13392cba1c9fa01bfecc39967974568cd2c10fcfbee2ee7e88c3b378b SHA512 419e40ac4110061e675cccd351b5a3e5f46e0c62d5169feb97eadee805d99b9caaae5f65fb9433808081d670db1cbb5ba6d9776e794f4cff624ec85906e28613 WHIRLPOOL b04cd675afed703acdddbe2494f47f15b381fb88a4ae6ebb2b932414dae71ba5a051e1a277f4b225e52834e19cdf5cb3a6fcd53091f777463298948f9f82c8ae
+AUX dibbler-relay 348 SHA256 1c27d02040b49982bb1f2453e9ca5b8f78bb4b67caeb62b773682b0bdf01a653 SHA512 5eb62c4c7e9a4c5b558d0fed79a41b5a2db996349ab5ebfdff2f50d2bf0ba0e4293aab1a9bb089014aacaa3a502a7a13c14b3f3fe9510d1c0d91fca2b0674745 WHIRLPOOL 47b5abedcde1f60f47b19ef97a845984c698ad9e9512101c0d7eae7cc3958abb6dedb27c94d9fe206442553bd7d7a2ba8d1657c031738e7fec7869eeba7de02b
+AUX dibbler-server 354 SHA256 a3c98c6b1aedab5ef432eff7c8a4916c0e2f1a0f43b1102197253a83fb833cbe SHA512 3d2f1df6263e3373988d5ba75479a7bed16c3a363809fdde582afeebab0cda746c91d02f8a9535e15ed1095c098f4ab3721322092bc692e0403f8c46f16adcd5 WHIRLPOOL 4671e04a469f3ae956d8177efc93680f3ef7e7a3ee585b68ba66f930bd9cb2a8d98aee0669713f52426ba567c6321d6cd189679833d6e9e26c3688611a3d7ff7
+DIST dibbler-1.0.1.tar.gz 4375118 SHA256 27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1 SHA512 2369d4a3ca50a1c60bd5a47bf4168d4c113e2fdcb1ae4d937a3bf226c057142f2e81f6c46bf4e1dfa9ca0d2e92f7f857572a4bfb0d0dd721c35efe762e6c3ea0 WHIRLPOOL dafc1663b487bc62068ef86be6261484729cf8da966f5572b1e459fb3a902c9474d9a8bea361dba683111f9f7994b86a3a7484333c77c9f977ec54169653898d
+EBUILD dibbler-1.0.1.ebuild 1191 SHA256 0dd1e2cfcaa6a215bade2089a453abf114b850ddb68de1fb569351cfc65cb246 SHA512 1d2dcff9ec38d8e9521a8a1e5fddba4a0738d809b739e0d033f592bcee6b36ad3b22ed4a818a6a31f8854b080333c9669e8bf87ff8df20336652c98e8ccd9bf0 WHIRLPOOL c80b4d169bedbba34462dcf682e2e480c2abeda9bd5ae160bc7f600b5932e9451bcdf0a98d64a3d797f0822e56f3aae2b3fad8161aa3fd2ecac31e26dd74831e
+MISC ChangeLog 3276 SHA256 0ad2063e35bc0575d2dfc8b24c83e7b1674bf2a02626f4507298b8a4fbc942da SHA512 c77f88e82411cb482f655763673044739095ab7a38f4f53f0623b2e0da8983725661b769938530a2c516f3fa0c35c9571719cc0725eb646332c4eae79e3ae721 WHIRLPOOL d59e718d145cb177422641e645f944e95c1a7859a9d83be02cdbb58704390ef54445d8e6d0fa56b6a2fa8d7474962a38a6e5a589216934d25a308e7b0a18cbba
+MISC ChangeLog-2015 4813 SHA256 17d2248d567df64f34479a7bbbfa44da356bce2c1689f28d57d34864b8e87553 SHA512 aea9dead9c6b5febf3a66342fba29bce1d0a4099f1685bf428578128ebf1e33481cb27efe3f7bbb8f35d87ffb3626720595f0befd905bd8b40f27664a947281c WHIRLPOOL 4083bdd3ee548be06a217c4d764fe9e57a4495ebfc6724b1194e16d1d0e5b836818e50c82a71fdae7c1b131cff1d1449b4576b3421830a30f115e33daad5a8e3
+MISC metadata.xml 252 SHA256 f09077829bd604b153aecd586b23fe39af2279d2b5871eb74391c7b7e9496404 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724 WHIRLPOOL 5da21d058640f220853befb609832550c9078b8879264a87ffb4b845b89e557ae43f04975c4e7b65531b2b843f6a6cd5b139648b72574b555e8cf6610ffd610e
diff --git a/net-misc/dibbler/dibbler-1.0.1.ebuild b/net-misc/dibbler/dibbler-1.0.1.ebuild
new file mode 100644
index 000000000000..6e7824899da4
--- /dev/null
+++ b/net-misc/dibbler/dibbler-1.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils readme.gentoo systemd
+
+DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
+HOMEPAGE="http://klub.com.pl/dhcpv6/"
+SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 hppa ~mips x86"
+IUSE="doc"
+
+DEPEND="doc? ( || (
+		dev-texlive/texlive-latexextra
+		dev-tex/floatflt )
+	)"
+RDEPEND=""
+
+DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf
+to suit your needs. They are stored in /etc/dibbler"
+
+src_prepare() {
+	epatch_user
+}
+
+src_compile() {
+	emake
+	# devel documentation is broken and users should consult the online version
+	# http://klub.com.pl/dhcpv6/doxygen/
+	use doc && emake -C doc/ user
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dosbin dibbler-{client,relay,server}
+	doman doc/man/*.8
+
+	insinto /etc/dibbler
+	doins doc/examples/*.conf
+	dodir /var/lib/dibbler
+
+	dodoc AUTHORS CHANGELOG RELNOTES TODO
+	use doc && dodoc doc/dibbler-user.pdf
+
+	doinitd "${FILESDIR}"/dibbler-{client,relay,server}
+	systemd_dounit "${FILESDIR}"/dibbler-client.service
+}
diff --git a/net-misc/dibbler/files/dibbler-client b/net-misc/dibbler/files/dibbler-client
new file mode 100644
index 000000000000..ec381be75f9f
--- /dev/null
+++ b/net-misc/dibbler/files/dibbler-client
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting DHCPv6 client: dibbler-client"
+	/usr/sbin/dibbler-client start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping DHCPv6 client: dibbler-client"
+	/usr/sbin/dibbler-client stop
+	eend $?
+}
diff --git a/net-misc/dibbler/files/dibbler-client.service b/net-misc/dibbler/files/dibbler-client.service
new file mode 100644
index 000000000000..bdac26318fc0
--- /dev/null
+++ b/net-misc/dibbler/files/dibbler-client.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Dibbler IPv6 DHCPv6 Client
+
+[Service]
+ExecStart=/usr/sbin/dibbler-client run
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dibbler/files/dibbler-relay b/net-misc/dibbler/files/dibbler-relay
new file mode 100644
index 000000000000..1adf16f9fab2
--- /dev/null
+++ b/net-misc/dibbler/files/dibbler-relay
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting DHCPv6 relay: dibbler-relay"
+	/usr/sbin/dibbler-relay start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping DHCPv6 relay: dibbler-relay"
+	/usr/sbin/dibbler-relay stop
+	eend $?
+}
diff --git a/net-misc/dibbler/files/dibbler-server b/net-misc/dibbler/files/dibbler-server
new file mode 100644
index 000000000000..95f2845ae325
--- /dev/null
+++ b/net-misc/dibbler/files/dibbler-server
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting DHCPv6 server: dibbler-server"
+	/usr/sbin/dibbler-server start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping DHCPv6 server: dibbler-server"
+	/usr/sbin/dibbler-server stop
+	eend $?
+}
diff --git a/net-misc/dibbler/metadata.xml b/net-misc/dibbler/metadata.xml
new file mode 100644
index 000000000000..7d273a80ff68
--- /dev/null
+++ b/net-misc/dibbler/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
new file mode 100644
index 000000000000..e7ca6fb8d617
--- /dev/null
+++ b/net-misc/dleyna-server/Manifest
@@ -0,0 +1,6 @@
+AUX dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch 285 SHA256 52ab8032e242136fe0ef31a3e74e755373a0e2d66880b544299700f794cf66c9 SHA512 76df25eac5b3b0d726089e98c38d8280bf3a72dfa830381f3b6a9a31df10abe31cc53c64e75f2fb12901130f243377392c607129821ca7645929ec2696bd88e4 WHIRLPOOL 177ee7f73c5ab2953f46f4d20328d2c30abc6dd979bbb8461fac2fc6b7d14c3808282ae8fd9b70ac8de38fe60c425c4d1e3a40531926b5fcb20583eecc847d12
+DIST dleyna-server-0.5.0.tar.gz 412938 SHA256 65aea97df031ac2ceeae04bf8473d2a260db58ced737992f882fe331ec3f19ae SHA512 30bafd14c9b85406efc21dd078bce80ed10927ef2728c4535990654b6c279549c5a89099d9266cd1e22a2f574006d2c9cfec8e3e79109c2e760d8ab4609cf398 WHIRLPOOL 5e8a02a816824fe23743b44e15e51cb57a4369f17bee152e170d56ff624b1216aab2962563fb6cd33092ac814da6ef5677f0f63dcb6d2e6a488ba674681a7cb7
+EBUILD dleyna-server-0.5.0.ebuild 868 SHA256 414f36eafbd81d728d0e8165b2478ffbc8e098947fa79d474cd84216f02bbc6a SHA512 e51835c8331450fe6e93d725695a250e1ec7ab1dceb1eac81539656e140e4fc030dca95d63fae03fe72a3609c87545ef71699005fcb32738a820b1c5f8d7a476 WHIRLPOOL 7554249eaedaa0647a17a8ebc0100f616b933df272199b2ad3e41c0bd5226613fb800242d387ba62cbff0fcb0eba296bf7417ca3145f485e4824505154c4b2ff
+MISC ChangeLog 2948 SHA256 08d0ec36577a95a48ef8100d56fee1bdcb4ef3d3b9e06a55977526c019ca4c3e SHA512 4d50121a7003419d5014da9a6c5b793edd5a43c7baad95f925305df6f7e2c1d863ea72d1635e69f2ff76599d622f0e64898687a0db6e3404a9a04012093bd678 WHIRLPOOL c6d136cd1859ef7c5f7a89a11a4b3618eb7262bdb1a20bdfaf97a879af180fee7024db80e4575d584a91724e84c8a3e27e03983cf02d58f456bdf4eab180bb96
+MISC ChangeLog-2015 571 SHA256 bba920a1cdde65aa69791e27747d80fcf28eefa41fe43199e009b601957aff2d SHA512 1d60ba7c11ea6f128e39db62cf9410a25193d3034cc75abdc2c788b0e87bbd029f5b99872ed50c65cbac0db784f48cd867fa8a582a9fbf08386eff267cfdf94a WHIRLPOOL c6ad0a5eb8195f92ea5baaa9b74c9e5325686997751dc5281050abdf6dc9cc6a784b005816af87d62aa1f2e237c1b4a749fa2da1b7710231ac1cc32005a81769
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
new file mode 100644
index 000000000000..ba4c52b8a763
--- /dev/null
+++ b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="library for implementing services that allow clients to discover, browse and manipulate DLNA Servers"
+HOMEPAGE="https://01.org/dleyna/"
+SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	dev-libs/libxml2
+	>=media-libs/gupnp-dlna-0.9.4:2.0
+	>=net-libs/dleyna-core-0.5
+	>=net-libs/gssdp-0.13.2
+	>=net-libs/gupnp-0.20.3
+	>=net-libs/gupnp-av-0.11.5
+	>=net-libs/libsoup-2.28.2:2.4
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix build with recent gupnp, bug #597952
+	epatch "${FILESDIR}"/${P}-fix-references-to-GUPnPContextManager.patch
+	default
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-misc/dleyna-server/files/dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch b/net-misc/dleyna-server/files/dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch
new file mode 100644
index 000000000000..9efb1feb1906
--- /dev/null
+++ b/net-misc/dleyna-server/files/dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch
@@ -0,0 +1,13 @@
+Fix build with recent gupnp version
+
+Gentoo-Bug: 597952
+--- a/libdleyna/server/upnp.h
++++ b/libdleyna/server/upnp.h
+@@ -24,6 +24,7 @@
+ #define DLS_UPNP_H__
+ 
+ #include <libdleyna/core/connector.h>
++#include <libgupnp/gupnp-context-manager.h>
+ 
+ #include "client.h"
+ #include "async.h"
diff --git a/net-misc/dleyna-server/metadata.xml b/net-misc/dleyna-server/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/net-misc/dleyna-server/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/dnetstats/Manifest b/net-misc/dnetstats/Manifest
new file mode 100644
index 000000000000..9d6928308225
--- /dev/null
+++ b/net-misc/dnetstats/Manifest
@@ -0,0 +1,6 @@
+AUX org.gentoo.pkexec.dnetstats.policy 737 SHA256 05a0854a3f33f3e3b1bce070ad8e32a37fe2038f1b626f3a08e054dce68ac113 SHA512 93eb8f683f666fbe9044efa8651594d963b418a374a57c7ac5a83ae4ceaa81d6a91f517520adea0f7ae24a2f246f1263ff5fe955eeafff02b1c2ede8f56b01dc WHIRLPOOL 2c311d05ac23bc26e5d9cb0da84abbb2217fb1c50fb643315648ec0080f93fe38d13f1996295c4e260bd9b9d34f99038926342b05890fba331ea74105ee58e8a
+DIST 107467-DNetStats-v1.2.6-release.tar.bz2 213492 SHA256 590521d60731e7066855151c4a9545322c8f6031aaec766fae4ad19a6a95cb57 SHA512 80fd7c296fba6921d23b22524de3a05e19f44113c57a43b615f963c84d7587ef7c187c3d7d410b3919f536e2bf9708aec6022e63c298bbc8790d5577bb783b68 WHIRLPOOL 1c82da70668f47af2db0f5901805966bf3e7972dd8a2a7a45daa1e37f757bb64521482132eef7d3fbd3d194fc05cd59d44e6b04446b09b05d3c54d5533c5af37
+EBUILD dnetstats-1.2.6-r3.ebuild 1049 SHA256 593d7b1ccebc7d09accdd7f945fdd76e2304151ef6025fa828be6f3c967fca9b SHA512 b3af9b2b81549361dd8306744e88c40f14fdbff73bbf951981a88ab741b4580b24fec1583d9cf0f65dad9ae61e3f76c3794324e58655f71a7035287dbcb2c2cc WHIRLPOOL cc30adaab51b57bd91b29bd27a33e1fbafb468a14297b1c6b9fda33ebaa894ef17ad8122c34392af43169474d46dc8ad3924e8e2aa74ac2eb45ba675a2cad00b
+MISC ChangeLog 2877 SHA256 f6c27a46c0f0146b6a8da6545db4ecba3e047167e14e45513c66765df15e924f SHA512 e110214346a8ed048be43ba4e6ddec1c8e5a83bfad2ae22109bcb3753fff2fbb3e93d2301674bc625edfeb107d71eec568b60a5cea762e1fd1f68fcdf31c72f9 WHIRLPOOL 0d7abf8567bb3dc712153d487235a296fea03692c72f9ab30a85007e075109bdd41950eaff1c078776e20d7818fb239962537c77bcd6ed17fd48a8a2d162351c
+MISC ChangeLog-2015 2672 SHA256 6eb6a66f0e65cf740abfcfa16bb71fadbf8901eeae537baf6293eae00d5cac65 SHA512 4db9f9851758a3205659c695ef5b385104a8196f31a9e6db6778e350c9218090592bf6116157b2e08a9b985185e4eb9e97ab0367c9f367c278abf2a7e15ce74e WHIRLPOOL 66351bdaec7d7b213d37c9fbc90799174b8e8b99495bffd81c6d0ac74811ff576f94f1342ef737a7fea577e9ad54d8135da5562cd23d0195d6a03c9eab63c372
+MISC metadata.xml 243 SHA256 40d70720dcef790c8b2af5864ea1d289f0a661e0db1e89d2c6a8a5c0d2ea971e SHA512 fc40891d1d0c8526f7ac87f25fbdb63e927494f972894e0006fe85eab8eef60ae79761cbc42febd202172da040283a2daa432908bf02ef83d27454660f20e72b WHIRLPOOL 0c09ba0a23280f3d5b0bd26ca7e3f3fe8e43302780afbcb20218599b9b8f426485b8aba8c97f1507f9adab1688d78cb132792cb4d13e130454c393b69fc662f4
diff --git a/net-misc/dnetstats/dnetstats-1.2.6-r3.ebuild b/net-misc/dnetstats/dnetstats-1.2.6-r3.ebuild
new file mode 100644
index 000000000000..fee04bad42e8
--- /dev/null
+++ b/net-misc/dnetstats/dnetstats-1.2.6-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+MY_PN="DNetStats"
+MY_P="${MY_PN}-v${PV}-release"
+
+DESCRIPTION="Qt4 network monitor utility"
+HOMEPAGE="http://qt-apps.org/content/show.php/DNetStats?content=107467"
+SRC_URI="http://qt-apps.org/CONTENT/content-files/107467-${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="policykit"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}
+	policykit? ( sys-auth/polkit )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	# clueless upstream ships generated files...
+	rm -rf moc_* qrc_* || die
+}
+
+src_install() {
+	newbin mythread ${PN}
+	dodoc ReadMe
+
+	newicon resource/energy.png ${PN}.png
+	make_desktop_entry ${PN} DNetStats ${PN} 'Qt;Network;Dialup'
+
+	if use policykit; then
+		insinto /usr/share/polkit-1/actions
+		doins "${FILESDIR}/org.gentoo.pkexec.${PN}.policy"
+		sed -i -e 's/^Exec=/&pkexec /' \
+			"${ED}"usr/share/applications/${PN}*.desktop \
+			|| die
+	fi
+}
diff --git a/net-misc/dnetstats/files/org.gentoo.pkexec.dnetstats.policy b/net-misc/dnetstats/files/org.gentoo.pkexec.dnetstats.policy
new file mode 100644
index 000000000000..c910a6c3610b
--- /dev/null
+++ b/net-misc/dnetstats/files/org.gentoo.pkexec.dnetstats.policy
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD polkit Policy Configuration 1.0//EN"
+    "http://www.freedesktop.org/software/polkit/policyconfig-1.dtd">
+<policyconfig>
+	<vendor>Gentoo</vendor>
+	<vendor_url>http://www.gentoo.org/</vendor_url>
+	<action id="org.gentoo.pkexec.dnetstats">
+		<message>Authentication is required to run the DNetStats</message>
+		<defaults>
+			<allow_any>auth_admin</allow_any>
+			<allow_inactive>auth_admin</allow_inactive>
+			<allow_active>auth_admin</allow_active>
+		</defaults>
+		<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/dnetstats</annotate>
+		<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+	</action>
+</policyconfig>
diff --git a/net-misc/dnetstats/metadata.xml b/net-misc/dnetstats/metadata.xml
new file mode 100644
index 000000000000..32fe1293e9a9
--- /dev/null
+++ b/net-misc/dnetstats/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/drive/Manifest b/net-misc/drive/Manifest
new file mode 100644
index 000000000000..8837b30a6c9d
--- /dev/null
+++ b/net-misc/drive/Manifest
@@ -0,0 +1,36 @@
+DIST drive-0.3.9.1.tar.gz 333217 SHA256 562958e336d2f52a34443fc8fbf59d9d2a2467b2bf4592a1d78dc009ade661a7 SHA512 5d8f6aaf08ad600915bac4c30626998069d1c6fa676948eb1e03235562dfdf447c0f9f05dbf2c5ffbf6e3e05003b3cee180b9fd28ceb7e83746a52d6640dcfa1 WHIRLPOOL b719d38d35ebc0bdfc6292e2d8d5ed6e1a529d66ed8994a87587918a4aa72fa7e78a1a14a7d2b64efe66d5070518426161da8fade692a679158ec58170067511
+DIST github.com-GoogleCloudPlatform-gcloud-golang-a5e721bf760c8055ea3ae8b732da1dc6a10fc3f9.tar.gz 846769 SHA256 8e45bcb99e43c85c638d1d14f7e6065e22dbcc85f9985b7988288a14c4596409 SHA512 85bf289a4daea998bbcdfc7c4da9539305c4847f005b5f180ca5f056288d6c6b1f4cee88ce7e91d594358b0dfec2f5cc8e0c9e0c9d436ff199fb217c7b86f835 WHIRLPOOL ba41aea3a20bbfeb666b4a8453eef747cc8cf4a8b49a78a2ff50576fdf2eda03d83bda4a49e290009426641b48e9245e46e357b3fb2005e824875be9d848aa15
+DIST github.com-boltdb-bolt-fa5367d20c994db73282594be0146ab221657943.tar.gz 83957 SHA256 530be574604e8ad80d04060c55405a66e941c20a17887380dd1f1a197babf38a SHA512 d877c68da702a5bd0cbec5d7f7c2d2f6d58e1fe1dd0071b095d1ba1d12e5a9844e53dbef7d4855e56852e4669c976dc0705358ad8ee5466e49cc4a2a5ca5202a WHIRLPOOL d819223d103ce584a701c6a4448a9b1f183b509788d7b200dbd91b6378b775353b0328eac293d31f869879f287ccfcc6da893c488bc869a9e68e429bccd692f3
+DIST github.com-cheggaaa-pb-657164d0228d6bebe316fdf725c69f131a50fb10.tar.gz 11372 SHA256 137f3f0ce6b93d0bce421c47a456f153515b8e15e0fe37a2377197f3c3ff0da9 SHA512 ef1d88b9cc4c939841680fa2a6ecc02de55c7c954224491ea9bba4c13c9c70e8c8a66524c748557b96b8998196f21c2fd712720a717a8e349f0e97d5ce9943c1 WHIRLPOOL 9e9f7569e28ba991a66b22752d722f0e1bae5f473597fb43fbd50918962992109fa0d7b6479a1aab0355d0f9eaf0ea70cca5aa52824469599fa37bed6d531101
+DIST github.com-codegangsta-inject-33e0aa1cb7c019ccc3fbe049a8262a6403d30504.tar.gz 5059 SHA256 60c2983497f697b496d0ea0ff67acaa6ce11721b6da2493040ed8558c0d3b422 SHA512 f6c062c41587e998020099888c370c5ece39a664c014bd809ad57533191dca5aa46d00cbe438588abb6f24d7275c3a3c86c7a6d37f9928fd530e1724741b2c1e WHIRLPOOL dd43202c70560f93a87f29f4ed38bed1c4d6ce59ceab259a6fb7300122c046596c0096610d29ad7699d2621f1819b8d41d38db331ee44b151c4e034375a58a18
+DIST github.com-go-martini-martini-22fa46961aabd2665cf3f1343b146d20028f5071.tar.gz 66063 SHA256 8b55b87731e13816f2dbc6aa70faf85fdc950e213d2ed81fb50e9a5b5addf05f SHA512 f5b01ccd3045df4e3cfa92ae31540754f50fc5b29850341d6df3afb6db41cafdd3a0e0b4b78fce9361c7069b6ce6926270604565b8fec028c0a6b1911171585a WHIRLPOOL 611eb168ef8183ceabc7e58ba0a53f604a8f7bce8d38f38b0ddfaba801bd5227e718d11c7b9d494d9d03fe18817cfa344b0b16851a00833e9e3518658c4d6686
+DIST github.com-golang-crypto-faadfbdc035307d901e69eea569f5dda451a3ee3.tar.gz 1432695 SHA256 b7aea0b94aa61354196ef64fb510152f02af9b120afc60694f3ea7da22f046e9 SHA512 dc11930e69b5552559b8fb906bd6cd302468d397f4d43087f215ea2afc74aa4ab014a532d6005b0f4cf600887da51acc4584333077334204351200bfecb44adc WHIRLPOOL d60629f80741aa738421dde3ade4c54b91942751414332dab63d9cdb3a431e3001693e44b53404db61a9fff634d32db386bd57f5db7ce0f178122d0812fcea2f
+DIST github.com-golang-net-859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz 920336 SHA256 6ca476b72c2b53b181fc32015651b385f565079d8395a28176bf8be168e8a1d2 SHA512 49ccb64c9b675460d12ea6d0456bb1124a92d56e70b04398d14b33dd5879c4e188dcc3e6c79c1aa6f491507f854911a9298fbc61aed60cbdab0205b6995bb4a3 WHIRLPOOL 6995b918f17d4930c246c6796febf09eab7c2777f649565cc4cfc03b770577dbd6a01a8824ba3dde555001cf814e27dd8b886de466e7f5fec1cdbd1791dbc225
+DIST github.com-golang-oauth2-13449ad91cb26cb47661c1b080790392170385fd.tar.gz 38610 SHA256 37eb1785d9f7ed65cf65440f539212afd79542557e87210d6dac0ab1a3bf6dc4 SHA512 9301e42d43ff421f85949b1fd7e60baa183842b0d128c0f4895708c30a91e4e614032a08dda03c2564b41251037c453f95aa21fe1876672e033c83890a96d660 WHIRLPOOL 26cb7db13df1acad3f1e3bd06e0cbac01af3f24c094bd3105179ee3d949a52ccd5666d6860434ae97ed2f1111e8c23f37adfb4d1d5463e5ac94fed6162cb7cfa
+DIST github.com-golang-protobuf-11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz 267933 SHA256 327b39ec814a097e18944d161a115990d0bcedd76a4c28d5aad236425278acd5 SHA512 7b6ac268d15fc5e2c07a22784565466abca6257deef90183bab45e1935c915dbebe5560e6583d76b2ba8b58fa22b0c07f5f512c188b6503ebbf47937f844afe9 WHIRLPOOL 8691fdcb7d99993fce6eae79a0bb127161d74c5dfe3d98a4f1b9559e605365bf8753ab506d2b7c691e88ec1bb56d30f31e1ac169e65cb0489b80e70f12b2e1ee
+DIST github.com-golang-text-14c0d48ead0cd47e3104ada247d91be04afc7a5a.tar.gz 4618483 SHA256 2fe10f43f044e97447bab62576a229851353acf59235924f9b0ade017fde5d67 SHA512 3878ad8e044c46bb005b245ea2d23cfd3dc3810a0c93a70eb12a04705deb0342223a250e9466c3e407504cbe3514917f0d1b50873c0375c945688b8869ba5f9d WHIRLPOOL a1405096d8ba110856c1f0cdcc2fc2affe2b332f3c3d04533bd64514bd4e8ee655228d2bcd9279eff3a1ff8d1d27261d274bd9b1ec2170b1cd2507fa97356f4a
+DIST github.com-google-go-genproto-595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz 988349 SHA256 e75295c57cc5f8b2be1f13a496bf9aa4bb223fcbf81415eb48240f0bd2e3516e SHA512 1cfcc16d9eb8d6414e943d7a62ea6606527b34135e8baa905f92e1e4f438f245d9cc4db9711c9b191b979bab6eef404adb84c2c85fd2af2c91bc0d8e89a7b1cf WHIRLPOOL 5c5b0019d4cede329a940bb413b14f414634cfe722bb69c49ef84bd203ec70d45e8efef21d065fc4aefb48a792d9bcbae8179c03ab704a7ffe980b859dbe413e
+DIST github.com-google-google-api-go-client-39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz 6388385 SHA256 33a6f85f6a4b2bef1f9c33ddd6f285181200b43f13eba4a191fce2d39efff448 SHA512 5d5d66abff2bad1a758e0a9cd9b12b9d9d2f02df8b9eb6ff0b38ae505808c1a6e78eb46ee0516b92ab04e1241aac827287b2dc050adf84c867168e0b441864ba WHIRLPOOL 0bdc487c8540cdb3615e8e4500602af650acb217b4706eb82efe35a32f674d09da2504b2f864a4eb4849b4e320c7185eb47616dac796b8d767a896d72efd6274
+DIST github.com-googleapis-gax-go-317e0006254c44a0ac427cc52a0e083ff0b9622f.tar.gz 6194 SHA256 018019a19484f547444ab8ec8160578a4ee357ff559d3bb630f25c09300e4615 SHA512 880d9a46a9ed3814546049f50b71824f9b59bd89dfc8c8d0d2710a69eef5036f70a553495c72783d9d8336d05a6caf89bcecc2be2f5ad2667d1380d4ad8ac2e3 WHIRLPOOL baf75519b4928240dbf11ba698c036dab7b5a5e0c442f97f17e04ed5f52a758298917caa89aba498253c5bd8dd4f2ac1b816c6ba83fe65bc3d50bc3c05682000
+DIST github.com-grpc-grpc-go-bb78878767b96d411e740439ac820f118e95ae2f.tar.gz 315770 SHA256 06743a2fa15540cc6cce10e646f65d595c8bf5f183f936990cefc5e374221e52 SHA512 9c54f853ca37d0493f17a2532b8d6f4c4a445fb26aa96f9220ab3abf92b00143233c4c38784dda4dbcf02fb181aa2bae6b37f29eaa45f5ae97ee5510f9115a9f WHIRLPOOL db283b3e65eddd35da2b023043727eb7615a36c3b71b467f6d601e312b9c3e6c97cfcbdbea7d00465eb2d66cc1a24bf23c4460aa6dbb96940d98b44d67cf7fb2
+DIST github.com-martini-contrib-binding-05d3e151b6cf34dacac6306226a33db68459a3b5.tar.gz 16976 SHA256 b2b59de42fb6d43fa15af92820c31046c6568615df30d59d8b70dedeaedaca7c SHA512 c53c61cc3904d9c5c25a3d1b22bb3651242e89f2975c783a60edd25ae387d51dd5566624dd030d1b4697ab09b99f828a628e917e8079e27356e9971ac2e1c028 WHIRLPOOL 11b4ddaf20c32c4171f51b0c6f0cd554e81a6f0cca493534d42c445d194106816f930838cf88d266cfaccdd02e902f45b1bb572e63795de9459cad58a6b7b277
+DIST github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz 3262 SHA256 c013b75f090745e80bc5e3060a26d7053ebc63bd3d077177aa7a3e349bf151ca SHA512 8627d22f5ee5a087744bbf4dd391f8f87ebabe8940564206935dec9e406e40a98976479ea973e61afeb1774df211992cd61c67ee198d546e22fbf60826b64ac9 WHIRLPOOL be9969d0cca83428e9f6eadfffd970d95ae8c0562c00005303eb8122b2cd737410372458e2cd8e6328ff65536d5b7d6b60e34f94fac8cb4d582202dae4e0b94a
+DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 SHA256 60afaf4d86f11a5d256d240cbccba766c5ef6ba2e695661df6bc4608021ca186 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70 WHIRLPOOL 5606a1879961eed55f00e3d7cfb21663db1d9f7059a586ea5a423f58655713a333d89ceb8dab328af0cea9d13e9dd02bde49bff6a086d80d571a03c79fc72ba8
+DIST github.com-odeke-em-cache-baf8e436bc97557118cb0bf118ab8ac6aeeda381.tar.gz 3525 SHA256 3dcd26929a993bb0e652118bca2883f9fad1ba16398416e45e8226a316715d12 SHA512 547f5923824fe422bb3bc6240dd7bc2c13fa499352c168ba69bc650549e4f39e5f52cfd0ab30fc86221bebe600401e72a530b3365575e40e9d0e72b1f83bd522 WHIRLPOOL 8c7bff31928e3c25bdeeaddc4e328645bed9eb168f1cf1ee2c9c5e234087b67cc81d6dc96f6b35aa2eff5cfd31468512dd8b582f8944a04eb239002a1ffaa613
+DIST github.com-odeke-em-cli-spinner-610063bb4aeef25f7645b3e6080456655ec0fb33.tar.gz 2376 SHA256 02b26aa2fde9f8f4286bc9e38ac7c78c022e8cfa3522c68e65e23070c37b75b5 SHA512 91dcf9cf1634691685c091a78609cc6cbd87b4bc9677092bb4d078cb3680b75dec131444e0afe813dc35f5703a164029a77497482b44e11f7d88ee976d73ed26 WHIRLPOOL d36a854c7e7c97a3e3464e0b7ebf489b413cdbf895c2e6e244ecb53b667e23386af01734008eb819ce466bfeb05ade379ec1f7eeebfedecc702a1bcd84152db0
+DIST github.com-odeke-em-command-91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561.tar.gz 4078 SHA256 f7685aabda1994d95f996eb687b3575d15a85f1a1e84f61688b0cacf4bcba85c SHA512 2efb78236313bd0ddc82f7322f752e0b0bf351e8bcd1f1643efeeec7185ba1757a34d6c640b89429b60bae29cffe0ee093b0af7e63861deab38ee5feaf5bb73a WHIRLPOOL 1b25a3db5ed2e92197782df65d7b32d0979456582e9a4c33106b131d5bf18dc45c410ce12786687344c098768377659d69b7889ad67e3ee3900adbcd52ee98c1
+DIST github.com-odeke-em-exponential-backoff-96e25d36ae36ad09ac02cbfe653b44c4043a8e09.tar.gz 2188 SHA256 b2984a02ef1c5dfcc943172a39718d11ad1e4d242f8d717e60f86ab7e364575b SHA512 3bca870fc1e2b9920442ac8672f937e6a346ec5794e3acbd831b01d287e1bcc7c9cbbf1996766369e2ee65e886aced2e1a6d3274818d7b69b6ed13cbf4e5595e WHIRLPOOL c51cfca17b99a02a8f47656cdb39847f15bccd501c79ca293a0c647fae151dd898417c02f11f51d83dfa08268d8dc3c3f840bfa29e1943964587bf6b1f19508d
+DIST github.com-odeke-em-extractor-801861aedb854c7ac5e1329e9713023e9dc2b4d4.tar.gz 1750 SHA256 1a52d0bcae0803bea4322ce8b9372ca1fefafbf13065cf9212cdea227b40e7fe SHA512 6cc47a2aa73357e6a6ca1f0fd0ae5750db1efe9f0eb966b654b670b14f672bf872310dd633a5530d8d0bc05c745f401ad2f3985e477706bb012b5477f2975856 WHIRLPOOL 27f15f47b2c5a9d09bced08fad6bc428b9ebf5bd2b8ce105f2c5ba867fbd59696870a2700d617e2fa22e3cdb6bb1f5f882c07e707b6487284d6068561fe63e46
+DIST github.com-odeke-em-go-utils-e8ebaed0777a55fa09937617a157dd51386136c2.tar.gz 6256 SHA256 8e49dcb099aa004844534f9a3159b43b61bdfeead6067ad0a3c14ff02f14d565 SHA512 c0497264181b42a7b794b913c863a84e2b0d44659db3ed27fbb073c48f875c57a418e2350d43c759397697ee5d5db566bf427705eadfe7bde48828bc69456df8 WHIRLPOOL ff1cf81ae6ee4c990c43f7af49f3fee7fc06596ed74463ca0b91a271bbbf0d1eb6a72ab8c8449bf3ba0a816f591eabb1c2a1d4d6995c5ccac3ae1adc176e3d14
+DIST github.com-odeke-em-go-uuid-b211d769a9aaba5b2b8bdbab5de3c227116f3c39.tar.gz 10400 SHA256 7ab64af609ab9d2032dc46a51ed61b43252b1f12b4f5b5496d81d5134ac7cf6f SHA512 e8b53aa2ee88cea20052091eb6b7022dcb5bc1a2d1ef342b18468c2ea53a3c43c64941f57fc777244ab72bb105d061de1f255d257b044d048fbae3044d93e528 WHIRLPOOL 9a2ada4b6425ba6edae4d86884774e176735d8cba912f5b3067c63165b16bbf0205f9af2770cadefb166b2343bd7044d80288dd90c718e2d030dd10cdeff4dfa
+DIST github.com-odeke-em-log-8d60a6917853243fd746612e6ba47843a794fa82.tar.gz 2426 SHA256 62f33543bf0faa910dad9ec31aa9f9d18736661a8912dea6a468e1b75f350f85 SHA512 de24de185b05d448a37d9b38a415ed8f47757ba0b12171d0bac217a040f3b43d31716ae351194c89c289855cd61d37be38887419c14c584de8686555bb4be675 WHIRLPOOL 76ac37839ae759f7e183fbae65745403fe96dc3ef585668f2d80b30a450a1b3653c6540c52424a6f40a880e1234b10c984a2d3837a9989aa0762916692a62bed
+DIST github.com-odeke-em-meddler-d2b51d2b40e786ab5f810d85e65b96404cf33570.tar.gz 1972 SHA256 355da29af73f7ed1f45a9f786c41c4e7ee690c91bd1c921a146fe92f994bbb62 SHA512 7d27ab87bc97994d053f4396fe4419c74afbab210e7f7d172472779263ff2878fa0d8bd5eb242167403e53d40b66683bc3c19fc83f5b8f374e12273d58949630 WHIRLPOOL 02f6d7df515ad0a197882293cf634258de07ed96d6fc90f44c4509bcd63b763dc4c255879583140f7b320dee38109af1e0ef3f6b91388144c390250ed827db44
+DIST github.com-odeke-em-namespace-0ab79ba44f1328b1ec75ea985ad5c338ba3d56a6.tar.gz 2825 SHA256 d537ecfc6275d4e241574b7024ccbc20a4bc43089b76d2ea9be23ea99d521486 SHA512 d22d4f561d5278211957203e27faeb29234f9d103757aed8413386c3b9b2e4bbd210cade9511c6f4168a6c615fa637f36639c9d6b3f161836611a40db30994b5 WHIRLPOOL 0711bd8a57e44bdcda52c070a127bfc29ce241faa3382df320e04d60910dce9b7b424055a7a43148803ad3b5762956d4079dc7109538e1336cd8578879427e67
+DIST github.com-odeke-em-pretty-words-9d37a7fcb4ae6f94b288d371938482994458cecb.tar.gz 2377 SHA256 b6690e78fc854fdbc4d5544e6263ec8f8f9a0d429c395d34a83d513a621b0d31 SHA512 e5dffef8840aafe77302f33dd4c22489df6a3f15850cf05bc9adb052bad1f449be972703543a610303a19b355730109d98be35d4397dc2c1751e560fe16bac5c WHIRLPOOL dda578ad7f717483eb71b7eb1c3b5ed858c91dada1d9bb0f1e42503965b2f0c0df522b5804666eb4896253fd1450de0ae02b2280c029bef3bc6d16196ca47ec2
+DIST github.com-odeke-em-rsc-6ad75e1e26192f3d140b6486deb99c9dbd289846.tar.gz 2130311 SHA256 dfbc5f039c030f0923d034e5852550e5b4cd396c07dfd46481d1b0931bb5185f SHA512 220162a67229ddc1b234b3b6e4fc446c834b8c08348dcbb3d3a71767c7099c5b77d46c01d5cb91ca83745686ec66fd8184ad3eea300e4db63b89c1557568acba WHIRLPOOL 6b7260d7f61eab00f7e8432f7c8a04426f47b3c8e6f1c0da32f833136ce25ef36e05da5303e9cfff3bc28bbf68ed0868d555d5b50450b3bc5cbccc10001ff173
+DIST github.com-odeke-em-semalim-9c88bf5f9156ed06ec5110a705d41b8580fd96f7.tar.gz 2742 SHA256 e1f9e2cb6a1ff78c453be5bb9fc41c1468313183c0e1d1e0fb7995d28fddf4f4 SHA512 f2d6ae78d017f7603dd6a7737803bf3633dad1abb029a069001fd4d8af63fa52220f8c3942433970e4d9e68fa3ca7be7945d68fa84b99f599164eca88d81cb29 WHIRLPOOL a3012a80cffa6316e65d798d0cafadb4b34793976ae3a734e77096dd5a58a46bd3834fc5b233f2a092d2eef2fe8b97f8cf718747e3e10d8aad60d6cf329404ed
+DIST github.com-odeke-em-statos-292960a201e2310a667eac7796f4e11cd51021a3.tar.gz 2874 SHA256 5c0c8ab4006df78536c7cfd0f835be3ae14e2eb11fee431920b7c51545e65de3 SHA512 359fbdc4f03ce7477c5dd08a7ea6892193fa0ea976497cfa5e5e8bc3b8ac57c7a479b02b6d54e615842c4ab8d3f4d369b865408654cb18b2ccac2511e87ccdd8 WHIRLPOOL 0611f50c887bca0327a2fe6a5d87e05080c0ead705cd606859752187ada7e05050b05517b0bf0b31b5b0acb23f72bd81662cb74798008aa21a6e68a0bea3efdf
+DIST github.com-skratchdot-open-golang-75fb7ed4208cf72d323d7d02fd1a5964a7a9073c.tar.gz 7012 SHA256 78d343a6c3b759e9fcc7b21f36a8e0c883ef5051d19a705acb798c540c4263e7 SHA512 c9255b599d6f743c00bb0acd7f6b3c3078c34b2dfb1c30dc2f8a4e4f4c466efb2115749d0b0ab8595c925efc8e67f9e769ab6183d1676743f279289e8c5b3744 WHIRLPOOL fe882e2e30b2dd4d4c1de0c23ee537f446a575ccd23705e7e04b7c4ec3cd2f3931e24553a148f0fcf3d890b8de8bb8569f5fb2ac76c515e9bbfeb21c4a4ea005
+EBUILD drive-0.3.9.1.ebuild 3175 SHA256 ac796c2e22b1d989aa96036d1b30ea547d9b01badb7184ddf8377b07d6cff270 SHA512 90e08a2435b73f9be38ef3f7c6ea70439d0fb59ea3d266d892711dbe03629bb037ff57345839e3a66712630d37034ca4aa7efc464bdf8dd3a893ccb87fa97b6c WHIRLPOOL ca2669a01b8120e6edd8016da7276942b6ebeaee79600884038144bac7c2eda138e4f9f179289d38d98c402cecd3cb8c5122c4d32f6b7b10dd4695b8e8f47f94
+MISC ChangeLog 1262 SHA256 e54670652678945bead6a85270889b0c174aee17032a83c85cc332bace5cdfcb SHA512 0a0b6242ccd89ac3a4dae21ba2f32b9da03f905768c38e05784d42358edaaf6d992b1b8ae33cfd3ffe244e134f1d09dc7d89facd48db642ed29c1d6805a2d043 WHIRLPOOL ba68746b374a469c2424de4a895dc977ef2f674108599fc8db98b3b7ddfe7d05746e3de25f9b5ae91e9a4894882928c1cd86b23b81135827118eeb5f57658dbb
+MISC metadata.xml 323 SHA256 053c4e18884018a92296e72c795555585f132c4fad3bc54bd209455f5127422d SHA512 7b192d2cca21406fdf830d8df5d338c82dccae2cb2d4a65b8e9c06084bde9239b3797bc040c2e0401fcbadd711e5760bc10ebcbaac6424e83bfa1ab6601ccde5 WHIRLPOOL 15e2eb97922a0066d784da61cd95aa9e4550a015f06a0877e5a18c8ea2984fdf03c1b8c04a34d1b4e35a6c3b125c36a37935bf306037edf81855da959f6e380e
diff --git a/net-misc/drive/drive-0.3.9.1.ebuild b/net-misc/drive/drive-0.3.9.1.ebuild
new file mode 100644
index 000000000000..5a6b7812ce82
--- /dev/null
+++ b/net-misc/drive/drive-0.3.9.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64"
+DESCRIPTION="Google Drive client for the commandline"
+HOMEPAGE="https://github.com/odeke-em/drive"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+EGO_VENDOR=(
+	"cloud.google.com/go a5e721bf760c8055ea3ae8b732da1dc6a10fc3f9 github.com/GoogleCloudPlatform/gcloud-golang"
+	"github.com/boltdb/bolt fa5367d20c994db73282594be0146ab221657943"
+	"github.com/cheggaaa/pb 657164d0228d6bebe316fdf725c69f131a50fb10"
+	"github.com/codegangsta/inject 33e0aa1cb7c019ccc3fbe049a8262a6403d30504"
+	"github.com/go-martini/martini 22fa46961aabd2665cf3f1343b146d20028f5071"
+	"github.com/golang/protobuf 11b8df160996e00fd4b55cbaafb3d84ec6d50fa8"
+	"github.com/googleapis/gax-go 317e0006254c44a0ac427cc52a0e083ff0b9622f"
+	"github.com/martini-contrib/binding 05d3e151b6cf34dacac6306226a33db68459a3b5"
+	"github.com/mattn/go-isatty fc9e8d8ef48496124e79ae0df75490096eccf6fe"
+	"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
+	"github.com/odeke-em/cache baf8e436bc97557118cb0bf118ab8ac6aeeda381"
+	"github.com/odeke-em/cli-spinner 610063bb4aeef25f7645b3e6080456655ec0fb33"
+	"github.com/odeke-em/command 91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561"
+	"github.com/odeke-em/exponential-backoff 96e25d36ae36ad09ac02cbfe653b44c4043a8e09"
+	"github.com/odeke-em/extractor 801861aedb854c7ac5e1329e9713023e9dc2b4d4"
+	"github.com/odeke-em/go-utils e8ebaed0777a55fa09937617a157dd51386136c2"
+	"github.com/odeke-em/go-uuid b211d769a9aaba5b2b8bdbab5de3c227116f3c39"
+	"github.com/odeke-em/log 8d60a6917853243fd746612e6ba47843a794fa82"
+	"github.com/odeke-em/meddler d2b51d2b40e786ab5f810d85e65b96404cf33570"
+	"github.com/odeke-em/namespace 0ab79ba44f1328b1ec75ea985ad5c338ba3d56a6"
+	"github.com/odeke-em/pretty-words 9d37a7fcb4ae6f94b288d371938482994458cecb"
+	"github.com/odeke-em/rsc 6ad75e1e26192f3d140b6486deb99c9dbd289846"
+	"github.com/odeke-em/semalim 9c88bf5f9156ed06ec5110a705d41b8580fd96f7"
+	"github.com/odeke-em/statos 292960a201e2310a667eac7796f4e11cd51021a3"
+	"github.com/skratchdot/open-golang 75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"
+	"golang.org/x/crypto faadfbdc035307d901e69eea569f5dda451a3ee3 github.com/golang/crypto"
+	"golang.org/x/net 859d1a86bb617c0c20d154590c3c5d3fcb670b07 github.com/golang/net"
+	"golang.org/x/oauth2 13449ad91cb26cb47661c1b080790392170385fd github.com/golang/oauth2"
+	"golang.org/x/text 14c0d48ead0cd47e3104ada247d91be04afc7a5a github.com/golang/text"
+	"google.golang.org/api 39c3dd417c5a443607650f18e829ad308da08dd2 github.com/google/google-api-go-client"
+	"google.golang.org/genproto 595979c8a7bf586b2d293fb42246bf91a0b893d9 github.com/google/go-genproto"
+	"google.golang.org/grpc bb78878767b96d411e740439ac820f118e95ae2f github.com/grpc/grpc-go"
+)
+inherit golang-vcs-snapshot
+
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+src_compile() {
+	GOPATH="${S}" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} \
+		"${EGO_PN}"/{cmd/drive,drive-server} || die
+}
+
+src_install() {
+	dodoc "${S}/src/${EGO_PN}/README.md"
+	dobin "${S}/bin/drive"{,-server}
+}
diff --git a/net-misc/drive/metadata.xml b/net-misc/drive/metadata.xml
new file mode 100644
index 000000000000..783063b06072
--- /dev/null
+++ b/net-misc/drive/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">odeke-em/drive</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
new file mode 100644
index 000000000000..2f18d6e30c66
--- /dev/null
+++ b/net-misc/dropbear/Manifest
@@ -0,0 +1,8 @@
+AUX dropbear-0.46-dbscp.patch 500 SHA256 b133670f2417a112e06ae0e4ec7fe50eeb76015e44a5c19d4f55a8df3636ed2d SHA512 33596d1b59ba266eade106e8fe058cc9d20d1657db88d51fb11c2111835f7887b3fa5714b3feb9767c48ed94d3af0c539864886e0a2586b6f58a38bb9f741210 WHIRLPOOL d442a66dbbc6aff293ef4b6b358573fe6a08c22cbfc31a02ef8fc9fe0b88e9a80d7f9cf3c1fe3ac6470e922d512054f0543d714e6a1bf07f482e3546e68df045
+AUX dropbear.conf.d 190 SHA256 e891255a49d408eb11514662faa4d724a1df27cc2ee90268507dbd2573b67334 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f WHIRLPOOL 91db627754119bec23cb22b047741699f732a8f23fef84d35cacc1977dc738e16631f936c36ee9f86dafe0a30962c9583dad44b36b798961668875451106b18b
+AUX dropbear.init.d 731 SHA256 d31714f6b09aa87de700ae49b192d2ac63e2935f98a557aa3aa9e0afc1983a0f SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8 WHIRLPOOL e76ecf7d9969c295fea63f541b64a65688b352a56cc6b2479a1393f89a7e125f5be794377477dc53279d8ed2bf2ebe7cdd1570d3189377a0af8af50ea5e58205
+DIST dropbear-2016.74.tar.bz2 1622234 SHA256 2720ea54ed009af812701bcc290a2a601d5c107d12993e5d92c0f5f81f718891 SHA512 c0f4ea7840077b8302b48e27b5b588a4babac6583740dfdb845c40f633aa3ec96174d1d2ade81d2c3e23ea99b75e906312c512d8c7580e6e4105b2dbd37e5e22 WHIRLPOOL 7feee8beda0990649c3456350aa16776de92a649f02d368bbdf925f9077db0f3d822a46d2dd5832405a112132990142119e94da26af4fde0dfb954b301a08ae3
+EBUILD dropbear-2016.74.ebuild 2480 SHA256 04dacb3e6748ba75f675838f9f75c3f457f913398eea1aeb0f6354a303d2a587 SHA512 aaf43ba85a8263110a368772d021f47cb876b0e1ac40bd82a3ff0099a07103093593cebb27d2fdd2bf7f6863bfea4992d0f9bcd34ef4e53288e029d014e1dfab WHIRLPOOL 664e4821b03a86f86090498fb8f43f99cc644a17d72912ac17b9b6fa0cb56285fc70f3ff7b997cfef527cee17f6fe927d1c3142ab49b00037f9c7dd0232ef328
+MISC ChangeLog 5364 SHA256 ce0bb83d0d90df62f4b9259378f34d2f5c0d3576055da8cac930294710c567ec SHA512 d0a691b870b70400e5808456c357c0941adff29b0a61ebd12b3ef3616b1d53a609edbb16c7086be920e7dd2dc3994ca56f7d71216253cc7eed0fe8dec8b0a115 WHIRLPOOL 28ae6f5662ed3bdcab336c66c7d1e6c3afefa7043c33e5cd3f18e33e80a608ca5df99e613e82175aad0011c25bd7073e1aa318e3dbde0fb8f2cc6e8b6e45aae2
+MISC ChangeLog-2015 17112 SHA256 f59fa884243280b22c4ad7596a0d5a7b0f2db2da0e22875609a72a4490861385 SHA512 69efb28eeaa36417306f57b0d1a63aff7e8f6a08d1d939b5d0da2c955ec6f622e88f6149b6ea6535408176923d97b013ed5093287e419b9a80984d71035a5851 WHIRLPOOL c3f9e4c65b4d05e10555cdfcc03c1576a477999595c2dc3d0feb30b0968a58de629bdc9e3b965c61ac708bd6d80d91163715df1503e417af2f74a2cb3b334e0f
+MISC metadata.xml 1791 SHA256 8cc475b63ededac9ca283ae966a7833840d2265e8158b19f47da6a5530920c12 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314 WHIRLPOOL 82ec6d9d6ed9581b9c1d9c77fb146aeb858252dc04c67add13ad32636d7bfc082454d670763956268443df6d23258b8a49a1e5f1e9f20d334f5a8c08a69cbd75
diff --git a/net-misc/dropbear/dropbear-2016.74.ebuild b/net-misc/dropbear/dropbear-2016.74.ebuild
new file mode 100644
index 000000000000..ba624f584a3d
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2016.74.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils savedconfig pam user
+
+DESCRIPTION="small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
+
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
+	dev-libs/libtommath[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+
+REQUIRED_USE="pam? ( !static )"
+
+set_options() {
+	progs=(
+		dropbear dbclient dropbearkey
+		$(usex minimal "" "dropbearconvert scp")
+	)
+	makeopts=(
+		MULTI=$(usex multicall 1 0)
+		STATIC=$(usex static 1 0)
+	)
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
+	sed -i \
+		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+		options.h || die
+	sed -i \
+		-e '/pam_start/s:sshd:dropbear:' \
+		svr-authpam.c || die
+	restore_config options.h
+}
+
+src_configure() {
+	# XXX: Need to add libtomcrypt to the tree and re-enable this.
+	#	--disable-bundled-libtom
+	econf \
+		$(use_enable zlib) \
+		$(use_enable pam) \
+		$(use_enable !bsdpty openpty) \
+		$(use_enable shadow) \
+		$(use_enable syslog)
+}
+
+src_compile() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+}
+
+src_install() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+	doman *.8
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+	dodoc CHANGES README TODO SMALL MULTI
+
+	# The multi install target does not install the links right.
+	if use multicall ; then
+		cd "${ED}"/usr/bin
+		local x
+		for x in "${progs[@]}" ; do
+			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+		done
+		rm -f dropbear
+		dodir /usr/sbin
+		dosym ../bin/dropbearmulti /usr/sbin/dropbear
+		cd "${S}"
+	fi
+	save_config options.h
+
+	if ! use minimal ; then
+		mv "${ED}"/usr/bin/{,db}scp || die
+	fi
+
+	pamd_mimic system-remote-login dropbear auth account password session
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
diff --git a/net-misc/dropbear/files/dropbear-0.46-dbscp.patch b/net-misc/dropbear/files/dropbear-0.46-dbscp.patch
new file mode 100644
index 000000000000..18873f24c5a6
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-0.46-dbscp.patch
@@ -0,0 +1,20 @@
+--- dbmulti.c	2005-07-17 07:00:07.000000000 -0400
++++ dbmulti.c	2005-07-17 06:59:35.000000000 -0400
+@@ -60,7 +60,7 @@
+ 		}
+ #endif
+ #ifdef DBMULTI_scp
+-		if (strcmp(progname, "scp") == 0) {
++		if ((strcmp(progname, "scp") == 0) || (strcmp(progname, "dbscp") == 0)) {
+ 			return scp_main(argc, argv);
+ 		}
+ #endif
+@@ -81,7 +81,7 @@
+ 			"'dropbearconvert' - the key converter\n"
+ #endif
+ #ifdef DBMULTI_scp
+-			"'scp' - secure copy\n"
++			"'dbscp' - secure copy\n"
+ #endif
+ 			,
+ 			DROPBEAR_VERSION);
diff --git a/net-misc/dropbear/files/dropbear.conf.d b/net-misc/dropbear/files/dropbear.conf.d
new file mode 100644
index 000000000000..555f275d993c
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear.conf.d
@@ -0,0 +1,6 @@
+# /etc/conf.d/dropbear: config file for /etc/init.d/dropbear
+
+# see `dropbear -h` for more information
+# -w disables root logins
+# -p # changes the port number to listen on
+DROPBEAR_OPTS=""
diff --git a/net-misc/dropbear/files/dropbear.init.d b/net-misc/dropbear/files/dropbear.init.d
new file mode 100644
index 000000000000..eaa3ae2919c2
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear.init.d
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use logger dns
+	need net
+}
+
+check_config() {
+	mkdir -p /etc/dropbear
+
+	local t k
+	for t in dss rsa ecdsa; do
+		k="/etc/dropbear/dropbear_${t}_host_key"
+		if [ ! -e ${k} ] ; then
+			# See if support is enabled for this key type.
+			if dropbearkey -h 2>&1 | grep -q "	${t}$" ; then
+				einfo "Generating ${k} ..."
+				dropbearkey -t ${t} -f ${k} >/dev/null
+			fi
+		fi &
+	done
+	wait
+}
+
+start() {
+	check_config || return 1
+	ebegin "Starting dropbear"
+	dropbear ${DROPBEAR_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dropbear"
+	start-stop-daemon --stop --pidfile /var/run/dropbear.pid
+	eend $?
+}
diff --git a/net-misc/dropbear/metadata.xml b/net-misc/dropbear/metadata.xml
new file mode 100644
index 000000000000..5133c5c348b6
--- /dev/null
+++ b/net-misc/dropbear/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>embedded@gentoo.org</email>
+    <name>Embedded Gentoo</name>
+  </maintainer>
+  <longdescription>
+I was looking for a small and secure SSH server to fit on a laptop with 4 megs ram and no hard 
+disk, and couldn't find one which was satisfactory. I decided to write my own, and Dropbear is 
+the result. It implements most required features of the SSH 2 protocol, and other features such 
+as X11, TCP and Authentication Agent forwarding. Dropbear is Open Source software, distributed 
+under a MIT-style license.
+</longdescription>
+  <longdescription lang="ja">
+私は 4MB の RAM とハードディスクを搭載しないラップトップ型にぴったりな小さ
+くて安全な SSH サーバを探していました。しかし満足するものは見つけられません
+でした。私は自身で作ろうと決意しました。その結果が Dropbear です。SSH 2 プ
+ロトコルに必要な機能の大半、他にも X11 や TCP、認証エージェント・フォワーデ
+ィングといった機能が実装してあります。Dropbear はオープンソースで、MIT スタ
+イルのライセンス下で配布されます。
+</longdescription>
+  <use>
+    <flag name="bsdpty">Add support for legacy BSD pty's rather than dynamic UNIX pty's -- do not use this flag unless you are absolutely sure you actually want it</flag>
+    <flag name="multicall">Build all the programs as one little binary (to save space)</flag>
+    <flag name="shadow">Enable shadow password support</flag>
+  </use>
+<upstream>
+  <remote-id type="cpe">cpe:/a:matt_johnston:dropbear_ssh_server</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
new file mode 100644
index 000000000000..d1de8580ea9c
--- /dev/null
+++ b/net-misc/dropbox-cli/Manifest
@@ -0,0 +1,7 @@
+DIST dropbox-cli-1.6.0.py.xz 17632 SHA256 0030e948dbc6795fecde32c41a7c0779f3ec5131473fa4039ae9356e7238b3d6 SHA512 06fcbba67031c18fe1840f592d04039a7c78848d6e77ae8cca04881f5f72ada7fb368921e2ae3b92d161e49bf91eae0f41b559a210eacd0dc203c51134597857 WHIRLPOOL a0af611c354474e5bec27796bf07933de64d6bd8f3c04641238c8f5149111daf5b1f93a2b33bdc3c89f5386f7a864e7edfa0d9d784f72a2c2b1db9250bdfa6c7
+DIST dropbox-cli-1.py.xz 17580 SHA256 4773944647444b2fafef0b2db36cab6605de8ca6557d824d527e3725d65eecfe SHA512 d5510a66a5605e474059bb761cc2f33cd4d23481e85f040b049c36759a030f1e7072a9ad2cc7f72e59507767aa375ff3ea1c06d7bf702eb7ba7d698db2bfefe5 WHIRLPOOL 50740fa16f669321bf16a69358e8cada1f11c77f984b138b6ec0ff7a0c99f84d1515ddeab6483ffb578b5ccabe189def35b10d83a7c3b7a0d6e67e70c0675770
+EBUILD dropbox-cli-1-r1.ebuild 557 SHA256 5856d59a2161af426d8deb259e987f3756bb83bb2022545208096449c0332bac SHA512 f05f11819aa08f4a3c15ebbac4aec43147e93175b04670c8a6b7c393322886c992185f67fc1ec0cc85121225d590660767cbd5452f2d8086a57a2ae1c54e1df6 WHIRLPOOL 85b906bd9d1c78ec9128ce105fa24bcae04e8db6576e57f5b9e291c64f409ec39c1a06598e9fdfcedc0e8b6056b3742554b374c8d77037c1ca83317a554d5a13
+EBUILD dropbox-cli-1.6.0.ebuild 576 SHA256 52bfd6302345adffd428f48430e1c473d733d30909f52e02187131f2ea22c941 SHA512 d85d45e60ace1c07220b94ede13aa18d2293b7bf3494981bc1a21ff4ad19a5e1fb35110a7d215b342d6d99e8d6e4a36be0bc65631037bcc8bb9eb60e288a9ccc WHIRLPOOL 0b2a48f9b8b1fe46c85d3271d3082e2173b2bd5aa1d040cabe8281efd26cde242de3f22b3976a4a3146eacbd553025678a221235879b349846af512c35b22ed8
+MISC ChangeLog 2639 SHA256 78d68401d289a6c1c11e6f2d2317326f0d7de56c7434396f10e0a60e8ae55b75 SHA512 0cb5187400bfcb88295b4a1cf9ea6a7839d7c528cba35059d8c36411c936317ceaea94e36f355242b9c35a56c88bf85eb90962789c1eae41a7db8ad31ec83b1b WHIRLPOOL 66eab9f8090813204043238febb6709832ac29e40fac3e35dd9d8f5a1b501fd45242710f2f8f57991055b9c48255a1ca9f1dc292d7c4c0361baaa7cc14ff24cd
+MISC ChangeLog-2015 2107 SHA256 4637e82e443d35b7bb1b371598d5812ec30b01b64c976cdbeeac3c98cd43885b SHA512 dc334feb5ee2f0d22dd45a3480c02c8fb17f702c3a14fb916dd23a89995a2414acbdd9cd7475cd1cc7adc0fb0834644578c742b9e82246e2c7c1c669692a95cd WHIRLPOOL b2cc7054c61cf60582a44100eb1d73b04526af765beb95c6e0432ef92551127154c66f2b7f77d6ff98ce086e07013a526bc50cab4b35e30377a8d39bf67b2181
+MISC metadata.xml 217 SHA256 fe17ecde701f56da69571b47571fe71a41cabb0cce7116d62547cd223543cb75 SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396 WHIRLPOOL fd4b3579be790f2cf0d3431a179f982d58867449ede4d0b0f0f3e5b081aba5dbb0d4526c6b5997faa3d7bb181dbc3b387b236748a949e6115147b5f9043d8d28
diff --git a/net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild
new file mode 100644
index 000000000000..028c2c8b2060
--- /dev/null
+++ b/net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="Cli interface for dropbox daemon (python)"
+HOMEPAGE="http://www.dropbox.com/"
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.py.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="net-misc/dropbox
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}
+
+src_install() {
+	newbin ${P}.py ${PN}
+	python_replicate_script "${D}"/usr/bin/${PN}
+}
diff --git a/net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild b/net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild
new file mode 100644
index 000000000000..299c194c861d
--- /dev/null
+++ b/net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
+HOMEPAGE="http://www.dropbox.com/"
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.py.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="net-misc/dropbox
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}
+
+src_install() {
+	newbin ${P}.py ${PN}
+	python_replicate_script "${D}"/usr/bin/${PN}
+}
diff --git a/net-misc/dropbox-cli/metadata.xml b/net-misc/dropbox-cli/metadata.xml
new file mode 100644
index 000000000000..13830225acf7
--- /dev/null
+++ b/net-misc/dropbox-cli/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 type="person">
+		<email>grozin@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
new file mode 100644
index 000000000000..ca39c3f3db53
--- /dev/null
+++ b/net-misc/dropbox/Manifest
@@ -0,0 +1,13 @@
+AUX dropbox.conf 322 SHA256 b45db3c9676cfd8bf568ca5ce86a4e1a6b95cd604edeba2b3e2b3fb604e19ab4 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132 WHIRLPOOL 2093d21df44308b478654457bf753913b56cc64ff76dd037720dcf15ba061307fc65175cf32c3ae54a16dba32614b1f123aff3c69bad599651ed67be0685f791
+AUX dropbox.initd 1581 SHA256 63c002b19573242477b4b3882f77f31ea6580910d859b1fd8d3b80f3435f6ef0 SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912 WHIRLPOOL d563a53c47dae74e8b3a15cbd07d8b92659813a825336ead9a0029664266844e9ff0365c8c01123ab9da12d5f324b04b66a01de9d0ebaf6add792c665cb72aa6
+AUX dropbox_at.service 220 SHA256 8a02c67f98781a781741ab54d5c22ff904871db84e5549bc2e4864b8d5b9cee8 SHA512 cb33bf6aa290be0ba1afce2f5e525489f8bf4144daf09619b15292968657c74ee17678ed1aba6aa9d2dbd068dc394a10896e7dbd0eaf74d74a928368394bc933 WHIRLPOOL eb318ca1804cd023ca3a78eb923ce5be4dce1166187956fc190af23ae9676bcad61e6180869778e2bea53c572d7e53c0e3f9402874d57791b9e728ad9dd3cc4d
+AUX dropbox_at.service-r1 220 SHA256 33f514f89be2136750725ac06700933e5b03ef406ff5cc19968a9d6c7ee702b7 SHA512 ea685e6eb901b841e54aeb9b530d5a0d2a367d8b598019f7f0d2ae69b013be7cf3986c68fabbbaa30c51c9fb5406dc45b07ff15914c7cf18a7aceacf466328e5 WHIRLPOOL 01587f3ea00445a320d3e91d4f406f94f5ae8b4d4d466b73cc44dfd186e2b16d0b1cf6fe9302a3586cca5f42be627791ad83166a4d46a5b7a55717aaeb2180ff
+DIST dropbox-lnx.x86-26.3.21.tar.gz 66464459 SHA256 fee6936d207a3e675832ac0d8015f0037368f2652b96601f7f965bed9a9ac3fc SHA512 6d730cac63076baf1792ea4cee290fcacb4c55653baa4fdaa51cd4db7d166d13e03df26181662785309bccfd8475ec248cf68b5cc0b7a541a86db97b92127bb6 WHIRLPOOL 790043cd0c26f5f62725fcd4f9c437c028b597ac90cbd9e3089bb6f237f8e69e3a834b8ed405256a0ec41c5c3231bb6ff5645fe63d1ce00e3f3c7153e684bfad
+DIST dropbox-lnx.x86-34.3.19.tar.gz 68452832 SHA256 190faa0334c5a7f51c2dc68da12aee7e9bde2b9d80cdbd9ebd0f8d99dc03cf03 SHA512 d71d7742d603e50d4ce7d8e366eac5a17a9641f7508a33f1a4d7135048d0df0af6f7d6dad11c6f523127ca2bf16e8819221d73b80375ace2850a0d87aee03903 WHIRLPOOL f7a3bdcc6c4cc5ce4da48a4d0f2fa0cf8df367f6461696d04a77d6d31db708409f7b5997f681cfcc2c9d841125aac05e9bbadcb841ab2397beb0562cd85190ad
+DIST dropbox-lnx.x86_64-26.3.21.tar.gz 70341986 SHA256 244f67ea1eca6fc7384dccc8ea14836712663ed269d32b3a0498f9fc6b02cc71 SHA512 b4c9f160184785e4fe14253fb4208a6ba276708547e519a9fe73ad3731a123cf9c410ccb3a2048ecad90261cd7f8a03d127e7c2b6bbce16665e5dd5d8b738234 WHIRLPOOL 793f7953ccb2bc5c10debbb766537f28b6edf8bbe20a44aecc635211d20154a677b2cfb2e3a6b45bd462823f4b96e5b75a0bbee742dd81e8997c08db7ab46004
+DIST dropbox-lnx.x86_64-34.3.19.tar.gz 72543000 SHA256 19f22d49b49ba9fceefe6115adc70ace8854bad45c22871c3de0eecb598c27cc SHA512 49be921903df05483f222f417538800843fd12d82dff720633640a740859a6a2da28b7137ffbf2dbf178d3908f11801f0a3622d1dec80da53adbe46a60f4c269 WHIRLPOOL 1c9389d649ebe4c3a7d0dfa6dc209a23733885590441502555fdccfe0b622d8acf958852e6f3c63f03e02e8844c61b1f4b4940e005648cbc1b0f753230a4672f
+EBUILD dropbox-26.3.21.ebuild 3225 SHA256 bc325a4ce210f31936fc994db9e46d98f193fc24b6993e2e038b1eb64083d3c5 SHA512 fd9cdf1a28988aa5fc47dc7374743a3580ff911b3664853d1c42a9fd1007408fafbf745408aee1bb76a78f06075442d331aa7a1707e6983712d56788052457d9 WHIRLPOOL 213aa4861babd3c029225fefbc27c815f167dcb63fbcd153fbd70d8b4b916972dc365654589533c237912be7231541b554742fb94050807d61253e1b86d73f70
+EBUILD dropbox-34.3.19.ebuild 3069 SHA256 728fa78254c9482182a99fae6c72a60ace3e88a961abd190315d89813557a4f9 SHA512 e7f218c0f8ef8d7c9cd4c5651f7c08cdec1deda754530fc2c0620f0e452521f21b0d839cea23b902b5ae35a3ae727307277c7d86c17dfd0796d91f55d8d1d605 WHIRLPOOL 2037e3e1ecb1b0a2201f1040402876eaf73628a0775caa97a367b28142d3cf095b7e79586d1c0558f9db458d8b185b6c6ac19348208ee9eb42786f3436c4c33b
+MISC ChangeLog 6052 SHA256 7c04020528761c421266ad4536e5dafd804e8d31219cfee7b4a4ede7b55b8a0d SHA512 7f665eae9642b85c073f36e1822eebb532dea040a26e9ec25d78442b9cba43f80f914c30d477772c107cec1d14242d503589f2fa76394a2d3d5caf006ce223a8 WHIRLPOOL b35ab46f12125d4840709d2eeed0a69dbf18d601db204bcafb6f2e721d36383a4d3c4142a8236d14e8d7d94cd795314b1329aad0f29720aa693c6a9931cabfe3
+MISC ChangeLog-2015 9677 SHA256 bf4188db8d40baf835df916f62672b477747116d635ad62b1e0c0f3fa63fca05 SHA512 079a472917a28324bdd271de425ec1d7a371459c7e9106cb3106b78ba379a3809983fc4c282acc5c88763c314ed21b15286b2ba239a152043e4b565d75a75d72 WHIRLPOOL 4152b5aae61c435c3df363d774788a7028e4fa8bc0a4383d03db7b35026b46b3261948a9c089d647e2b5bb8fe84dd6ff3efb5397d21ca9638877921fec69706e
+MISC metadata.xml 392 SHA256 1cdc85b2e928a4783c0d3d058e6ff2a69be3e4cca2f3ae6553de95337cc778b7 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141 WHIRLPOOL 336f1ffd2198a65bf957ea3c11f5ff1d11e781b88d043ee325cf868e39ec7c016b8c377d7b93f6cc4b7f9950c82add02414842686b87c7f0852af5b1ea522c4e
diff --git a/net-misc/dropbox/dropbox-26.3.21.ebuild b/net-misc/dropbox/dropbox-26.3.21.ebuild
new file mode 100644
index 000000000000..1545137de6a1
--- /dev/null
+++ b/net-misc/dropbox/dropbox-26.3.21.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils gnome2-utils pax-utils systemd python-single-r1
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="http://dropbox.com/"
+SRC_URI="
+	x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
+
+LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+# USE=X require wxGTK's dependencies. system-library cannot be used due to
+# missing symbol (CtlColorEvent). #443686
+RDEPEND="${PYTHON_DEPS}
+	X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5[-gles2,xcb]
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	|| (
+		sys-libs/ncurses:5/5
+		sys-libs/ncurses:0/5
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	local target=(
+		dropbox_sqlite_ext-0.0-py2.7.egg
+		setuptools-20.3-py2.7.egg
+	)
+
+	eapply_user
+
+	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
+	rm -vf libdrm.so.2 libffi.so.6 libGL.so.1 libX11* || die
+	rm -vf libQt5* libicu* qt.conf || die
+	rm -vrf wmctrl plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi.so* || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	mv ${target[@]} "${T}" || die
+	rm -rf *.egg library.zip || die
+	(cd "${T}"; mv ${target[@]} "${S}") || die
+	ln -s dropbox library.zip || die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/dropbox/dropbox-34.3.19.ebuild b/net-misc/dropbox/dropbox-34.3.19.ebuild
new file mode 100644
index 000000000000..2ea39b1ac76e
--- /dev/null
+++ b/net-misc/dropbox/dropbox-34.3.19.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils gnome2-utils pax-utils systemd python-single-r1
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="http://dropbox.com/"
+SRC_URI="
+	x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
+
+LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+# USE=X require wxGTK's dependencies. system-library cannot be used due to
+# missing symbol (CtlColorEvent). #443686
+RDEPEND="${PYTHON_DEPS}
+	X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5[-gles2,xcb]
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	|| (
+		sys-libs/ncurses:5/5
+		sys-libs/ncurses:0/5
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	eapply_user
+
+	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
+	rm -vf libdrm.so.2 libffi.so.6 libGL.so.1 libX11* || die
+	rm -vf libQt5* libicu* qt.conf || die
+	rm -vrf wmctrl plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi.so* || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	rm -rf *.egg library.zip || die
+	ln -s dropbox library.zip || die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/dropbox/files/dropbox.conf b/net-misc/dropbox/files/dropbox.conf
new file mode 100644
index 000000000000..c20c3c4694ef
--- /dev/null
+++ b/net-misc/dropbox/files/dropbox.conf
@@ -0,0 +1,14 @@
+# /etc/conf.d/dropbox.conf: config file for /etc/init.d/dropbox
+
+# Users to run dropbox
+DROPBOX_USERS=""
+
+# integer [-20 .. 19 ] default 0
+# change the priority of the server -20 (high) to 19 (low)
+# see nice(1) for description
+#NICE=0
+
+# See start-stop-daemon(8) for possible settings
+#IONICE=2
+
+PID_DIR=/var/run/dropbox
diff --git a/net-misc/dropbox/files/dropbox.initd b/net-misc/dropbox/files/dropbox.initd
new file mode 100644
index 000000000000..4f8dd70629f3
--- /dev/null
+++ b/net-misc/dropbox/files/dropbox.initd
@@ -0,0 +1,65 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+    need localmount net
+    after bootmisc
+}
+
+start() {
+    local tmpnice="${NICE:+"--nicelevel "}${NICE}"
+    local tmpionice="${IONICE:+"--ionice "}${IONICE}"
+    local started=""
+
+    ebegin "Starting dropbox"
+    for dbuser in ${DROPBOX_USERS}; do
+	local homedir=$(eval echo ~${dbuser})
+	if test -d "${homedir}" && \
+	    echo 0 > ${homedir}/.dropbox/dropbox.pid && \
+	    start-stop-daemon -S -b \
+	    ${tmpnice} ${tmpionice} \
+	    -u ${dbuser} -v \
+	    -p ${homedir}/.dropbox/dropbox.pid \
+	    -e HOME=${homedir} \
+	    -x /opt/bin/dropbox; then
+	    started="${started} ${dbuser}"
+	else
+	    eend $?
+	    eerror "Failed to start dropbox for ${dbuser}"
+	    if [ -n "${started}" ]; then
+		eerror "Stopping already started dropbox"
+		DROPBOX_USERS=${started} stop
+	    fi
+	    return 1
+	fi
+    done
+    if [ -z "${started}" ];then
+	eerror "No dropbox started"
+	eend 1
+    else
+	eend 0
+    fi
+}
+
+stop() {
+    local retval=0
+    ebegin "Stopping dropbox"
+    for dbuser in ${DROPBOX_USERS}; do
+	local homedir=$(eval echo ~${dbuser})
+	start-stop-daemon --stop \
+	    --pidfile ${homedir}/.dropbox/dropbox.pid || retval=$?
+    done
+    eend ${retval}
+}
+
+status() {
+    for dbuser in ${DROPBOX_USERS}; do
+	local homedir=$(eval echo ~${dbuser})
+	if [ -e ${homedir}/.dropbox/dropbox.pid ] ; then
+            echo "dropboxd for USER $dbuser: running."
+	else
+            echo "dropboxd for USER $dbuser: not running."
+	fi
+    done
+}
diff --git a/net-misc/dropbox/files/dropbox_at.service b/net-misc/dropbox/files/dropbox_at.service
new file mode 100644
index 000000000000..1cea6177ce7b
--- /dev/null
+++ b/net-misc/dropbox/files/dropbox_at.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Dropbox
+After=local-fs.target network.target
+
+[Service]
+ExecStart=/opt/dropbox/dropboxd
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=always
+User=%I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dropbox/files/dropbox_at.service-r1 b/net-misc/dropbox/files/dropbox_at.service-r1
new file mode 100644
index 000000000000..b46a8509c61c
--- /dev/null
+++ b/net-misc/dropbox/files/dropbox_at.service-r1
@@ -0,0 +1,13 @@
+[Unit]
+Description=Dropbox
+After=local-fs.target network.target
+
+[Service]
+ExecStart=/opt/dropbox/dropboxd
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=always
+User=%i
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dropbox/metadata.xml b/net-misc/dropbox/metadata.xml
new file mode 100644
index 000000000000..7e45457c3266
--- /dev/null
+++ b/net-misc/dropbox/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>perfinion@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>naota@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="librsync-bundled">Use bundled librsync library</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest
new file mode 100644
index 000000000000..4c60d7c86564
--- /dev/null
+++ b/net-misc/efax/Manifest
@@ -0,0 +1,7 @@
+AUX efax-0.9a-fax-command.patch 269 SHA256 87263c0d23b217e5e50a7dd37d97b3c93bcdf9a4b09049795a2c0a6aaf7f5ea6 SHA512 a0d776e9a668bd48fffd5aeca42acb2b22364626985c01216c8fae3f170bd53067431ac93c0785a8f7b705695a5fee0a9e8c1dc4f8b0931b029291bb6a63cca2 WHIRLPOOL e505c2ccef6b29aea8c15f44e093a8fd4a5a237b53850fef7e18689a2c86c8a516919975a4eea49f58ba6a5576b44b662e7da284e5088b5aca065f23272dc2d8
+DIST efax-0.9a-001114.tar.gz 97402 SHA256 46abddf13f7565ea0c9d85b92845cdb32fb265c47cfc84c972e11a0219cda8ea SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b WHIRLPOOL 790aa776668f58aaea3b1be16daec47e223fea08e8104647427bc80d63b52037ac526f2d8696dc3d93b2ff6efd7bb7b0b6c7bbc251d5db911788b805d13b6f01
+DIST efax_0.9a-19.diff.gz 18178 SHA256 eb039ae8e4be159e262bbb11e1de5596b249ba22f67a9bd3bfdbab0da3964197 SHA512 8b1a2d007ebba73b772400eb1e0ccc61d832775590ac4fd6e171008c9741409118db099b444dc8da04dd87f1cb7025a9af62f60b2c3ccba21cc89863a2909735 WHIRLPOOL 521e647c564216d016efa1cf763fb9ca5977effe310be3db05c9d0401eea25c9bc41e58ddadcd711a4e7f96b034efce189ea346866c86cff30cd3212f1e0c4d8
+EBUILD efax-0.9a-r4.ebuild 984 SHA256 678693193d15ea32d7551a04d4e6bee721984b3a628399ba8f643f8d817af071 SHA512 24ed551aeaf705a960e11be4813045c84fe1fe0653c0dd840faf7c428b6462e1410c7b5de8ed84e4655f3743f0bc75daa5eeace1806bcbda1a04c5588f7165f8 WHIRLPOOL 7225e4011daece1ea7086461a2eab1af831c9eb069aab21c7ee370f6cb1887e1cd1fc966a70d43de9d491e744655fce9c72d1a1e10316b2209f8e54492bd9fd6
+MISC ChangeLog 2553 SHA256 9251df710def7ed9a7e8b8483b81dbd65b01dc3ad5d962f5aabbbb04d0a1fcd5 SHA512 0172e90ca915f43458388bdbd5a27dd5a21c008bbd28b45c9eebb85764a1f37be033772401cf5cd8a5fb48fe9ebb2c25ed49c4b7d3f8504d8840045f1f8501e4 WHIRLPOOL 12483637eae0a03e4a5595feec636b565fdadf0eb98e7f231fac53fe1c82dc13bd6bbdcae1f10d21f5b34e63b9e83cf65dcdc07177c14985e4cafa4d5a9bd476
+MISC ChangeLog-2015 2937 SHA256 bb6237997930aa6bb80d17258f10a96f3ed65dd5dd13c938095189bc56497bac SHA512 8574aa1bb549300421e090a3ddb067db2f4b591284f236ba1cd3ed052aa016eddef5dbd588b77e1b92fc04b498e915661635c8ba05419429af62f6307be57b58 WHIRLPOOL 394d71f22f8a474f67157e8a25264fc342082a9850b863084c1067442702dce207358f2c59baaa8b7dacd57717fa336dc4a86d8c9471199587d01e7447227d4b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/efax/efax-0.9a-r4.ebuild b/net-misc/efax/efax-0.9a-r4.ebuild
new file mode 100644
index 000000000000..da87d0c139a5
--- /dev/null
+++ b/net-misc/efax/efax-0.9a-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+S="${WORKDIR}/${P}-001114"
+
+DESCRIPTION="A simple fax program for single-user systems"
+HOMEPAGE="http://www.cce.com/efax"
+SRC_URI="http://www.cce.com/efax/download/${P}-001114.tar.gz
+	mirror://debian/pool/main/e/efax/efax_0.9a-19.diff.gz"
+
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+
+src_prepare () {
+	epatch "${WORKDIR}/${PN}_${PV}-19.diff"
+	rm -f "${S}"/${P}/debian/patches/series "${S}"/${P}/debian/patches/00list
+	EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches/*
+
+	epatch "${FILESDIR}/${P}-fax-command.patch" #327737
+
+	# remove strip command as per bug #240932
+	sed -i -e '/strip/d' Makefile
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install () {
+	dobin efax efix fax
+	doman efax.1 efix.1
+	newman fax.1 efax-fax.1 # Don't collide with net-dialup/mgetty, bug #429808
+	dodoc README
+}
diff --git a/net-misc/efax/files/efax-0.9a-fax-command.patch b/net-misc/efax/files/efax-0.9a-fax-command.patch
new file mode 100644
index 000000000000..92bec22aa879
--- /dev/null
+++ b/net-misc/efax/files/efax-0.9a-fax-command.patch
@@ -0,0 +1,10 @@
+--- fax	2010/07/11 02:05:19	1.1
++++ fax	2010/07/11 02:05:37
+@@ -773,6 +773,7 @@
+ 		$GS -q -sDEVICE=tiffg3 -r$RES -dNOPAUSE -dSAFER \
+ 		-sOutputFile=$BASENAME.%03d \
+ 		-sPAPERSIZE=$PAGE \
++		-dMaxStripSize=0 \
+ 		$BASENAME </dev/null >/dev/null )
+ 		;;
+ 	II*|MM*|P4*)
diff --git a/net-misc/efax/metadata.xml b/net-misc/efax/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/efax/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
new file mode 100644
index 000000000000..2f83631ab46e
--- /dev/null
+++ b/net-misc/electrum/Manifest
@@ -0,0 +1,15 @@
+AUX 2.7.15-no-user-root.patch 704 SHA256 3a5d4897ab0d53929a985dccd11d86262e5b32715dfeee415a0ac2f7d2c7d456 SHA512 3bce2f6b0605e708107097b8bb033681c901afc535c1921712d3b2db172cc296b50cc4a833b0d21c9718fc094d37d9d9b3c2e9abb65d6f96449ae91635d3101c WHIRLPOOL 3456b25d828f0122b29b72cd0e509028c8b39f5903c00e86032118aacd793ea2f338eb14c61f343dfefae34365153d43704aeb07bafbe2f48b468ae7fe29f142
+AUX 2.8.0-no-user-root.patch 708 SHA256 424374637884ddf105bca14d556f9f763ab3fc8349ce2ec19b0b5d4b433daa96 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd WHIRLPOOL c2e2b7ce93886e668757686ede021717e06709a1d280298103b6def5574d40ca362fe313b942f592acfc4646c1340ca63b657f8afaee151415ec3fff2c3305f7
+DIST Electrum-2.7.15.tar.gz 1967697 SHA256 1f237b394079ec5ced34ae09dc6b50472e51233dd1dfef580127168e293b9652 SHA512 2f4f5181dcf0b98ce34348c296e50383b677db1fd14fa0052a0168a7c880d18d04ebb9a91dbb7316e09adeda275cc87b5457c8f0925b3635a1c769c81f31165c WHIRLPOOL b7a85fd9a4f7fdf5f64dc1182630b9d5b1bb033e49ebb00f1dd421d93c02f8fab8a0679de9a2fae074fdda5932fbfd261d5c8a2d6be3940821f18f82d46f2e28
+DIST Electrum-2.8.0.tar.gz 2241359 SHA256 6343ae1732920734c45ebf899592c1c29123530ce027b4dcdd4a62e87663e9ef SHA512 dcef8c84677ff6045ee00a7b26aac7ded00b54753737c32a0c9b8939647a8467769ba93be3ce6beecdc5030c94dc6647121681ce22e84f487b36ede6d0d69e1c WHIRLPOOL 5f6f170306fa6c62e4fe4ebbfac1460b04e1a6606f1e3a2339b6d4284d9f884c2123f78401201511653402a3771b383fea7aed2b2c0fcb8b720472b80a4662a6
+DIST Electrum-2.8.2.tar.gz 2277689 SHA256 d8152bebc5c6f47b28a5d867707bc5742158fe544e7e8046d2c4747ae282b707 SHA512 4f4dd4b017e1b4ef3de311d840e9704e0169d4813f646296f99aa00afe39ea83c5b53b320fd31244dd2a67c320be1537b7132b54d775b7c1a9f1da54627ecf9d WHIRLPOOL bcd9ce9369dbe9d94c75e46429ba05968a51f4fdf8a6d2b67e27c981b13bf239fb7d290bf18227ed07e6704c3f292e10e5022dec95d7dc84fb5740d11acbf6d4
+DIST Electrum-2.8.3.tar.gz 2321524 SHA256 c16ea6266f036a942efa1554ac138e2748a8050c78551da30995ffe6a9e25a12 SHA512 40988667538eb2c8733f9cede52380cb3c9212efc0780e5c4665b93b55677f0705262216fafc7544c5c18e77621bac4828312b792acbb35ac6048f54b17877a9 WHIRLPOOL 8f197ab89674899ba8d0f41804c496cf851cd2c096f8f6b8c84ebd0c1da0a8e5e49f7b0d384a851f5509eda4273089b2fe26734ba23b05bfbf4234febc1fb05a
+DIST Electrum-2.9.3.tar.gz 2389367 SHA256 c2192d4df6490fdc6e6f9f85b05db0e3915683a016a43ed444ebbc51ccfa0e34 SHA512 4f0be390ad10ec37a27b8ad9beaa4ebe003186a2ba583aa313466b89d8867ab61eec80a09bd575ceec08be060c2998f58231c7c77a4b78be0d1fcd690a090f57 WHIRLPOOL c41a4e9b3a069f16df56eca3aec33f498550efaeee62ebc199a8fdc263de2703a07ac11670335f59bb5a7564101f3378efdee08646719d9365af13ba442f52b6
+EBUILD electrum-2.7.15.ebuild 3909 SHA256 c4267db092d0ac622444fac26c508c66c0ce1848a7a32e4a2137bd2f38a605bf SHA512 42b84f4262d4d104c547e25695638ae9b9340e33ba2bf18793252db3396817582defb2264bb898eed7b98a84e3211ef5a3cf3f716be246df9ca66ae4e7e7b84c WHIRLPOOL 66595ad85a8950d9dcca3e842c4182569dd27a9299b256257226873da33a416004a848327ed2024c3906a9fa2909e6f275e41c9626bf4129cdde091858ff052d
+EBUILD electrum-2.8.0-r1.ebuild 4133 SHA256 48a9f5ffbf16f185289e87b532401a9758c160cc2d63b2e41a53741e2715ae28 SHA512 71d53b7056845138d870c558489ef8660c9fe999db3a0e1125385ea46f03ebe6435b6f06cfab8c93d9c0e8c8c5ca91188223152f7e25f80968e5bc00daef1359 WHIRLPOOL 5e4e85665587b6c786663aae760d426f5a4ac93d44cdfb6ee751ad6c4f25035fe123ccdc6578afc2060e341ddad8dcea82ba20ba0e27578b94cc5d1b0ee6a5a5
+EBUILD electrum-2.8.2.ebuild 4133 SHA256 29de8a6b7e1cf4d8ac80ed1172891c3235d7313fd1963e7f24c8ba1a255f62ed SHA512 abcaa6c286f6734f1e6832af8698d72333af19c5b758fba4d9b2a3645cf96fd8e94194cedc49a7fd31ca70bec33ddff83915677e436767249fc0ab50e3ce99db WHIRLPOOL 28b8546ec43e699c9a2178bf103b816f848d44bb3668f2b3fce1d5e312f405348bd81334354dbf472088e76327a42c402b49d91f567336c28382f60fefa32182
+EBUILD electrum-2.8.3.ebuild 4133 SHA256 29de8a6b7e1cf4d8ac80ed1172891c3235d7313fd1963e7f24c8ba1a255f62ed SHA512 abcaa6c286f6734f1e6832af8698d72333af19c5b758fba4d9b2a3645cf96fd8e94194cedc49a7fd31ca70bec33ddff83915677e436767249fc0ab50e3ce99db WHIRLPOOL 28b8546ec43e699c9a2178bf103b816f848d44bb3668f2b3fce1d5e312f405348bd81334354dbf472088e76327a42c402b49d91f567336c28382f60fefa32182
+EBUILD electrum-2.9.3.ebuild 4133 SHA256 29de8a6b7e1cf4d8ac80ed1172891c3235d7313fd1963e7f24c8ba1a255f62ed SHA512 abcaa6c286f6734f1e6832af8698d72333af19c5b758fba4d9b2a3645cf96fd8e94194cedc49a7fd31ca70bec33ddff83915677e436767249fc0ab50e3ce99db WHIRLPOOL 28b8546ec43e699c9a2178bf103b816f848d44bb3668f2b3fce1d5e312f405348bd81334354dbf472088e76327a42c402b49d91f567336c28382f60fefa32182
+MISC ChangeLog 4535 SHA256 492302b176ad5990829d1a7f7960f777f9ab3807a73ef8269d0abaf0f3bd210c SHA512 b7a18b5d760cb319801302c575d9a736ca76f4c962679cefafff7a5b7bbd8fd5de92bf99d227746bfd1028e45557140bc23ebc584ad13da2975fb6056e79f13f WHIRLPOOL 2cf43b3bf574c8ef484b598469f0fdcc6df8883e46aff982464279423fc5d7f3d38b8ebe416058c7530d5b108b892cf68e8fd2423ec9526e3c362cef3c712c31
+MISC ChangeLog-2015 5754 SHA256 91c51ff815dacba31132da483cb65dd39926a3cc91ef3612e53153ce84056b35 SHA512 f913c729a3793575315ed135adfdad3081b33c3af57e0c6abba6c69f95e50b6ca2870b10e8344903d3a53a75106204bbc089bacf24ddb16c1bd5ab43f20b1087 WHIRLPOOL 7b0e54a1cc8390502234391613fca426a3d3a49d0af90e3b42d1004166a07bba59573c76915f2237d9de88423a71b2bcfce48c195f6b167d30779d7026263eb6
+MISC metadata.xml 1327 SHA256 9f59cf1fedffda8ddc3b0ef02546a565580836c4fbfe728bc81c3ff89dff69f0 SHA512 3047791e1985494eeec1348c64e9a7ef6f9055cc01b0eb462dcb8958a6fb448d75ace206c33498cdd45a5470efc4091f5bc0bc062284a2bd2b0f4a6299591d09 WHIRLPOOL 3b6775af40704f3ac6b542e03b92c8535115afab0f52a67ca001788c80b11115d7d6c0ed4b3e1c27145a1176d14510fec1e318b260be658b1d182b75f4740383
diff --git a/net-misc/electrum/electrum-2.7.15.ebuild b/net-misc/electrum/electrum-2.7.15.ebuild
new file mode 100644
index 000000000000..536d54d9c396
--- /dev/null
+++ b/net-misc/electrum/electrum-2.7.15.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?"
+
+inherit distutils-r1 gnome2-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
+
+IUSE="cli cosign email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+REQUIRED_USE="
+	|| ( cli ncurses qt4 )
+	cosign? ( qt4 )
+	email? ( qt4 )
+	greenaddress_it? ( qt4 )
+	qrcode? ( qt4 )
+	sync? ( qt4 )
+	trustedcoin_com? ( qt4 )
+	vkb? ( qt4 )
+"
+
+RDEPEND="
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/slowaes[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	|| (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-libs/protobuf[python,${PYTHON_USEDEP}]
+	)
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
+	qt4? (
+		dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-no-user-root.patch"
+
+	# Don't advise using PIP
+	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	# Remove unrequested localization files:
+	for lang in ${LINGUAS}; do
+		use "linguas_${lang}" && continue
+		rm -r "lib/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex linguas_ja_JP '' japanese) \
+		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
+		$(usex linguas_es_ES '' spanish) \
+		$(usex linguas_zh_CN '' chinese_simplified) \
+	; do
+		rm -f "lib/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt4      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt4      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt4; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex cosign        '' cosigner_pool   ) \
+		hw_wallet \
+		ledger \
+		$(usex email         '' email_requests  ) \
+		$(usex greenaddress_it '' greenaddress_instant)  \
+		keepkey \
+		$(usex sync          '' labels          )  \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin   )  \
+		$(usex vkb           '' virtualkeyboard )  \
+	; do
+		rm -r plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/electrum/electrum-2.8.0-r1.ebuild b/net-misc/electrum/electrum-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..b00584832176
--- /dev/null
+++ b/net-misc/electrum/electrum-2.8.0-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?"
+
+inherit distutils-r1 gnome2-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
+
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+REQUIRED_USE="
+	|| ( cli ncurses qt4 )
+	audio_modem? ( qt4 )
+	cosign? ( qt4 )
+	digitalbitbox? ( qt4 )
+	email? ( qt4 )
+	greenaddress_it? ( qt4 )
+	qrcode? ( qt4 )
+	sync? ( qt4 )
+	trustedcoin_com? ( qt4 )
+	vkb? ( qt4 )
+"
+
+RDEPEND="
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	|| (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-libs/protobuf[python,${PYTHON_USEDEP}]
+	)
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
+	qt4? (
+		dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PV}-no-user-root.patch"
+
+	# Don't advise using PIP
+	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	# Remove unrequested localization files:
+	for lang in ${LINGUAS}; do
+		use "linguas_${lang}" && continue
+		rm -r "lib/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex linguas_ja_JP '' japanese) \
+		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
+		$(usex linguas_es_ES '' spanish) \
+		$(usex linguas_zh_CN '' chinese_simplified) \
+	; do
+		rm -f "lib/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt4      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt4      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt4; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		$(usex greenaddress_it '' greenaddress_instant ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin          ) \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/electrum/electrum-2.8.2.ebuild b/net-misc/electrum/electrum-2.8.2.ebuild
new file mode 100644
index 000000000000..82aa0e5d8a49
--- /dev/null
+++ b/net-misc/electrum/electrum-2.8.2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?"
+
+inherit distutils-r1 gnome2-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
+
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+REQUIRED_USE="
+	|| ( cli ncurses qt4 )
+	audio_modem? ( qt4 )
+	cosign? ( qt4 )
+	digitalbitbox? ( qt4 )
+	email? ( qt4 )
+	greenaddress_it? ( qt4 )
+	qrcode? ( qt4 )
+	sync? ( qt4 )
+	trustedcoin_com? ( qt4 )
+	vkb? ( qt4 )
+"
+
+RDEPEND="
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	|| (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-libs/protobuf[python,${PYTHON_USEDEP}]
+	)
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
+	qt4? (
+		dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
+
+	# Don't advise using PIP
+	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	# Remove unrequested localization files:
+	for lang in ${LINGUAS}; do
+		use "linguas_${lang}" && continue
+		rm -r "lib/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex linguas_ja_JP '' japanese) \
+		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
+		$(usex linguas_es_ES '' spanish) \
+		$(usex linguas_zh_CN '' chinese_simplified) \
+	; do
+		rm -f "lib/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt4      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt4      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt4; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		$(usex greenaddress_it '' greenaddress_instant ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin          ) \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/electrum/electrum-2.8.3.ebuild b/net-misc/electrum/electrum-2.8.3.ebuild
new file mode 100644
index 000000000000..82aa0e5d8a49
--- /dev/null
+++ b/net-misc/electrum/electrum-2.8.3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?"
+
+inherit distutils-r1 gnome2-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
+
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+REQUIRED_USE="
+	|| ( cli ncurses qt4 )
+	audio_modem? ( qt4 )
+	cosign? ( qt4 )
+	digitalbitbox? ( qt4 )
+	email? ( qt4 )
+	greenaddress_it? ( qt4 )
+	qrcode? ( qt4 )
+	sync? ( qt4 )
+	trustedcoin_com? ( qt4 )
+	vkb? ( qt4 )
+"
+
+RDEPEND="
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	|| (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-libs/protobuf[python,${PYTHON_USEDEP}]
+	)
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
+	qt4? (
+		dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
+
+	# Don't advise using PIP
+	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	# Remove unrequested localization files:
+	for lang in ${LINGUAS}; do
+		use "linguas_${lang}" && continue
+		rm -r "lib/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex linguas_ja_JP '' japanese) \
+		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
+		$(usex linguas_es_ES '' spanish) \
+		$(usex linguas_zh_CN '' chinese_simplified) \
+	; do
+		rm -f "lib/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt4      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt4      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt4; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		$(usex greenaddress_it '' greenaddress_instant ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin          ) \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/electrum/electrum-2.9.3.ebuild b/net-misc/electrum/electrum-2.9.3.ebuild
new file mode 100644
index 000000000000..82aa0e5d8a49
--- /dev/null
+++ b/net-misc/electrum/electrum-2.9.3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?"
+
+inherit distutils-r1 gnome2-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
+
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+REQUIRED_USE="
+	|| ( cli ncurses qt4 )
+	audio_modem? ( qt4 )
+	cosign? ( qt4 )
+	digitalbitbox? ( qt4 )
+	email? ( qt4 )
+	greenaddress_it? ( qt4 )
+	qrcode? ( qt4 )
+	sync? ( qt4 )
+	trustedcoin_com? ( qt4 )
+	vkb? ( qt4 )
+"
+
+RDEPEND="
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	|| (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-libs/protobuf[python,${PYTHON_USEDEP}]
+	)
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
+	qt4? (
+		dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
+
+	# Don't advise using PIP
+	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	# Remove unrequested localization files:
+	for lang in ${LINGUAS}; do
+		use "linguas_${lang}" && continue
+		rm -r "lib/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex linguas_ja_JP '' japanese) \
+		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
+		$(usex linguas_es_ES '' spanish) \
+		$(usex linguas_zh_CN '' chinese_simplified) \
+	; do
+		rm -f "lib/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt4      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt4      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt4; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		$(usex greenaddress_it '' greenaddress_instant ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin          ) \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/electrum/files/2.7.15-no-user-root.patch b/net-misc/electrum/files/2.7.15-no-user-root.patch
new file mode 100644
index 000000000000..e98cf30da42c
--- /dev/null
+++ b/net-misc/electrum/files/2.7.15-no-user-root.patch
@@ -0,0 +1,15 @@
+--- setup.py.orig	2017-01-06 19:17:44.294137848 +0000
++++ setup.py	2017-01-06 19:17:50.093161327 +0000
+@@ -21,12 +21,6 @@
+     parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
+     opts, _ = parser.parse_known_args(sys.argv[1:])
+     usr_share = os.path.join(sys.prefix, "share")
+-    if not os.access(opts.root_path + usr_share, os.W_OK) and \
+-       not os.access(opts.root_path, os.W_OK):
+-        if 'XDG_DATA_HOME' in os.environ.keys():
+-            usr_share = os.environ['XDG_DATA_HOME']
+-        else:
+-            usr_share = os.path.expanduser('~/.local/share')
+     data_files += [
+         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
+     ]
diff --git a/net-misc/electrum/files/2.8.0-no-user-root.patch b/net-misc/electrum/files/2.8.0-no-user-root.patch
new file mode 100644
index 000000000000..2ca5363effe7
--- /dev/null
+++ b/net-misc/electrum/files/2.8.0-no-user-root.patch
@@ -0,0 +1,15 @@
+--- ./setup.py.orig	2017-01-06 19:17:44.294137848 +0000
++++ ./setup.py	2017-01-06 19:17:50.093161327 +0000
+@@ -21,12 +21,6 @@
+     parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
+     opts, _ = parser.parse_known_args(sys.argv[1:])
+     usr_share = os.path.join(sys.prefix, "share")
+-    if not os.access(opts.root_path + usr_share, os.W_OK) and \
+-       not os.access(opts.root_path, os.W_OK):
+-        if 'XDG_DATA_HOME' in os.environ.keys():
+-            usr_share = os.environ['XDG_DATA_HOME']
+-        else:
+-            usr_share = os.path.expanduser('~/.local/share')
+     data_files += [
+         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
+     ]
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
new file mode 100644
index 000000000000..a766f4d7a676
--- /dev/null
+++ b/net-misc/electrum/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>luke-jr+gentoobugs@utopios.org</email>
+		<name>Luke Dashjr</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maksverver@geocities.com</email>
+		<name>Maks Verver</name>
+	</maintainer>
+	<use>
+		<flag name="cli">Enables the CLI interface</flag>
+		<flag name="audio_modem">Enable plugin to support Audio Modem</flag>
+		<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
+		<flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag>
+		<flag name="email">Enable plugin to support emailing invoices</flag>
+		<flag name="greenaddress_it">Enable plugin to verify GreenAddress.it instant transactions</flag>
+		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
+		<flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
+		<flag name="trustedcoin_com">Enable plugin to use two-factor service by TrustedCoin.com</flag>
+		<flag name="vkb">Enable plugin for virtual keyboard</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/ethercard-diag/Manifest b/net-misc/ethercard-diag/Manifest
new file mode 100644
index 000000000000..93d941970433
--- /dev/null
+++ b/net-misc/ethercard-diag/Manifest
@@ -0,0 +1,6 @@
+DIST ethercard-diag-20050321.1g.tar.lzma 113181 SHA256 99953e09d3cba3234f43240ec131ddb0caf226650ecb6eca71f26240235eb4fb SHA512 19f9030f97a6a675b2f372acaa320314452b1c5edf543973ac72ac5cce45c05c03c1b1cc0a0375a2b15fc26c89b7a9d18b0702f82c8d4f4362e2f82362feda35 WHIRLPOOL 063744e05ca0f5a821e68757a09fcedc3a39368c162704d119a72830fad6998eb5770274ac42bce2a754b5d43839ae1d2ee6524ad01d51fc9934f28f5732cfca
+EBUILD ethercard-diag-20050321.1g-r1.ebuild 780 SHA256 600059c13bc893ce683eeebea7313cf96212224abc5f82e134509f7c86225785 SHA512 a69bf748d173795e70bfd1bc8071e3bcae6eae9f171199e54563a3adcbc50b4cdac42bbef917475aaa062fd1cc932e22016692560aa67e6da93929a42cc01c45 WHIRLPOOL 145d19eaddae593de4170e1e8d10f720de46c02ebc59c8c08e58c813a8b6ec3d09a81e082c4ed6a69a5b942602a35018e8e7b80f6fcb09dd5f88e3909e55f657
+EBUILD ethercard-diag-20050321.1g.ebuild 581 SHA256 b458bc5a9e6bb710965e71ae1e16db051e4b40537722078dc4e0b92369735b17 SHA512 010296169b2b96c6235dbb7a328d4689cfb416b03e374fca892382ce3466abcb06ed00d5ab90f4f0f20b8a11011c302ea5f6409fa20271c4fd29284902510bff WHIRLPOOL 0799918ed923c9c43809b08a42ea7cdccdf8af7585a66e9840459a617b544d68c970c60d63422e3af251ca2e89028f8ab17063d6b8345aa1397c453d48dcff10
+MISC ChangeLog 2546 SHA256 fdde54c39e87edaf0264770e150557b6eda5011f9a489b1b6d1146234e0478b7 SHA512 60e66e8b6a0b824f5478f6deffc30de52a771e214b7eb40bc9521fbdd3246ec3c0ced6eac4c7950aeb93922f6e6d992b82448b61b4813b4e3b90248b2210c73b WHIRLPOOL 1aa69831e477f10c690f9d7dc84506b590dbe26a216ed88ca0763f35b1b7164b345c94df7a74b7cba1695b66b26ad9838549628af3b9b7d3113cbfb7230fa886
+MISC ChangeLog-2015 663 SHA256 90780e329b7b82d54490620ccdfecf4e592575ef4a67ddcab80f397390628031 SHA512 63b158a6b5c4a7770c9e7bfc912dbea33fa7418176d5a2f61017c9d6d0e8c7ae070178cad11b0eaa025db35210856e76a26a1881b32c6afec3319f8948bc7aff WHIRLPOOL d4182284d57ce5887f5122c466f9d02665b1b7dff9b5e005446a83262f63accbc6d8fbf44437dabce083be95c8e97bbd7a56a2de734a1f0592df0a55a6cf73f5
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/net-misc/ethercard-diag/ethercard-diag-20050321.1g-r1.ebuild b/net-misc/ethercard-diag/ethercard-diag-20050321.1g-r1.ebuild
new file mode 100644
index 000000000000..4c7c7138bffa
--- /dev/null
+++ b/net-misc/ethercard-diag/ethercard-diag-20050321.1g-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="low level mii diagnostic tools including mii-diag and etherwake (merge of netdiag/isa-diag)"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!sys-apps/nictools"
+
+src_prepare() {
+	default
+	# Since the binary is `ether-wake`, make sure the man page is
+	# `man ether-wake` and not `man etherwake`. #439504
+	sed -i \
+		-e 's/ETHERWAKE/ETHER-WAKE/' \
+		-e 's/etherwake/ether-wake/' \
+		pub/diag/{etherwake.8,Makefile} patches/* || die
+	mv pub/diag/ether{,-}wake.8 || die
+}
+
+src_compile() {
+	tc-export CC AR
+	default
+}
diff --git a/net-misc/ethercard-diag/ethercard-diag-20050321.1g.ebuild b/net-misc/ethercard-diag/ethercard-diag-20050321.1g.ebuild
new file mode 100644
index 000000000000..f8424e16c1d3
--- /dev/null
+++ b/net-misc/ethercard-diag/ethercard-diag-20050321.1g.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="low level mii diagnostic tools including mii-diag and etherwake (merge of netdiag/isa-diag)"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="!sys-apps/nictools"
+
+src_compile() {
+	tc-export CC AR
+	default
+}
+
+src_install() {
+	default
+	dodir /sbin
+	mv "${ED%/}"/usr/sbin/{mii-diag,ether-wake} "${ED%/}"/sbin/ || die
+}
diff --git a/net-misc/ethercard-diag/metadata.xml b/net-misc/ethercard-diag/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/net-misc/ethercard-diag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest
new file mode 100644
index 000000000000..ead2063f04f0
--- /dev/null
+++ b/net-misc/eventd/Manifest
@@ -0,0 +1,5 @@
+DIST eventd-0.21.0.tar.xz 392080 SHA256 f4e1bf014e3e17bf79d3b2a61d947cf4d34000d35fab0b90b869f33f002d2349 SHA512 5907d453c493c9f2332df506037027ef7df021b1e29a6773cf8bb5c32c7a301b65ca55d3e3ea40982d3e48b837738c97b5420309a45a550f409d8912636d1dae WHIRLPOOL 864221209a50491aa9d631ff4b8d9f28b1cda77c6c34b5ac597f0496312830ae75bf10166a574df5adcd93b062fa711f79bcabb8b74e7ca254b40c99b1cb373c
+DIST eventd-0.23.0.tar.xz 157468 SHA256 fe4905d79c8312686c11db28783364b84216289fd1a7fa58db3137135047dc9e SHA512 3aba3e6c969fd123420935537b504ee3868ae1bb2589c1a755228a3aaf010fb71720a708e20de9de7a006cce9094a2b549c5eb686575f6b5b7a772e523b778c6 WHIRLPOOL 56807be1e2c52dd0fee24e815e601dd0ca11c7bdc2d5d3a3e7bdf8ecdf1d090438bf106135de411d788d3eada47dd4f1d5137665c26a5194a164f5d1ae649003
+EBUILD eventd-0.21.0.ebuild 2966 SHA256 74772e2b924fae4400c134ebd7ec616de57c5401ccf68793a73609d9d3f1706a SHA512 c01234e76c5d57a059da82843a3cfd33c088723432e4964a23440c7ab5276755a7e159a23bf10a736e999e7c0566a8d87dd751b58b7112cf19b5abebe5e032a1 WHIRLPOOL 5f42a7c7b5cc8de5724458e4b67271c035588ef7418a2526cc334e450bb59463780ffe30a1e3234e99f69f31d8ce04c72240f05e7707d7d2bd34077b78a94acc
+EBUILD eventd-0.23.0.ebuild 3437 SHA256 019bb71068ae49ec030a76ca4c8785ebb001c0fa880fb09dff34c79e9de3c7ec SHA512 3d8b65b2cab267a18aaf5e1e49b14225a5bdb9ff153d920aae802025478547d40a2c4f0d791ae2c2292a2b290bba93f828afc41db03e801fa648a208c94d55fc WHIRLPOOL 91a59a6c6a54bffddd9edbe9e1fe9b597d4d1e5678ff064e0c215061994800975210cffa331fbc3e396857dca3e7b6f0a56eae6812a2530a3bea59c6fe0489d1
+MISC metadata.xml 1025 SHA256 0808be888d72f12b8bd8fd2775d1ca42d3902a8d75e1a7c5328f15dfa40deee7 SHA512 9cb34b13668a902ce4bb7748245a7c254d52246e4df047fa0ce4de5ae9625fe0f83566394116dd99c638953786d84bfa40dd20144e2f87bf26c518c1be615e8b WHIRLPOOL d42e5b532a6f96c1a2f748e374e57831fbc02347a75f5771883728d0eb907b32e98ee8f9f61fdb052c2d39d92d52c2ac99b454883911ba792639978d1a30de4f
diff --git a/net-misc/eventd/eventd-0.21.0.ebuild b/net-misc/eventd/eventd-0.21.0.ebuild
new file mode 100644
index 000000000000..e367b620f030
--- /dev/null
+++ b/net-misc/eventd/eventd-0.21.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd xdg-utils
+
+DESCRIPTION="A small daemon to act on remote or local events"
+HOMEPAGE="https://www.eventd.org/"
+SRC_URI="https://www.eventd.org/download/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+ LGPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification
+	pulseaudio purple speech systemd test upnp websocket +X zeroconf"
+
+REQUIRED_USE="
+	X? ( notification )
+	fbcon? ( notification )
+	notification? ( || ( X fbcon ) )
+"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2
+	sys-apps/util-linux
+	introspection? ( >=dev-libs/gobject-introspection-1.42 )
+	libcanberra? ( media-libs/libcanberra )
+	libnotify? ( x11-libs/gdk-pixbuf:2 )
+	notification? (
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gdk-pixbuf:2
+		X? (
+			x11-libs/cairo[xcb]
+			x11-libs/libxcb:=
+			x11-libs/xcb-util
+			x11-libs/xcb-util-wm
+		)
+	)
+	pulseaudio? (
+		media-libs/libsndfile
+		media-sound/pulseaudio
+	)
+	purple? ( net-im/pidgin )
+	speech? ( app-accessibility/speech-dispatcher )
+	systemd? ( sys-apps/systemd:= )
+	upnp? ( net-libs/gssdp:= )
+	websocket? ( >=net-libs/libsoup-2.50:2.4 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+"
+RDEPEND="${COMMON_DEPEND}
+	net-libs/glib-networking[ssl]
+"
+
+pkg_setup() {
+	if use ipv6; then
+		CONFIG_CHECK=$(usex test 'IPV6' '~IPV6')
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Workaround Gentoo bug 604398.
+	sed -i \
+		-e 's|libspeechd|speech-dispatcher/libspeechd|g' \
+		plugins/tts/src/tts.c || die
+
+	# Prevent access violations from introspection metadata generation.
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		$(use_enable websocket)
+		$(use_enable zeroconf dns-sd)
+		$(use_enable upnp ssdp)
+		$(use_enable introspection)
+		$(use_enable ipv6)
+		$(use_enable systemd)
+		$(use_enable notification notification-daemon)
+		# Wayland plugin requires wayland-wall, which is currently WIP.
+		# See https://github.com/wayland-wall/wayland-wall/issues/1
+		--disable-nd-wayland
+		$(use_enable X nd-xcb)
+		$(use_enable fbcon nd-fbdev)
+		$(use_enable purple im)
+		$(use_enable pulseaudio sound)
+		$(use_enable speech tts)
+		$(use_enable libnotify)
+		$(use_enable libcanberra)
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local -x EVENTD_TESTS_TMP_DIR="${T}"
+	default_src_test
+}
+
+pkg_postinst() {
+	if { use notification || use libnotify; } && ! has_version 'gnome-base/librsvg'; then
+		elog
+		elog "For SVG icons in notifications, please install 'gnome-base/librsvg'."
+		elog
+	fi
+}
diff --git a/net-misc/eventd/eventd-0.23.0.ebuild b/net-misc/eventd/eventd-0.23.0.ebuild
new file mode 100644
index 000000000000..c656458a7962
--- /dev/null
+++ b/net-misc/eventd/eventd-0.23.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="A small daemon to act on remote or local events"
+HOMEPAGE="https://www.eventd.org/"
+SRC_URI="https://www.eventd.org/download/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+ LGPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification
+	pulseaudio purple speech systemd test upnp websocket +X zeroconf"
+
+REQUIRED_USE="
+	X? ( notification )
+	fbcon? ( notification )
+	notification? ( || ( X fbcon ) )
+	test? ( websocket )
+"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2
+	sys-apps/util-linux
+	introspection? ( >=dev-libs/gobject-introspection-1.42 )
+	libcanberra? ( media-libs/libcanberra )
+	libnotify? ( x11-libs/gdk-pixbuf:2 )
+	notification? (
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gdk-pixbuf:2
+		X? (
+			x11-libs/cairo[xcb]
+			x11-libs/libxcb:=
+			x11-libs/xcb-util
+			x11-libs/xcb-util-wm
+		)
+	)
+	pulseaudio? (
+		media-libs/libsndfile
+		media-sound/pulseaudio
+	)
+	purple? ( net-im/pidgin )
+	speech? ( app-accessibility/speech-dispatcher )
+	systemd? ( sys-apps/systemd:= )
+	upnp? ( net-libs/gssdp:= )
+	websocket? ( >=net-libs/libsoup-2.50:2.4 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+"
+RDEPEND="${COMMON_DEPEND}
+	net-libs/glib-networking[ssl]
+"
+
+eventd_check_compiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
+	fi
+}
+
+pkg_pretend() {
+	eventd_check_compiler
+}
+
+pkg_setup() {
+	if use ipv6; then
+		CONFIG_CHECK=$(usex test 'IPV6' '~IPV6')
+		linux-info_pkg_setup
+	fi
+	eventd_check_compiler
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Workaround Gentoo bug 604398.
+	sed -i \
+		-e 's|libspeechd|speech-dispatcher/libspeechd|g' \
+		plugins/tts/src/tts.c || die
+
+	# Prevent access violations from introspection metadata generation.
+	xdg_environment_reset
+}
+
+eventd_use_enable() {
+	echo "-Denable-${2:-${1}}=$(usex ${1} 'true' 'false')" || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		$(eventd_use_enable websocket)
+		$(eventd_use_enable zeroconf dns-sd)
+		$(eventd_use_enable upnp ssdp)
+		$(eventd_use_enable ipv6)
+		$(eventd_use_enable systemd)
+		$(eventd_use_enable notification notification-daemon)
+		# Wayland plugin requires wayland-wall, which is currently WIP.
+		# See https://github.com/wayland-wall/wayland-wall/issues/1
+		-Denable-nd-wayland="false"
+		$(eventd_use_enable X nd-xcb)
+		$(eventd_use_enable fbcon nd-fbdev)
+		$(eventd_use_enable purple im)
+		$(eventd_use_enable pulseaudio sound)
+		$(eventd_use_enable speech tts)
+		$(eventd_use_enable libnotify)
+		$(eventd_use_enable libcanberra)
+		$(eventd_use_enable introspection gobject-introspection)
+		$(eventd_use_enable debug)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	EVENTD_TESTS_TMP_DIR="${T}" meson_src_test
+}
+
+pkg_postinst() {
+	if { use notification || use libnotify; } && ! has_version 'gnome-base/librsvg'; then
+		elog
+		elog "For SVG icons in notifications, please install 'gnome-base/librsvg'."
+		elog
+	fi
+}
diff --git a/net-misc/eventd/metadata.xml b/net-misc/eventd/metadata.xml
new file mode 100644
index 000000000000..921e71edf64f
--- /dev/null
+++ b/net-misc/eventd/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="libcanberra">Enable plugin for sounds via <pkg>media-libs/libcanberra</pkg></flag>
+		<flag name="libnotify">Enable plugin to relay events to notification daemon
+			(Note: not required for local notifications via <pkg>net-misc/eventd</pkg>)</flag>
+		<flag name="notification">Enable plugin to display on-screen notifications</flag>
+		<flag name="purple">Enable plugin for IM notifications via libpurple</flag>
+		<flag name="speech">Enable plugin for Text-To-Speech support</flag>
+		<flag name="websocket">Enable support for WebSocket protocol</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">sardemff7/eventd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
new file mode 100644
index 000000000000..a46226286cf9
--- /dev/null
+++ b/net-misc/exabgp/Manifest
@@ -0,0 +1,5 @@
+DIST exabgp-3.2.17.tar.gz 596373 SHA256 c8bf85a4b3c3697c63af848d3fe4d88f64fe79ae12d2b8bae4abfd9d7a9fe1f9 SHA512 69dbff75caf287e9e0f6ab3707a2bbd576b0b4c8a8c318217cf88c8a1c417d47915b038bc7d64be3bbce9771caa550275703e5543fb5799afc7149dc9f054416 WHIRLPOOL 11c9a08f0289032257847448ea828e61fbcb19ba7b2e3bb4b6202ef00f22f60f636038b9f80c7d81d98ff43ee5ebc11e0b773d7ea0d70b811a863d0cb09c01da
+EBUILD exabgp-3.2.17.ebuild 435 SHA256 6b9c16f821e08a434eff49eb0ff30648021fc8b82d276aaa7bfbf6086e0afa78 SHA512 200dbcc99913a28bd69a7ebde17b729efb280fd1c79e7cd99196c1648f60f771ddac734dbd56d5c4ecc182fd00e9d9d7d89e7b46ed09e9c67bd9c35d544f8359 WHIRLPOOL d1f73467f65eb8e44b76a4e6bee40c1e3ef77d506c182008adc468e4c4adbbbf684be5606c345f8f3acfd154c630a50028f8e2404f9d4f9eb55e4765c2e2a496
+MISC ChangeLog 2175 SHA256 efde5816390fe09d23a6b8fec4db9603232b6fc56eeeb5d7045fdb81765576c1 SHA512 8c58a72fbd2ea8d455cec9ee34bf8865f4db2cacbfaf37d986ca81d10d9a8de6c13a7a247b36b404ea6059bb74547a95f1d72caa90228201d507ecb2976b1364 WHIRLPOOL 368efc4f0307afbc15df62373c930175be8517be2bf4035b8322e398dcbcbc932fe1fdaaa030460241a98a9318ce43c48339119e55d230c9d4fc5a8723f1ff8d
+MISC ChangeLog-2015 421 SHA256 e06dacfbbb6b776c1b3c0bc78b05216c48c97e823c803f3727d998c38daac0dc SHA512 bc633c0ffca27c27710855daaec020370ecaeaa11e86a1863a8aee20dc648d39db64c4c72451cf835acbc60e21c51858a02b461c9398c363919fa2b919a241d3 WHIRLPOOL e0fcaec8e09f62e97043a3f5d27d965dcdb1979181693d1ac3c9df36b609f5f19ec0fc24cc3d56a15341c103e136ae8c32febae1f80deed03351bd1b868f6dce
+MISC metadata.xml 339 SHA256 8d9c00ff3a75a9bf2d4be2b15fe92b0e0324104075e037d82470ad1c1f06f182 SHA512 81c99b9e586b1873b2949359be5147e2651e1b7a7e81aed124f54248f2c5f96ffe68f19f153d7029ec8a16e04b1a71b0c6c79c4c747d5901079a536d716acdc8 WHIRLPOOL 5293f23feed6757cd963ddfff07f7e73260faae881ac253cfe3b6c5d0bfe2414738445b14a20e650f1e588634de19fbbde55ae5bfe458307563fcc6989fc74a4
diff --git a/net-misc/exabgp/exabgp-3.2.17.ebuild b/net-misc/exabgp/exabgp-3.2.17.ebuild
new file mode 100644
index 000000000000..5792e63eb1c2
--- /dev/null
+++ b/net-misc/exabgp/exabgp-3.2.17.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="The BGP swiss army knife of networking"
+HOMEPAGE="https://github.com/Exa-Networks/exabgp"
+SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${P}.tar.gz"
+MY_P="${PN}-${PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/net-misc/exabgp/metadata.xml b/net-misc/exabgp/metadata.xml
new file mode 100644
index 000000000000..019082130680
--- /dev/null
+++ b/net-misc/exabgp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Exa-Networks/exabgp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/fakeidentd/Manifest b/net-misc/fakeidentd/Manifest
new file mode 100644
index 000000000000..a911708477b5
--- /dev/null
+++ b/net-misc/fakeidentd/Manifest
@@ -0,0 +1,8 @@
+AUX fakeidentd.confd 196 SHA256 e3b891648121876f32f4909f70dbb877874a7263f509530a2f50804ce2378bd8 SHA512 1d79379fbe78ad7fbfda09340574161747a6f2ea7d3e886e0a71afd9829da7812e1aa8da8d6806ba9d491406f62f66a9a803c4f2a617f025eb9af351acc183aa WHIRLPOOL 7b498b92a8edf2f1151934d29e2947e96cd18c928640f8ebf0559dca9d5887dead4f4e9c811d70765e4ca2e9307b19f074b832fa58a2b8e38696bf35f347a414
+AUX fakeidentd.rc 392 SHA256 27c693433fddc85b8dfb72d85939f91f589ae12aae2c1a61e28bd8851e09c41a SHA512 2831d5cf5292dbef0d0fd8f5b6aebdc0e753a8c8ed871f40b76fabde52ca65db939be4e1eef66ec0c73af0041add3c2a3a615bd16dc3fe7d89239d6cfe56f7f5 WHIRLPOOL 1453ab63dde988e1acb252035fd450129eb70f2bb8b752fa1f2af340bf9b6931a9b4fcb85d5fa539b32e965358fff2fd5e0061dd960b2f16a2788b799266bc24
+DIST fakeidentd-2.6.c 23042 SHA256 75b321e5d9dddcea2b38035b62ac30f2175ed43f3f187be6da19aaa67c4fe165 SHA512 97f6cc70c5cbd757d250db58dfe01f0b82bfecd8296f26f258ef16cc612d7427350ad93740150bf2e8a3c09b92de3340b2e9612ed5c9b4a4be5550f0b18da76b WHIRLPOOL 3da376b7c1f36f093be2b40faa63c87c8d32590a16c1e8ff99294d4204346f9bacabdb1b8d9950f3708e136fcd7b1a9ea10b1b6f43e1b888b72640aa0158cf88
+DIST fakeidentd-2.6.readme 5589 SHA256 887acf81df0ef991f5990fd434b0c38b32f92d4e86d19f258960c83d847f36c4 SHA512 057f0ce278b5520d5db1edf3139a68ac15f36fde1aefcb2c94db59d1557905f4f437a0bfaa30f0714e3b8b4c1cf4698a245d2c94fc6023fd2e677cc76e796d75 WHIRLPOOL 1aab212b8a45dbb194ee7c178d75cf09d259a472c38f43ab4eebf0555b32b6b3f1e1afa7c98d358e0fe76eba3531f7c22586c4db840d7499a28b068549a4ca12
+EBUILD fakeidentd-2.6-r1.ebuild 908 SHA256 80aaaca85ccc9498dfa86d9d3df4236f017d984b566be774c8bc0a8cacd675f2 SHA512 f85acfaebc6e786932bd2e656ae2d2b94a172d474aa281c58032d9dbd6305c8f01b7e90f103783b06574de2f4a72d559669110d07d7d66168dd714474bd7d722 WHIRLPOOL 4c302e750ee37c6050281c9702be1ef7676f6fbb77ca3850c52156fc653de7676aad34d539179fab9df7442a1273d85979a40d82cbaac290deeb7530df7b9a1b
+MISC ChangeLog 2983 SHA256 f49157f7d4476408896901bf2b63dee3b367d37a9dfe662c833ac01d66185aa5 SHA512 9df6d6776daed9c73292b388071740772fbdbae24e44cfb2b12ee5994090de470840bee99e2e5d942c6fa7deba8102b79b5f749e970a468f32b1b082c6807e83 WHIRLPOOL 30bb549a54dce3723672fe0a2200c6d4fbcb1af8052580266bd94d35ecf8004157bc5774ff230ea9f04da00bc467255dd001eded002ecbebd8b36776dfd43e1f
+MISC ChangeLog-2015 5741 SHA256 6ee93318ae2f9a5d749f698bf2639afc20aad61c2720bf87efef9599dbe1388c SHA512 552bd5ba37aa153342e1568d74e861afcf3c91a411e59d4670184a06709b682b1903e69c66db290d4d90f5db6e7b8a2aca01ecb07e96f8b7390e3b5696aef84c WHIRLPOOL a9ae600ddf3a75f1e3d01450d0e3b01500d5b83d0f7b926b90be2af7c524aa0f756ad3cf468cb8e08d79c2e5f13ec7a77aca5ef3574a144104cec3016b27fc57
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild b/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
new file mode 100644
index 000000000000..e12691e18f24
--- /dev/null
+++ b/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A static, secure identd.  One source file only!"
+HOMEPAGE="http://www.guru-group.fi/~too/sw/"
+SRC_URI="http://www.guru-group.fi/~too/sw/identd.readme -> ${P}.readme
+	http://www.guru-group.fi/~too/sw/releases/identd.c -> ${P}.c"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh sparc x86"
+IUSE=""
+
+echoit() {
+	echo "$@"
+	"$@"
+}
+
+src_unpack() {
+	mkdir -p "${S}"
+	echoit cp "${DISTDIR}"/${P}.{c,readme} "${S}" || die
+}
+
+src_compile() {
+	echoit $(tc-getCC) ${CFLAGS} ${LDFLAGS} \
+		-DTRG=\"${PN}\" -DUSE_UNIX_OS -DVERSION=\"${PV}\" \
+		-o ${PN} ${P}.c || die
+}
+
+src_install() {
+	dosbin ${PN}
+	newdoc ${P}.readme identd.readme
+
+	newinitd "${FILESDIR}"/fakeidentd.rc fakeidentd
+	newconfd "${FILESDIR}"/fakeidentd.confd fakeidentd
+}
diff --git a/net-misc/fakeidentd/files/fakeidentd.confd b/net-misc/fakeidentd/files/fakeidentd.confd
new file mode 100644
index 000000000000..d842995ead38
--- /dev/null
+++ b/net-misc/fakeidentd/files/fakeidentd.confd
@@ -0,0 +1,6 @@
+# /etc/conf.d/fakeidentd: config file for /etc/init.d/fakeidentd
+
+# Change this to whatever you want the daemon to reply with.
+# The daemon will default to 'nobody' ...
+
+#FAKEIDENTD_OPTS="nobody"
diff --git a/net-misc/fakeidentd/files/fakeidentd.rc b/net-misc/fakeidentd/files/fakeidentd.rc
new file mode 100644
index 000000000000..5b3bfef5aca2
--- /dev/null
+++ b/net-misc/fakeidentd/files/fakeidentd.rc
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting fakeidentd"
+	fakeidentd ${FAKEIDENTD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping fakeidentd"
+	start-stop-daemon --stop --pidfile /var/run/fakeidentd.pid
+	local ret=$?
+	rm -f /var/run/fakeidentd.pid
+	eend ${ret}
+}
diff --git a/net-misc/fakeidentd/metadata.xml b/net-misc/fakeidentd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/fakeidentd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/fatrat/Manifest b/net-misc/fatrat/Manifest
new file mode 100644
index 000000000000..23269c248662
--- /dev/null
+++ b/net-misc/fatrat/Manifest
@@ -0,0 +1,6 @@
+AUX fatrat-1.2.0_beta2_p20150803-build.patch 357 SHA256 8f192e7e945065e4fe6b3a21a5f0bb9ad7b217dc4a28eae972af4bf8753914c4 SHA512 884c79a2b40ce0aa3748df8df7e7ed5050a56cda23922c3cfbae0987a192fe1d2320d059830ed6de88f527dda87ebbc9033a73f5f12d269e93e1c3deffb0fc3e WHIRLPOOL e43275093cd60a84763b0f09d823ca6d06d87a71996f0832f24178c25aaa843b921d54b357d14f846fdf187dda32717ec6c6154f870d48097f9b2eccaee62f5e
+DIST fatrat-1.2.0_beta2_p20161204.tar.gz 4988560 SHA256 be1202e4fd6b16fb3d9074be104fea76d6b03ef858eb438ff6aba23cb69d41b6 SHA512 d3a9816cc53fd93ef2ccd3fb5896dde5846382d40e30dc687a14379e6048f8ffc27b40c2b5c3977c6bccc912dcb054426c84c016c319174e2c2a440f9a588063 WHIRLPOOL d2b7a80415ce99f920b97508a1cabd43699ae02f8257d4a619b3f0b7036c9320bb95587bbe043211406af8ebdfc141571dd0f0a056a7f82bc94db4a8482d9430
+EBUILD fatrat-1.2.0_beta2_p20161204.ebuild 1532 SHA256 b34c6397518648fc24f26c446a0e4caed035bcd9cbda0da993154a055cc2fad7 SHA512 bb2c8966a19f0551546b3a9b3e698676ecf97a7684b8c97aca8b4d5290ca0c5485758c6cb08171b31af44669efc862e08b66545f1c49cf996f7d50b73e041cd3 WHIRLPOOL 490d30874239650e4334ccc83a97469d5ee78714424453119be4af72a26af96bc19ae59cc02316005201c7c54df44d6308e631b72032333330a7c4eeea02991f
+MISC ChangeLog 2991 SHA256 9d6a34c3aa74e227e938d954c8c6991495876e6ddf0de435c5902856fcfa492f SHA512 3043f5c64a3eb1509a4abe89b0d409a42bdfdc2c726bef1fd6a70d5713099e868cfab65d0711f89f5581844f46309afd7c415063a9a7a39cfc30937e7cbbf5b0 WHIRLPOOL b29f862eafa79415c0801773904d32f3f6e8eb0609c83f3f11365f2a99fdaa5f1f17d9f727fd9a5d77e0c989803918670dac66b9c54b49c81084efe24e24052a
+MISC ChangeLog-2015 1196 SHA256 9d968a436a21bc712ba9bcc63fa2a607fb1cb6597eac324732593a40a3921052 SHA512 40349d09d6ddb0e80e7a2b135d7037e2bd3301c926edd3e325fa260a5d8cd51c161e7814ef80c1d15be5e0c038d5d342d75d56e691a9e981f2c140b3353ee3fb WHIRLPOOL 28c0175ee2b3b8172687004191d37c13ad9c38ee774fb38a12f52673166bfd6cb326eb384846429ad2b85fedc07555ac42d29857fe99ddb33b1df6ba9e532b1b
+MISC metadata.xml 555 SHA256 8b91fc4c41d2d7342742a0b989aa4ebec8c1a9c761971d7b93dc96c80e665eaa SHA512 908bffaa9e59275d709dd0d470567dc5a2eb712766bee6e75697d60554d5ff66db58af7c067329f1ab76ce0a9858a57929418c014937e532d62264d3f14b4615 WHIRLPOOL a63d340ab0c210b212f47e2392aafe4074ff1bd8b807eb35e8840561b08ac122ca8832849d4347ad84fbf1a65e0593a46e616a57a6f7df8895c212e96e4bdfc8
diff --git a/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild b/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
new file mode 100644
index 000000000000..6a079aa56c89
--- /dev/null
+++ b/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SNAPSHOT="14a1a146df76d70c44dcc38363848a5b41a364d5"
+
+inherit cmake-utils vcs-snapshot xdg-utils
+
+DESCRIPTION="Qt5-based download/upload manager"
+HOMEPAGE="http://fatrat.dolezel.info/"
+SRC_URI="https://github.com/LubosD/fatrat/tarball/${SNAPSHOT} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bittorrent +curl doc nls xmpp"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	bittorrent? (
+		dev-qt/qtwebengine:5[widgets]
+		>=net-libs/libtorrent-rasterbar-1.1.1
+	)
+	curl? ( >=net-misc/curl-7.18.2 )
+	doc? ( dev-qt/qthelp:5 )
+	xmpp? ( net-libs/gloox )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.0_beta2_p20150803-build.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_BITTORRENT="$(usex bittorrent ON OFF)"
+		-DWITH_CURL="$(usex curl ON OFF)"
+		-DWITH_DOCUMENTATION="$(usex doc ON OFF)"
+		-DWITH_NLS="$(usex nls ON OFF)"
+		-DWITH_JABBER="$(usex xmpp ON OFF)"
+		-DWITH_WEBINTERFACE=OFF
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	# optional runtime dep
+	if ! has_version dev-libs/geoip; then
+		elog "If you want GeoIP support, emerge dev-libs/geoip."
+	fi
+
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20150803-build.patch b/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20150803-build.patch
new file mode 100644
index 000000000000..f38604e8588d
--- /dev/null
+++ b/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20150803-build.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -127,10 +127,6 @@
+ 	ADD_DEFINITIONS(-DDEBUG_BUILD)
+ 	ADD_DEFINITIONS(-DNDEBUG)
+ 	ADD_DEFINITIONS(-Wall)
+-else(CMAKE_BUILD_TYPE MATCHES Debug)
+-	ADD_DEFINITIONS(-ggdb)
+-	ADD_DEFINITIONS(-DNDEBUG)
+-	ADD_DEFINITIONS(-Wall)
+ endif(CMAKE_BUILD_TYPE MATCHES Debug)
+ 
+ CHECK_INCLUDE_FILES(sys/epoll.h HAVE_SYS_EPOLL_H)
diff --git a/net-misc/fatrat/metadata.xml b/net-misc/fatrat/metadata.xml
new file mode 100644
index 000000000000..2b0630af5171
--- /dev/null
+++ b/net-misc/fatrat/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<longdescription lang="en">
+		FatRat is an open source download manager for Linux.
+	</longdescription>
+	<use>
+		<flag name="bittorrent">Use the bittorrent protocol via <pkg>net-libs/libtorrent-rasterbar</pkg>.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">LubosD/fatrat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
new file mode 100644
index 000000000000..b0e367b34caf
--- /dev/null
+++ b/net-misc/felix/Manifest
@@ -0,0 +1,42 @@
+AUX felix.confd 111 SHA256 2c30899984f4d44059f67512243e9268b49cf72aa3c8365e28d2d3315ba31f64 SHA512 b922e79f5cffff9ee72ca6b24c8eef13eef08ec5e0a5815665e784b89b7548b9154f5e5d31865aa3fbe964abb76efe4a93331ff2513ddf1fbd2a71f6d815be25 WHIRLPOOL 8eca42b5e6e178a930e0245e892272f05c701a62b62091bb788c8ed1d4b15e5b65e5cdd33a8f49f1d67ef1593dd5a415c65e0bba3a3cc5b85304b43ac97577af
+AUX felix.initd 522 SHA256 fdd0b2c579677fc8355daa0d426dcc16f39e2afc952290bd90b17627bf2913df SHA512 c5393cfcf94303fb02e7c2aea7992cc3969437d5f39674f243a800ad2d0659fbc6e42a411aec20d6477774353b125c7a8ffacc510dffb20442eba81e88582ee9 WHIRLPOOL 674e1ca02ebcd4cd1c42c5911d1bad6a6c8fdd4bdf8c84a4f27ab09448def6624e65aee07226d059634ef399d152b23166bbe3e63c7818ae146d3665f59329a9
+DIST felix-2.5.0.tar.gz 331171 SHA256 4594486a7e9a3666b7047526a4d88a6170eac49a778dd9e197d775edf501a489 SHA512 cc9aa285aaa2bc1345b66842cd3072614ab3f0b4d852d08010424c87a34614874d0d81075c71e46ec1c5527b1f5d7db3b95a2db84858c39e8ae43276004a9f2c WHIRLPOOL 1900c53cc38f269ee0e4115803d1b82cfa13c02c65bab5c48f1f06681b9990dc4b15a3c8541bd1381fa77cfefb911d210b4a4937c04bb2313340844b3b785821
+DIST felix-2.5.1.tar.gz 331705 SHA256 56ba778f446e3e37e599446ba6d48eb21cae86057162dbefa87d0cd491e36408 SHA512 60bea2115164b0c75b08ee5011e6754a5173c5e360215b71483fac2f26f1a57223df6ccfcd226e542335be5aec886d9e4f379353f3d57f11f9ec0098b98b393c WHIRLPOOL fd245efada4aef28a885fd91c0ad5efda92684ac81c4e3122d2eb1bf777cdb255744e1748b593594976a05811ea58e1b9ed5a43df7fedf73413d3cef18d09f9d
+DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 SHA256 d80f6864af88af9a4f726d3a0ccaea30a3dd2a7c0ea3a79ab92a9987598bd9f0 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32 WHIRLPOOL 787aad3e28076b51c4904b3aaf8f01a69ce69988dc3e518c97b1a79ec8496f88b4e25ec25e89ae290935c748b3f8033f98906627ebfe2e0f6c9e489f5bffd7d6
+DIST github.com-coreos-etcd-d267ca9c184e953554257d0acdd1dc9c47d38229.tar.gz 2527242 SHA256 e457ef786235222bacb0fe2b8ccb1548d4969bb01a15c82512ea587ca38fb901 SHA512 ace63a7e909629993d1b5038460848cecc1aecb024bcb6f35738f3ad36933e564da80f7faafb9b0d6a3e9149e37d34b86913219ce068b17a8adc643aa3099d86 WHIRLPOOL 83d08ebcb058e62b73783a481e42a830c8a0fe56b14bfb2931c23943cc1caa7789dd36b2f655f9bcbbaa09d8f7c5fe81555eaf56cf3b54e7670a6f8562e8dfd6
+DIST github.com-coreos-go-systemd-2688e91251d9d8e404e86dd8f096e23b2f086958.tar.gz 28165 SHA256 fa2e609e33b7d797d64874e93c0a09a1a16b33c9dd0744fa534025a216fe8301 SHA512 29d6ee973c1752a661ee78869ff26873c2ae6684ea77612c2516b0ccfc9dd00ead885a6b87c1fb9be2ac74ae3381be1893cdb143b6fa18a19b6450f8733fe549 WHIRLPOOL 7773686904348a494664b1707a80be7d1994a343959f4e84859d2703d61574ce2d21c3c29a3b8a4193b4591eb80431efa7d0544ed70c28e4802775d92229828e
+DIST github.com-coreos-pkg-fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8.tar.gz 30353 SHA256 65f0ce590fec4ed56299a1349ca979763c638606f7c0be6d39368fca0dc56dae SHA512 f1247031ebd00d6b5c5039dd3e66734035c761c39f7a7f333727248a9a78894b121f1cd18d06c58965292e9b95db2369219adeaf3bf0c63efbc90a6a6004b04b WHIRLPOOL e81a3a0ac3644071413bdeea9c4a66b9ccde6270ae806507cd612e35cfb30d67fb0189447ea33bd9988cdda48e52f064fda8e8aacb2e9894980ef3697b3164f8
+DIST github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz 23844 SHA256 b281aee76036bb69f735b60003cf04ce631433223a10dd57e4a60bce598269bb SHA512 1d97e29b2dd84b3ccb619efbffa396ad0f988c5e09e18136edb64ed046d25512e31bd43f5586852d520ef2a38bd98ae2fd9c2e66c49bb52e828c386285bd9391 WHIRLPOOL a3409875407f58be35c3165d74699295a07b77d4a29d50f9de4847b7c94123439bafc8abef2489ff8ec184679d5d08827572cd8ebf2c334634900fa5d38c780a
+DIST github.com-gavv-monotime-47d58efa69556a936a3c15eb2ed42706d968ab01.tar.gz 5945 SHA256 2cce2c8555685fcfdb60edc9438e4a66a8184969609ab476ec64cc7b29b8b737 SHA512 b736e2f99b44ecf3876faf1243374885048084ea61786e77bc17a866f2f27ac14dc3b4d032e5968489a08044321ef32b0bca020db453a6315e3696e063b6bf11 WHIRLPOOL 0b40329923c013ac42e0f3a451ccd987c7cd8e1dd82444f67ae2a427fff900bb31b93a7ac2ed7c0d028f594e81ac0bf2bd1f2cd988b02723fe47c4237c81256a
+DIST github.com-go-ini-ini-20b96f641a5ea98f2f8619ff4f3e061cff4833bd.tar.gz 38030 SHA256 6f1590a6dec6ebb44c0d04c457197fa1e31cbfed0285832d0f4ee68ea85a21ca SHA512 9de56f22a8b4ffcc8d64ebba79e2a4aac796f4d2edf475dc506a45e155a3a5bd27bf4dc7c7b5745be585ae69f3ba1394d1f6f14812b7c3a338125a5b0c315b40 WHIRLPOOL 2c52a04e335c619213aadbb0c420da3b7a7e8f60090cee89cc8e058c78d08dc0d4cea64c84ecba452bee8dfb7c3c556cc11a644c84eb93f93f3e8981145d91f9
+DIST github.com-go-playground-validator-5f1438d3fca68893a817e4a66806cea46a9e4ebf.tar.gz 61584 SHA256 e2069527ab697b0cd9f178ad255f64852f8bd3482594830d3d6de510edf2f4d5 SHA512 86721164b62d3bda80683bbfe578e48e5842cf10ea9236fe56b2db49617afe17a5faa6b85b7be87be34d4a77c3acdf6de6d200e3176a5a46f8b929546602622d WHIRLPOOL 942826cae1a81b5e7857fffb8a2732604674dc4ae41991afe4c13f176269eb2162a438c17c1ff91558e622e64b0e02cabbc03360272f67dc04a42e68c20148c7
+DIST github.com-gogo-protobuf-100ba4e885062801d56799d78530b73b178a78f3.tar.gz 2432841 SHA256 b04eb8eddd2d15d8b12d111d4ef7816fca6e5c5d495adf45fb8478278aa80f79 SHA512 6047875c5488d943a9f63776a4b55f71ab335344f6e99e76861240ad152db018b13ea52c18ff4db21c932090a50d32659643e0737c3290f18e945a352e450f3f WHIRLPOOL 5b75ef1d64b65326e7ab7fd1669ad03323328fdd4fb8f54c4c8641b35cfb71cada10172ced26819a45034df52b6297d39714ac83746c9c3150b12162e710f872
+DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 SHA256 9339c2c779e8d27fd122b1b1bf5c5df108bbe658a403d1df9356a993ed1c7505 SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9 WHIRLPOOL 566a469f1c3738391bed2ea8fb63a605e670d52f65919e61d5c6a84bab6d0b03bfd1a1ea7c2344f981dffb0498ab2d46e39b45cda0dd90699fd42e8477ab0bde
+DIST github.com-golang-net-3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz 899847 SHA256 1a5ab307db7d71ee30e45dce13c4204dd7e18b5824e92e21bc88c2b5d4712d17 SHA512 9b98953b1cd4a0382175b4299cf605b3a41f758054a167bc764c324c4c5c8ba7205760113c44666f77d447804f7f1a6d3b34a334859cf9528b19161f77baf075 WHIRLPOOL f3903a8bed2ddaa89ef2c9ac21a81b99eeb5a1d449bb2edacef477c3b920468bb6607a11a092053f2220d30a80819f0e1711256168d9ac3a6f8dd9469261300a
+DIST github.com-golang-protobuf-8616e8ee5e20a1704615e6c8d7afcdac06087a67.tar.gz 217385 SHA256 c0029cd5bb2ecfd39d7283f8dd2c10e0feca333c42492384c627a28944abf998 SHA512 bd5531821feea03d7bb273daf81ed648cf15c1573e70701f0e05c65995cef0030a927980447a5b9e52cfabd6049df9c3f3d9c7736157d994b3b38d4eef026a2c WHIRLPOOL 9f478509add98c71c88d8edc4458260df33e8ddfae117bad81948c6c5e8bda356a354ba189e68cf3650454403bac18d5e254b9c801cf042b1d772d532ef73b13
+DIST github.com-golang-sys-43e60d72a8e2bd92ee98319ba9a384a0e9837c08.tar.gz 761710 SHA256 14ec4e2e5486707c9d625973d3dd9900f896f4f51683201543fc5a7aad0fe761 SHA512 9b2bc7a6fe78d4c7c4a6d4cb533be483c7f6b3b0f0821452cdcb0f015bf1f07d649d4d562c44d7bfc65d63cc1c2f8def2e7274a02e6f11ad41cdffaa1edc82f5 WHIRLPOOL 84f55311c3b8704e9d512587c303781c293c1a3b44e8e7844978881fdad1c4e4338c1c1708d0cacb07606f794afba8e90f6c3dbffd0820bc7dd7c2bfdcad9017
+DIST github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz 4860 SHA256 136511d8ed9ee98a71266cda7b810d9e2650ece65647ccf3c0eac0f92fdf8bf1 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7 WHIRLPOOL b6686b94d0d46feb6660e7fcf2cad41e4f31e9d270c15968d9932a01af883a56f5e62fa5b77c8e4d6310dee0b746c448685cf157ce01de2edabaa281935bd2af
+DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 SHA256 15b8c46fe72b45595752a4a997d4293211c77bc84ebf929521ab5a51daaae763 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf WHIRLPOOL 7ec6180d23105c2918e9d56a0d687b7846ff452400ab9fb2a99b64ee7724ea7bb560a5b724aeb7acebe75e7b407a4d0094467630970d888b9ae14eb884b40860
+DIST github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz 1317793 SHA256 ac3c6482a00116d7d70257c6e4eab92aa8f543837578abae82f03b552a4e29b2 SHA512 f44fd60453259a050b591d198a6e64c0e8729065b3b3ba73bb36b22211428e2d9bbadc7a8286a31084f5253f9f8cf95aeb7d1ee4ad5eba870887a5f7787a81c1 WHIRLPOOL 92aa66b880d75105dfdafc7cc0a661401226a8ece818aca12898530b16a9093331cef242ffb01d818ee52e3e94d7627597d18f3e727197f530b1d66616684bae
+DIST github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz 2764746 SHA256 5b4a33bbe76604042014ed38fded8e6652ccf6fc6e08102ddea6170f4673f0e5 SHA512 63e57485cf08a438d913ee221d95fe61eab33c66548a24cc3dda0d833cc49cd1a30ea75c1678c407384e7e7d6f23d8e4ef22c944f208676a9693affad57a5cfe WHIRLPOOL 13eff7813edde256176ad3b3f7a69c6c1962f8d184a78096a55f31b7139df5e46fb10089fdbc8503b92a6e72add6cf7e9beabff774a379bef94d4f7a590dfd63
+DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 SHA256 f373f9acadebba162ced5d544db0125088b9733510ca9cd51ae8f2d653e11804 SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d WHIRLPOOL 41a8a6dafbda423b236b148fa603c9595ab7a38715602623366f17fdc0c9c891dbf89bb0d0409f566b3df4a7276f9f09d7117427dd79b18d9735b97595428518
+DIST github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz 3009 SHA256 1fbdca6d1a281d5468ca84632377403b772cc2140e1a1ae4dff9ab4354671789 SHA512 21392e0a444215f0345548e38e5bd439c1d97742fe705060c9e6dd41c0646d4cffb2932b886f7080c4b849fa4f075a8496328f37112dbf87a81967b229f255c9 WHIRLPOOL 3a9eb6520072db0268a17ec256a0fb630bdf97ab3f3fb7e9a2df31781ebf5cd76b3c3358131af3a8917590648d2cdeeff868f517699ab9b88e3fa22c93cbde35
+DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 SHA256 24ff87a92a1e160251fb32d2f529bf574ca71f6944ee3a562da2fdfda687313a SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593 WHIRLPOOL 32ce47e091d24f48a431326a59db0f35763a6b10f6bcb22eb815544bb4a315f66fe154370ebb73afd8335f895c988723eb4e083f5611de549d89627b3deec83b
+DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 SHA256 db66b04139d6629f5974735bd207a789e31a3e7af2810585c11ac4ce678217ef SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755 WHIRLPOOL 566af5526b6c7d109d8e411b36b49576ae001a28de768021532388bf145d7f09b7bd36443d80242488ac516035a57627bf317a85266a0a296126b1860f103977
+DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 SHA256 26989379d6b8473e43a6bb4c27166a6203af361a3e86f80a047b55e6f3bcea1b SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e WHIRLPOOL 2e633dd9411d36208adb6fabbfa867d170d9afeb3932f43c40508aa83aee18e4251615ff8dbe5bda2aca954b262989671fb0aaa4415a9d738535b06e88638546
+DIST github.com-projectcalico-libcalico-go-fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz 198156 SHA256 aef65d677af4e43978632d468ecd8e8ef94d361ce0a9d97c22243506df7641ac SHA512 0cab2d2d14205b184dba501fd171897117f0dbc2cb42ab121e789c20d46c3e2e6c71fcea4162646432726379322d332a841866101cf32ae51e698fdd92b54c1f WHIRLPOOL 3af6328987620c389edb0590478f5258813910ecc6ba21b42962c03ee57cd7886fdb851ea597b91b915b9c812e223c247998fb5b706555aba54f9373d109d47b
+DIST github.com-projectcalico-typha-71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz 227211 SHA256 a3a355390d9ed53b08d892823f506e423fc94451fc8215630147730fc8479974 SHA512 100d53dc3164008d6f5e701193ea1860a266e2321da585bff2a083a7853224ce866ff5cd1a64be0fd6530101bf0cc6c98fa366df331336023c4fc6f140649e6f WHIRLPOOL c55f11e51608599e3fbe65e7edfc3ad4fecd77f0bdf1d8a7434cdd8868d3e27fd81c0f8216ba3caa023b1656d79ba1245fcbee48d8750d475ab748222c4fffc3
+DIST github.com-projectcalico-typha-ec14f2716227ed72aff32691071f4b450367930a.tar.gz 226544 SHA256 fcdfc19b6ce4bbc4a5f1e180c40e51f6478de35e7a1383a64a5bac5f00f7a4a6 SHA512 1ce6b08af7e6cb40b41f719798716f21b90c6718d1789cb504e201de90d2b8124e674ab6ea3b2e274b5111bef534252419d4d208d651693c69b35b6256974ce7 WHIRLPOOL f2fb9319480b497fe24993de269f9efa902d26cc6bde89da0332f743843c3d767636c726cef753302391629a3569d383e2eb07420cfb7a3a2af9d78439fee83a
+DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 SHA256 8f8f18491440aaa688801c4e4a6117453fc8621a1ac4fdf253c1e464fb8b078d SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7 WHIRLPOOL d0722b8af87aafb041266be213e4ac1bfefe30df5736fe846b5cc0737d0461fc7e9fe4aa544f36d3e9ae18edeb5e76b075ee029062bbaaa2667e0fb3466dc365
+DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 SHA256 0fb341020432aff4c4f66189c979e83bcbd394a9b897b40b154ab95419fdf520 SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf WHIRLPOOL ce8a454860f1105068cf8dce5cca9ebeeb2d9a0a12bfcd5b0ee93e6fe27b8d65891a0a42cf8917b4196492edf57cc620f6324dc7d51604648e871eaff1e3a885
+DIST github.com-prometheus-common-61f87aac8082fa8c3c5655c7608d7478d46ac2ad.tar.gz 61732 SHA256 5847896a19e31d3e19683b37fc0f103a730aaea36cf53400a7e21a8ebf3e8ad3 SHA512 8dd198db3ee1f9708684ce25b3afa6e3202c9144537302d21dd34474d56163ceb429bd9372619d025d06a31f712feb2374b14d4053ba83355ff3b193e232c9b1 WHIRLPOOL 434838b093a6777f0a2676dc0e7529d7595be1f84f513e024d7c89a094687497c40c92381798aa439ad5464ea40914675594dc2d42fb885788470451aac7ea4f
+DIST github.com-prometheus-procfs-e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2.tar.gz 43889 SHA256 27f4c32930b2ed9045c958b3c5365c321443dacd0968f26a7dc49082e6e0f955 SHA512 c31a595327ee82e4f5fdd9f58f395261cd9a290e2bfd9115593b20508966ad529a31322b228736c7fa6eb0cc74d81c6f298bfd17450e534ffe1a8bd74633b325 WHIRLPOOL abb366c976e58dfdcd6adced0a2007ae6976508cedc27c91ad2058aaec10f365d3868a10dd35d41d2e8c88217460c16c3765c1fa33480ae55a505055c5ef38c2
+DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 SHA256 c4902a24e1ada0905214b868fb097c051b37872bcd7da9112770eab0b47eb479 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39 WHIRLPOOL edfa508abea9ebcb564c1014af758edc04e6501a101350676126c41563e63107eeddb85d8ca0af4b1fc9d5f903f44fb4e923b9bdf7db67074ed7455c4651abd0
+DIST github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz 26698 SHA256 f467efaa34789907be3031a660d948af306452ffb15efa1883416300d0f13744 SHA512 7152a9e355e21de7980a28e915b712103ae1eaaa4142a5c37db00d8d30415cb2ecacf53bbe178cce49a1b9c4ad57336e8438a40f0bb92dd20a2bcabb1980013b WHIRLPOOL fc9b10c2a11975c295e787f67319bdc9b61e7017acd4ff6c13cb75310232f4d813b7bfb5a84de2af0b85b378ee02ff31e90956f516f620a59b417a02e100e94d
+DIST github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz 11995 SHA256 bd49895b4aeadff6fef1dbb8c159df259a134b88bf9afdcb0eeca81ae2cf69b0 SHA512 e8aade384d3505c3bc9389c7215b789e013bc4088c1662e23170503876f2ad2ef97df63cfc6ed9b30c58b6287793e003d4c3a2e6250c0ea76aab807b2eb08ab2 WHIRLPOOL bd0371e169113836a0e1f6afb02f17ec51f05a90094deb9710a9f01c147f7d43614c62596c49567d2dbcbcc94eb6ecc8f6e58214ccdef77ffc95865f0528b9dd
+DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 SHA256 49670b1b620823420cd4b562ec3d12eff1339181c63d03a115101ccb16ca66fc SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8 WHIRLPOOL 64e8d03f49ae119facab176a4a20cd881a95667a6e446ed6f3cd9e31a5737979a76048cd2867e7ec820dba268057fb425e8d999e4cf8ac6d44c6e354de099d23
+DIST github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz 103396 SHA256 8db668261d9e599f131bab0b575e6ceb3f961c4cc1a82b19a85dfe89584c189c SHA512 4e9f7d7017486160599aa6b98d32c41b135b74fdcc08f642dbb3ec9db83c21a94a2b4c9ff52ee78d0762468710c566c052e5b4fe7287e5ef99263136ae595184 WHIRLPOOL 35d9ac6dbb88ca08105b08b3f6c7b71cb2a0205a0ca2bb38ee1c39a5e517452f97f1537b8b7bdfa39614d6afc7252ca25f48328b8dbfd2f3b88c883d227d3ece
+DIST github.com-vishvananda-netns-86bef332bfc3b59b7624a600bd53009ce91a9829.tar.gz 7753 SHA256 1f750700ef099344329da811017fa07ad035a743d658e018e1db5f00ae22aee4 SHA512 7298f8ff33c14faca3cd57f68de676049eee8aad6891f5ac03427b63f3554c666bf27896801a8528d9483b469df14040116fa52d263d851c7a9766577728b0fe WHIRLPOOL 354304f2c160bf87348b2fc9ce40a0eb18db621e53949d900f706e9c38621488d9f2d7ceb6c4918a90ab72d2b0ce02153ac731305d27dce9b03d016a7e0e11da
+EBUILD felix-2.5.0.ebuild 3914 SHA256 c67f1e1d36fa006fe41990b8aaa29ae3dc76d75ed8d317111b19ae2a3cd19f8e SHA512 0d64fcd46f458048500d763678a9d3fc7c905f8278cb1d1ed93bafd1b0647dee4d7895fceca319a8b86ea7de8965fcd8a85c27a27fe17dc3339a6ab47b98a4d7 WHIRLPOOL 2c46fb70c007460366d1f99c2a76a7fb874ca8a69613380f5b7f4e3d4592c546ce29f52dbe430d7f9d6d2086538729f19577f6291a56e40e35b1aef78a479689
+EBUILD felix-2.5.1.ebuild 3998 SHA256 dd395a50b11e2d894c23113c6998da8645c1dce14f895a64b1414955c5201989 SHA512 3d8f122b1c6214dc60cc47659d44d17aae7da4d14db083eba8d57a08c8c506a8f7086e4a350de2e518df91a96c4f42b8ff75cfb5339c755a950d93c63b4b4cb3 WHIRLPOOL b002ac5f464aa640c82e8088a84e9dffa8c65162345a993fb3ac6a2439e39329319edacfef7295a78ac12be8487a6e7d9f4548a2e441222c7c2e2bb0fbd6f7e5
+MISC metadata.xml 329 SHA256 879b302e413fd6440f23af253912278250d3d55822642bc06e572be111576f6c SHA512 8a411baf49586b4fd8614bd6a6ddc3adea3dae29c288943f0b85383ee9ec7c994d2e7011f3a2a68bc5cfb8b8bea1a2a749a28fde99fd7a920fc5fb84e79e08a4 WHIRLPOOL 518355cb9b17b0a5d268f521b5d6e35722c52e2463ee8c1cde29064cd1041c9ab63d5546bc8978c1abbc70aa1d0119a49ec6ba8c0ca77784e4c29016a65b72d8
diff --git a/net-misc/felix/felix-2.5.0.ebuild b/net-misc/felix/felix-2.5.0.ebuild
new file mode 100644
index 000000000000..b7fa92b18a8a
--- /dev/null
+++ b/net-misc/felix/felix-2.5.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
+	"github.com/gavv/monotime 47d58efa69556a936a3c15eb2ed42706d968ab01"
+	"github.com/go-ini/ini 20b96f641a5ea98f2f8619ff4f3e061cff4833bd"
+	"github.com/gogo/protobuf 100ba4e885062801d56799d78530b73b178a78f3"
+	"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
+	"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
+	"github.com/projectcalico/libcalico-go fc4a3648215b9beda5d08e26d76e91f12fb45079"
+	"github.com/coreos/etcd d267ca9c184e953554257d0acdd1dc9c47d38229"
+	"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
+	"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
+	"github.com/projectcalico/typha ec14f2716227ed72aff32691071f4b450367930a"
+	"github.com/coreos/pkg fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8"
+	"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
+	"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
+	"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+	"github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
+	"github.com/coreos/go-systemd 2688e91251d9d8e404e86dd8f096e23b2f086958"
+	"github.com/golang/protobuf 8616e8ee5e20a1704615e6c8d7afcdac06087a67"
+	"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
+	"github.com/prometheus/common 61f87aac8082fa8c3c5655c7608d7478d46ac2ad"
+	"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+	"github.com/prometheus/procfs e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"
+	"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
+	"github.com/sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
+	"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
+	"github.com/vishvananda/netlink f5a6f697a596c788d474984a38a0ac4ba0719e93"
+	"github.com/vishvananda/netns 86bef332bfc3b59b7624a600bd53009ce91a9829"
+	"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+	"golang.org/x/net 3da985ce5951d99de868be4385f21ea6c2b22f24 github.com/golang/net"
+	"golang.org/x/sys 43e60d72a8e2bd92ee98319ba9a384a0e9837c08 github.com/golang/sys"
+	"gopkg.in/go-playground/validator.v8 5f1438d3fca68893a817e4a66806cea46a9e4ebf github.com/go-playground/validator"
+	"gopkg.in/tchap/go-patricia.v2 666120de432aea38ab06bd5c818f04f4129882c9 github.com/tchap/go-patricia"
+	"k8s.io/apimachinery b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215 github.com/kubernetes/apimachinery"
+	"k8s.io/client-go 4a3ab2f5be5177366f8206fd79ce55ca80e417fa github.com/kubernetes/client-go")
+
+inherit golang-vcs-snapshot systemd user
+
+FELIX_COMMIT="daa250caf64ac7f121c62aae8d9c0d4303ee145e"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
+EGO_PN="github.com/projectcalico/felix"
+HOMEPAGE="https://github.com/projectcalico/felix"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-libs/protobuf-3
+	dev-go/gogo-protobuf"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	protoc --gogofaster_out=. proto/*.proto || die
+	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
+		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
+		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
+		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
+	popd || die
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	dobin "bin/calico-${PN}"
+	dodoc README.md
+	insinto /etc/logrotate.d
+	doins debian/calico-felix.logrotate
+	insinto /etc/felix
+	doins etc/felix.cfg.example
+}
diff --git a/net-misc/felix/felix-2.5.1.ebuild b/net-misc/felix/felix-2.5.1.ebuild
new file mode 100644
index 000000000000..970b4349f1b8
--- /dev/null
+++ b/net-misc/felix/felix-2.5.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
+	"github.com/gavv/monotime 47d58efa69556a936a3c15eb2ed42706d968ab01"
+	"github.com/go-ini/ini 20b96f641a5ea98f2f8619ff4f3e061cff4833bd"
+	"github.com/gogo/protobuf 100ba4e885062801d56799d78530b73b178a78f3"
+	"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
+	"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
+	"github.com/projectcalico/libcalico-go fc4a3648215b9beda5d08e26d76e91f12fb45079"
+	"github.com/coreos/etcd d267ca9c184e953554257d0acdd1dc9c47d38229"
+	"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
+	"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
+	"github.com/projectcalico/typha 71413e6c4e8f903f899429329cf3e38e17633ba5"
+	"github.com/coreos/pkg fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8"
+	"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
+	"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
+	"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+	"github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
+	"github.com/coreos/go-systemd 2688e91251d9d8e404e86dd8f096e23b2f086958"
+	"github.com/golang/protobuf 8616e8ee5e20a1704615e6c8d7afcdac06087a67"
+	"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
+	"github.com/prometheus/common 61f87aac8082fa8c3c5655c7608d7478d46ac2ad"
+	"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+	"github.com/prometheus/procfs e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"
+	"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
+	"github.com/sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
+	"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
+	"github.com/vishvananda/netlink f5a6f697a596c788d474984a38a0ac4ba0719e93"
+	"github.com/vishvananda/netns 86bef332bfc3b59b7624a600bd53009ce91a9829"
+	"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+	"golang.org/x/net 3da985ce5951d99de868be4385f21ea6c2b22f24 github.com/golang/net"
+	"golang.org/x/sys 43e60d72a8e2bd92ee98319ba9a384a0e9837c08 github.com/golang/sys"
+	"gopkg.in/go-playground/validator.v8 5f1438d3fca68893a817e4a66806cea46a9e4ebf github.com/go-playground/validator"
+	"gopkg.in/tchap/go-patricia.v2 666120de432aea38ab06bd5c818f04f4129882c9 github.com/tchap/go-patricia"
+	"k8s.io/apimachinery b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215 github.com/kubernetes/apimachinery"
+	"k8s.io/client-go 4a3ab2f5be5177366f8206fd79ce55ca80e417fa github.com/kubernetes/client-go")
+
+inherit golang-vcs-snapshot systemd user
+
+FELIX_COMMIT="53553b4f7ff80d193e8550ee3b31704da5349d42"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
+EGO_PN="github.com/projectcalico/felix"
+HOMEPAGE="https://github.com/projectcalico/felix"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-libs/protobuf-3
+	dev-go/gogo-protobuf"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	protoc --gogofaster_out=. proto/*.proto || die
+	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
+		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
+		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
+		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
+	popd || die
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	dobin "bin/calico-${PN}"
+	dodoc README.md
+	insinto /etc/logrotate.d
+	doins debian/calico-felix.logrotate
+	insinto /etc/felix
+	doins etc/felix.cfg.example
+	newinitd "${FILESDIR}"/felix.initd felix
+	newconfd "${FILESDIR}"/felix.confd felix
+}
diff --git a/net-misc/felix/files/felix.confd b/net-misc/felix/files/felix.confd
new file mode 100644
index 000000000000..566b9b5aaaf9
--- /dev/null
+++ b/net-misc/felix/files/felix.confd
@@ -0,0 +1,7 @@
+###
+# Calico Felix Agent config
+#
+# The following values are used to configure calico-felix
+#
+
+command_args=""
diff --git a/net-misc/felix/files/felix.initd b/net-misc/felix/files/felix.initd
new file mode 100644
index 000000000000..92adbb10f489
--- /dev/null
+++ b/net-misc/felix/files/felix.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Calico Felix host agent"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-root}
+group=${group:-root}
+
+command="/usr/bin/calico-felix"
+command_args="${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	need net
+}
diff --git a/net-misc/felix/metadata.xml b/net-misc/felix/metadata.xml
new file mode 100644
index 000000000000..91f15b4152a0
--- /dev/null
+++ b/net-misc/felix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">projectcalico/felix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/fmirror/Manifest b/net-misc/fmirror/Manifest
new file mode 100644
index 000000000000..e3e116420dc2
--- /dev/null
+++ b/net-misc/fmirror/Manifest
@@ -0,0 +1,6 @@
+AUX fmirror-crlf.patch 387 SHA256 2f003af798fcc8ea7597eb1a484d8ff42060cbb71c5d9b84ac23b7a1729fa638 SHA512 823a18ef0dac701fb3f85fdf01c040a034d7cfd608de2fb62fb4c37d413405955b92b3fbe4cacb9096492ed99da5461c854e19922f66bc642e7962975661c4d6 WHIRLPOOL f2f30a71b1c7d84e86066a3f07d05645ea1f7278b3300062f9d9aa43ffbb32c81500e2ac0771c4666f38fbe60d07f86d11374db2fecdd8cb943a0b55404794dd
+DIST fmirror-0.8.4.tar.gz 59831 SHA256 d280e496a2b6dedbd6fda635a80486dbc1462e7c09dbd950962b6742f927dae4 SHA512 069ce1f943b7cd614351dfbc7777b49fdeccd5aa2d7371b3050dd6133ced0c457eed9a92f9f89c364e9a73691bedfc70c471188dfcf17e881d33587e7d73d93b WHIRLPOOL f149529cc2080298b5a7d37c89d1944c3d6a47f2d5f06d68d1bb8b7ae59501827fade5d8d8418077b4e353f7676251bf4c39cadb0f483f70899755d281c6b591
+EBUILD fmirror-0.8.4-r2.ebuild 869 SHA256 83de19d2a3fbf65c39eca5aae831d8d5cb04681898a7ededb324b6b2c9c641a5 SHA512 52684ba9d25c411b7bc01b3f7b1639b094e6801e5dcc1e7a0dc61d200281b09e4a9c09cdf4f480138d174f924e509b7dfe399a8de2b73430d7ae5db4323eccd0 WHIRLPOOL 8b285e448b6aff008abed0a645db29277e6f6fc16bc71ade813b27f40bc9865abbcff34764bdeda47595665f07c362d52529c94336214e00bff0f35a5199f119
+MISC ChangeLog 2555 SHA256 b84ab8d5cc156d427582cf5373981ef8138c7ada136d6d3255375aa0c3166b7b SHA512 e0e8fcfbea0bbcd1141af30b387a348ab4f1552f07cabd72ee0e298476e7a93c3db7bd2f751932fa70795fd43a28c4f342ba061e24f4cebd9c3479f0735a996f WHIRLPOOL 245ae3da5e779102a3a2cf0711a47e77e63b84785905ebeddb7d1dca7b19295d4f94d294e3073f44cb6230fa209fa36e55af2bc1f28ca919f86b84f13e2a63c3
+MISC ChangeLog-2015 1276 SHA256 3a1b9673d01bc3b73b88a6c6998eb568f0d8afdecfa8d5687a406bef9a3c00da SHA512 73c54205eecd1c56b5a10751a576bdd83775ed6dec06a9ec935f0b2af6e97f0834e6982517ae346d7b5a615183314d3c178e634910990c2ed9aee404afe3a393 WHIRLPOOL b7d9e6cae82aef1d8b96d434909db76751cef5b81998c22f953a330a01e0a9d116bb93051f682b6ded0fa308786ad839c258976ec07f0f569586b2b52590b4a8
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/fmirror/files/fmirror-crlf.patch b/net-misc/fmirror/files/fmirror-crlf.patch
new file mode 100644
index 000000000000..e97a846e6e6e
--- /dev/null
+++ b/net-misc/fmirror/files/fmirror-crlf.patch
@@ -0,0 +1,11 @@
+--- fmirror.c	2000-03-09 08:52:52.000000000 +0200
++++ fmirror.c.new	2005-03-16 20:07:14.767419627 +0200
+@@ -642,7 +642,7 @@
+     va_list args;
+     va_start(args, format);
+     vsprintf(buffer, format, args);
+-    l = fprintf(out_file, "%s\n", buffer); 
++    l = fprintf(out_file, "%s\r\n", buffer); 
+     fflush(out_file);
+     buffer[l - 1] = 0;
+     LOG(6, cmd, ("---> %s", buffer));
diff --git a/net-misc/fmirror/fmirror-0.8.4-r2.ebuild b/net-misc/fmirror/fmirror-0.8.4-r2.ebuild
new file mode 100644
index 000000000000..a43d223a34c9
--- /dev/null
+++ b/net-misc/fmirror/fmirror-0.8.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="FTP mirror utility"
+HOMEPAGE="http://linux.maruhn.com/sec/fmirror.html"
+SRC_URI="http://www.ibiblio.org/pub/solaris/freeware/SOURCES/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-crlf.patch
+}
+
+src_compile() {
+	append-flags "-D_FILE_OFFSET_BITS=64" # large file support bug # 123964
+
+	econf \
+		--datadir=/etc/fmirror || die "econf failed"
+
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dobin fmirror
+	dodoc ChangeLog README
+	newdoc configs/README README.sample
+	doman fmirror.1
+
+	cd configs
+	insinto /etc/fmirror/sample
+	doins {sample,generic,redhat}.conf
+}
diff --git a/net-misc/fmirror/metadata.xml b/net-misc/fmirror/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/fmirror/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
new file mode 100644
index 000000000000..70b8f7cf06b1
--- /dev/null
+++ b/net-misc/freerdp/Manifest
@@ -0,0 +1,18 @@
+AUX 1.2.1-gstreamer.patch 3675 SHA256 1834db2d676c562192d9821050794e853d581bdad3520d6e176bf8d795595120 SHA512 758675e9f9292acc9877c37e240c8144a2e4f2f0440f9a75b64895f0f8514bb991cab4295250107b85df2058f07988c93f399690c8e06dbcfcb023d9dfde921e WHIRLPOOL 984e7c6b6f5da0e2d70025d57373d8029e3494e9ec3b511ad4d00c1535ecc9d856572b25fbcce0668440cc7376bae23d7a7b9a8c73693fc91b74ed0852826150
+AUX 2.0.0-rc0-libressl.patch 3404 SHA256 b648d12bc796ad4358f7ef98a810fb3236a03701718a8ed15e60e3221578fd72 SHA512 b7b1018da4469de6c688e5894b200ec6846090e7e04ccd3e8e38b6f500832e75ffb30eef84845628eb26ed9ca64a4768dfd5c6a2f44d1fd13ad58b60074be21b WHIRLPOOL f6ea31d75e507dc9b30fd305844e684bcf932827c6fa010a67eabc6e4d39ddc9ab12f4ea7b32656a4bb6c84010835f1863d6ba765275b6a767e82eb30c2860d9
+AUX freerdp-Fix-gstreamer-1.0-detection.patch 989 SHA256 bdc78887d0b5cd66306661f721b40342f8c8e52252cdd40f10ab4787d01c58b8 SHA512 50fb859ce7dfb2af89efe5f40f0cf318da3fd32503b51e133e296420bde16bbc090f0aa10f6df09dce5ff9769e79fcabc1535f89413d962b7b06f6461dfcfb77 WHIRLPOOL 408225170cc317e8d26fc212bd9cd15a2f5875ed2c4898602c7bd2fe4bf04ea8014b8040bd0933377ce4aef7cfcb236d7286af4cfdf22b83090bc30fb6e32e6e
+AUX freerdp-armfp.patch 2930 SHA256 c23833cf722098cc0f74a6c130c30e57ead3effd3a04a6b4206f2aa887ace6e7 SHA512 57dd03e82b822fed95a5379aa79ada99910ef6c2a9cfaab1dc721181f76aa249d839576d31aa83e3568a37abc5b81a3ff8c5c2d0d15e6a5e457d254660581a48 WHIRLPOOL 546448549b20e4a4b81c2cba4a4db92d9c971a070ff5d21ef9c6db22bd67157a6eb8b54901e038876926fa6a7d8f9208185580214132c91ce460b417be0b0af9
+AUX freerdp-ffmpeg29.patch 1778 SHA256 34495290e5b3a49c0028ad755fab86d7cb86d5c28c0008d52681458b5bbd38ee SHA512 c58acc5ddab34fe664d38649b7271ad793430cb1c9ad8e6b78f1924a8b70e1b8d76c426fb633cf6dd97fe3277664649fd7254e2e4377330c64234d23f1b26fd1 WHIRLPOOL 7473fbe86dc56c0f7d57a68a6b06b1cfa2058e844eff228f9d8c41cc6e54ed72ae57b67b80dd6069e157d94a74eac2b57f1f442cc63222431771d8f1eedae152
+AUX freerdp-libressl.patch 5386 SHA256 27000f4daea0fc4457584aa11007619a6ebda610184161138425f3ff97a473ec SHA512 9ee540047e4d8e61904eace6f41dcc8ec36089b6e34f6df152529a1f505014aa9cec163e46478938af38b173498d254d5b738183c2d463d445524903be6b6645 WHIRLPOOL edd5b64df7ba9a27b5cd50b81c2c2d1234d8d953723d3296de15b63d0401c86c23668ab82b4674a8210a2c033c94f5d1cc81b1d97bdad46205a0ccde0ae55c35
+DIST FreeRDP-2.0.0-rc0.tar.gz 6486533 SHA256 b432d92f529646f3e914513c8202c66ce167405082ee5b9e6d15ba4321ff6664 SHA512 9bc9ee976c73f274a4258613409e242088bd077bcd1cc43f7941170374fc0f9deda7f2f7644506d0cdc2e029b6037abb21d848810dcce6aefa3c5f1642f19cb3 WHIRLPOOL ae0e5d0422a1a3bb95e351dcf9a8845d56eb39189cd94f1a33d27f6a8282d6901ba743f0e3dfda6f53e1915b506a596bac6812553bf5a42ec1fecfb8c5b875ea
+DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 SHA256 c0646f224ea30a485e165fb31eb8a039af2ca3f257cdf784b319e1b5c13e0425 SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8 WHIRLPOOL 1ff6ce70d454a7e0cbb3cd4fbafe1fb4191dadc3b2f8a6dbff10d8c725b8fc2838a863837d9b01f6daa670483fe40266fb57569904ad8ac8503549d6605c9e64
+DIST freerdp-2.0.0_pre20160722.tar.gz 6412437 SHA256 17d6b7b9ec6bcfbb78d72ecda034e1ed6bdae4f95a8100297096a5e5e095463a SHA512 3b67de8f31740ccba0ce59f0035328bda6c1602e6197a31008bdd5bcab15e85f473c6c4eca5cb87670b34fa174e4b0da21a7f75be99686df485bb7f9cda6f589 WHIRLPOOL b494070185435da954e9d998915fbe4b47286c803c03bc4839afa583082434fc4d51776b62db27255b9ba62ecb8ef9c95af96e2920414e0fff9b27dceecb4cd4
+DIST freerdp-2.0.0_pre20161219.tar.gz 6425913 SHA256 b71aa5e99624f7bd4c28e69cb2bf3b7710696db121f67091de843c5c652194fd SHA512 ad1699f520df2fdc0719ca35623beaa7b24ca9325e3ed6f30a153a34a237606dc43af2d71068c003f56e4ecbb0bdc07651564d62ba26c792896cecd9065c019a WHIRLPOOL 80dda4d7f97854a19dec48d6169b2cca6bebcd28feab153ca2686faba67d9ae8ae6286661667567315a8e19e7d40bd45c97829171743489681f391236415b8cb
+EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 SHA256 a7d5d3266839d0064003a7af8d56f2be0edb386da45c96267e6cbef2ccc54732 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900 WHIRLPOOL 80c393052b9d482dd5ecd94460b416110abdb4a62a44044594fc4c18c93fc489de7f3d7aacc4f4468e788a51ec81f7cb1ba064ddd2ecf0de866b2860756738d9
+EBUILD freerdp-2.0.0_pre20160722.ebuild 2618 SHA256 f8c2359f54efa6ba9b33210ce67be89268dcc7872113d897a2f307e6f7cec6a3 SHA512 0b287c9c0aa5cc661077aba27d19b66e7df14286b026e096a8bc6caf29089130af8e8a8c07972157698ed6e2718d7c4ec2e98771688c49084d4ae9157913df25 WHIRLPOOL e11a14ae7d10cc1ff1b8b9915956c98333017d73e533dfe67d1d4f9ccdf22d03cb30f417b7d99e919140f3b4156b73e08ff25c686f9eb3ab4374406ff5c203a1
+EBUILD freerdp-2.0.0_pre20161219.ebuild 2717 SHA256 79f4ed394816e0d62cd3577519e973a89b61e4bfa0ee464d83a60e13c41ce7be SHA512 9b9c7c9183248983953e9dd654c804809f9c0be94eff4738d2d302e139e54aebdc76cadec90cd5fe0f54d3f687b1c68eb129316eb16e50df513fd343136570c2 WHIRLPOOL 73bc2054bf69a909accb11e58da82ecd47dbcd6b39d4cdc6612149bce93b4466d88cec2252019a0793ce798582437e1c90213841721c8ddbfaa5cfdef04f9219
+EBUILD freerdp-2.0.0_rc0.ebuild 2859 SHA256 2056d92fbebc2a1b6d5de98a27cc1da7fb2c28dfc7f3b17cd181ac947a282b05 SHA512 0e04d79ddd6dafec57f013f454f0cbff07c13ad906c9956c968e23ae84d61c0ffc4c1cdfd1ae821e05c29657a84967ee8f0942488e5840f8613376e5fc83e347 WHIRLPOOL 5039f73774ca3b423f219b3ef5f4ecda16410482fae0cc265ffc54d8b354eb84bfef70ad323cd5e9e9908f971897747e1f3043828fa011f3ec88c24e41fe71a3
+EBUILD freerdp-9999.ebuild 2750 SHA256 920ece2f9682ee7f2596683a2a066582a0a1d13e438349b1523d227bfa7cb3de SHA512 67262976d2f1e4b990aa02347c81bd91f916425ba3ef1963800ee98632c5f9cb54121f1548125d83b0c83222508fdf8788f566d37cfbcdf9fc8d58543cb2ade4 WHIRLPOOL 906978a8f4303c093134f8126de0391d412e11065ec5b06c352d72e443b81dd884cb9bb843e9ad5171a4b7460d8141f3dcdd9275461e85cdf310dbdbf05f41d6
+MISC ChangeLog 6836 SHA256 3c7bef6d4b666b0d2a39418b1b3782a2f08bcc3dfdd844251cbd4af9552581d6 SHA512 67939aa2da6a6846b44cd211c85536bed311e43ea3177bc13599fffacccf7de0559ea3c01b2f7ea0477542bc33a265c8631060286770385132bc09f9c647d763 WHIRLPOOL a79bc36cf9dca2cee4f7a3eb0bef7f41c8357d8c5ebfe01c4dbbe601f8451ac713e8aa983d17c25c5557ad76a21b1bc89a42fdaeb60d97cd0c4ed6e05b027927
+MISC ChangeLog-2015 15438 SHA256 441eb5b5de512e3a69e2d6534e6df2887eac0dc47442bbae9d9d38da4c8e6418 SHA512 860511c1522ab39ac87790071dcf3d184b482747c95c26262a0dda8e169c27ea543132f342e24f706acd4149e2e974070313244a900b457c6b9c8b083a7a34bf WHIRLPOOL a66bd0559152bb47bec372a8e90e5877d863f3fcf25ed22a04bf5bc87a45bdbb5b909dea6e3fcc25b11b301ee3857c609d6c15749c955cfd80da65cef532b01b
+MISC metadata.xml 532 SHA256 694d3fcf1af992c0ad27ff7d42fb22f4f8f253398daf9f5e4c3e3e74df9fb835 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0 WHIRLPOOL ec2e222b5720a3711d98a459ccfafb4f61a16bf310242fec526433b9b94fd826b1a9a82693c10381e9111e54cc6f78f507976c8b85c53653e10373d236522ffc
diff --git a/net-misc/freerdp/files/1.2.1-gstreamer.patch b/net-misc/freerdp/files/1.2.1-gstreamer.patch
new file mode 100644
index 000000000000..cafe9702210a
--- /dev/null
+++ b/net-misc/freerdp/files/1.2.1-gstreamer.patch
@@ -0,0 +1,71 @@
+From bea27fd919b64ee8d97996409e279e1e83d13594 Mon Sep 17 00:00:00 2001
+From: Jean-Louis Dupond <jean-louis@dupond.be>
+Date: Sun, 4 Oct 2015 18:17:33 +0200
+Subject: [PATCH] FindGStreamer_1_0: fix build failure for new gstreamer
+ versions
+
+---
+ cmake/FindGStreamer_1_0.cmake | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
+index f7bf990..3aa8fc6 100644
+--- a/cmake/FindGStreamer_1_0.cmake
++++ b/cmake/FindGStreamer_1_0.cmake
+@@ -53,17 +53,17 @@ set(GSTREAMER_1_0_MINIMUM_VERSION 1.0.5)
+ # Helper macro to find a Gstreamer plugin (or Gstreamer itself)
+ #   _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_1_0_AUDIO")
+ #   _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", or "gstreamer-video-1.0").
+-#   _header is the component's header, relative to the gstreamer-1.0 directory (eg. "gst/gst.h").
+ #   _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0")
+-macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
++macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
+     # FIXME: The QUIET keyword can be used once we require CMake 2.8.2.
+-    pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
+ 
+-    find_path(${_component_prefix}_INCLUDE_DIRS
+-        NAMES ${_header}
+-        HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
+-        PATH_SUFFIXES gstreamer-1.0
+-    )
++    string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
++    if ("${CMAKE_MATCH_2}" STREQUAL "")
++        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
++    else ()
++        pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
++    endif ()
++    set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS})
+ 
+     find_library(${_component_prefix}_LIBRARIES
+         NAMES ${_library} gstreamer_android
+@@ -78,8 +78,8 @@ endmacro()
+ # 1.1. Find headers and libraries
+ set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
+ find_package(Glib REQUIRED)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0)
+ 
+ # 1.2. Check Gstreamer version
+ if (GSTREAMER_1_0_INCLUDE_DIRS)
+@@ -110,11 +110,11 @@ endif ()
+ # 2. Find Gstreamer plugins
+ # -------------------------
+ 
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gst/app/gstappsink.h gstapp-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gst/audio/audio.h gstaudio-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gst/fft/gstfft.h gstfft-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gstpbutils-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gst/video/video.h gstvideo-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gstapp-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gstaudio-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gstfft-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gstvideo-1.0)
+ 
+ # ------------------------------------------------
+ # 3. Process the COMPONENTS passed to FIND_PACKAGE
+-- 
+2.6.3
+
diff --git a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch b/net-misc/freerdp/files/2.0.0-rc0-libressl.patch
new file mode 100644
index 000000000000..9e565e5b05db
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc0-libressl.patch
@@ -0,0 +1,89 @@
+From 9bf9ff9e8a548ecb5306d0142e75cdc274e93ba1 Mon Sep 17 00:00:00 2001
+From: Valery Kartel <valery.kartel@gmail.com>
+Date: Wed, 26 Jul 2017 17:12:14 +0300
+Subject: [PATCH] Fix build with LibreSSL
+
+---
+ libfreerdp/crypto/crypto.c      | 2 +-
+ winpr/libwinpr/utils/ssl.c      | 6 +++---
+ winpr/tools/makecert/makecert.c | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c
+index 15e65d534..f3bb595b8 100644
+--- a/libfreerdp/crypto/crypto.c
++++ b/libfreerdp/crypto/crypto.c
+@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* certificate_store_path)
+ 	if (cert_ctx == NULL)
+ 		goto end;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	OpenSSL_add_all_algorithms();
+ #else
+ 	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
+index b674e21d5..78cbab1d8 100644
+--- a/winpr/libwinpr/utils/ssl.c
++++ b/winpr/libwinpr/utils/ssl.c
+@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO
+ 	}
+ #endif
+ 	/* SSL_load_error_strings() is void */
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 	SSL_load_error_strings();
+ 	/* SSL_library_init() always returns "1" */
+ 	SSL_library_init();
+@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
+ #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
+ 		_winpr_openssl_cleanup_locking();
+ #endif
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 		CRYPTO_cleanup_all_ex_data();
+ 		ERR_free_strings();
+ 		EVP_cleanup();
+@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
+ #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
+ 	if (flags & WINPR_SSL_CLEANUP_THREAD)
+ 	{
+-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 		ERR_remove_state(0);
+ #else
+ 		ERR_remove_thread_state(NULL);
+diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c
+index a9efb352c..c9e38200a 100644
+--- a/winpr/tools/makecert/makecert.c
++++ b/winpr/tools/makecert/makecert.c
+@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_CONTEXT* context, char* pa
+ 				printf("Using default export password \"password\"\n");
+ 			}
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 			OpenSSL_add_all_algorithms();
+ 			OpenSSL_add_all_ciphers();
+ 			OpenSSL_add_all_digests();
+@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv)
+ 		key_length = atoi(arg->Value);
+ 	}
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 	context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);
+ #else
+ 	{
+@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv)
+ 	{
+ 		ASN1_TIME* before;
+ 		ASN1_TIME* after;
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 		before = X509_get_notBefore(context->x509);
+ 		after = X509_get_notAfter(context->x509);
+ #else
+-- 
+2.14.1
+
diff --git a/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch b/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch
new file mode 100644
index 000000000000..b63771d08187
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch
@@ -0,0 +1,25 @@
+From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 28 Jul 2017 16:31:41 -0400
+Subject: [PATCH] Fix gstreamer-1.0 detection
+
+---
+ cmake/FindGStreamer_1_0.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
+index 3aa8fc6dc..6fbc0ecc5 100644
+--- a/cmake/FindGStreamer_1_0.cmake
++++ b/cmake/FindGStreamer_1_0.cmake
+@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
+ 
+     string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
+     if ("${CMAKE_MATCH_2}" STREQUAL "")
+-        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
++        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}")
+     else ()
+         pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
+     endif ()
+-- 
+2.13.3
+
diff --git a/net-misc/freerdp/files/freerdp-armfp.patch b/net-misc/freerdp/files/freerdp-armfp.patch
new file mode 100644
index 000000000000..1a367d5600c3
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-armfp.patch
@@ -0,0 +1,84 @@
+From 2355b54f8516a6e1c600df8f26ac7d56916bfd99 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 1 May 2015 17:35:21 -0400
+Subject: [PATCH] Remove the ARM_FP_ABI option
+
+It's unclear why this option would be necessary, and it causes problems
+when people do not match it to their toolchain and CFLAGS.
+
+To set the float abi, either use a toolchain with an appropriate default
+or set the float-abi option in the CFLAGS environment variable.
+
+This should resolve #2586.
+---
+ cmake/ConfigOptions.cmake           | 6 ------
+ libfreerdp/CMakeLists.txt           | 4 ++--
+ packaging/deb/freerdp-nightly/rules | 7 -------
+ 3 files changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake
+index b51a46b..cef6ba6 100644
+--- a/cmake/ConfigOptions.cmake
++++ b/cmake/ConfigOptions.cmake
+@@ -29,12 +29,6 @@ if(TARGET_ARCH MATCHES "ARM")
+ 	else()
+ 		option(WITH_NEON "Enable NEON optimization." OFF)
+ 	endif()
+-	if (NOT DEFINED ARM_FP_ABI)
+-		set(ARM_FP_ABI "softfp" CACHE STRING "Floating point ABI to use on arm")
+-	else()
+-		set(ARM_FP_ABI ${ARM_FP_API} CACHE STRING "Floating point ABI to use on arm")
+-	endif()
+-	mark_as_advanced(ARM_FP_ABI)
+ else()
+ 	if(NOT APPLE)
+ 		option(WITH_IPP "Use Intel Performance Primitives." OFF)
+diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
+index a1cbd9d..112b75a 100644
+--- a/libfreerdp/CMakeLists.txt
++++ b/libfreerdp/CMakeLists.txt
+@@ -156,7 +156,7 @@ if(WITH_SSE2)
+ endif()
+ 
+ if(WITH_NEON)
+-	set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -mfloat-abi=${ARM_FP_ABI} -Wno-unused-variable" )
++	set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -Wno-unused-variable" )
+ 	set(CODEC_SRCS ${CODEC_SRCS} ${CODEC_NEON_SRCS})
+ endif()
+ 
+@@ -236,7 +236,7 @@ if(WITH_SSE2)
+ 	endif()
+ elseif(WITH_NEON)
+ 	if(CMAKE_COMPILER_IS_GNUCC)
+-	    set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon -mfloat-abi=${ARM_FP_ABI}")
++	    set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon")
+ 	endif()
+ 	# TODO: Add MSVC equivalent
+ endif()
+diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules
+index 4366f63..44ceb56 100755
+--- a/packaging/deb/freerdp-nightly/rules
++++ b/packaging/deb/freerdp-nightly/rules
+@@ -1,11 +1,5 @@
+ #!/usr/bin/make -f
+ 
+-DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+-ifneq (,$(filter armhf,$(DEB_HOST_ARCH)))
+-ARM_FLOAT_ABI = -DARM_FP_ABI=hard
+-else
+-ARM_FLOAT_ABI =
+-endif
+ NULL =
+ 
+ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
+@@ -26,7 +20,6 @@ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
+                           -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \
+                           -DCMAKE_INSTALL_INCLUDEDIR=include \
+                           -DCMAKE_INSTALL_LIBDIR=lib \
+-                          $(ARM_FLOAT_ABI) \
+                           $(NULL)
+ 
+ %:
+-- 
+2.5.0
+
diff --git a/net-misc/freerdp/files/freerdp-ffmpeg29.patch b/net-misc/freerdp/files/freerdp-ffmpeg29.patch
new file mode 100644
index 000000000000..e4d81bd1c2aa
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-ffmpeg29.patch
@@ -0,0 +1,42 @@
+https://github.com/FreeRDP/FreeRDP/pull/2895
+
+Index: freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+===================================================================
+--- freerdp-1.2.1_pre20150326.orig/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
++++ freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+@@ -102,7 +102,7 @@ static BOOL tsmf_ffmpeg_init_video_strea
+ 	mdecoder->codec_context->bit_rate = media_type->BitRate;
+ 	mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator;
+ 	mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator;
+-	mdecoder->frame = avcodec_alloc_frame();
++	mdecoder->frame = av_frame_alloc();
+ 	return TRUE;
+ }
+ 
+@@ -320,7 +320,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
+ 								 mdecoder->codec_context->width, mdecoder->codec_context->height);
+ 		mdecoder->decoded_data = malloc(mdecoder->decoded_size);
+ 		ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size);
+-		frame = avcodec_alloc_frame();
++		frame = av_frame_alloc();
+ 		avpicture_fill((AVPicture*) frame, mdecoder->decoded_data,
+ 					   mdecoder->codec_context->pix_fmt,
+ 					   mdecoder->codec_context->width, mdecoder->codec_context->height);
+@@ -389,7 +389,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
+ 									(int16_t *) dst, &frame_size, src, src_size);
+ #else
+ 		{
+-			AVFrame *decoded_frame = avcodec_alloc_frame();
++			AVFrame *decoded_frame = av_frame_alloc();
+ 			int got_frame = 0;
+ 			AVPacket pkt;
+ 			av_init_packet(&pkt);
+@@ -469,7 +469,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_fo
+ 
+ 	switch (mdecoder->codec_context->pix_fmt)
+ 	{
+-		case PIX_FMT_YUV420P:
++		case AV_PIX_FMT_YUV420P:
+ 			return RDP_PIXFMT_I420;
+ 		default:
+ 			WLog_ERR(TAG, "unsupported pixel format %u",
diff --git a/net-misc/freerdp/files/freerdp-libressl.patch b/net-misc/freerdp/files/freerdp-libressl.patch
new file mode 100644
index 000000000000..cbb79bcc1d31
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-libressl.patch
@@ -0,0 +1,148 @@
+From 70ab61c8e6083080093fc42e8e7172969864e2bd Mon Sep 17 00:00:00 2001
+From: Aric Belsito <lluixhi@gmail.com>
+Date: Sun, 19 Mar 2017 13:58:24 -0700
+Subject: [PATCH] Support LibreSSL
+
+Broken by the addition of OpenSSL 1.1.0 support.
+---
+ libfreerdp/crypto/opensslcompat.c | 4 ++--
+ libfreerdp/crypto/opensslcompat.h | 4 ++--
+ libfreerdp/crypto/tls.c           | 8 ++++----
+ winpr/libwinpr/crypto/hash.c      | 8 ++++----
+ winpr/libwinpr/utils/ssl.c        | 2 +-
+ 5 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/libfreerdp/crypto/opensslcompat.c b/libfreerdp/crypto/opensslcompat.c
+index bb5aff7..701902d 100644
+--- a/libfreerdp/crypto/opensslcompat.c
++++ b/libfreerdp/crypto/opensslcompat.c
+@@ -19,7 +19,7 @@
+ 
+ #include "opensslcompat.h"
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ BIO_METHOD* BIO_meth_new(int type, const char* name)
+ {
+@@ -41,4 +41,4 @@ void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM
+ 		*d = r->d;
+ }
+ 
+-#endif /* OPENSSL < 1.1.0 */
++#endif /* OPENSSL < 1.1.0 || LIBRESSL */
+diff --git a/libfreerdp/crypto/opensslcompat.h b/libfreerdp/crypto/opensslcompat.h
+index a599863..b42d32f 100644
+--- a/libfreerdp/crypto/opensslcompat.h
++++ b/libfreerdp/crypto/opensslcompat.h
+@@ -30,7 +30,7 @@
+ 
+ #include <openssl/opensslv.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #include <openssl/bio.h>
+ #include <openssl/rsa.h>
+@@ -59,7 +59,7 @@
+ BIO_METHOD* BIO_meth_new(int type, const char* name);
+ void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM** d);
+ 
+-#endif /* OPENSSL < 1.1.0 */
++#endif /* OPENSSL < 1.1.0 || LIBRESSL */
+ #endif /* WITH_OPENSSL */
+ 
+ #endif /* FREERDP_CRYPTO_OPENSSLCOMPAT_H */
+diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
+index 1071a2e..c415763 100644
+--- a/libfreerdp/crypto/tls.c
++++ b/libfreerdp/crypto/tls.c
+@@ -323,7 +323,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
+ 		case BIO_CTRL_PUSH:
+ 			if (next_bio && (next_bio != ssl_rbio))
+ 			{
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 				SSL_set_bio(tls->ssl, next_bio, next_bio);
+ 				CRYPTO_add(&(bio->next_bio->references), 1, CRYPTO_LOCK_BIO);
+ #else
+@@ -346,7 +346,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
+ 				if (ssl_rbio != ssl_wbio)
+ 					BIO_free_all(ssl_wbio);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 				if (next_bio)
+ 					CRYPTO_add(&(bio->next_bio->references), -1, CRYPTO_LOCK_BIO);
+ 				tls->ssl->wbio = tls->ssl->rbio = NULL;
+@@ -384,7 +384,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
+ 					BIO_push(ssl_rbio, next_bio);
+ 
+ 				BIO_set_next(bio, ssl_rbio);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 				CRYPTO_add(&(ssl_rbio->references), 1, CRYPTO_LOCK_BIO);
+ #else
+ 				BIO_up_ref(ssl_rbio);
+@@ -1021,7 +1021,7 @@ BOOL tls_send_alert(rdpTls* tls)
+  *        SSL struct is opaqe now
+  */
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
+ 	{
+ 		/**
+diff --git a/winpr/libwinpr/crypto/hash.c b/winpr/libwinpr/crypto/hash.c
+index 949d687..27eb434 100644
+--- a/winpr/libwinpr/crypto/hash.c
++++ b/winpr/libwinpr/crypto/hash.c
+@@ -146,7 +146,7 @@ WINPR_HMAC_CTX* winpr_HMAC_New(void)
+ 
+ #if defined(WITH_OPENSSL)
+ 	HMAC_CTX* hmac = NULL;
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 	if (!(hmac = (HMAC_CTX*) calloc(1, sizeof(HMAC_CTX))))
+ 		return NULL;
+ 	HMAC_CTX_init(hmac);
+@@ -267,7 +267,7 @@ void winpr_HMAC_Free(WINPR_HMAC_CTX* ctx)
+ 	HMAC_CTX* hmac = (HMAC_CTX*) ctx;
+ 	if (hmac)
+ 	{
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 		HMAC_CTX_cleanup(hmac);
+ 		free(hmac);
+ #else
+@@ -317,7 +317,7 @@ WINPR_DIGEST_CTX* winpr_Digest_New(void)
+ 
+ #if defined(WITH_OPENSSL)
+ 	EVP_MD_CTX* mdctx;
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 	mdctx = EVP_MD_CTX_create();
+ #else
+ 	mdctx = EVP_MD_CTX_new();
+@@ -406,7 +406,7 @@ void winpr_Digest_Free(WINPR_DIGEST_CTX* ctx)
+ 	EVP_MD_CTX* mdctx = (EVP_MD_CTX*) ctx;
+ 	if (mdctx)
+ 	{
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 		EVP_MD_CTX_destroy(mdctx);
+ #else
+ 		EVP_MD_CTX_free(mdctx);
+diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
+index 2f8100f..5fd6ac6 100644
+--- a/winpr/libwinpr/utils/ssl.c
++++ b/winpr/libwinpr/utils/ssl.c
+@@ -45,7 +45,7 @@ static BOOL g_winpr_openssl_initialized_by_winpr = FALSE;
+  * set locking callbacks to use OpenSSL in a multi-threaded environment.
+  */
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #define WINPR_OPENSSL_LOCKING_REQUIRED 1
+ 
diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
new file mode 100644
index 000000000000..0ead5f2d8dc9
--- /dev/null
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit cmake-utils vcs-snapshot
+
+if [[ ${PV} != 9999* ]]; then
+	COMMIT="aa2181dcf2dd98693767ba738c5b2ad8c3d742d4"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm ppc ppc64 x86"
+else
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/1.2"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav
+	libressl neon pulseaudio server smartcard test usb wayland X xinerama xv"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		usb? (
+			virtual/libudev:0=
+			sys-apps/util-linux:0=
+			dev-libs/dbus-glib:0=
+			virtual/libusb:1=
+		)
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+"
+
+DOCS=( README )
+
+PATCHES=(
+	"${FILESDIR}/freerdp-armfp.patch"
+	"${FILESDIR}/freerdp-ffmpeg29.patch"
+	"${FILESDIR}/1.2.1-gstreamer.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with alsa ALSA)
+		$(cmake-utils_use_with client CLIENT)
+		$(cmake-utils_use_with cups CUPS)
+		$(cmake-utils_use_with debug DEBUG_ALL)
+		$(cmake-utils_use_with doc MANPAGES)
+		$(cmake-utils_use_with ffmpeg FFMPEG)
+		$(cmake-utils_use_with gstreamer GSTREAMER_1_0)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with neon NEON)
+		$(cmake-utils_use_with pulseaudio PULSE)
+		$(cmake-utils_use_with server SERVER)
+		$(cmake-utils_use_with smartcard PCSC)
+		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
+		$(cmake-utils_use usb CHANNEL_URBDRC)
+		$(cmake-utils_use_with X X11)
+		$(cmake-utils_use_with xinerama XINERAMA)
+		$(cmake-utils_use_with xv XV)
+		$(cmake-utils_use_build test TESTING)
+		$(cmake-utils_use_with wayland WAYLAND)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild
new file mode 100644
index 000000000000..980a8e4d2950
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ ${PV} != 9999 ]]; then
+	COMMIT="5b2455f3147aca395a441fc65b602938600f0788"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm ppc ppc64 x86"
+	S="${WORKDIR}/FreeRDP-${COMMIT}"
+else
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		usb? (
+			virtual/libudev:0=
+			sys-apps/util-linux:0=
+			dev-libs/dbus-glib:0=
+			virtual/libusb:1=
+		)
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+"
+
+DOCS=( README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_ALSA=$(usex alsa)
+		-DWITH_CLIENT=$(usex client)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_DEBUG_ALL=$(usex debug)
+		-DWITH_MANPAGES=$(usex doc)
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_NEON=$(usex neon)
+		-DWITH_PULSE=$(usex pulseaudio)
+		-DWITH_SERVER=$(usex server)
+		-DWITH_PCSC=$(usex smartcard)
+		-DWITH_LIBSYSTEMD=$(usex systemd)
+		-DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+		-DCHANNEL_URBDRC=$(usex usb)
+		-DWITH_X11=$(usex X)
+		-DWITH_XINERAMA=$(usex xinerama)
+		-DWITH_XV=$(usex xv)
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_WAYLAND=$(usex wayland)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-2.0.0_pre20161219.ebuild b/net-misc/freerdp/freerdp-2.0.0_pre20161219.ebuild
new file mode 100644
index 000000000000..6d7b867a1b06
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.0.0_pre20161219.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ ${PV} != 9999 ]]; then
+	COMMIT="8d0809cf26868fc5ff651850a32724650597747f"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/FreeRDP-${COMMIT}"
+else
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		usb? (
+			virtual/libudev:0=
+			sys-apps/util-linux:0=
+			dev-libs/dbus-glib:0=
+			virtual/libusb:1=
+		)
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+"
+
+DOCS=( README )
+
+PATCHES=(
+	"${FILESDIR}"/freerdp-libressl.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_ALSA=$(usex alsa)
+		-DWITH_CLIENT=$(usex client)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_DEBUG_ALL=$(usex debug)
+		-DWITH_MANPAGES=$(usex doc)
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_NEON=$(usex neon)
+		-DWITH_PULSE=$(usex pulseaudio)
+		-DWITH_SERVER=$(usex server)
+		-DWITH_PCSC=$(usex smartcard)
+		-DWITH_LIBSYSTEMD=$(usex systemd)
+		-DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+		-DCHANNEL_URBDRC=$(usex usb)
+		-DWITH_X11=$(usex X)
+		-DWITH_XINERAMA=$(usex xinerama)
+		-DWITH_XV=$(usex xv)
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_WAYLAND=$(usex wayland)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
new file mode 100644
index 000000000000..eef56aa415d3
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="${PV/_/-}"
+	MY_P="FreeRDP-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+else
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		usb? (
+			virtual/libudev:0=
+			sys-apps/util-linux:0=
+			dev-libs/dbus-glib:0=
+			virtual/libusb:1=
+		)
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	openh264? ( media-libs/openh264 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+"
+
+DOCS=( README )
+PATCHES=(
+	"${FILESDIR}"/2.0.0-rc0-libressl.patch
+	"${FILESDIR}"/freerdp-Fix-gstreamer-1.0-detection.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCHANNEL_URBDRC=$(usex usb)
+		-DWITH_ALSA=$(usex alsa)
+		-DWITH_CCACHE=OFF
+		-DWITH_CLIENT=$(usex client)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_DEBUG_ALL=$(usex debug)
+		-DWITH_MANPAGES=$(usex doc)
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_NEON=$(usex neon)
+		-DWITH_OPENH264=$(usex openh264)
+		-DWITH_PULSE=$(usex pulseaudio)
+		-DWITH_SERVER=$(usex server)
+		-DWITH_PCSC=$(usex smartcard)
+		-DWITH_LIBSYSTEMD=$(usex systemd)
+		-DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+		-DWITH_X11=$(usex X)
+		-DWITH_XINERAMA=$(usex xinerama)
+		-DWITH_XV=$(usex xv)
+		-DWITH_WAYLAND=$(usex wayland)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
new file mode 100644
index 000000000000..4f99bd08f244
--- /dev/null
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="${PV/_/-}"
+	MY_P="FreeRDP-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+else
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		usb? (
+			virtual/libudev:0=
+			sys-apps/util-linux:0=
+			dev-libs/dbus-glib:0=
+			virtual/libusb:1=
+		)
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	openh264? ( media-libs/openh264 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+"
+
+DOCS=( README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCHANNEL_URBDRC=$(usex usb)
+		-DWITH_ALSA=$(usex alsa)
+		-DWITH_CCACHE=OFF
+		-DWITH_CLIENT=$(usex client)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_DEBUG_ALL=$(usex debug)
+		-DWITH_MANPAGES=$(usex doc)
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_NEON=$(usex neon)
+		-DWITH_OPENH264=$(usex openh264)
+		-DWITH_PULSE=$(usex pulseaudio)
+		-DWITH_SERVER=$(usex server)
+		-DWITH_PCSC=$(usex smartcard)
+		-DWITH_LIBSYSTEMD=$(usex systemd)
+		-DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+		-DWITH_X11=$(usex X)
+		-DWITH_XINERAMA=$(usex xinerama)
+		-DWITH_XV=$(usex xv)
+		-DWITH_WAYLAND=$(usex wayland)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
new file mode 100644
index 000000000000..22b0a0566617
--- /dev/null
+++ b/net-misc/freerdp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<use>
+		<flag name="client">Build client binaries</flag>
+		<flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag>
+		<flag name="server">Build server binaries</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">FreeRDP/FreeRDP</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/gcap/Manifest b/net-misc/gcap/Manifest
new file mode 100644
index 000000000000..0c451ade7dcf
--- /dev/null
+++ b/net-misc/gcap/Manifest
@@ -0,0 +1,5 @@
+DIST gcap-0.1.1.tar.gz 20612 SHA256 2941788de17f74fcd245290b233e4039ae71ca7ba5e90a400a19d551cfb545c3 SHA512 5206bdbc7cd5265456dd0b1a2c028c9ffb5e1324a0527c16ae2d74ff93e82e56bfc9e498f94d9895108265ce5e87c5510aece5ef61011f3128bf260eeaaee52d WHIRLPOOL 89c40c45b4026a601ffddc09254300ec990371c11095ac441392a06fcb11d63dc802749c7e7a7267dddb79129b37a07ead81d37b50d6ec39d8cb53e1457f7982
+EBUILD gcap-0.1.1-r1.ebuild 538 SHA256 6c92b5e79414ef77473b3615bc2ad8b2090e1953b1b449f186b45b33a37c476b SHA512 2234c644ea4cc7c7f195f2458f5bcef0fd77e4f55933cdc1b95291b5db9095b8a422f5cd9e31bdeab2dc136a7476e8898fb3839b3a88c3abcd8a17e2f3ccabc8 WHIRLPOOL a3c43a1854fcdbc010e0580a514999302f7e877638aa6b4fec96970ff67cfb9c317e0f9265a7bb435414b4b804ee5f33ff41be3329ab2d023d7e09665b66c1e4
+MISC ChangeLog 3230 SHA256 627e793e82049fcb833e2ca8ae6d7979fd32c03bb303d2e184963465c89efe76 SHA512 e7314c8f54b8aef06f19d7b1866c96d15784e59df9d4b9a78b3e70b3387fc5be2f50ac6865c3777d028a6e92250cb4d528d7b8f37dacc3c62e6817846d6fc98f WHIRLPOOL 0b3211c48de731139f4b1e4069f59e9e910f184fc41e71b4533895211fcdeeccb0d35264a9d05739c168d5f092aa15722e3deb28e1eadba8567db275c3e83928
+MISC ChangeLog-2015 907 SHA256 34ea057bce9a214f4733dc3d7de135d21561822ebac80377a5e88830bee39a99 SHA512 b4f8926004bd4fce8e577b212fa4989758bc4d47deb57c14c20899ec2b49ccb0166ac15c28c0a466a3263f6dd350d2384dd7859ac4efca53431cf7f645018c88 WHIRLPOOL c5c8ceaa38e5af0de295ef77cbee1f7fef9cd6f5d73b2e1bbf3b873acd6790e47f4010f70696061544a172785109f80d11f5a199883498faf00800f12037840b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/gcap/gcap-0.1.1-r1.ebuild b/net-misc/gcap/gcap-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..52e93b829eb3
--- /dev/null
+++ b/net-misc/gcap/gcap-0.1.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="Command line tool for downloading Youtube closed captions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-perl/Getopt-ArgvFile
+		dev-perl/XML-DOM
+		virtual/perl-Getopt-Long"
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+SRC_TEST="do"
diff --git a/net-misc/gcap/metadata.xml b/net-misc/gcap/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/gcap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
new file mode 100644
index 000000000000..a1761c69506b
--- /dev/null
+++ b/net-misc/geoipupdate/Manifest
@@ -0,0 +1,7 @@
+DIST geoipupdate-2.3.1.tar.gz 362497 SHA256 4f71e911774c4fd32e217889c242d2c311fa5ffd3df56be48a2d1aedfe2e671c SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1 WHIRLPOOL 315a5d99cef9d7d36c4353f57c455549a3bf33787aa6669c72b0f13068f247d7301e1399b029f32675c557d855db424a60a6c2e310cc99b6da439a2ca4606ac5
+DIST geoipupdate-2.4.0.tar.gz 369949 SHA256 8b4e88ce8d84e9c75bc681704d19ec5c63c54f01e945f7669f97fb0df7e13952 SHA512 6285810380a12ce34c90798fe31954959c9b462060e9b49348b5dbca3af7f3b1798384cf958de3b213ac7d03d42688c6744365d91efc4ad1fe76330bd893d4b1 WHIRLPOOL 759b42c747037bc3b1918c8f2dd5636ee33dc337f35221fca4057efeaacd1762063265b1607bd37040a83c6721338030fae05ec0f674ee9feef7e2677065546a
+EBUILD geoipupdate-2.3.1.ebuild 573 SHA256 e03802d9e4acb36b2bbdef5437def78a73bc7a40b546f944bfad7301421a8fa6 SHA512 add023538fe12026667cf0feba8c1ebf1157609ba2ac9622466920d2ed7c128bec10ba7ac1a12acb358067e0ec757996ad0eec63c91c7b4a7c9d75984b06bcff WHIRLPOOL b3257963c5bf41a80ffdcdcceaf69198f5b1d15aaf3152ebac550c6f8d87729c48c82549b2580c2906957a5e8e015e332df08e5758345ca1a6cd344a917e6e38
+EBUILD geoipupdate-2.4.0.ebuild 582 SHA256 eacfef2e48f19597edfb72482712decfd6cf0a370e8763ea14b44398cde9ac06 SHA512 f96dbf26af4c15369a5fce9b2a0a9e5571b7940304031e98c201231cc662b8ddf179a55b5454d6cd91855b68653eda03bf078043eb55edffb4e7992a8d5815f8 WHIRLPOOL 6fec9f32272e68f22c66c6b66f9504f6f67900aa5448d86ddecc3c20e57485445da43a846fed45b2f4058853af47b34230a13cbb4772d9fe468da9fe0dfec17c
+MISC ChangeLog 3838 SHA256 065302db05c0219821ff086fc82b26d76f84df814143c2bd1c0cc8db3dded505 SHA512 47a6e0f0c5724c5c1d939156dff5e89ddf377fa8df2a6fe3ebdec63dc9035254b0ce5539b48ea9b0d54e1fa6edc721d49301c5c89efdbf7c4cfc9f81a9742a92 WHIRLPOOL da3588458de471a2d1ad341946a5db14be05d21fb4252771e058c2b50681b1adbae061679b151ae7e44c81b39f3432c71454c85bf73260a715ac833a2c80efcd
+MISC ChangeLog-2015 5645 SHA256 04ff36a3debb9d1a6f9422495a569718c73b84772ee94e89025ecba0d240f8e0 SHA512 691ff97d4145087ea588ef62d04ad46fbe62639d31382f8494e62d0d32f84a5e8cdf1cf24794a8ef791cab420339ad9ce0f254fe3ae1b2319720fe99185ca472 WHIRLPOOL a7fd626a05466d901eddce0ed5d4b61901bde5880d11bf665f154eaba1c996fbc5c12a01f09e08ea100019b24e28fc1babff8734dfc396c5142115ec0d89fc9d
+MISC metadata.xml 364 SHA256 2b655fd82941862b31cd1b67868d029a7afab3dcd3bfd081b5a3e3b3d17b49e1 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc WHIRLPOOL 2c652b96413ffd7f7fb7115e7ecc7e537f8197b035bf0f4e276d44ee876c583c285dc974e7810695b18f9c7dda5dcd961dbb41342299b3d24f08557d67edb14d
diff --git a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
new file mode 100644
index 000000000000..131aab6394d0
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd"
+
+DEPEND="
+	net-misc/curl
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	!<dev-libs/geoip-1.6.0
+"
+
+src_install() {
+	default
+	keepdir /usr/share/GeoIP
+}
diff --git a/net-misc/geoipupdate/geoipupdate-2.4.0.ebuild b/net-misc/geoipupdate/geoipupdate-2.4.0.ebuild
new file mode 100644
index 000000000000..c853ab96cf0b
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-2.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+
+DEPEND="
+	net-misc/curl
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	!<dev-libs/geoip-1.6.0
+"
+
+src_install() {
+	default
+	keepdir /usr/share/GeoIP
+}
diff --git a/net-misc/geoipupdate/metadata.xml b/net-misc/geoipupdate/metadata.xml
new file mode 100644
index 000000000000..77e4137ec885
--- /dev/null
+++ b/net-misc/geoipupdate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">maxmind/geoipupdate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest
new file mode 100644
index 000000000000..21ded8ed1a8d
--- /dev/null
+++ b/net-misc/geomyidae/Manifest
@@ -0,0 +1,7 @@
+DIST geomyidae-0.26.2.tar.gz 15399 SHA256 49b4fbc437321e31a3b073cf8b88ddd4482b35a144a4289b4849e2242b991465 SHA512 337665350ee9fc09a88c83ebc8dd8d53ead9c5542c90c23f519bc99c1a1055e4751e78dbb70578325ba42d9aa59adcbbf4e32629fc75744b70e7ddc4c8266dce WHIRLPOOL 9e2409c7f5d5be2b46e43908db065a56db2e488b0769415cce9fb4b828d0f213a836e48068812d2e7aa9ee7cfd00d1970e04c504e18e9186b573e275a0c0ae2e
+DIST geomyidae-0.26.3.tar.gz 15556 SHA256 162f55ab059ab0a9be8e840497795293bbd51c34b1f4564dcdf3f0ddd5c0db31 SHA512 fcee0133547881f6df173a24eac0fd3007436365375f11c572c50cf2e77c2033d441209f7f20dab1d291b0e9305de245da409351a02df4ca92d7b158768424b3 WHIRLPOOL 79385698ddd1c9c99fbb03c77ac6e817e157e3d8779f9929fe5ae281472bbc00eec81a18b2fe02c27fd96377e6b20e5e2d0b18d9bb747a3004aa96db076bcaf3
+EBUILD geomyidae-0.26.2.ebuild 902 SHA256 b8efa0f9f2c22d1042e245e4f963aed47889f759238d989a21d1a518c7261dda SHA512 d0cb2c36f7d2d2e4896006f92a1ee624e4d94188c891dd85c0d0cd2075bbeb06dc62299119190beb713c67e41ad4230ad0e3aca8ce1a54268852821c156a7b70 WHIRLPOOL d8084ea5526681340a5a2aaa77afe9de5ed70da5805158f0d551458115f1e3cf4365b2ffbef879189c5a6a75db95e8f234e3e9d7238f9a01d45832b68f206bec
+EBUILD geomyidae-0.26.3.ebuild 902 SHA256 b8efa0f9f2c22d1042e245e4f963aed47889f759238d989a21d1a518c7261dda SHA512 d0cb2c36f7d2d2e4896006f92a1ee624e4d94188c891dd85c0d0cd2075bbeb06dc62299119190beb713c67e41ad4230ad0e3aca8ce1a54268852821c156a7b70 WHIRLPOOL d8084ea5526681340a5a2aaa77afe9de5ed70da5805158f0d551458115f1e3cf4365b2ffbef879189c5a6a75db95e8f234e3e9d7238f9a01d45832b68f206bec
+MISC ChangeLog 2242 SHA256 699fd57a47b460ce591723fd3a05fd0f2f91f8fb427a4bae018c89714769f661 SHA512 5f87aa244fa0f539f7907b40b0e0b36751f072ec6a8250d971c53efa655c38d77fbe1ec5464bfcf6104c19f74512ec0017ac99ff96de11802edd9ad15ebbf2ff WHIRLPOOL 7d236b3c1a3e21b2831b6b6d160578b52bf1eb3a4e252317d59e048534aaa236bd4a6785e2a24e2a9f37429915e5dc60b9d1e023486905c620f2c48186907ef7
+MISC ChangeLog-2015 887 SHA256 ccdf33ec986ea035f828a57db2ed77ac0bb7dfbdd9ae48173189ae22e4d4ff9d SHA512 c9bd2bc96dacfffeefdea47d5c8d5a33d9d1770377478a9a20ba4a658bb1f70cf981084607a104a52f5125828a97c21e42be7e42227e93f1b7a1b83d8e4d20c0 WHIRLPOOL 73efc19fc1b0c99a41307d7b6bce1b188c869e7cf5fbc25c8bc0a027894591163762796ed7ce0a29a87e89b1c1aff664a97383facb80e35ccf56b41e5ca2adc2
+MISC metadata.xml 247 SHA256 fb925313d1ae70feaa6db91150f34a2157b48e884e8f47d773640af149e3744b SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a WHIRLPOOL 142b4295733faec48b0ca9eb6d3561799ff743481aabf2b74ecf6d717d972b4961979c7b6bf32b9840cb34e47d22fe2befb9b0ef8ec0d3f28f6416069128d3c7
diff --git a/net-misc/geomyidae/geomyidae-0.26.2.ebuild b/net-misc/geomyidae/geomyidae-0.26.2.ebuild
new file mode 100644
index 000000000000..f6c4c90a5a2d
--- /dev/null
+++ b/net-misc/geomyidae/geomyidae-0.26.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="A daemon to serve the gopher protocol"
+HOMEPAGE="http://r-36.net/src/geomyidae/"
+SRC_URI="http://r-36.net/src/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+pkg_setup(){
+	enewgroup gopherd
+	enewuser gopherd -1 -1 /var/gopher gopherd
+}
+
+src_prepare() {
+	# enable verbose build
+	# drop -O. from CFLAGS
+	sed -i \
+		-e 's/@${CC}/${CC}/g' \
+		-e '/CFLAGS/s/-O. //' \
+		Makefile || die 'sed on Makefile failed'
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin ${PN}
+
+	newinitd rc.d/Gentoo.init.d ${PN}
+	newconfd rc.d/Gentoo.conf.d ${PN}
+
+	insinto /var/gopher
+	doins index.gph
+	fowners -R root.gopherd /var/gopher
+	fperms -R g=rX,o=rX /var/gopher
+
+	doman ${PN}.8
+	dodoc CGI README
+}
diff --git a/net-misc/geomyidae/geomyidae-0.26.3.ebuild b/net-misc/geomyidae/geomyidae-0.26.3.ebuild
new file mode 100644
index 000000000000..f6c4c90a5a2d
--- /dev/null
+++ b/net-misc/geomyidae/geomyidae-0.26.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="A daemon to serve the gopher protocol"
+HOMEPAGE="http://r-36.net/src/geomyidae/"
+SRC_URI="http://r-36.net/src/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+pkg_setup(){
+	enewgroup gopherd
+	enewuser gopherd -1 -1 /var/gopher gopherd
+}
+
+src_prepare() {
+	# enable verbose build
+	# drop -O. from CFLAGS
+	sed -i \
+		-e 's/@${CC}/${CC}/g' \
+		-e '/CFLAGS/s/-O. //' \
+		Makefile || die 'sed on Makefile failed'
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin ${PN}
+
+	newinitd rc.d/Gentoo.init.d ${PN}
+	newconfd rc.d/Gentoo.conf.d ${PN}
+
+	insinto /var/gopher
+	doins index.gph
+	fowners -R root.gopherd /var/gopher
+	fperms -R g=rX,o=rX /var/gopher
+
+	doman ${PN}.8
+	dodoc CGI README
+}
diff --git a/net-misc/geomyidae/metadata.xml b/net-misc/geomyidae/metadata.xml
new file mode 100644
index 000000000000..5b159fbcadd1
--- /dev/null
+++ b/net-misc/geomyidae/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
new file mode 100644
index 000000000000..5b2db0256553
--- /dev/null
+++ b/net-misc/gerbera/Manifest
@@ -0,0 +1,8 @@
+AUX gerbera-1.0.0.confd 531 SHA256 10a790f79e2059bd396ca400de06ef66f5a2774cc71142b186af9dcf9d30406f SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931 WHIRLPOOL 8c2d7e1c787ec6cbea6d3d5dbe5f2ad93c8d522ae4b9744c069a09c46d6f611d0b52ca9398f1c59960424a9cd50f7462dbc0532c48120b7b4d1e3e74277477e7
+AUX gerbera-1.0.0.config 6164 SHA256 da240e2ccae01b091c3b2f991aef87ba6c0858bb0a3e68e297b0f042ea8fc113 SHA512 5a4c44d71e7bb4f1e9be2de61ab831d6b8871ab432ed31b58799957e7812e23c382f81c32062c0db44712287643e495fd66e1fa214676df3e0b18d7e1bb2f23d WHIRLPOOL 938dfa5327c34b015d38eb84a0a25c4df7feafe9be2e1e068257a7187dae5dc9b7b8acdf3759b5c4c705a4bfd70afe716d80b3180789bddfdd8f0140f27cafe3
+AUX gerbera-1.0.0.initd 555 SHA256 0f3e0df3078537693c5d5049a79d0987d1ceed53e1eb806b3496841295726814 SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d WHIRLPOOL 56abe31be21067bc16bbacb557ee57706b8f0d6874c0124f04fe35a9838066bd3b4597926a2a65ac724f577b797699bc6f9e023c1f67f8c0e5a8e6fe3c46c671
+AUX gerbera-1.1.0-build-failure.patch 455 SHA256 19a6ce7efb1ac04fd55c423892144dc44e7254f39ab2f18c1b44c178bd822e51 SHA512 5def64f7d94b9005890d56b16385df8b78701fb139dbc379f29818413f4bea03eb1e2b87db0e4b4206b710d9e80f646061dd223f3370deced72667ece9b5f25d WHIRLPOOL ccde4d3a6b6af8cca6a7bfd80a62419c961bc05f6ca9fbfb666612e09d4cfb6df2924a1dae4e8ab75220229b5ed1b51e32f28a9ed67054755c385525b7afe5e1
+DIST gerbera-1.1.0.tar.gz 1308827 SHA256 225247e94983d24d50c0877cd7c9ef1e013091f2ec43fac7e2a3c3b82c11d5bd SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b WHIRLPOOL 876625f2669dd32dd67e88bc60ca98e216f6bf01f3729d8a629e42f6871c69f53dbc62fdce9b9ea98aecc77a5f4fe1da17530586227546c6929ae762c9ecb49a
+EBUILD gerbera-1.1.0-r1.ebuild 2560 SHA256 76d4ea25175449a5c2dd81aafeb4dbe781709e83de4934ec40c96c737aad33a4 SHA512 614e5686ddae454103444bdfdf562dbec1a1260ba78b4f93dfe78d2045a40754ec0a8f4acc0b9b006dbc9b6af97625e9eb1fb3d745dd5a3cb17094a2eccd22c2 WHIRLPOOL d88df04706ba1076921ed2c32b356620287c2cfa75cd851810c2aec8cd0495a8ccd8ea274fd3a38837ab57d59dd750478bbf9533aea5fa768ae2b6b57d1c05d4
+EBUILD gerbera-9999.ebuild 2508 SHA256 89ceabebaab787cb55d884633a85777a4b2bff35f18693c5809af1b41921764b SHA512 053d702146225c24421d8d83466121996997917a7bd2dd462304ad6fbe488b6fd03a609712dd46e9bd8a4ec803702323ae0e3fc508b84a71757bfe6966ff7963 WHIRLPOOL 3f8730d438c838474c276440e71061f847308e7a309ce3cfff462a46876cfecb3a4fa766c0de7fcab2d3b57d6be10f6184077a6bb516f18e4db70e590b06e2cc
+MISC metadata.xml 1154 SHA256 5ef469cf1dff29ec5965438186773b00fa5ab648f01ed552733cbce35bfe2029 SHA512 3048a14a5414888be83baade4f1961161cd07097aa9574cd60225d54001d35df4bac8855c10ca529595baa82fd6137b310f64aff79af3057495b16fcd6cfd558 WHIRLPOOL 158a569fb4e7dd064216aa70875ecf0f2ec65e0296eb0cd5068e937935a0ca1088ce9074c96c2e71107e12b372e904fe22094ca38793fe4a2776506682a1216f
diff --git a/net-misc/gerbera/files/gerbera-1.0.0.confd b/net-misc/gerbera/files/gerbera-1.0.0.confd
new file mode 100644
index 000000000000..3f4bdf16a75f
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.0.0.confd
@@ -0,0 +1,20 @@
+# /etc/conf.d/gerbera: config file for /etc/init.d/gerbera
+
+# See the gerbera(1) manpage for more info.
+
+# Gerbera Web UI port.
+# NOTE: The minimum value allowed is 49152
+GERBERA_PORT=49152
+
+# Path to Gerbera config file.
+GERBERA_CONFIG="/etc/gerbera/config.xml"
+
+# Path to Gerbera log file.
+GERBERA_LOGFILE="/var/log/gerbera.log"
+
+# Other options you want to pass to Gerbera.
+# Add "--interface eth0" to bind to a named interface.
+GERBERA_OPTIONS=""
+
+# Uncomment if you are running Gerbera against a local MySQL
+# rc_need="mysql"
diff --git a/net-misc/gerbera/files/gerbera-1.0.0.config b/net-misc/gerbera/files/gerbera-1.0.0.config
new file mode 100644
index 000000000000..94bdb936e145
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.0.0.config
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
+  <server>
+    <ui enabled="yes" show-tooltips="yes">
+      <accounts enabled="no" session-timeout="30">
+        <account user="gerbera" password="mediatomb"/>
+      </accounts>
+    </ui>
+    <name>Gerbera</name>
+    <udn></udn>
+    <home>/var/lib/gerbera</home>
+    <webroot>/usr/share/gerbera/web</webroot>
+    <storage>
+      <sqlite3 enabled="yes">
+        <database-file>gerbera.db</database-file>
+      </sqlite3>
+      <mysql enabled="no">
+        <host>host</host>
+        <database>database</database>
+        <username>username</username>
+        <password>password</password>
+      </mysql>
+    </storage>
+    <protocolInfo extend="yes"/>
+    <pc-directory upnp-hide="no"/>
+    <extended-runtime-options>
+      <ffmpegthumbnailer enabled="no">
+        <thumbnail-size>160</thumbnail-size>
+        <seek-percentage>10</seek-percentage>
+        <filmstrip-overlay>no</filmstrip-overlay>
+        <workaround-bugs>no</workaround-bugs>
+        <image-quality>8</image-quality>
+      </ffmpegthumbnailer>
+      <mark-played-items enabled="no" suppress-cds-updates="yes">
+        <string mode="prepend">*</string>
+        <mark>
+          <content>video</content>
+        </mark>
+      </mark-played-items>
+      <lastfm enabled="no">
+        <username>username</username>
+        <password>password</password>
+      </lastfm>
+    </extended-runtime-options>
+  </server>
+  <import hidden-files="no">
+    <scripting script-charset="UTF-8">
+      <common-script>/usr/share/gerbera/js/common.js</common-script>
+      <playlist-script>/usr/share/gerbera/js/playlists.js</playlist-script>
+      <virtual-layout type="builtin">
+        <import-script>/usr/share/gerbera/js/import.js</import-script>
+      </virtual-layout>
+    </scripting>
+    <mappings>
+      <extension-mimetype ignore-unknown="no">
+        <map from="mp3" to="audio/mpeg"/>
+        <map from="ogx" to="application/ogg"/>
+        <map from="ogv" to="video/ogg"/>
+        <map from="oga" to="audio/ogg"/>
+        <map from="ogg" to="audio/ogg"/>
+        <map from="ogm" to="video/ogg"/>
+        <map from="asf" to="video/x-ms-asf"/>
+        <map from="asx" to="video/x-ms-asf"/>
+        <map from="wma" to="audio/x-ms-wma"/>
+        <map from="wax" to="audio/x-ms-wax"/>
+        <map from="wmv" to="video/x-ms-wmv"/>
+        <map from="wvx" to="video/x-ms-wvx"/>
+        <map from="wm" to="video/x-ms-wm"/>
+        <map from="wmx" to="video/x-ms-wmx"/>
+        <map from="m3u" to="audio/x-mpegurl"/>
+        <map from="pls" to="audio/x-scpls"/>
+        <map from="flv" to="video/x-flv"/>
+        <map from="mkv" to="video/x-matroska"/>
+        <map from="mka" to="audio/x-matroska"/>
+        <map from="avi" to="video/divx"/>
+        <map from="m2ts" to="video/avc"/>
+        <map from="cr2" to="image/raw"/>
+        <map from="nef" to="image/raw"/>
+      </extension-mimetype>
+      <mimetype-upnpclass>
+        <map from="audio/*" to="object.item.audioItem.musicTrack"/>
+        <map from="video/*" to="object.item.videoItem"/>
+        <map from="image/*" to="object.item.imageItem"/>
+      </mimetype-upnpclass>
+      <mimetype-contenttype>
+        <treat mimetype="audio/mpeg" as="mp3"/>
+        <treat mimetype="application/ogg" as="ogg"/>
+        <treat mimetype="video/ogg" as="ogg"/>
+        <treat mimetype="audio/ogg" as="ogg"/>
+        <treat mimetype="audio/x-flac" as="flac"/>
+        <treat mimetype="image/jpeg" as="jpg"/>
+        <treat mimetype="audio/x-mpegurl" as="playlist"/>
+        <treat mimetype="audio/x-scpls" as="playlist"/>
+        <treat mimetype="audio/x-wav" as="pcm"/>
+        <treat mimetype="audio/L16" as="pcm"/>
+        <treat mimetype="video/x-msvideo" as="avi"/>
+        <treat mimetype="video/mp4" as="mp4"/>
+        <treat mimetype="audio/mp4" as="mp4"/>
+        <treat mimetype="video/divx" as="avi"/>
+      </mimetype-contenttype>
+    </mappings>
+    <online-content>
+      <YouTube enabled="no" refresh="28800" update-at-start="yes" purge-after="604800" racy-content="exclude" format="mp4" hd="no">
+        <favorites user="NationalGeographic"/>
+        <playlists user="PlayStation"/>
+        <uploads user="Google"/>
+        <standardfeed feed="most_viewed" time-range="today"/>
+        <standardfeed feed="recently_featured" time-range="today"/>
+      </YouTube>
+    </online-content>
+  </import>
+  <transcoding enabled="no">
+    <mimetype-profile-mappings>
+      <transcode mimetype="audio/ogg" using="audio2pcm"/>
+      <transcode mimetype="audio/x-flac" using="audio2pcm"/>
+      <transcode mimetype="video/ogg" using="video2mpeg"/>
+      <transcode mimetype="video/x-flv" using="video2mpeg"/>
+    </mimetype-profile-mappings>
+    <profiles>
+      <profile name="audio2pcm" enabled="yes" type="external">
+        <mimetype>audio/L16</mimetype>
+        <accept-url>no</accept-url>
+        <first-resource>yes</first-resource>
+        <hide-original-resource>yes</hide-original-resource>
+        <accept-ogg-theora>no</accept-ogg-theora>
+        <sample-frequency>44100</sample-frequency>
+        <audio-channels>2</audio-channels>
+        <agent command="ffmpeg" arguments="-i %in -acodec pcm_s16be -ab 192k -ar 44100 -ac 2 -f s16be -y %out"/>
+        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
+      </profile>
+      <profile name="video2mpeg" enabled="yes" type="external">
+        <mimetype>video/mpeg</mimetype>
+        <accept-url>no</accept-url>
+        <first-resource>yes</first-resource>
+        <hide-original-resource>yes</hide-original-resource>
+        <accept-ogg-theora>yes</accept-ogg-theora>
+        <sample-frequency>48000</sample-frequency>
+        <audio-channels>2</audio-channels>
+        <agent command="ffmpeg" arguments="-i %in -vcodec mpeg2video -b 4096k -r 25 -acodec mp2 -ab 192k -ar 48000 -ac 2 -async 1 -f dvd -threads 2 -y %out"/>
+        <buffer size="10485760" chunk-size="262144" fill-size="524288"/>
+      </profile>
+    </profiles>
+  </transcoding>
+</config>
diff --git a/net-misc/gerbera/files/gerbera-1.0.0.initd b/net-misc/gerbera/files/gerbera-1.0.0.initd
new file mode 100644
index 000000000000..758b0c8101e8
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.0.0.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/gerbera"
+command_args="--logfile ${GERBERA_LOGFILE}
+	      --config ${GERBERA_CONFIG}
+	      --port ${GERBERA_PORT}
+	      ${GERBERA_OPTIONS}"
+command_user="gerbera:gerbera"
+command_background=true
+start_stop_daemon_args="--wait 500"
+retry="10"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath --owner "gerbera:gerbera" \
+			  --mode 0644 \
+			  --file "${GERBERA_LOGFILE}"
+}
diff --git a/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
new file mode 100644
index 000000000000..ff5f6075ec10
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
@@ -0,0 +1,14 @@
+diff --git gerbera/src/file_request_handler.cc src/file_request_handler.cc
+index 2fade4a9..de33617b 100644
+--- gerbera/src/file_request_handler.cc
++++ gerbera/src/file_request_handler.cc
+@@ -282,8 +282,8 @@ void FileRequestHandler::get_info(IN const char* filename, OUT UpnpFileInfo* inf
+                     header = header + "CaptionInfo.sec: " + url;
+                 }
+             }
+-#endif
+         }
++#endif
+     }
+ 
+     if (!string_ok(mimeType))
diff --git a/net-misc/gerbera/gerbera-1.1.0-r1.ebuild b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..f9521cc5691e
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils linux-info systemd tmpfiles user
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
+HOMEPAGE="https://github.com/gerbera/gerbera"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+
+DEPEND="
+	!!net-misc/mediatomb
+	net-libs/libupnp:1.8[ipv6,reuseaddr]
+	>=dev-db/sqlite-3
+	dev-libs/expat
+	mysql? ( virtual/mysql )
+	javascript? ( dev-lang/duktape )
+	taglib? ( >=media-libs/taglib-1.11 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	ffmpeg? (
+		libav? ( >=media-video/libav-10:0= )
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+	)
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	curl? ( net-misc/curl net-misc/youtube-dl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+PATCHES=( "${FILESDIR}/${P}-build-failure.patch" )
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CURL="$(usex curl)" \
+		-DWITH_LOGGING=1 \
+		-DWITH_DEBUG_LOGGING="$(usex debug)" \
+		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_AVCODEC="$(usex ffmpeg)" \
+		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
+		-DWITH_JS="$(usex javascript)" \
+		-DWITH_LASTFM="$(usex lastfm)" \
+		-DWITH_MAGIC="$(usex magic)" \
+		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
+		-DWITH_SYSTEMD="$(usex systemd)" \
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}-1.0.0.config" config.xml
+	fperms 0640 /etc/${PN}/config.xml
+	fowners root:gerbera /etc/${PN}/config.xml
+
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "Gerbera has been built with MySQL support and needs"
+		elog "to be configured before being started. By default"
+		elog "SQLite will be used."
+	fi
+}
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
new file mode 100644
index 000000000000..7f6f95dd5c36
--- /dev/null
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils linux-info systemd tmpfiles user
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
+HOMEPAGE="https://github.com/gerbera/gerbera"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+
+DEPEND="
+	!!net-misc/mediatomb
+	net-libs/libupnp:1.8[ipv6,reuseaddr]
+	>=dev-db/sqlite-3
+	dev-libs/expat
+	mysql? ( virtual/mysql )
+	javascript? ( dev-lang/duktape )
+	taglib? ( >=media-libs/taglib-1.11 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	ffmpeg? (
+		libav? ( >=media-video/libav-10:0= )
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+	)
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	curl? ( net-misc/curl net-misc/youtube-dl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CURL="$(usex curl)" \
+		-DWITH_LOGGING=1 \
+		-DWITH_DEBUG_LOGGING="$(usex debug)" \
+		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_AVCODEC="$(usex ffmpeg)" \
+		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
+		-DWITH_JS="$(usex javascript)" \
+		-DWITH_LASTFM="$(usex lastfm)" \
+		-DWITH_MAGIC="$(usex magic)" \
+		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
+		-DWITH_SYSTEMD="$(usex systemd)" \
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}-1.0.0.config" config.xml
+	fperms 0640 /etc/${PN}/config.xml
+	fowners root:gerbera /etc/${PN}/config.xml
+
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "Gerbera has been built with MySQL support and needs"
+		elog "to be configured before being started. By default"
+		elog "SQLite will be used."
+	fi
+}
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
new file mode 100644
index 000000000000..1c5747db8ebf
--- /dev/null
+++ b/net-misc/gerbera/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>thev00d00@gentoo.org</email>
+    <name>Ian Whyman</name>
+  </maintainer>
+  <longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription>
+  <use>
+    <flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
+    <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
+    <flag name="lastfm">Enable last.fm support</flag>
+    <flag name="magic">Use libmagic to determine file types</flag>
+    <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
+    <flag name="protocol-extensions">Enable partial DLNA support</flag>
+    <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">v00d00/gerbera</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/getdate/Manifest b/net-misc/getdate/Manifest
new file mode 100644
index 000000000000..695d2e100df9
--- /dev/null
+++ b/net-misc/getdate/Manifest
@@ -0,0 +1,5 @@
+DIST getdate_rfc868-1.2.tar.gz 8323 SHA256 45a9a6bdfe0fcde29a03704ffac2fbcd39014f412eb5f4ad3da943827341fd8d SHA512 f4ce167e42f2ef54cb961923f15d8101c5d047659991b0f3859a0282d024b0e0273517b94b663a90f8d6af1d3e4acf46b96b17d39cd6b2f3ee25bc89995b1404 WHIRLPOOL 3123b35bee8a07caa000742126619cc2361dabcdeb026cc0d4d7ed1466b8febb264f1a9f05fd1bac329cd817364634e392482fcfa0a2c7ba0b6e8f5d451ef509
+EBUILD getdate-1.2-r1.ebuild 747 SHA256 6214be5f6d91a0c2ca62da4b269bd562f96fde87729a2579726ea5e47559a952 SHA512 b565d91d623326b4e5f2223d837b79176adbeda6ff174952766203501a766355eeaa6787e792c38700b0f37b54d1ba66e37ebdf57f7dca6296b93a977242b5f4 WHIRLPOOL 3832b94ade8ffa41be45f5391685c0a2ad0dea13e12c21061c7f12ed444872dfb3bef433bffe747bd1d1a7f9ee2a28d6b92826dfe60157a1f1d4615caeb07a27
+MISC ChangeLog 2524 SHA256 fdd172997f182f970c0e998a9931ee06adbbc9d32b2d01606572011263ce2e33 SHA512 ce269539c6a32a0ba1b8ae2a450619146885b4e8a42bdbe7b836a7c4679e7c73f4456ec119b14a6bfd40393b9b81c185bf7c8d6bf38506d1a87c4452c4fba9c3 WHIRLPOOL bd0fdadb52b9e5b9150df9a62af9b9986d7e785938a2fdaa37e3c8b5a196b07009981d7b9873702fbf38bc1dd7c9ca30f1eadcd48f680b9055cfd354ffc62509
+MISC ChangeLog-2015 2551 SHA256 fb076b00b283e33251895fde6beca688948a16727af5cf77bde378926bc794a1 SHA512 544b709581d24c8c72778ff345bd6d6f645f27507eaae7219af40472aa13ce220289ddae5b707e48914ea7b49e01f8b01a345d66da55debb6cc8e42c7f7bd784 WHIRLPOOL 721805ba575beef070c3035fc713948e2df0f65c6f7264b247ae1e3d2975a9bb44bb7b9c61897a68a9cd102913352540b7abea898a30a5287b31bf6e341625dd
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/getdate/getdate-1.2-r1.ebuild b/net-misc/getdate/getdate-1.2-r1.ebuild
new file mode 100644
index 000000000000..d05e5f442fe2
--- /dev/null
+++ b/net-misc/getdate/getdate-1.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+MY_PN="${PN}_rfc868"
+MY_P="${MY_PN}-${PV}"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Network Date/Time Query and Set Local Date/Time Utility"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/network/misc/"
+SRC_URI="http://www.ibiblio.org/pub/Linux/system/network/misc/${MY_P}.tar.gz"
+
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e "/errno.h/ a\#include <string.h>" getdate.c || die
+	# Respect CFLAGS
+	sed -i -e "/CFLAGS/d" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin getdate
+	doman getdate.8
+	dodoc README getdate-cron
+}
diff --git a/net-misc/getdate/metadata.xml b/net-misc/getdate/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/getdate/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
new file mode 100644
index 000000000000..a6d835751c27
--- /dev/null
+++ b/net-misc/gnome-online-miners/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-online-miners-3.22.0.tar.xz 272832 SHA256 bf51666866527b236d980fa3a0d036581a85987c59d604566ccb3ad685dd8bb8 SHA512 91fafb41523b239fae6dda6dbbf0a1c64dba6089f70b2336574604c996c2e09e1f64445621c170ec70a98736362633443aea5ed7028cd8347d9beaaeb7f4aed4 WHIRLPOOL d79936770c0ad4b51ce59f078531f212fa54d06e368b3ecea547d886617cf69b21a9e78bea902da303d0d5a4c49dc289856d5b1f751eacc9927e6a8590767395
+DIST gnome-online-miners-3.24.0.tar.xz 272572 SHA256 8c0508f459b0364bed5f2f6a997aa81c1cbe75a94b23cc8fcfd83b0d3485d3ab SHA512 96c6aa99b99553c399ecef754d10a918d8ef3bdf6369a77357241091edc9c2ff7a8350f8a064bb011deddac75b25bdde8006e8d72b6562f9cdcf3b373e693253 WHIRLPOOL 68c1dddd0456470623b23d5b05a3632c932ce1313e00e7f428a8babc582dd92f355496c1bdcd4864c6284b498fc3fcb8fd7107ec30c836ac857d05195347a72f
+EBUILD gnome-online-miners-3.22.0.ebuild 894 SHA256 29eb645a7652d4e523b353f7237184d2b4576f20fe13617967e5b0de217527c6 SHA512 2d8df1e94072b071be24a5498baa901842163112f16edebb81784e8d86b4efd77120093e349df31a4d1a1a2306a332f3e1d0a098d4608c11631c84d427db9b46 WHIRLPOOL 828e9b0b027ee0213693dd5078381de7b0e983338dfb7117ef2e773469059f5d89e1e2b2cbfba84589848c3e0054f2c4562b5f6d65a82b60b07aec08d2ebcdc7
+EBUILD gnome-online-miners-3.24.0.ebuild 896 SHA256 fbe346039577accd3e6fc0b23f511cec9e0fd43f2f5dfacdaf7b1884a0266954 SHA512 a5ec352c6e61c62905de73b31f46d03fdf7849845ce99bb5cfc87c95d4d507068c029a4146025f5907c40708d59ee745595fb434d59b5b62a727178f8e2203aa WHIRLPOOL ad09e20d73929fc202256866be7222b1211f2c426216e1dcc51336ff2c2720c5e0af88d3e76936fe5104e6ce12ffb3732c53fb6d41193f9e4f93ea3a69a55232
+MISC ChangeLog 5179 SHA256 40cb23c0828d5d697c1e2d43d8b0c40c4e3126e4938188fba9562397d3afc7f9 SHA512 444936ee4237601854d71429815859486d8c334ccc12ee6df9c5e71c9d169d5c70b6e51f2b05abccf25a8ccbab35476e68c5a34bef59d4454322818d44c4ed10 WHIRLPOOL b84165afcda691d808bc2f781fdda95e0812c87fcf02868c1b1fc806a76e4920b982c5d65c17d894f1994f2100ddc6674f1da330709d25adad47dfbde0a69daf
+MISC ChangeLog-2015 3487 SHA256 e3822412a88fa3222a89cfb83f5043ec77ae7552ca585179ffa8c97d98ba6281 SHA512 b2433ddd7e967beeeafb28daf2fdec44d2b319f526b7e0961b8c893560e87ffae4957726bd9f264167f3d25ecaa735eb5f95a30ac10851ead08c87abed34289c WHIRLPOOL c81c93ef6e979a8468c120977e48ecc5941f8c31ccb1f35e034f9ba0713b5b905a749de1f3972771ebc142bdccb740f6f7f5c96f11f7f2aa1d6f4e542d983f8f
+MISC metadata.xml 312 SHA256 6430f28d10c3b8e74b87f854ae4ebe759a06383eb5015b21f634cbb5d35e9987 SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd WHIRLPOOL 5756fc6e5edfb72a369eee9f6e6e92d5f81aa2aa106de288668d9dd3fa44acab857115c8338dfc885241d77113bc9c9d680e6fcb61cb0ec84d5a3906dd53db84
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.22.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.22.0.ebuild
new file mode 100644
index 000000000000..d8ce960d90d3
--- /dev/null
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.22.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Crawls through your online content"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="flickr"
+KEYWORDS="amd64 x86"
+
+# libgdata[gnome] needed for goa support
+RDEPEND="
+	>=app-misc/tracker-1:0=
+	>=dev-libs/glib-2.35.1:2
+	>=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts]
+	media-libs/grilo:0.3
+	>=net-libs/gnome-online-accounts-3.13.3:=
+	>=net-libs/libgfbgraph-0.2.2:0.2
+	>=net-libs/libzapojit-0.0.2
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable flickr) \
+		--disable-static \
+		--enable-facebook \
+		--enable-google \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-windows-live
+}
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
new file mode 100644
index 000000000000..3aa887f5701d
--- /dev/null
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Crawls through your online content"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="flickr"
+KEYWORDS="~amd64 ~x86"
+
+# libgdata[gnome] needed for goa support
+RDEPEND="
+	>=app-misc/tracker-1:0=
+	>=dev-libs/glib-2.35.1:2
+	>=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts]
+	media-libs/grilo:0.3
+	>=net-libs/gnome-online-accounts-3.13.3:=
+	>=net-libs/libgfbgraph-0.2.2:0.2
+	>=net-libs/libzapojit-0.0.2
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable flickr) \
+		--disable-static \
+		--enable-facebook \
+		--enable-google \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-windows-live
+}
diff --git a/net-misc/gnome-online-miners/metadata.xml b/net-misc/gnome-online-miners/metadata.xml
new file mode 100644
index 000000000000..16c433dd2cb5
--- /dev/null
+++ b/net-misc/gnome-online-miners/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="flickr">Enable Flickr support</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/gns3-converter/Manifest b/net-misc/gns3-converter/Manifest
new file mode 100644
index 000000000000..fddf2f177b96
--- /dev/null
+++ b/net-misc/gns3-converter/Manifest
@@ -0,0 +1,5 @@
+DIST gns3-converter-1.3.0.tar.gz 45837 SHA256 771b3ab878de87007d00342507bdd381c8d60870afa1537b20e791f5d4d80716 SHA512 ac2e44b3f02c8f0429158e11c964bf342973809139dcf34863071905400964006d7adbc3ddb80efe57a5ecc5eaf59e228bf7d07a7e5776dd6bcf51b4e1d3fe57 WHIRLPOOL 1d5616b74f9d910e5a6cb342a70e2b726469decb20fce1b90c16e00e56ae3ed228a213a57cfcce03ad66599e1b4d07a5ff5b2d1e20053f8908bcea9f96287284
+EBUILD gns3-converter-1.3.0.ebuild 516 SHA256 1d04084af4a2ae6393cf09e415055f230a5bdf7e16f76d0656164b97e48d3a1b SHA512 8f4190388d2f28cfb48060a38dec966dc95920508f60fa79d30145f9f220f121d2f3dc0bd92ea1a32298603ab0da0cfeaeebb595403c79c655ed71f81039467e WHIRLPOOL 3d5b2cd50d6e6f160cd17341afc0fd6a3ca6b6e91f54522432f9fb6278b9563437f1e3fd1bf026afd5e99653d87cbfaf943d7e68d9ec0daee04349f5fe2b7d97
+MISC ChangeLog 2986 SHA256 5884945b47cfb91a64775c6b05b84a5e8f36208bf9877771b1ddcd2d6c1d0986 SHA512 fb1eb25af70fb18933e3b280f4254c42867d83b514654c3717b3f9749753f08e9da0d313ea63ee16166bb56a677fd0ef755baf419b41db5e312357e947f4cf6e WHIRLPOOL 7b3cb0af2dfa485ab8ac6be4817bc0e326a8f32fd69d18249ed6d1c85aaca8e8c718086a29cdea0504853c059ab8f601ddc9569a39f2d5a652fe37ebd78c01a9
+MISC ChangeLog-2015 1035 SHA256 b4060b693cc9b8fcdb7b0ef93e4a795153ebd0e7b138fae39d5474bb6c5e3e32 SHA512 5d146bb8184e17c30b42624763e1ef9f34e502ef38fcac3ba7e3b138c8ee0f90b8a70c6e5bf792e1b943086ee33cded3a970ebb79dbb0807a920bcf15c20cef2 WHIRLPOOL 73bbbf1b8b4a0d231f84aecc6f29b3ab467c3638c389f7d03d7a7f996b01410248b3dca6fc7d69fd6fc2d53bd20c9438a3b14662b9eb75f3b7a06c63bd0e1d8c
+MISC metadata.xml 318 SHA256 74c4b0a8f6d130f3957bfedd2a028e415e81383f87e88fa81a5c12bdb1c8f7e9 SHA512 dc536a1fe5c3823df1695330539be342f516f572adbee086dffc8d3d8b55141c0b081043b6aa673bd8d150e4a6211f82dd27119a5835bd0a87a33b6457c4a3cc WHIRLPOOL c8dddd0e37770c53c80ba07f7aa81fdad20f7c039402e63f1938e8af30d7ed1e640c0886238bc988d51136fbe50592c0329d135dd7f68b44cf2c6068dd88f309
diff --git a/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild b/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
new file mode 100644
index 000000000000..353f6052dbec
--- /dev/null
+++ b/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Designed to convert old ini-style GNS3 topologies"
+HOMEPAGE="https://github.com/dlintott/gns3-converter"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/configobj[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/gns3-converter/metadata.xml b/net-misc/gns3-converter/metadata.xml
new file mode 100644
index 000000000000..d6b85616ff74
--- /dev/null
+++ b/net-misc/gns3-converter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gns-3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
new file mode 100644
index 000000000000..c60141488d12
--- /dev/null
+++ b/net-misc/gns3-gui/Manifest
@@ -0,0 +1,9 @@
+DIST gns3-gui-1.5.2.tar.gz 5781908 SHA256 23bf516ca76fe3ec6b43fecb2113256491f1ae04c2b1bfb8b0655a69f96335e8 SHA512 420ca3560161913023bf1fea6c48f7ef5f18489e8500ec1daba2022b1840288277692b78432a55291cea2cf28d296f5ce96b79f5feefd6fa30ab550d4a02065e WHIRLPOOL 2eb5bcec653dd33aa13a55f9f34e4ca1da0376253a61e91bd674ff3142bc4bca9587c7068c80e57778a3e3b6f1cfd844fb1272feed047f8d37874d5d9a6acab6
+DIST gns3-gui-1.5.3.1.tar.gz 5784326 SHA256 8f8b89397208a323dc58357eddf95a75387b326f69678182b0c5b44504190823 SHA512 1d145d1565dc890d3e54386d9867826470cce2997d42f113cfcfd9a2cadd6e215e96753af8f0cdc9d2a7776341d9c4cb8ac473084126ba4ea76585de4c37dd0c WHIRLPOOL 446ffd28dfba0f9c528219f50153bf40d439b3296473e909a4fd05edb27f41c1ad9d29ebdf5f699ba792af6057896ada52ed4ed027f9061177239fc1613cda3e
+DIST gns3-gui-2.0.3.tar.gz 5528039 SHA256 177d387841aff69bb9f6c3cba470fb2c79e35292a17af48ca861da69b9407e8c SHA512 0c6955c885c1110acd4c791e92ba24db583d259938bb7f0c2147f3f648dabd4dcaeb2967b8e30e6169adca9f3b8ee667f00431bec66d6fb5fde1f9d90cca88f8 WHIRLPOOL fcc83d2bd998888cf0dc88e80c3c910a58a505ce295d05528122091bc4692f8f64ac80ec35bd9ab216c2549f7a8d11450e39078820f9e75fee293a211855a6c3
+EBUILD gns3-gui-1.5.2-r1.ebuild 1289 SHA256 850bf70ef10f3cd371d8209db430890b10841974aa53dd3e5949489b2db429b1 SHA512 b84bcf32d92035383c65d7c67e693dcb5b54507314aaffedc8d0383c29837e35673b93c5e37d3928853521281d1952eb392c015dce283ed3908672c3c7272b0d WHIRLPOOL 0bcb034da3d7c120c06f6362cbb285687a19065c3eb0809d50b1f992a9c7b1d235b2d0597646d93b657b09265658946c5bc750856caa14893632a441ac6cdea5
+EBUILD gns3-gui-1.5.3.1.ebuild 1297 SHA256 9e64e38cf7b03b1ee1f6951ec8c05dd0d8aa2d4adb1bcfd5717bbcafe5fa8e53 SHA512 22caaff4f7e1c66379b5e6d0f8ea6be5a149e4c471503a34131308f4891f8f098c80ce2b3cc56fed877f0ffa35c398d100caf9500bf2116540220427cf7f29a3 WHIRLPOOL 77405dde024013cb207540bad0ec901358ecf50981422d56f2a089240a1be0caf50742466b012393350b71aa8d687cdf449c97c6cd7e1bbb0d69f1dae9edd32c
+EBUILD gns3-gui-2.0.3-r1.ebuild 1121 SHA256 4fc768a77ca6ae17c44b3e71d7dc67ada81d3868c3b85fc7e672105cab9e8d9e SHA512 ffc3b9117a2fb85cc45f1f64f2e0234ff4d05e50f6ba8c9622eef4175e25b03ecba9f878826381ad045784bcc3741a81ff33827b6c702d7648ad3ed1d9488765 WHIRLPOOL d326bcf0e74e16a5f184b7a371d794fe50449aceac2084621421fe006e29747ed36295cf107b810400ebf16d077151740f79a2439013b80e2df088e7da14e8c4
+MISC ChangeLog 4546 SHA256 ade3d60ea6893c5b9c1280657b7b3916ba8e5d1d214f89ffcad861eb3d8127dd SHA512 4dc28b68c219388e325470ee7c30d768ccf8681445f1ac73a0630a46787d34e34489d4e08ece7c59c9866de4236b392e637bcb579660fb8eec36525d043b910e WHIRLPOOL d22edf0027a1efbb388d7d84365a52a6d59475343336bad44dffe1387731b1c3443b33d7c86a8090ab8ce9bbc82a02732c2345ad069d3f1893bcf08dee359f0c
+MISC ChangeLog-2015 2034 SHA256 d011044acae838fa36220890e3e0c443e0c9cca46ff7276afacc458ccaf9ca5b SHA512 0940c7caac70bb815b75cdd09ad069ba31e949cc6533d652e708bce7343b970fb9d5e97c9c2338dc6d031eab2c9024257e32b0d1e8017e5e94014b9cbc188d7e WHIRLPOOL ba87271014843f996fbc5e23ec389c38c580f3af2468bcc5a970b134e5d8ce294797dbc52096ceb64c46604dbe0e4a6714e17f64cd2095dbe9324529ebe3645d
+MISC metadata.xml 318 SHA256 74c4b0a8f6d130f3957bfedd2a028e415e81383f87e88fa81a5c12bdb1c8f7e9 SHA512 dc536a1fe5c3823df1695330539be342f516f572adbee086dffc8d3d8b55141c0b081043b6aa673bd8d150e4a6211f82dd27119a5835bd0a87a33b6457c4a3cc WHIRLPOOL c8dddd0e37770c53c80ba07f7aa81fdad20f7c039402e63f1938e8af30d7ed1e640c0886238bc988d51136fbe50592c0329d135dd7f68b44cf2c6068dd88f309
diff --git a/net-misc/gns3-gui/gns3-gui-1.5.2-r1.ebuild b/net-misc/gns3-gui/gns3-gui-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..7437e6aae0a9
--- /dev/null
+++ b/net-misc/gns3-gui/gns3-gui-1.5.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Graphical Network Simulator"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+#net-misc/gns3-server version should always match gns3-gui version
+
+RDEPEND="
+	>=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}]
+	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+	>=net-misc/gns3-converter-1.3.0[${PYTHON_USEDEP}]
+	=net-misc/gns3-server-$PVR[${PYTHON_USEDEP}]
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-python/PyQt5[gui,network,svg,widgets,${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure() {
+	# temporary fix until upstream releases 1.4.5 with proper setup.py
+	sed -i -e 's/gns3-net-converter/gns3-converter/' setup.py requirements.txt || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doicon "${WORKDIR}/${P}/resources/images/gns3.ico"
+	make_desktop_entry "gns3" "GNS3" "/usr/share/pixmaps/gns3.ico" "Utility"
+}
diff --git a/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild b/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild
new file mode 100644
index 000000000000..b0bf8d76cd11
--- /dev/null
+++ b/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Graphical Network Simulator"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+#net-misc/gns3-server version should always match gns3-gui version
+
+RDEPEND="
+	>=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}]
+	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+	>=net-misc/gns3-converter-1.3.0[${PYTHON_USEDEP}]
+	=net-misc/gns3-server-$PVR[${PYTHON_USEDEP}]
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-python/PyQt5[gui,network,svg,widgets,${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure() {
+	# temporary fix until upstream releases 1.4.5 with proper setup.py
+	sed -i -e 's/gns3-net-converter/gns3-converter/' setup.py requirements.txt || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doicon "${WORKDIR}/${P}/resources/images/gns3.ico"
+	make_desktop_entry "gns3" "GNS3" "/usr/share/pixmaps/gns3.ico" "Utility"
+}
diff --git a/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..4e2020676ee9
--- /dev/null
+++ b/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Graphical Network Simulator"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests are severely broken upstream and they have been notified
+RESTRICT="test"
+
+#net-misc/gns3-server version should always match gns3-gui version
+
+RDEPEND="
+	>=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}]
+	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
+	=net-misc/gns3-server-$PVR[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,svg,widgets,${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	rm -rf tests || die
+	eapply_user
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doicon "${WORKDIR}/${P}/resources/images/gns3.ico"
+	make_desktop_entry "gns3" "GNS3" "/usr/share/pixmaps/gns3.ico" "Utility"
+}
diff --git a/net-misc/gns3-gui/metadata.xml b/net-misc/gns3-gui/metadata.xml
new file mode 100644
index 000000000000..d6b85616ff74
--- /dev/null
+++ b/net-misc/gns3-gui/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gns-3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
new file mode 100644
index 000000000000..72740b905a04
--- /dev/null
+++ b/net-misc/gns3-server/Manifest
@@ -0,0 +1,9 @@
+DIST gns3-server-1.5.2.tar.gz 844649 SHA256 8e6fa52fd9cccccb82af51651a2816b959687bcea5cd41dd6b2ae793f5dd7fed SHA512 4a8beb69b2cbd6771a68d9e2877099e2103f2ca8140806ad06ba1ad7dbac6f02fca71b660871dd5af5940ecf02f0809127a1f0ff44845962aec4b0c57f1dd329 WHIRLPOOL dd32b426603bba1b0a5e73ecdb305746634aebb944d46120a23d2f83c0248b67e8722f4c9e3d25aa83d34b57c07d7b8af22c7fe754633587634d09dddc9afc08
+DIST gns3-server-1.5.3.1.tar.gz 847598 SHA256 dca731d13c0d2d3e8a92b6a0a820f485625dd8189c094e01b6b9fd8786f46e25 SHA512 79e8b2546d8239d78fcf621fe8e88c0ddc10bea2e216225ca1f48ebd4d0e307cebc81e63ded2e36cca50917d518d52d8619eed5a84b39123c3ce56f3a6606fd9 WHIRLPOOL a1c852e4e4523867c2613896ff22df2f47d7019921a5b5d4b217835a3eff3129c1748fb4ad60f29f503221081c62f3e3317f1e2ae913aacfb02f2f49d0addc1b
+DIST gns3-server-2.0.3.tar.gz 1468528 SHA256 aba345436f3d7302ca6b1f39faf12e0124eaae25fb97d25783da44b516232200 SHA512 a9927e414f6fc6558cecabd006f9d123752b0b6e5b88408a53a6d1f195d22047ffdc3e4ccc6e132d04135c434174aa4b58f29deae9e952f83ccc678037f25b8a WHIRLPOOL 31b253d00f5857798c9cb867ec8260e832aaeda72840779184934ec7ec0d288b5331621e7ec58d9d15fc5006b50d375bef48f13526e2ad31b7a9bdb656773386
+EBUILD gns3-server-1.5.2-r1.ebuild 1400 SHA256 6bf92ec57fb35ed6ff3e24b9105656df1fee96bdcad83522dfcf0821489b727e SHA512 6c2ced2fea04bedbe512fbbf070c91007609d28220afb5d50530a3a7a065b21e8d61a4c217ab645c18cf866279d5f748032bded910a03356fe62206f0ce49ccb WHIRLPOOL f209b44ebbcc52eda21c42cac06fd514b5ad9eb4119b480868d0ea7eb76129adc5002a4f6185601262744b00c4bea76b3636708d5ed4609109523027d3ca85b6
+EBUILD gns3-server-1.5.3.1.ebuild 1589 SHA256 e7e38369dd94b1d89097808fe07140317180221f68ca27b1d69bfb71f71a486b SHA512 55cc83a0f392f71f72b65e97654dd54d986c91fcf92c713ba4e1795c5a9d19969942d80346a015ad2b342a9e9fcbbe386a5905311c3a3c4282b321aed0303c3c WHIRLPOOL ad9034121de32e6ca163a4b475533d8535121d6f44f81cef4469a8859b9b38581245aeff337104c478b73fb9a53a5b1967f7f96b11476027cfdfa50624b2ed18
+EBUILD gns3-server-2.0.3-r1.ebuild 1650 SHA256 aca9d60c8f6809bbef8add4fa350901cdad22b8afae30e2a3c6edccf2e0eafdf SHA512 bc606ebbe9c3019571af53a85b129b820314e2a11931b70d85110180697b8fb3b402bfae075e227f94a744a045f063e40d1f523e0983568b5b33ce9f52382c7d WHIRLPOOL 40dc2cb4139545c6c80ebf31daec04a44739ab0e2802fd43683c6d7e64ffba6a5159786f9bcb4a6b7513c82835114a36fcd52afd0b055c10bdc10aee1d90cd99
+MISC ChangeLog 4853 SHA256 812cde4c8f0d67bf3d90d94bd4b9fac13159b975c26b63fcc5896defa7c6b64d SHA512 278a6d8a04ff41e12768b883568d7a91c5ef5e0d01a38e7d74bf4e3fedb53de186667956da151997d90a2053443f8345219d5887f715db2498fa4f9227abacf8 WHIRLPOOL 234a3d9c5004cbf9a8b8d4788293c1b028105e02f83b8ba646503b18723171af26c4e2d45507d897f41c0e3188b176db69abe6f729ae2d5912409567dc320e9b
+MISC ChangeLog-2015 1677 SHA256 be354caad1517ef6043426c755b3a2913419f21af3684a3897f9416b9f382cf3 SHA512 75b4cb38f31d3af199db662be124838980cf5e77224e809672b12dd5bdc83872b718c4e8800f274c05285155e22112dc73929ce3bb5b63c9739a48dfa3331707 WHIRLPOOL a1a54309236c9503d7e5ae06a1bb955015094b76e89d43d21344ba468ffc42fa13488020b1cd18d213b39c18b050ac24c848e501dc2e6b0116fdab4b7bf1b542
+MISC metadata.xml 318 SHA256 74c4b0a8f6d130f3957bfedd2a028e415e81383f87e88fa81a5c12bdb1c8f7e9 SHA512 dc536a1fe5c3823df1695330539be342f516f572adbee086dffc8d3d8b55141c0b081043b6aa673bd8d150e4a6211f82dd27119a5835bd0a87a33b6457c4a3cc WHIRLPOOL c8dddd0e37770c53c80ba07f7aa81fdad20f7c039402e63f1938e8af30d7ed1e640c0886238bc988d51136fbe50592c0329d135dd7f68b44cf2c6068dd88f309
diff --git a/net-misc/gns3-server/gns3-server-1.5.2-r1.ebuild b/net-misc/gns3-server/gns3-server-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..3260b6c2fa69
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-1.5.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=app-emulation/dynamips-0.2.12
+		=dev-python/aiohttp-0.21.5[${PYTHON_USEDEP}]
+		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
+		>=dev-python/raven-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	ewarn ""
+	ewarn "The following is a list of packages that can be added:"
+	ewarn "app-emulation/qemu, app-emulation/virtualbox, and net-analyzer/wireshark"
+	ewarn ""
+	ewarn "The following packages are currently unsupported:"
+	ewarn "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/gns3-server-1.5.3.1.ebuild b/net-misc/gns3-server/gns3-server-1.5.3.1.ebuild
new file mode 100644
index 000000000000..624d2a1d1232
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-1.5.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+RDEPEND=">=app-emulation/dynamips-0.2.12
+		>=dev-python/aiohttp-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/aiohttp-cors-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
+		>=dev-python/raven-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-3.5.3.0[${PYTHON_USEDEP}]
+		>=dev-python/yarl-0.7.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	ewarn ""
+	ewarn "The following is a list of packages that can be added:"
+	ewarn "app-emulation/qemu, app-emulation/virtualbox"
+	ewarn "app-emulation/docker and net-analyzer/wireshark"
+	ewarn ""
+	ewarn "The following packages are currently unsupported:"
+	ewarn "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild b/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..3b205da4bc24
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND=">=app-emulation/dynamips-0.2.12
+		=dev-python/aiohttp-1.3.5*[${PYTHON_USEDEP}]
+		=dev-python/aiohttp-cors-0.5.1[${PYTHON_USEDEP}]
+		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
+		>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-3.5.3.0[${PYTHON_USEDEP}]
+		=dev-python/yarl-0.9.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	rm -rf tests || die
+	eapply_user
+}
+
+pkg_postinst() {
+	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	ewarn ""
+	ewarn "The following is a list of packages that can be added:"
+	ewarn "app-emulation/qemu, app-emulation/virtualbox"
+	ewarn "app-emulation/docker and net-analyzer/wireshark"
+	ewarn ""
+	ewarn "The following packages are currently unsupported:"
+	ewarn "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
new file mode 100644
index 000000000000..d6b85616ff74
--- /dev/null
+++ b/net-misc/gns3-server/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gns-3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/gofish/Manifest b/net-misc/gofish/Manifest
new file mode 100644
index 000000000000..5398c2646cf6
--- /dev/null
+++ b/net-misc/gofish/Manifest
@@ -0,0 +1,7 @@
+AUX gofish.confd 429 SHA256 426e7a16f269693c592563646ff2387eb2b33d593e6c5f430c6b1fe738c9b807 SHA512 3a3fc8a701149195d6a18aa38cf22030415fcaf1e72bb9603175345d639a055e7b13130d4a2ef3308eaf946ed4d0c8d21378f8793e344d2baf6dc4c9ad0b7db6 WHIRLPOOL 547eb21ba3ed189f3394abc9208ecc6c6db72268ff7676b329a44cb43742f9e208f5184311bfd66bf1d3e94fdddba48dfa32f26a1168f8c2ca4a509e65e49ac9
+AUX gofish.rc 607 SHA256 5de1229facdb8ea422e9624a9cbed92de5bab2d7eafe4d2646cb5537b7698061 SHA512 dbae20d8b5bd17e05612bf85acea2a6d0433a7c59670e6d7c2807274da8d8a81a82cdb15eac7dda572be062ef2aa87b62dabc0dfc208013eaeb682f7bc49f9e1 WHIRLPOOL 21ed195fbcd76cc9c4701e406c9731e9fdaef327d9dc47d421c740d3e7e394d7502dd9697b4beee55309bdc5f1ad5061b35cfad4b56a0a09768dd56ca69c790e
+DIST gofish-1.2.tar.gz 212596 SHA256 1ab8390ec9b3373a298eee564c8b10b3527b22f86f044c9427d32065e9b6252f SHA512 f7999a5e2b4f80d6402f26d9434f844b26b47b43a6b00055e72ba399426672ed299ca759252d8eb732b23a4c2c369a92c11c0d496f16f4bf3a999398cf6c5bee WHIRLPOOL 3e2f94f364de8557358d37970fe8b2ed4ffc466123c9bc0ca42ac4df8e717ed0bc56724939f7e9b572e00733c796de776cb042e24bb65c057390e578f5014ca7
+EBUILD gofish-1.2.ebuild 737 SHA256 b82f08ad7eb1a3e1029c56532adfbaafbb364440d4116bcb17cc1d2a709009f9 SHA512 c1bf2fe90610d55875bb02894a333584a31f680c5e451191dfe525e6ae3b4a506c6661ecc08fcb466017bacb70afc9c5f37d70798172ffb852e363992b23f574 WHIRLPOOL 6c14b4bad614c746b4ad5905b37f348e5a4d3701575602be336938d362579c225847edad32e9001b9ec6c2f8d93c5d23f6bf6fad7de1dbfcdded59c41e68a18c
+MISC ChangeLog 2334 SHA256 fb1371b4086e920398b390266389c32afc5b7337f7383ad7854832089a00d766 SHA512 7962c0f44f8fd2764a60c1c3ed56025b885a2fc69df21da4595cbf0ee5b20ad4de3f4fe693f24791b57be15a24f88c61084ef0e4f254c965fb660451101e53fd WHIRLPOOL f7abb780332e4c965b8f743c73ce21b6a627dff6ea9b6fb3a1dc73f30d089f1659ff745872565bd625a7b4c3b9331b4c7d92dface85640aea75afd41241967e2
+MISC ChangeLog-2015 3056 SHA256 32d77508283de06808e301919c437d2728467ec2ffdac506100ef1a80c31682b SHA512 954813cc6921ae557261fdd6b5b6205de9887da8f0aef4d1ae13af7a5462bc2dfb5ffafe948f3ad4a762f0a65bc05f7620faa0ef5d03de9ee545dfbc2de429cc WHIRLPOOL cf4cdd457f5dceb81835c3461c730abdfb63c88dc66e91da4b12006436d25a3ac0a3159af278b9a65f3f5b64e04223472a596998e07ba9da459ff04d7978a37f
+MISC metadata.xml 319 SHA256 be70d7bb71ee097eeee2d6dc6065be463c86dee9b6add119badc81cc8ea2ef7e SHA512 c8463c7246f59639db01c3d7c3ce2aea6b26f6f4d3e40239097e8df3e78d040ee50adb71d11748a2ce50a7b4d11ebd209596f4abfe3832dc1aae218d29d88f2c WHIRLPOOL f36f3b64f7967156b4a9019139cc04b5ba9be5bbb0a4bacf3a7cbe97680828cbaa85698ec8ba4df0dfe06228356f69fe5e1d77fbd51ec1dfc46172a5d1cd87f9
diff --git a/net-misc/gofish/files/gofish.confd b/net-misc/gofish/files/gofish.confd
new file mode 100644
index 000000000000..af244521a7e7
--- /dev/null
+++ b/net-misc/gofish/files/gofish.confd
@@ -0,0 +1,27 @@
+#
+# Config file for gofish Gentoo start-script.
+# Should be stored as: /etc/conf.d/gofish
+#
+
+# Application name
+GOFISH_APP=gofish
+
+# Path to gofish executable
+GOFISH_EXEC=/usr/sbin/gofish
+
+# The gofish config file
+GOFISH_CONF_FILE=/etc/gofish.conf
+
+# The start options
+GOFISH_START_OPTS="-d"
+
+# The stop options
+GOFISH_STOP_OPTS=""
+
+# The reload options
+GOFISH_RELOAD_OPTS=""
+
+# The pid file
+GOFISH_PIDFILE=/var/run/gofish.pid
+
+
diff --git a/net-misc/gofish/files/gofish.rc b/net-misc/gofish/files/gofish.rc
new file mode 100644
index 000000000000..5667b78a7c1b
--- /dev/null
+++ b/net-misc/gofish/files/gofish.rc
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+#
+# Startup script for the Gofish Gopher Server (for Gentoo Linux)
+#
+# config: /etc/conf.d/gofish
+##
+# use: rc-update add gofish default
+#
+
+opts="start stop"
+
+depend() {
+       need net
+}
+
+
+start() {
+       ebegin "Starting ${GOFISH_APP} "
+       start-stop-daemon --start --verbose --pidfile ${GOFISH_PIDFILE}  \
+           --exec  ${GOFISH_EXEC} -- ${GOFISH_START_OPTS}
+       eend $?
+}
+
+
+stop() {
+       ebegin "Stopping ${GOFISH_APP} "
+       start-stop-daemon --stop --quiet --pidfile  ${GOFISH_PIDFILE}  \
+           --exec ${GOFISH_EXEC} -- ${GOFISH_STOP_OPTS}
+       eend $?
+}
+
+
+
diff --git a/net-misc/gofish/gofish-1.2.ebuild b/net-misc/gofish/gofish-1.2.ebuild
new file mode 100644
index 000000000000..68b0fe7e5df9
--- /dev/null
+++ b/net-misc/gofish/gofish-1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils user
+
+DESCRIPTION="Gofish gopher server"
+HOMEPAGE="http://gofish.sourceforge.net"
+SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	enewgroup gopher
+	enewuser gopher -1 -1 -1 gopher
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--disable-mmap-cache || die
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+
+	newinitd "${FILESDIR}"/gofish.rc gofish || die
+	newconfd "${FILESDIR}"/gofish.confd gofish || die
+
+	dodoc AUTHORS ChangeLog Configure_GoFish README TODO || die
+}
diff --git a/net-misc/gofish/metadata.xml b/net-misc/gofish/metadata.xml
new file mode 100644
index 000000000000..bd537594c884
--- /dev/null
+++ b/net-misc/gofish/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gofish</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/grdesktop/Manifest b/net-misc/grdesktop/Manifest
new file mode 100644
index 000000000000..740b2089b04b
--- /dev/null
+++ b/net-misc/grdesktop/Manifest
@@ -0,0 +1,7 @@
+AUX grdesktop-0.23-desktop.patch 538 SHA256 ff19348ca9e05702425e35634b903f2e2223ded4866f7cb2212f2e181e223594 SHA512 c228120c40f1c1afa18b120c6804e5bb824256fd5515bdcd05b7fb4a8c964cf8ef6d2a7902645640b5133b513bc9612b2484cce7413af5663d0e16c7e65122fd WHIRLPOOL d75228fb4503cdb1209e35346bac18c2eb76fb5fa0a4a8d0bee12e45d91d6b5bfb47c66d3b6d327d67dd91d98ff9505754699be52c058cf7ee49e96e32193a39
+AUX grdesktop-0.23-format-security.patch 856 SHA256 e2aab1aef56a91fea2eb703f265c0669ea9f6424040caf4fb7903402417731bf SHA512 7754a958a45648cf1194e0840ab22de3025a3eaf0001670c3abe6b5ea0852caa9d27fd9f7db0b4c43a8c93a462a8f297b1c89007755486c9cef9eff26cca6590 WHIRLPOOL 37ada202c538bea31f72f2bb33568a445805f37d7cca8d8431c15678e054320967623d03e211be23317b52d6eccf00d48e96564bb7b4ef0564ca6558adc9e9a0
+DIST grdesktop-0.23.tar.gz 299914 SHA256 a94632ed42273d280ad4f8eec6a803024666ed5c8737ae34585c2d9d2eed5193 SHA512 a0993d7589d0b22b26535de0cf562604c89ce580fede076c15d8d7f2e7a3bd2fd5ec0a35c6a8ec07fcc8f53a0635381fefe9c2e67d9ff75cec7af47cdd25732f WHIRLPOOL 25b29dfd7e0f1b9b09f2cd8f6c92c2c2d09cfee966ca0df480e92e51fdea21c91dd45a68976f139f3f2013c0994aea11fd27664daa81f2cdfb4bf57a1927b0f8
+EBUILD grdesktop-0.23-r1.ebuild 960 SHA256 575f0e29b1670d09b01d3486d14516c734a9cf4387a848fca521fae85df2ec88 SHA512 9f6f8373691f63013d2599b0fc5c12ad3e1267ccd06796f4d13621482b85046ce168fa2804047b2d73a7d02fd01c7df2d0a603681a22bee170f39d426e9ce4c7 WHIRLPOOL 48d5fc2b0d674babcd7e1162efce9187bb31ac82a7ba1aab0fd4eb765150f65e5586c24d7937c29261ca718c3c20a67f1602afa5ad237c3917006bfb2acc7db9
+MISC ChangeLog 2857 SHA256 11967a608e3a25d097898069985a4ae051c259bbc77291923c27ced7f810bd11 SHA512 ed6e2ff977f778bf1ef4ade35bbddad9c354e1c3578ba19d8192ce5124ac5022b18e819e006bc077b81c61cfd7c1fbe7f20b09bb6e7789c0ac518f247f7f190a WHIRLPOOL c6d4f559cb0ac74601e2b823f2fff65e50437cc6880879f6a3cd69c58a6c192e9c3ddf8e3d45a68cb25c873dab0ae121fc5b134a5288a19d3d1074e1e804a6ba
+MISC ChangeLog-2015 4675 SHA256 75f1f96a7d02aaa013b91a79afa5e68b685cb622898161f5e98b11c5d346cfce SHA512 f19d43796b97189029289ab708f987c06424d854d1548382f78f5b38aa1f70681631f62c96151285dd16521ec93dcae32256079975329f4c25df9d3a5aaea467 WHIRLPOOL 2dfa9a8cc9b32605e61730e0726ec4a81de449e3ecbadcb75d51b9ccaad93ce35a534da9c62650778f1286306ea1751a10cd531d4aec1e2cf3dec79eaf0c3e51
+MISC metadata.xml 429 SHA256 eecc98d1eba9fc2f76acab3169c962ea3486ebf4922a125f9e90dbcd07d62162 SHA512 359d469647e065e6b771ce02442ce3789d8e67708679d07b5a3d0cb5fc76a5bd16af0483b37d3a5c593d1660d1e58d4ecc97cbe0c26659cfc6a3b6e7ce863a7d WHIRLPOOL 38706b7abf96d04d7fed05b0f4561cbd795969a39a8b2da9dd4cd4d09bda4827733d96f3a5e6c4d1040b90b25c085d26cd913cd242a319598e09abf588d76dab
diff --git a/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch b/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch
new file mode 100644
index 000000000000..01102b802cd3
--- /dev/null
+++ b/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch
@@ -0,0 +1,19 @@
+--- a/grdesktop.desktop.old	2014-07-08 14:05:45.500537718 +0200
++++ b/grdesktop.desktop	2014-07-08 14:06:27.237420849 +0200
+@@ -4,13 +4,13 @@
+ Comment[de]=Verbindet zu einem entfernten Windows Terminal-Server
+ TryExec=grdesktop
+ Exec=grdesktop
+-Icon=grdesktop.png
++Icon=/usr/share/pixmaps/grdesktop/icon.png
+ Terminal=false
+ Type=Application
+ Version=1.0
+ Actions=Full;
+-Categories=Application;Network;X-Red-Hat-Base;
+-Encoding=UTF-8
++Categories=Network;X-Red-Hat-Base;
+ 
+ [Desktop Action Full]
++Name=Remotedesktop Client
+ Exec=grdesktop
diff --git a/net-misc/grdesktop/files/grdesktop-0.23-format-security.patch b/net-misc/grdesktop/files/grdesktop-0.23-format-security.patch
new file mode 100644
index 000000000000..b5610efc0c62
--- /dev/null
+++ b/net-misc/grdesktop/files/grdesktop-0.23-format-security.patch
@@ -0,0 +1,25 @@
+--- ./src/run.c.orig	2004-03-30 13:17:53.000000000 +0000
++++ ./src/run.c	2012-05-13 06:33:35.000000000 +0000
+@@ -110,7 +110,7 @@
+ 		sshcmd = g_strconcat(sshcmd, g_strdup_printf("%s",
+ 			SHASH("sshhost")), NULL);
+ 		sshcmd = g_strconcat(sshcmd, g_strdup_printf(" \"%s\"", cmd), NULL);
+-		g_warning(sshcmd);
++		g_warning("%s",sshcmd);
+ 		cmdline = g_strconcat(sshcmd, NULL);
+ 	} else {	/* execute without ssh */
+ 		cmdline = g_strconcat(cmd, NULL);
+--- ./src/rdpparse.c.orig	2012-05-13 06:36:59.000000000 +0000
++++ ./src/rdpparse.c	2012-05-13 06:37:31.000000000 +0000
+@@ -306,9 +306,9 @@
+ 	parts = g_strsplit(value, "x", 2);
+ 
+ 	if(typ == 'W')
+-		return(g_strdup_printf(parts[0]));
++		return(g_strdup_printf("%s",parts[0]));
+ 	else
+-		return(g_strdup_printf(parts[1]));
++		return(g_strdup_printf("%s",parts[1]));
+ 
+ 	if(parts != NULL)
+ 		g_strfreev(parts);
diff --git a/net-misc/grdesktop/grdesktop-0.23-r1.ebuild b/net-misc/grdesktop/grdesktop-0.23-r1.ebuild
new file mode 100644
index 000000000000..39b0acec73ce
--- /dev/null
+++ b/net-misc/grdesktop/grdesktop-0.23-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Gtk2 frontend for rdesktop"
+HOMEPAGE="http://www.nongnu.org/grdesktop/"
+SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	x11-libs/gtk+:2
+	>=gnome-base/libgnomeui-2
+	net-misc/rdesktop
+	gnome-base/gconf:2
+"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Correct icon path. See bug #50295.
+	eapply "${FILESDIR}/${P}-desktop.patch"
+
+	# Fix compilation with format-security, bug #517662
+	eapply "${FILESDIR}/${P}-format-security.patch"
+
+	sed -e 's/\(GETTEXT_PACKAGE = \)@GETTEXT_PACKAGE@/\1grdesktop/g' \
+		-i po/Makefile.in.in || die "sed 2 failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-debug \
+		--with-keymap-path=/usr/share/rdesktop/keymaps/
+}
diff --git a/net-misc/grdesktop/metadata.xml b/net-misc/grdesktop/metadata.xml
new file mode 100644
index 000000000000..97c0fce8f6f8
--- /dev/null
+++ b/net-misc/grdesktop/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 type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<longdescription>Gtk2 frontend for rdesktop</longdescription>
+<longdescription lang="ja">リモート・デスクトップの GTK2 フロントエンドです。</longdescription>
+</pkgmetadata>
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
new file mode 100644
index 000000000000..f13b11d64928
--- /dev/null
+++ b/net-misc/grive/Manifest
@@ -0,0 +1,14 @@
+DIST grive-0.4.0_pre20150905.tar.gz 158858 SHA256 c488e9956a48fa5416e1f6082ede649ae9d541b57a5170a4f6ff555e9e92e2aa SHA512 2a6842c742d79345ff805f92e74990de624d656c1f16fd98b2611e2359b051d6dfebef07590390eee3ea07e60143ca9e66ceecd675a3a75d6a099dcb0070ab46 WHIRLPOOL 22d25ea2913568d5132247f3472ca09ee5d291028b8303bd2f6784f1930e3308219f72e7a15b95a5e5a19637fb73e3d60181925afaa21e15f4fdaacc6d7769d4
+DIST grive-0.4.0_pre20151011.tar.gz 160502 SHA256 0e480a0f5aa1ba008d8e7e3f8cb0198728f6c67bf1e588a66a6d68bb39cff573 SHA512 c5b59a8740ee0886d95f64278c1dd8e0c80df8c53b982f0720fd3a9caa82503ce0ef75987afeafa8735b4e88ef6fea6b5266671516165b288156b1ab543dc3f7 WHIRLPOOL 8c888a218732c9be77d5ae407074f59e0c61d4facb70a8caee97f25e1f46fc5c618aeb09510e23ad18e7604cc17f645df9a9245fac96e1f3dff7279b8f0d2626
+DIST grive-0.5.1_pre20160114.tar.gz 162888 SHA256 20c15d84894a2943c50e6a9c1c95d1d29b5ca7240427dcd32e96113e5246a420 SHA512 8d10a9c1f36149def23326f3edd4350b156c59d6c2caa3d9ea262d9f61e174f0af2264a0c8d57592625c0e7cd5f9e7e171d01ff0c6a879a5605e44bb4c9a62d7 WHIRLPOOL 782fd3160f8970b837b989129993cfdb4e12327df46806c66aa8a5417ef9295373fe7e6acebfe7c30a00c936be67d127d8b886cb7cd3b4bfd79c8b71437bc91c
+DIST grive-0.5.1_pre20160706.tar.gz 163646 SHA256 299257850a482a08f556992c5cc895e1335206a13f94c40eb6afeb203f3e9cd1 SHA512 05496c9d38b13804b5839cf6a5d64a588e670b0e6d2796fe7f7a66267ade34f22bde28cf34210a4f2d36f12671ba38c963b3fc3fa6f8f80ff8b143aace648b52 WHIRLPOOL 44f0d778dd7e8240f6dec2ce437016cef1cd2fc824fd2e0c1d406758facea46e356e0716d438dcd07992c35f722e807db531c639385ff03e38a5653ffd0567ea
+DIST grive-0.5.1_pre20161004.tar.gz 163085 SHA256 d3ca4b728ba38ff735afbd308effaf18a6c1586487e9e15c8b4854144eb916f7 SHA512 1de5c2956d898d0a67e28469d7cf054e83b63f6dca736a60f875fbaac3197bc425432c43db2472e87113df2fa5da49eff9e17cd33610ccda7ba5bf0c2d4966c0 WHIRLPOOL 76148f8fe94cb0f5846e178d3bc9f35d61bded9181cc2835ae78040ee1b37fedeca6e1d7e8db7a55ed6e9390aca4135fda4e7f1aaa40621d618aab908c33e075
+EBUILD grive-0.4.0_pre20150905-r1.ebuild 756 SHA256 652d5d74c6a50c64d405a6d90dbc70ac2486f8adbd6db86f4baae0d473387abc SHA512 42f1338b6ff0290c6f2c3ff2c415790dbef5200edfdf11e349a1a4113375c1a59aa270a22d86c449c6fecccf5ca2b066557c733b418816a79ec3a78e59ba34d6 WHIRLPOOL 22b54e1e4c68e37eef4c2c2c8de469eca5c0a7e174137129fa9d03e4e6f59b2da1244688398b8c24d7695f967fe532eb82387b66ebffcf623e0d18b41000a2b5
+EBUILD grive-0.4.0_pre20150905.ebuild 729 SHA256 d782a0d72f9948e332a778e7248637a0f621804ee9d04db54eb8e2ef1e2ff54f SHA512 2bb48709a5ef707789bb8ee82eb146c467b11569b55fb420ee5fb6bb1227e306ad8a443c8ba69065e6e645d81b7457d61cf1ba4d0f8c7b55965db962a095854f WHIRLPOOL f3d2a01ca521c118395e8e4454a7a25e9e2a83f7202036803366336a22d6bff5298124cc6b25f8b12f20248c05b861a4ed377d644ab591a9f2811e0ce5e3cba2
+EBUILD grive-0.4.0_pre20151011.ebuild 756 SHA256 ffa8d273aba4693c4c28f0c59d0b902f4f79e8085b3ad3b32bb596cb1d4b33c2 SHA512 e5a8a365d6df018fb8d17b86becf6a00816518a81ead442148d49b6f937b3fac96f9dc5865846dba788b662f104142278312f88e4e4be72084700150451223ab WHIRLPOOL acc9620211567c2e271ccdae79d6b253ed5d159c1b0f5ceb0489045fd0c8a5043eaddb59ce242217cf9729e9e4ded41f36337553c1c41e85ff09d7920f014e36
+EBUILD grive-0.5.1_pre20160114.ebuild 756 SHA256 c50948d668c8cd1499134e5ec10055f9aa74f4339d769e5d19ab59686732bab1 SHA512 93784b777dfbd9614856b9ead55cedf7dc3ef216cdf6533a22b82b9b9e28d634a173f33482a929e42c303d13e1390c9468007110a5dc7aa5c51dd30308a396c6 WHIRLPOOL 7df0c934382bf4987fbe9f60f84b62ea3f2a1b0fd3a835444f3dd17f97e67e1b31301b23e9ab3dd30d89f38878e8275c0adc13bd631475339308a6344f6799bd
+EBUILD grive-0.5.1_pre20160706.ebuild 812 SHA256 dc312b5c170bec979c7723f4d2d06bd58e5096fef8f115c251e43031900e574c SHA512 c352c56b885251e3e7d0243ebfa23dd5945dd57b010e277c595f9ac93657cde1ccddcc3cddabf9356433cedc47b47b861906133fea3a3b5985c8d6125cffd161 WHIRLPOOL 972a7b77949744cec9a72455f4f9c3b4e3e07ed4d9a45c1a57fe720c8c366fc2d45863bf1a29208ea571a34e426de0b640db620962c1668b1d6a4f25205503b8
+EBUILD grive-0.5.1_pre20161004.ebuild 812 SHA256 51e5d1862675264a5f1ce296b194822172ac3f3a3ee27c0fa57401a61543349f SHA512 7b0dab16186ed93f95dfedf9f9ab04aef9bb0a259843e178fc8d83f47f8cbae0d45fa98d246cd39394a4612ce9a47b7e6e53de5cef31209d67feb144eb1496cf WHIRLPOOL 617c69cdc9e54b1a63651cc7d2f52184210aa04ca93f65170fe2519366defcdd32fc020910ccb56101d416d21f54c4fbec52f9b7b1f98501c81b5bc9b4e61560
+MISC ChangeLog 3904 SHA256 152780d525509d11d620c516e27b258fde8156a3be3458f349ef1ea879fa8573 SHA512 a7c3593311b7578a4688831fb06672927d1fde04accacc9365e0588f3a87e5ccfd9b279c05377295e7aa0283c0886bdf861288dab3bae525d9cc91db542c6f05 WHIRLPOOL 09c80fc8310eac2982ff25c6f5b777e11810b067afe21beaa4c4ea9251c141b10edeecfb3a217374ff078755f6a7327a6d8be16fee3d95872e7fdf8064aa1f9c
+MISC ChangeLog-2015 2321 SHA256 fea33186e53950e1acef7faba8a4d0fa18509bc0097d0cfa9568e1112f5a88f8 SHA512 258d4f0aad33ac7b1f98902f429db9d82d0428213fc89dcb2240e059537b804e8f02cbae6ed07c60ddf94063247a07bd734627a8dfb172dd692cc4ce7f805406 WHIRLPOOL f1310de874f525e28bb1d4d8f3108e4e1508f8bd1d189e130167db9bda42a8a8e521101a6b50aee3d1c55dfb9bb51b172e2dcb409fedb47f6ce3bd516076f00a
+MISC metadata.xml 329 SHA256 e495e865f6ff660bfee1d79d7b97a0b44ac2d5c611cb84432fb9e3f3a15471d6 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997 WHIRLPOOL 6409be4dd1e38bc73d484cc42be69ee79e3a44dcc4521b55ed62ef05d2a20bed03539882bea05c7ad3e99d964338d8a6ac47b29054a64afad0aa83bc2a2b29e9
diff --git a/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild b/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
new file mode 100644
index 000000000000..3aa16d50332e
--- /dev/null
+++ b/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	net-misc/curl
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.4.0_pre20150905.ebuild b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
new file mode 100644
index 000000000000..941ca8119a87
--- /dev/null
+++ b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	net-misc/curl
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.4.0_pre20151011.ebuild b/net-misc/grive/grive-0.4.0_pre20151011.ebuild
new file mode 100644
index 000000000000..1546398dab75
--- /dev/null
+++ b/net-misc/grive/grive-0.4.0_pre20151011.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="44cb91f94e67bcdad77ca564b4d8083cedf72251"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	net-misc/curl
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.5.1_pre20160114.ebuild b/net-misc/grive/grive-0.5.1_pre20160114.ebuild
new file mode 100644
index 000000000000..9e85ba1529d6
--- /dev/null
+++ b/net-misc/grive/grive-0.5.1_pre20160114.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="cfb8ff08b300d1fa57e12cdc85f724e3e25c906d"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	net-misc/curl
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.5.1_pre20160706.ebuild b/net-misc/grive/grive-0.5.1_pre20160706.ebuild
new file mode 100644
index 000000000000..bd19981b730b
--- /dev/null
+++ b/net-misc/grive/grive-0.5.1_pre20160706.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="457d84974592ed3f123622b12f2a7a748cbc0668"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.5.1_pre20161004.ebuild b/net-misc/grive/grive-0.5.1_pre20161004.ebuild
new file mode 100644
index 000000000000..5990f75e9ceb
--- /dev/null
+++ b/net-misc/grive/grive-0.5.1_pre20161004.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="7bbb01c3014cc996ec24a7e5c0684f24b604b735"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/metadata.xml b/net-misc/grive/metadata.xml
new file mode 100644
index 000000000000..f17224c625de
--- /dev/null
+++ b/net-misc/grive/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>junghans@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Grive/grive</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
new file mode 100644
index 000000000000..5f445fbeaede
--- /dev/null
+++ b/net-misc/gsasl/Manifest
@@ -0,0 +1,6 @@
+AUX gsasl-gss-extra.patch 951 SHA256 68223ba6c2367bd48afa18ed0470efd808b9a563c579920136507b202926dde8 SHA512 4225049a547b0ca6fbd0b5268e7a1de0454850fd6a29f31eb8b7356472fe400eb3a8076f537101be8cd9e09b7f092f5d784a8d660c8e66e475d4a7a4caff83df WHIRLPOOL 68777d4f79687ded47acaf3c76489e8971573d7738ca1d842ab3f40e47b11a806c8b8679c9f2aea54133f81d130592a1ddc69afc313802b6d10135a28e9e34bc
+DIST gsasl-1.8.0.tar.gz 4914837 SHA256 310262d1ded082d1ceefc52d6dad265c1decae8d84e12b5947d9b1dd193191e5 SHA512 711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f WHIRLPOOL cf5a0a855218af211dc6afc61e2ed18b7bc89e4c80c3e207df125a80ba8910c1c02dfa3d6260224aab59d29dcbf8f3f40168a145863db65a01b7b0e0446f6ead
+EBUILD gsasl-1.8.0-r1.ebuild 1694 SHA256 452dfb9f797f3564b83535400501d55e8b903f06aeccd052dccf5ab6bef5b127 SHA512 72cd3e807ff9e6575a862425d6ff6c9af3aa0b70a77557f5bf07ef242b9f5437aa19fbe7cf7a32d00593ef6e60da2196aa4ff46f514465470dbbcef87b3583c1 WHIRLPOOL 70e4bc6beaf1e695f6b21aad8a78d3370082d9814b72f5ab3e696b38af088d8785b1141bfe0ad71e0a937c7399e2446bf3a75a52763c9d5c30f37f78d01a1a04
+MISC ChangeLog 3092 SHA256 4bbff78c539b64c4ab193da57214311162342033e8bf0626630e1321a70e83c9 SHA512 f56bf2e3dd2f2e5d70bf292a467b6b3894dd2004401fb478bc652cb0f14a64b179992a67f26cf75865e981e2e599e20541fcb5437c2d9b308f97c3ed988315b5 WHIRLPOOL adc8a5cf43a2f94624244a46bb137e1e7bb2a1f06634ddd0db74d3a48c213c2e074935597d814cd925a72b83ead9ba7847b779825b393e5b4344b47918371e23
+MISC ChangeLog-2015 8054 SHA256 216717a7ae3590c6f335ea8fd82ad475e20bb59ca8c2a2dddb0a0de734003624 SHA512 328cb78cdc4dd0b5f18432506ef61461dbef9a4bb4480f4554bbffcb149ebdf5ebb87d74d0474e2c7dcfe7a96f8062ba87e0f626b73d31915e8206ab7a84fcf7 WHIRLPOOL f92c1364fac258bf67712b2bfd9219aad3b1c234fd3fd1e6549a152f683dc195ea3c4314aa6afe14a4329a0ca60bae93637a66609294875b2fe071a3856c7688
+MISC metadata.xml 443 SHA256 9c28229c668ccb3ac9701c173eebcdc13ae1901c672a5b05e747ceae0fe04eda SHA512 ea6f890ed660697d4eb67b42e9ede99161850a40441953ed15bc88c6281fa9d0840ac458f9be1c3c9446f6937957b5775db28bc0df9736c979f7effad1d89b0c WHIRLPOOL a8736f311bad6a692c71adf12e54478c99d97a2616879dfb52c6529340bc572ca7c80a19e51dbb183d4fd26c0653d638f7c7bf406fa4478815052a42cbfbd5b2
diff --git a/net-misc/gsasl/files/gsasl-gss-extra.patch b/net-misc/gsasl/files/gsasl-gss-extra.patch
new file mode 100644
index 000000000000..e08a36ae5779
--- /dev/null
+++ b/net-misc/gsasl/files/gsasl-gss-extra.patch
@@ -0,0 +1,21 @@
+Based on gentoo bug #359005
+--- lib/gl/m4/gss-extra.m4.orig	2010-12-14 12:57:08.000000000 +0000
++++ lib/gl/m4/gss-extra.m4	2011-11-05 21:11:54.000000000 +0000
+@@ -19,7 +19,16 @@
+     AC_CHECK_FUNCS([gss_decapsulate_token])
+     AC_CHECK_FUNCS([gss_oid_equal])
+     AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
+-    AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
++    AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
++    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
++    	[#include <gssapi.h>
++	#ifdef GSS_C_NT_HOSTBASED_SERVICE
++	   hostbased_service_gss_nt_yes
++	#endif],
++	    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
++	    [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
++	    AC_MSG_RESULT([yes])],
++	    AC_MSG_RESULT([no]))
+     if test "$gssapi_impl" != "gss"; then
+       AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
+       if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..5ffe9c0c185d
--- /dev/null
+++ b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="The GNU SASL client, server, and library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
+
+DEPEND="
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	idn? ( net-dns/libidn )
+	kerberos? ( virtual/krb5 )
+	nls? ( >=sys-devel/gettext-0.18.1 )
+	ntlm? ( net-libs/libntlm )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-gss-extra.patch"
+	sed -i -e '/gl_WARN_ADD(\[-Werror/d' \
+		-e 's/ -Werror//' configure.ac || die
+	sed -i -e 's/ -Werror//' lib/configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local krb5_impl
+	if use kerberos; then
+		krb5_impl="--with-gssapi-impl="
+		krb5_impl+=$(has_version app-crypt/mit-krb5 && echo "mit" || echo "heimdal")
+	fi
+	econf \
+		--enable-client \
+		--enable-server \
+		--disable-valgrind-tests \
+		--disable-rpath \
+		--without-libshishi \
+		--without-libgss \
+		--disable-kerberos_v5 \
+		$(use_enable kerberos gssapi) \
+		${krb5_impl} \
+		$(use_enable kerberos gs2) \
+		$(use_with gcrypt libgcrypt) \
+		$(use_enable nls) \
+		$(use_with idn stringprep) \
+		$(use_enable ntlm) \
+		$(use_with ntlm libntlm) \
+		$(use_enable static-libs static) \
+		$(use_enable threads)
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm -f "${D}"/usr/lib*/lib*.la
+	fi
+	doman doc/gsasl.1 doc/man/*.3
+
+	if use doc; then
+		dodoc doc/*.{eps,ps,pdf}
+		dohtml doc/*.html
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/net-misc/gsasl/metadata.xml b/net-misc/gsasl/metadata.xml
new file mode 100644
index 000000000000..2b6cd86af0a4
--- /dev/null
+++ b/net-misc/gsasl/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+<email>net-mail@gentoo.org</email>
+<name>Net-Mail</name>
+	</maintainer>
+<use>
+<flag name="gcrypt">
+	Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto
+</flag>
+<flag name="ntlm">
+	Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg>
+</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
new file mode 100644
index 000000000000..ca76aa720dfd
--- /dev/null
+++ b/net-misc/gsutil/Manifest
@@ -0,0 +1,17 @@
+AUX dummy.boto 128 SHA256 9ccaaa014a58a8fcf456241d0664bf62604d022e87429bf2ace67b3d3b2dd5c7 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d WHIRLPOOL 67dcf175e872fa47b787a290444a9d1e9847c607bdc4cd4f29053ceece9149a4aabe2a0d313f6aff9cad7765312301acd8156401ebf2f14afdcc10232f63ec5c
+AUX gsutil-3.37-drop-http_proxy-clearing.patch 1144 SHA256 148697e311fb2b11ddcc1caf9e05f3b63e26d2e33603cee1f67f5fb8792177c9 SHA512 30a1a3c2a858941201a0f0cf435cff6f9bfa22e3439e62913ed4f999fcca077c35ae7c2a0fcd90ed988d686f38d0df0fd021ba103bfa99a5931ba9dbe4a0e480 WHIRLPOOL 7a79fb91867480f41f061cc2e6f351c8592db256b45282f98ac77b3301d176c6457e975979c8d3d2c491ef62c320d8b0199329d9ef26a013e80b365b2c96a2d3
+AUX gsutil-3.42-use-friendy-version-checks.patch 473 SHA256 45362bbb927d063f4e523e7117031106fcf7ad6c0d33c27f36124de90b2d3506 SHA512 710f192953d3b0b10cfa4b2fb785d8515149a374197a51bc05e42ebc9293dd8418dcc05f38c005aeecaa87b6e6b8efc89f0c0bfb849a9c8b1741c8a22aed7374 WHIRLPOOL d2b0c49ea90629c5e50c207fa05918d0764e2f5e5ba5f454a6ddf6e05fbf9a0233650cc45a0813eed16864063105c23314b4eb6043e4d70bada8d0ae4de6b195
+AUX gsutil-4.19-use-friendy-version-checks.patch 562 SHA256 3de92d69d8599f5577d0c79657fdbe0d70bdc443aa91f8b1fd47d92ce0ce4c8d SHA512 90d3845ec4f43bfddf6bc71cb31cdffc0623370f15c0621a48bd2687f62221ca2f6ad947d44602143450cb6900a83847c482e33aefda1446361e3a35666ffb92 WHIRLPOOL dbfed5deb8d031e7c536e9b73b314c43c9b75a27e94b79c9479ff3321ea22f116372b704cdcd78f2d9a98a04ad1f1fc31dd39f95757677f5b9eedd321f627928
+AUX gsutil-4.20-use-friendy-version-checks.patch 639 SHA256 f4f295f4cc0593e9c852af4bbb9b6689e997f6f23c3d1cf80932319e11747ef0 SHA512 0446f26c1d25bdd160de849123b90b73ec63b12179f05851c83481860bcb4a259be4166b79ba1616d2ca3f001a75b1d9f7fad588d5d89e3c091f057ddf71cd0b WHIRLPOOL 779b5992291ebb8c57f997c5aaf3aa136f5f1d8005c4f5a7d08e5e71fb076739b7b920dd0b6973d6ed0217160acd846d23bd5bd6fd2023d1169db8d8ff5ab324
+AUX gsutil-4.27-use-friendy-version-checks.patch 745 SHA256 f8a81d187169c1a35e0454c9f8eab37bf2db993508b3d9c3c504250b79bfb6a2 SHA512 ed060d08fe58c171df591c010aec1c597a4ba2f08ecf4d5806a78437b90aedd9309f16f48a7cc24143c508b9cac44d865aa3b4499cd11ab8fa1cc0c6196796ad WHIRLPOOL 08d0725b88d33bfa0a271e38cc410987c0a9d0bf72d7c155cf26f99e09e7cb8ee1080a6a5fb73552caa89e5e4b9918ac8d66c521a852da7abc50b63afd37585e
+DIST gsutil_3.42.tar.gz 1878904 SHA256 50fc7acb7d1db8752f3eee106a3d8d65188107943e7cb30cfd3f94a9cfcdcf37 SHA512 084aaf43a44528af0cdfd9bd22beeb5d6abff240c09843cf35016d685d51b854ed5b2837eaa50c97bb44d5e1a3cdccbae6688ef27aa13f2a5db6040bf501b381 WHIRLPOOL 5b0d0fb1d2446a7b8777f368f073fdb4f7ad2d6407735976c178a2727a2548bf28522e06469dd0b7df1578d5586bc152fba3520b66f88d706417947aa3aa5578
+DIST gsutil_4.19.tar.gz 2715141 SHA256 6d9ce67de274d080775ed55e3d86edeb1c8c0a942bccdf5e96bdf1eaa51dd8d2 SHA512 59e96c9855a037300feae122462ff3c9f69e46f049812e88087ae532f590e84b81d67b4e961c47bd0f725c87aa6e0360f65bd8935a95a51c61eb80da0b82dcc1 WHIRLPOOL 70ccfa6f462e536f8aee7ef27aef0e9f8ef0d73bad1493959d2a177db675324f5a872bef5c7e7c844b380cabb04d00f6b334f46bc0f021e4ed743a209b4bf677
+DIST gsutil_4.20.tar.gz 2872954 SHA256 aa468f68ef7ac570b2071de56b4ce55c829cb92b62cf10c007bcbec6e74c7997 SHA512 3fb7903f87eb18a0bece514d1cfc4030b056e47044ef0d9ffd673015358bd86cfc9dcdcf4191e0a4d8f3bae7ef70e12e6856912940d857dc7eec1b1d087026f6 WHIRLPOOL 88932a54656a6399e1c489c294a83f185bb0343e30489c105de4bb6a556e3173b9bb0d3d24e5808872ea10d50d9731ccbceeb8e43280fb0c30ada61e8d2c6c0b
+DIST gsutil_4.27.tar.gz 3107288 SHA256 1e794e64429077ab2beddbc1a548f83dbde41228f83e8267904dee0778a025fa SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57 WHIRLPOOL 36e06017e1a1221f1af55976e470119e9543d70cc177ab2d12bb8957d25ff38cfc4fa85873b65b57bf4e7ac83301691d65e97398d638e7cb545fdd472e8437d0
+EBUILD gsutil-3.42.ebuild 1311 SHA256 3ed5dec9fca25ae97fe6540c7b3be4aeade162bf9fdc84ec37bd3e1fd28924c7 SHA512 3e25a65f6946ae050569435431eeff8004bb42f1e57dcfc9bf6ac6e60dbd7c22b011a0f3e78c13b7d1406c76f793a84b3f7cec01fa6ec3c9d158c20f820c6ab3 WHIRLPOOL 96b906f7beffdb9d98796f7d6f0188e034986e8f552b30994009341ffdfe190ed07b43c8a37c726b2f188361c26d5ffbeb3a1e157b70bd4fbb5944afeb8dd74d
+EBUILD gsutil-4.19.ebuild 1542 SHA256 d539930670bdd5751fec4d1610f273f20b1028dc27f0c27c86aa2777a266564d SHA512 2dc39b7f7967d33652547d8bddcddd1b43b8114a8279a3408c3ed3cc0143847908f2fd9a51e5b89524e61fbf90f83fb85d337fd5e0bd6994720b96eee6ac4e4f WHIRLPOOL 7b61b951d5fafea04b9963e84b01ac16ddecbc482c407f4eb0d2cf6bad7d1398ae845228d4aac4ed49c0ec470e75f0a8a60d4d68c438386ec07dabde495934ac
+EBUILD gsutil-4.20.ebuild 1514 SHA256 b08b2b56bbeab33f1eb886e5ea0928cfbd9de9343840ec362d5254a8866192f0 SHA512 fa6f9b69f9e15f369e442aa7b430d87f9b662efb86ea0673297f0d69fa6706db717341510b14a6d72d44b9e0937428eaa6b1df856cb1806d0774be93d7baea82 WHIRLPOOL 7e90f946d5727385d4e2a78e59604d26b4a01b7bd6d6bebefe0ab243bc6db8191b638455e49591cc5e67b9bb52e79e6631815a955a13c656b2c4f1a503b8de6b
+EBUILD gsutil-4.27.ebuild 1740 SHA256 93cbe8c5691d0c5359ad7ca192eea8d4f190369e115207dae09a630d475c79ad SHA512 bcdd47cd2b3a021b47e16a783e6ef805bdf89bddb08df894f0919972a801fa2a09eee724ca55ce15c316b7be371c643a17955eef4570701b4d4939bd41e20595 WHIRLPOOL 5a521a32be09c2f7ed3437440bbfb947fb0e7e3e022f52bc4242d8d28e5105807eef8b4e7322251fa58fc815d93e946f3092886c0b2fc06be25567ffbdabf5f1
+MISC ChangeLog 6807 SHA256 7f1e76a9d1e17208b084c35447b7a38bc755f212d6da177235101241ba5f63ef SHA512 049eb30ac49a9223db124d21660817f63da73737c2005d3e4ae5bc954b153e78a87dbbb324df115b49877ea97c63f57c7658dd4a78c31f2e048f4d8493542cd0 WHIRLPOOL 26dccba528cb709bc6e194a2569435431afccbe2e4f668eb70efeee992779d4d92cb7b47979e91823c42962193b75bd3cf7b242fdb54f7e637311a0a0f834f88
+MISC ChangeLog-2015 3546 SHA256 814f44f33ff09b7a83870f1bffd613cd1a66275ee7a697654d011f992a905e31 SHA512 2f6e9cf12797fc20540a0276e3b31f877e408e4a3e9c1d97529f2a0fa564cfe5ba88404cc0b65f4e2d6fdedeedd5fc197b5445df0e122d3e91108f09a67daf91 WHIRLPOOL d8eb1fb11e34f357c2116a9ad446ede944d2df498c01ea0b8639406a49b9e554afa3867f378c07db43598003273bd41c22c8643f7d153d7905285b0f971e142f
+MISC metadata.xml 359 SHA256 ad721c2e90e604e7b196492bda7457454442652abcb6930149bf045e30c62a8e SHA512 cc3c00dcd60084af77cae6428f522b05fdd95a38b986bbf174be3e1a0dbbffb5d7e448b8eb481b645edf8dc588b8a5d0beed42d6b07e6771fcf5e7e62ad942a0 WHIRLPOOL c6a527f5f24cacb3f2e6ef3337385376831a8f4e3a21e090327ade23b561f73e55f102a7e4e701b3ab850f8d6183800ff76a01c9b7b77a7d407652eeadb619dc
diff --git a/net-misc/gsutil/files/dummy.boto b/net-misc/gsutil/files/dummy.boto
new file mode 100644
index 000000000000..93e9dd2f8c77
--- /dev/null
+++ b/net-misc/gsutil/files/dummy.boto
@@ -0,0 +1,6 @@
+# dummy .boto file for testing
+
+[Credentials]
+gs_oauth2_refresh_token = 1/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+[GSUtil]
diff --git a/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch b/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch
new file mode 100644
index 000000000000..4c36035d21c5
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch
@@ -0,0 +1,35 @@
+http://crbug.com/318478
+
+From 0067df5b08ebab29b88bbb7e6c1cd79dc4d96100 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 27 Nov 2013 14:57:05 -0500
+Subject: [PATCH] drop http_proxy clearing
+
+The boto logic takes care of merging the env vars and the settings in its
+boto config file, so there shouldn't be a need to clear things.
+---
+ gslib/__main__.py | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/gslib/__main__.py b/gslib/__main__.py
+index 82a69c1..a18db42 100644
+--- a/gslib/__main__.py
++++ b/gslib/__main__.py
+@@ -247,14 +247,6 @@ def main():
+     else:
+       command_name = args[0]
+ 
+-    # Unset http_proxy environment variable if it's set, because it confuses
+-    # boto. (Proxies should instead be configured via the boto config file.)
+-    if 'http_proxy' in os.environ:
+-      if debug > 1:
+-        sys.stderr.write(
+-            'Unsetting http_proxy environment variable within gsutil run.\n')
+-      del os.environ['http_proxy']
+-
+     return _RunNamedCommandAndHandleExceptions(
+         command_runner, command_name, args[1:], headers, debug,
+         parallel_operations)
+-- 
+1.8.4.3
+
diff --git a/net-misc/gsutil/files/gsutil-3.42-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-3.42-use-friendy-version-checks.patch
new file mode 100644
index 000000000000..5d8bbbc7635e
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-3.42-use-friendy-version-checks.patch
@@ -0,0 +1,20 @@
+--- a/setup.py
++++ b/setup.py
+@@ -33,15 +33,13 @@ management tasks, including:
+ """
+ 
+ requires = [
+-    'boto==2.22.1',
++    'boto>=2.22.1',
+     'httplib2>=0.8',
+     'python-gflags>=2.0',
+     'google-api-python-client>=1.1',
+     'pyOpenSSL>=0.13',
+     'crcmod>=1.7',
+-    # Not using 1.02 because of:
+-    #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    'SocksiPy-branch==1.01',
++    'SocksiPy-branch>=1.01',
+     'retry_decorator>=1.0.0',
+ ]
+ 
diff --git a/net-misc/gsutil/files/gsutil-4.19-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.19-use-friendy-version-checks.patch
new file mode 100644
index 000000000000..66d8144329f2
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.19-use-friendy-version-checks.patch
@@ -0,0 +1,25 @@
+--- a/setup.py
++++ b/setup.py
+@@ -35,10 +35,10 @@
+ """
+ 
+ requires = [
+-    'boto==2.39.0',
++    'boto>=2.39.0',
+     'crcmod>=1.7',
+     'gcs-oauth2-boto-plugin>=1.12',
+-    'google-apitools==0.5.2',
++    'google-apitools>=0.5.2',
+     'httplib2>=0.8',
+-    'oauth2client==1.5.2',
++    'oauth2client>=1.5.2',
+     'pyOpenSSL>=0.13',
+@@ -48,7 +48,7 @@
+     'six>=1.9.0',
+     # Not using 1.02 because of:
+     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    'SocksiPy-branch==1.01',
++    'SocksiPy-branch>=1.01',
+ ]
+ 
+ dependency_links = [
diff --git a/net-misc/gsutil/files/gsutil-4.20-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.20-use-friendy-version-checks.patch
new file mode 100644
index 000000000000..8f0de98d0d38
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.20-use-friendy-version-checks.patch
@@ -0,0 +1,25 @@
+--- a/setup.py
++++ b/setup.py
+@@ -35,10 +35,10 @@
+ """
+ 
+ requires = [
+-    'boto==2.39.0',
++    'boto>=2.39.0',
+     'crcmod>=1.7',
+     'gcs-oauth2-boto-plugin>=1.14',
+-    'google-apitools==0.5.3',
++    'google-apitools>=0.5.3',
+     'httplib2>=0.8',
+-    'oauth2client==2.2.0',
++    'oauth2client>=2.2.0',
+     'pyOpenSSL>=0.13',
+@@ -48,7 +48,6 @@
+     'six>=1.9.0',
+     # Not using 1.02 because of:
+     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    'SocksiPy-branch==1.01',
++    'SocksiPy-branch>=1.01',
+     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
+-    'mock==2.0.0',
+ ]
diff --git a/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch
new file mode 100644
index 000000000000..c02e567989f3
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch
@@ -0,0 +1,29 @@
+--- a/setup.py
++++ b/setup.py
+@@ -36,21 +36,21 @@
+ 
+ requires = [
+     'argcomplete>=1.8.2',
+-    'boto==2.47.0',
++    'boto>=2.47.0',
+     'crcmod>=1.7',
+     'gcs-oauth2-boto-plugin>=1.14',
+-    'google-apitools==0.5.3',
++    'google-apitools>=0.5.3',
+     'httplib2>=0.8',
+     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
+-    'mock==2.0.0',
+-    'oauth2client==2.2.0',
++    'mock>=2.0.0',
++    'oauth2client>=2.2.0',
+     'pyOpenSSL>=0.13',
+     'python-gflags>=2.0',
+     'retry_decorator>=1.0.0',
+     'six>=1.9.0',
+     # Not using 1.02 because of:
+     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    'SocksiPy-branch==1.01',
++    'SocksiPy-branch>=1.01',
+ ]
+ 
+ dependency_links = [
diff --git a/net-misc/gsutil/gsutil-3.42.ebuild b/net-misc/gsutil/gsutil-3.42.ebuild
new file mode 100644
index 000000000000..35ad072fb781
--- /dev/null
+++ b/net-misc/gsutil/gsutil-3.42.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=dev-python/boto-2.22.1[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
+	"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README.md CHANGES.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-use-friendy-version-checks.patch"
+	"${FILESDIR}/${PN}-3.37-drop-http_proxy-clearing.patch"
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed \
+		-e '/SocksiPy-branch/d' \
+		-i setup.py || die
+}
+
+python_test() {
+	export BOTO_CONFIG=${FILESDIR}/dummy.boto
+	${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}
diff --git a/net-misc/gsutil/gsutil-4.19.ebuild b/net-misc/gsutil/gsutil-4.19.ebuild
new file mode 100644
index 000000000000..99c17123dd51
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.19.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# The oauth2client-2 dep sucks.
+# https://github.com/GoogleCloudPlatform/gsutil/issues/355
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.39.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-1.12[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-2
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README.md CHANGES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.19-use-friendy-version-checks.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e '/SocksiPy-branch/d' \
+		setup.py || die
+}
+
+python_test() {
+	export BOTO_CONFIG=${FILESDIR}/dummy.boto
+	${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}
diff --git a/net-misc/gsutil/gsutil-4.20.ebuild b/net-misc/gsutil/gsutil-4.20.ebuild
new file mode 100644
index 000000000000..15361383febe
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.20.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# The oauth2client-2 dep sucks.
+# https://github.com/GoogleCloudPlatform/gsutil/issues/355
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.39.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README.md CHANGES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.20-use-friendy-version-checks.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e '/SocksiPy-branch/d' \
+		setup.py || die
+}
+
+python_test() {
+	export BOTO_CONFIG=${FILESDIR}/dummy.boto
+	${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}
diff --git a/net-misc/gsutil/gsutil-4.27.ebuild b/net-misc/gsutil/gsutil-4.27.ebuild
new file mode 100644
index 000000000000..491ea929a00c
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.27.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# The oauth2client-2 dep sucks.
+# https://github.com/GoogleCloudPlatform/gsutil/issues/355
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/argcomplete-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.47.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.3[${PYTHON_USEDEP}]
+	=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README.md CHANGES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.27-use-friendy-version-checks.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e '/SocksiPy-branch/d' \
+		setup.py || die
+
+	# Package installs 'test' package which is forbidden and likely a bug in the build system
+	rm -rf "${S}/test" || die
+	sed -i -e '/recursive-include test/d' MANIFEST.in || die
+}
+
+python_test() {
+	export BOTO_CONFIG=${FILESDIR}/dummy.boto
+	${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}
diff --git a/net-misc/gsutil/metadata.xml b/net-misc/gsutil/metadata.xml
new file mode 100644
index 000000000000..df60255c433f
--- /dev/null
+++ b/net-misc/gsutil/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">gsutil</remote-id>
+		<remote-id type="github">GoogleCloudPlatform/gsutil</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/guacamole-server/Manifest b/net-misc/guacamole-server/Manifest
new file mode 100644
index 000000000000..f3368e2e9de1
--- /dev/null
+++ b/net-misc/guacamole-server/Manifest
@@ -0,0 +1,9 @@
+AUX guacamole-server-0.9.9-clipboard-id-update.patch 4393 SHA256 bebcabe9fb7b5e394dfcad12c77b05d6920d2e924afd9cc99dee07576c249403 SHA512 1667f56cd1a19222eff4bbc4af2ecb32d8a95d3cd0bbc9a66f38e91d8b38fb063cfc227d58502fb64da0ebc314f5b238d680793a1f7bb14874c3bb735b158391 WHIRLPOOL c36c2ebfcbca0a6faf17c07770b4ff0db875f91652fbd8d427ebd9986d9e588d838db73005ba425d97fbd57a9918f8c24de0b1331ca6cd4fabd35ddc2be8a48c
+AUX guacamole-server-0.9.9-glyph-order.patch 1369 SHA256 6fd821918cd05d6c3be3667c41b07c8e8e20bb6abe2d6dba15db2855ddc61f29 SHA512 5e86bc03235611920a941573dd080031e4b2c811684cbe98d56d204addd44fda6ae0a900a2296ebf1d4d73462c5cb52b781ee2079981ec8e15c761aeb4b2a308 WHIRLPOOL 3a4ca5ac70398df61d9d025f7e1618846b59be226a90b6c5660c2f84dd7bc02c65d79aaefe9128232dfd95d134ac27fea845a7cbde7a2d89d26f3678ef3e1627
+AUX guacd 551 SHA256 307a4d96ed808d669768a3dc04caa5bc1caa3f3022277d5bb64110b661217044 SHA512 58dd13812256eae0e4e4a76072ec10ccee55696d96d86200809c10cf281d5f451f1a83b7d853a268555d08e283d0f25d186169c3f3ea0e9a8f57e857e89cbfa2 WHIRLPOOL 1abd0e706b2c594b302283090c9d5dd7820e1f16d0672b66d5278448810292c99f274fffabc3e6f17b16bd6240b81046279c8fc0acef8c8c379816cf741b49ee
+AUX guacd.service 178 SHA256 4f0201fd1888bf1b147736691ea15c5081cc04603b983b004449817fb2e9e30e SHA512 a7b36ab99a88c5f37ca37ae57bd59e21c7d5a890ad6d3a19756ab9655da44abed98867114799407d070376a8207a29ceb6097785bbce377826686c4e7601e0e0 WHIRLPOOL 1c8ae0675b2cb8c0227f33a50c5e93d16b7622f7c9afbf554481240b6497f540bf1a96a97bdc0dd31f36d361cca73d306f9f3b237224b758f91cdc2060758444
+DIST guacamole-server-0.9.9.tar.gz 679635 SHA256 b37ac2013f278558094488c15ec4d6ee8f01e60cd2bcb0d976a207eb9d9c4e7d SHA512 bdc004c45e63bb2c692c1dfd280840ea682e461b2c578da511247cd36d727ffa22c3fdde22b3635ef6ac7e35a1b5e63f5971bdbb4d227f88d1b81ff035bd5f83 WHIRLPOOL 42a15cab6d723a9d0fe3376afad96e3283447bb7664c102b3795869fd72dd518281db447bceab18502ceaa38c9a322903a3b85dcff37c38f3bd568ea07f47ecb
+EBUILD guacamole-server-0.9.9-r1.ebuild 1468 SHA256 7a96b52abf1efbd6564ebcb69780e73dde0024e253b48adcf08c48fcca8619f7 SHA512 631c6ba02bb03cdfa786e0e66ce4c38b9bf0bfb62f207fbcf5e7b6ff00a7e3cb21c6bb531f24d40265d782f80fd0405b32d8812b0780c5ee07323233d641c5d9 WHIRLPOOL a0d89da4a75dac35f7b8fc498a88cebf2f701e34812f5822e8ef9020c84c0a8caa60c30871490882f28ac5677cec8a65572010a7d564d7a625a390c196e9f980
+MISC ChangeLog 4335 SHA256 1004275d40f03f03d1b07efe4897f121ca43716c98b6aba99b1a92cdb2f1005f SHA512 b06d71c601d9720d57beb8f6e98bf5636de8fe7703a74c05ba79bcd3a513b79e063d9924a769751404e1fb060fd19eba740c21f0776396e7849a85ad3c9f858b WHIRLPOOL be53f8acfc3abdce384d0ebf1452c121de8ed106627116c79acfaa9d4431a7a481b16474ff4a402cc4d1aba3e97e080504d9d11033c09643864ba6e497ca5eac
+MISC ChangeLog-2015 1612 SHA256 734ad7131993b53cd28816186ffdff7c5e996254c5a88826b3cf11dde40c4999 SHA512 696080d8380957f8d76f82776a132d51889fcd68d933914994e0cfee0ddc9e31436d4fe0f457c7224b3f17121e424246689cedbadd6e5b8a3e85f4f0f1f4b4b5 WHIRLPOOL 8a3908c87bb894daaf9ff9193e44678111593d9358ead4b185644170687c825f1f7c143d8516f75e4060adf86c8e89316753484662e8a44ec4fc914ab8cb8bec
+MISC metadata.xml 601 SHA256 bec20ae42c045f760c0ef8029233a3aa424109943f654bf9bb93f4c10cd9e032 SHA512 e6dbb46879c4224ed91eec7935d6c343aa7c963ca44b45af139d1e433ece6985a3ba8b2c8d6aeac3f55688492f37eff90024137fcce4a377bfd4e186a00b6e1b WHIRLPOOL 4909dc2d72d2c93897a7e87532944738ad0f36a6f8a518bfdb3ac890a0e8d9fc84d5de89b64470a60a04b7fde3694c8ec0a9abf755383f6cae6c7e1223cdc68e
diff --git a/net-misc/guacamole-server/files/guacamole-server-0.9.9-clipboard-id-update.patch b/net-misc/guacamole-server/files/guacamole-server-0.9.9-clipboard-id-update.patch
new file mode 100644
index 000000000000..4191479f34d8
--- /dev/null
+++ b/net-misc/guacamole-server/files/guacamole-server-0.9.9-clipboard-id-update.patch
@@ -0,0 +1,104 @@
+--- guacamole-server-0.9.5/src/protocols/rdp/rdp_cliprdr.c.orig	2015-03-17 12:39:58.316549546 +0000
++++ guacamole-server-0.9.5/src/protocols/rdp/rdp_cliprdr.c	2015-03-17 12:40:57.059229957 +0000
+@@ -104,8 +104,8 @@ void guac_rdp_process_cb_monitor_ready(g
+ 
+     /* Respond with supported format list */
+     format_list->formats = (UINT32*) malloc(sizeof(UINT32)*2);
+-    format_list->formats[0] = CB_FORMAT_TEXT;
+-    format_list->formats[1] = CB_FORMAT_UNICODETEXT;
++    format_list->formats[0] = CF_TEXT;
++    format_list->formats[1] = CF_UNICODETEXT;
+     format_list->num_formats = 2;
+ 
+     freerdp_channels_send_event(channels, (wMessage*) format_list);
+@@ -147,22 +147,22 @@ void guac_rdp_process_cb_format_list(gua
+     for (i=0; i<event->num_formats; i++) {
+ 
+         /* If plain text available, request it */
+-        if (event->formats[i] == CB_FORMAT_TEXT)
++        if (event->formats[i] == CF_TEXT)
+             formats |= GUAC_RDP_CLIPBOARD_FORMAT_CP1252;
+-        else if (event->formats[i] == CB_FORMAT_UNICODETEXT)
++        else if (event->formats[i] == CF_UNICODETEXT)
+             formats |= GUAC_RDP_CLIPBOARD_FORMAT_UTF16;
+ 
+     }
+ 
+     /* Prefer Unicode to plain text */
+     if (formats & GUAC_RDP_CLIPBOARD_FORMAT_UTF16) {
+-        __guac_rdp_cb_request_format(client, CB_FORMAT_UNICODETEXT);
++        __guac_rdp_cb_request_format(client, CF_UNICODETEXT);
+         return;
+     }
+ 
+     /* Use plain text if Unicode unavailable */
+     if (formats & GUAC_RDP_CLIPBOARD_FORMAT_CP1252) {
+-        __guac_rdp_cb_request_format(client, CB_FORMAT_TEXT);
++        __guac_rdp_cb_request_format(client, CF_TEXT);
+         return;
+     }
+ 
+@@ -186,11 +186,11 @@ void guac_rdp_process_cb_data_request(gu
+     /* Determine output encoding */
+     switch (event->format) {
+ 
+-        case CB_FORMAT_TEXT:
++        case CF_TEXT:
+             writer = GUAC_WRITE_CP1252;
+             break;
+ 
+-        case CB_FORMAT_UNICODETEXT:
++        case CF_UNICODETEXT:
+             writer = GUAC_WRITE_UTF16;
+             break;
+ 
+@@ -232,12 +232,12 @@ void guac_rdp_process_cb_data_response(g
+     switch (client_data->requested_clipboard_format) {
+ 
+         /* Non-Unicode */
+-        case CB_FORMAT_TEXT:
++        case CF_TEXT:
+             reader = GUAC_READ_CP1252;
+             break;
+ 
+         /* Unicode (UTF-16) */
+-        case CB_FORMAT_UNICODETEXT:
++        case CF_UNICODETEXT:
+             reader = GUAC_READ_UTF16;
+             break;
+ 
+--- guacamole-server-0.9.5/src/protocols/rdp/client.c.orig	2015-03-17 12:40:07.079651048 +0000
++++ guacamole-server-0.9.5/src/protocols/rdp/client.c	2015-03-17 12:40:57.064230015 +0000
+@@ -722,7 +722,7 @@ int guac_client_init(guac_client* client
+     guac_client_data->rdp_inst = rdp_inst;
+     guac_client_data->mouse_button_mask = 0;
+     guac_client_data->clipboard = guac_common_clipboard_alloc(GUAC_RDP_CLIPBOARD_MAX_LENGTH);
+-    guac_client_data->requested_clipboard_format = CB_FORMAT_TEXT;
++    guac_client_data->requested_clipboard_format = CF_TEXT;
+     guac_client_data->audio = NULL;
+     guac_client_data->filesystem = NULL;
+     guac_client_data->available_svc = guac_common_list_alloc();
+--- guacamole-server-0.9.5/src/protocols/rdp/rdp_stream.c.orig	2015-03-17 12:40:13.952730659 +0000
++++ guacamole-server-0.9.5/src/protocols/rdp/rdp_stream.c	2015-03-17 12:40:57.066230038 +0000
+@@ -289,8 +289,8 @@ int guac_rdp_clipboard_end_handler(guac_
+ 
+     /* Notify server that text data is now available */
+     format_list->formats = (UINT32*) malloc(sizeof(UINT32));
+-    format_list->formats[0] = CB_FORMAT_TEXT;
+-    format_list->formats[1] = CB_FORMAT_UNICODETEXT;
++    format_list->formats[0] = CF_TEXT;
++    format_list->formats[1] = CF_UNICODETEXT;
+     format_list->num_formats = 2;
+ 
+     freerdp_channels_send_event(channels, (wMessage*) format_list);
+--- guacamole-server-0.9.5/src/protocols/rdp/client.h.orig	2015-03-17 12:40:22.535830076 +0000
++++ guacamole-server-0.9.5/src/protocols/rdp/client.h	2015-03-17 12:40:57.067230050 +0000
+@@ -143,7 +143,7 @@ typedef struct rdp_guac_client_data {
+      * The format of the clipboard which was requested. Data received from
+      * the RDP server should conform to this format. This will be one of
+      * several legal clipboard format values defined within FreeRDP, such as
+-     * CB_FORMAT_TEXT.
++     * CF_TEXT.
+      */
+     int requested_clipboard_format;
+ 
diff --git a/net-misc/guacamole-server/files/guacamole-server-0.9.9-glyph-order.patch b/net-misc/guacamole-server/files/guacamole-server-0.9.9-glyph-order.patch
new file mode 100644
index 000000000000..70bba86d9000
--- /dev/null
+++ b/net-misc/guacamole-server/files/guacamole-server-0.9.9-glyph-order.patch
@@ -0,0 +1,24 @@
+--- guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.c~	2015-02-04 05:58:22.000000000 +0000
++++ guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.c	2015-03-17 14:04:45.549617112 +0000
+@@ -126,7 +126,8 @@ void guac_rdp_glyph_free(rdpContext* con
+ }
+ 
+ void guac_rdp_glyph_begindraw(rdpContext* context,
+-        int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor) {
++        int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor,
++        BOOL fOpRedundant) {
+ 
+     guac_client* client = ((rdp_freerdp_context*) context)->client;
+     rdp_guac_client_data* guac_client_data =
+--- guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.h~	2015-02-04 05:58:22.000000000 +0000
++++ guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.h	2015-03-17 14:05:27.929142981 +0000
+@@ -53,7 +53,8 @@ void guac_rdp_glyph_new(rdpContext* cont
+ void guac_rdp_glyph_draw(rdpContext* context, rdpGlyph* glyph, int x, int y);
+ void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph);
+ void guac_rdp_glyph_begindraw(rdpContext* context,
+-        int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor);
++        int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor,
++        BOOL fOpRedundant);
+ void guac_rdp_glyph_enddraw(rdpContext* context,
+         int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor);
+ 
diff --git a/net-misc/guacamole-server/files/guacd b/net-misc/guacamole-server/files/guacd
new file mode 100644
index 000000000000..64aa93fd0678
--- /dev/null
+++ b/net-misc/guacamole-server/files/guacd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON="/usr/sbin/guacd"
+PIDFILE="/run/guacd/guacd"
+
+depend() {
+    use net
+}
+
+start() {
+    checkpath -q -d -m 0755 -o guacd:guacd /run/guacd/
+    ebegin "Starting guacd"
+    start-stop-daemon --start --user guacd:guacd --exec "${DAEMON}" -- -p "${PIDFILE}"
+    eend $? "Failed to start guacd"
+}
+
+stop() {
+    ebegin "Stopping guacd"
+    start-stop-daemon --stop --pidfile "${PIDFILE}"
+    eend $? "Failed to stop guacd"
+}
diff --git a/net-misc/guacamole-server/files/guacd.service b/net-misc/guacamole-server/files/guacd.service
new file mode 100644
index 000000000000..547dc030259d
--- /dev/null
+++ b/net-misc/guacamole-server/files/guacd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Guacamole proxy daemon
+Documentation=man:guacd(8)
+
+[Service]
+ExecStart=/usr/sbin/guacd -f
+StandardOutput=null
+User=guacd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild b/net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild
new file mode 100644
index 000000000000..60d3b04ba27e
--- /dev/null
+++ b/net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole"
+
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="multilib pulseaudio rdp ssh ssl telnet vnc vorbis"
+REQUIRED_USE="multilib? ( ssl )"
+
+RDEPEND="
+	x11-libs/cairo
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	dev-libs/ossp-uuid
+	rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20150312:= )
+	ssh? (
+		x11-libs/pango
+		net-libs/libssh2 )
+	telnet?	(
+		net-libs/libtelnet
+		x11-libs/pango )
+	vnc? (
+		net-libs/libvncserver[threads]
+		pulseaudio? ( media-sound/pulseaudio ) )
+	ssl? ( dev-libs/openssl:0= )
+	vorbis? ( media-libs/libvorbis )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# From Fedora for compat with newer freerdp
+	"${FILESDIR}"/${P}-glyph-order.patch
+	"${FILESDIR}"/${P}-clipboard-id-update.patch
+)
+
+src_configure() {
+	local myconf="--without-terminal --without-pango"
+
+	if use ssh || use telnet; then
+		myconf="--with-terminal --with-pango"
+	fi
+
+	econf ${myconf} \
+		$(use_with ssh) \
+		$(use_with rdp) \
+		$(use_with vnc) \
+		$(use_with pulseaudio pulse) \
+		$(use_with vorbis) \
+		$(use_with telnet) \
+		$(use_with ssl)
+}
+
+src_install() {
+	default
+	doinitd "${FILESDIR}/guacd"
+	systemd_dounit "${FILESDIR}/guacd.service"
+}
+
+pkg_postinst() {
+	enewgroup guacd
+	enewuser guacd -1 -1 -1 guacd
+}
diff --git a/net-misc/guacamole-server/metadata.xml b/net-misc/guacamole-server/metadata.xml
new file mode 100644
index 000000000000..4d42c6188d3d
--- /dev/null
+++ b/net-misc/guacamole-server/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nativemad@gentoo.org</email>
+		<name>Andreas Schuerch</name>
+	</maintainer>
+	<longdescription>
+		This is the proxy-daemon for vnc, ssh and rdp connections used by www-apps/guacamole.
+	</longdescription>
+	<use>
+		<flag name="ssh">enable support for ssh connections</flag>
+		<flag name="telnet">enable support for telnet connections</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">guacamole</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
new file mode 100644
index 000000000000..c63409ebeb93
--- /dev/null
+++ b/net-misc/gupnp-tools/Manifest
@@ -0,0 +1,7 @@
+DIST gupnp-tools-0.8.13.tar.xz 560756 SHA256 aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed SHA512 1616348b21ebce98253168e328239cbe113fa7f22b3fb1a771ab8d08f1aa5b2cf89c1f6c37d9b73dab074c448d90ac1cef546dc1ab221449cd187d0183ab67e0 WHIRLPOOL 21a8578232f86ffb9a61477aa26eb50ed4f2cec79580bdf7071fd8f12223f047173940e33dcc8e2ae9ff9bc1f36bbfd9b0357eb5a3a9e3a71fc600eb8671fe34
+DIST gupnp-tools-0.8.14.tar.xz 558552 SHA256 682b952b3cf43818c7d27549c152ea52e43320500820ab3392cf5a29a95e7efa SHA512 746f12728c7d06d6fb2cab3f015c5d145ba8df45fb0ca8462a0d1c53db081f62ae7c39001604e73c2596f1584318680bf387a6f7751af7146b2b9c5c28651739 WHIRLPOOL 3e9ce7164aedb78a3fca092041a7dffa4a6bfa66362a596684fc42f415d4c71624da01f8d71f7c8817fc213c345cfc582b819a2b025edb0ae68b96cb04d907d0
+EBUILD gupnp-tools-0.8.13.ebuild 614 SHA256 b5a2e8998f0c3ad0cd258a969e18059ed59bfc3101ceab4c191d410cff591199 SHA512 8a4e2c83c8b6daed9bb3ea32e77411b9648f0fc9dbf07e032e9c0d2fd92e8da27301712b793f94e052750a6e53e96aaafe24f7ccbd3e4cfe7ad07fac68d7868d WHIRLPOOL 37128affa2f56d702990abaf1627dadb659d52eb0916aa5e7f7cc8b5a1bbd7497e7fc6f74fd5b635e29096fb6af7415b20653a789a58c88cb53714a4c5faa6be
+EBUILD gupnp-tools-0.8.14.ebuild 616 SHA256 32ad94aa253ee57c8afeb854d8f54e853ba63f1ff3741edcb891d1ac9963487f SHA512 ff87c456632a3af66de8c2ff348bea293318c00b240c1db927bed05892891fce3f5a8bb824b4d2ae3021465a62a2fcfbca7af9d38fa32fc5ef8fe09182763ccb WHIRLPOOL a7efc6c066c950ae90db99514fc0a1aaa94036727551c9ae31194727e63c1f85841efee383ad33a4bb4774bb467b883a7e99f7ad739cd80402d8ca96a98c13ae
+MISC ChangeLog 4818 SHA256 fb770beb64a2f0134a6a28460564e9ee6e4b91ae61626ec0b2d2a16efc503c01 SHA512 b8949ff2d2d1b7c68e324df7beb8d008f149c3be7debcf4bb8782d925fdae9450a9938d5c3db467b8efdb08a2376a90eb630db1829d4b48a4eab0a85e66b6076 WHIRLPOOL fe7cbb7f292962b876d19623675b3e1feab73b884588f21acafa9b68ecbbd19f1f5154f65e54ebf08690f9143f1c8f839e70dae1cbef0a6d2f8e86675de13daf
+MISC ChangeLog-2015 3288 SHA256 fd969be24cd7de51d05a7a26651f20a8811e00928f46fc4bc5936df1b826ef2f SHA512 955caf63ccfa201ade3d41f98aa67a509855da1620eee562605948ad7f3f5f315e7a3c0bd3e739f081e2c9cd5682da1416881fe4481b658017549406186f4a45 WHIRLPOOL cd92b461515527b06976195be8b4767f03932d9582ea0f53132a960184f2fe7b15ba57d9b6a653c30782167aea0df386fa510ab718122255e45a9e3a9bc21d62
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.8.13.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.8.13.ebuild
new file mode 100644
index 000000000000..36f012ae841b
--- /dev/null
+++ b/net-misc/gupnp-tools/gupnp-tools-0.8.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit gnome2
+
+DESCRIPTION="Free replacements of Intel UPnP tools that use GUPnP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.24:2
+	>=dev-libs/libxml2-2.4:2
+	>=net-libs/gssdp-0.13.3:0=
+	>=net-libs/gupnp-0.20.14:0=
+	>=net-libs/gupnp-av-0.5.5:0=
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-libs/gtk+-3.10:3
+	>=x11-libs/gtksourceview-3.2:3.0
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild
new file mode 100644
index 000000000000..208799cca94a
--- /dev/null
+++ b/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit gnome2
+
+DESCRIPTION="Free replacements of Intel UPnP tools that use GUPnP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.24:2
+	>=dev-libs/libxml2-2.4:2
+	>=net-libs/gssdp-0.13.3:0=
+	>=net-libs/gupnp-0.20.14:0=
+	>=net-libs/gupnp-av-0.5.5:0=
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-libs/gtk+-3.10:3
+	>=x11-libs/gtksourceview-3.2:3.0
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
diff --git a/net-misc/gupnp-tools/metadata.xml b/net-misc/gupnp-tools/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/net-misc/gupnp-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/gvrpcd/Manifest b/net-misc/gvrpcd/Manifest
new file mode 100644
index 000000000000..b29f8d9c0dde
--- /dev/null
+++ b/net-misc/gvrpcd/Manifest
@@ -0,0 +1,8 @@
+AUX conf.gvrpcd 132 SHA256 56693e8d6c4d97dfcef3d56cef5b60c5ea5010da5335a8b8af431d90ee4c729f SHA512 1b8e5eaef65c4140eb681d8047e2c38c67b6c3895d89b6d809554785f7542764126e43a38a90177805b1c181e168d8896656bc35fbec036e1b30ac1ba51837d0 WHIRLPOOL a85e196e0fe7b0898e9f3b81c7d934e0fbb835bd4d0ec31ef2bd50e3cbd105e3c2ab1b1cc76f58c5662965b05b830fab8a16549bd949a23839b1ed989c922b57
+AUX gvrpcd-respect-ldflags.patch 465 SHA256 b01266572c2c81c1b6c376dec89f32f89853a72d619b293278035e377a28d3df SHA512 c0d0230ed35ca4fb421e4b65333bdef6cb4e5dde954d95b1f56d9bea0b33f6353969294bb30e4c231580d946c65632c49f06eda98fa41064fef6ff12349f2507 WHIRLPOOL 6d676f3e80f2b9f2e556239c93a97e3154141188f150cbc0c5da220e243fb0894c2f04fbf169d156b79e187bcb64043573274fd34aa261578dd47d6cad6012db
+AUX init.gvrpcd 1055 SHA256 427223e41fd8361274f4bc06ab23e0b3cfbbeb7e46719ef2100cad6632ae8b1f SHA512 57fcd87fa6e209907352bd85984120ce2cdcd73cf008f41dab34d0b739d014229d10976416d0c6d4b154b81e36c6ac2e9cc961b79cf3e507a4b9d70d039ecaa7 WHIRLPOOL 98e8778e7593a0c2758b2af706d4e4c501ebefc12cc0228aad4f365942b6cf11c57c37e747607e47a4fbe92648653f2b4bbd0cd3cb988a5827dd002a2e83b3de
+DIST gvrpcd-1.3.tar.gz 12066 SHA256 9069e3f97478498b849122c8306fdb76879bb7010fb2a393f815a8e74d3a1209 SHA512 53f2ad4c9ce5ee2bbf72c691ca0ea1d3d2e22dba98c18cdcbecc09c9082427f8ebc83277b4ffc40fd693652c932a4c093512f99157e82d5a3b97bb6f3d8ff444 WHIRLPOOL 4908bbff6aba30ed406483b541702dff03c3387f8415567fd40cb3520ae58608546a826eb688a558866320e8b19a572d9033ae879e52953737bfcc0d659950f4
+EBUILD gvrpcd-1.3.ebuild 737 SHA256 f14c4ef328a60efed8c819b2f143b53f333fdc8d183541acb5c46510bea88ad4 SHA512 ee9de9b7741ec07bedcabe3d800f33de9feadefcc208087020f4baa670805c2927c738e0b08dad0824c4f7afd5ea8768d8f0cbd64f0c0d51e9d201e3cfec02a6 WHIRLPOOL 058e829f24c8e34f51ce933eda56ed447aa3bd9bd35908be7f13dbadd76254ba1988606332a3758f66db863ff2c805e368a813c998e93562ff5f99948e5e2ceb
+MISC ChangeLog 2627 SHA256 93f8d5c6f8a851eb045793594b5c37131ae3bcb9efdaa4ba8814d58499707617 SHA512 be3e59aa7e3da61a6047724b3edcf307fd5a86419fd98dab25fa5ea37626af8bcde687736f96b475747f219147226632c47ac69188f9f501a1cc6425cccaadc9 WHIRLPOOL ff8006e686611c23e0ca73c81a75bc503901768d71485b0ef07b9fe90eb2763d7cbb70171ba26c8c910ac2ea95c50fb0b62b30d9c38661f2b844c9426e4edc08
+MISC ChangeLog-2015 624 SHA256 9614b7ca5801254bef30f9f6941c2498a88539b25eb23a241a8edfccc27188ec SHA512 0e3923cc9ce3bca600286be3186d48668bb35887940caa399e7040d0506a784f14a5cf1e87888c43779b1151e0e20edeaf763beae924277e0a3a7ae67168321a WHIRLPOOL bb13fb169440a454cbdbb27d6da04ebea0562f4db2b6aa753669bcc4bfffd3e373adeb61f02cf8fa0eae274a3aa3ff701a95ff87151643a2e2b77bf953e29a1b
+MISC metadata.xml 483 SHA256 dcffe3d623b50010f6a64480700aa741e96649530b95591bad80493caefb76e6 SHA512 cab674a9dd6cd23a1be6b39c0d336053c4aedb85e46757b635c5842d28add4e526ccc3609065017384485cefae32f155e7e325728078f5b0f88abd2e0885185d WHIRLPOOL c9592d2c9e098f8d2aad96a1f53ed9b88d07761bbbb058a026348cf3de16a0a7848f21f83172bbab809cb4587b5ad04fb55cb7701b771301eb0045fc77e1f6a3
diff --git a/net-misc/gvrpcd/files/conf.gvrpcd b/net-misc/gvrpcd/files/conf.gvrpcd
new file mode 100644
index 000000000000..f7105124728a
--- /dev/null
+++ b/net-misc/gvrpcd/files/conf.gvrpcd
@@ -0,0 +1,6 @@
+# On which interfaces should listen gvrpcd?
+INTERFACES="eth0"
+
+# Extra arguments. See gvrpcd -h for additional info.
+EXTRA_ARGS=""
+
diff --git a/net-misc/gvrpcd/files/gvrpcd-respect-ldflags.patch b/net-misc/gvrpcd/files/gvrpcd-respect-ldflags.patch
new file mode 100644
index 000000000000..22dde710b048
--- /dev/null
+++ b/net-misc/gvrpcd/files/gvrpcd-respect-ldflags.patch
@@ -0,0 +1,17 @@
+--- a/Makefile	2012-09-23 16:31:55.761755338 +0400
++++ b/Makefile	2012-09-23 16:32:46.159759345 +0400
+@@ -1,4 +1,4 @@
+-LDFLAGS = -lnet
++LIBS = -lnet
+ TGTS = gvrpcd
+ 
+ all: $(TGTS)
+@@ -8,7 +8,7 @@
+ # gvrpcd.c:(.text+0x228): undefined reference to `libnet_init'
+ # But after moving LDFLAGS to end of the line, works just fine. Sigh...
+ gvrpcd: gvrpcd.c
+-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ clean:
+ 	rm -f $(TGTS) *.o
diff --git a/net-misc/gvrpcd/files/init.gvrpcd b/net-misc/gvrpcd/files/init.gvrpcd
new file mode 100644
index 000000000000..edef1f39f608
--- /dev/null
+++ b/net-misc/gvrpcd/files/init.gvrpcd
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_commands="checkconfig"
+
+checkconfig() {
+	if [ -z "${INTERFACES}" ]; then
+		eerror "INTERFACES should be set. PLease edit /etc/conf.d/gvrpcd"
+		return 1
+	fi
+	if [ ! -d /proc/net/vlan ]; then
+		modprobe 8021q
+		if [ ! -d /proc/net/vlan ]; then
+			eerror "VLAN (802.1q) support is not present in this kernel"
+			return 1
+		fi
+	fi
+}
+
+depend() {
+	need net
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting gvrpcd"
+	for IFNAME in ${INTERFACES}; do
+		ebegin "	on interface ${IFNAME}"
+		start-stop-daemon --start \
+			--pidfile /var/run/gvrpcd-${IFNAME}.pid \
+			--exec /usr/sbin/gvrpcd \
+			-- -d -p /var/run/gvrpcd-${IFNAME}.pid \
+			-i "${IFNAME}" ${EXTRA_ARGS}
+		eend $?
+	done
+#	eend $?
+}
+
+stop() {
+	ebegin "Stoping gvrpcd"
+	for IFNAME in ${INTERFACES}; do
+		ebegin "	on interface ${IFNAME}"
+		start-stop-daemon --stop --exec /usr/sbin/gvrpcd \
+			-p /var/run/gvrpcd-${IFNAME}.pid
+		eend $?
+	done
+#	eend $?
+}
+
diff --git a/net-misc/gvrpcd/gvrpcd-1.3.ebuild b/net-misc/gvrpcd/gvrpcd-1.3.ebuild
new file mode 100644
index 000000000000..f3f5ec854595
--- /dev/null
+++ b/net-misc/gvrpcd/gvrpcd-1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils linux-info toolchain-funcs
+
+DESCRIPTION="A program for announcing VLANs using GVRP"
+HOMEPAGE="http://sokrates.mimuw.edu.pl/~sebek/gvrpcd/"
+SRC_URI="http://sokrates.mimuw.edu.pl/~sebek/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-libs/libnet:1.1"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~VLAN_8021Q ~VLAN_8021Q_GVRP"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-respect-ldflags.patch"
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin gvrpcd
+	dodoc README
+	newinitd "${FILESDIR}"/init.gvrpcd gvrpcd
+	newconfd "${FILESDIR}"/conf.gvrpcd gvrpcd
+}
diff --git a/net-misc/gvrpcd/metadata.xml b/net-misc/gvrpcd/metadata.xml
new file mode 100644
index 000000000000..b326bd295ec3
--- /dev/null
+++ b/net-misc/gvrpcd/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/gwget/Manifest b/net-misc/gwget/Manifest
new file mode 100644
index 000000000000..4a15a3983cb8
--- /dev/null
+++ b/net-misc/gwget/Manifest
@@ -0,0 +1,7 @@
+AUX gwget-1.0.4-glib-single-include.patch 362 SHA256 014b44eed660837559e02e5f7047bf0027552dda1f0169676b37892a81a9157f SHA512 84bbe5d8f5f5add2a21623f8334d222e85b521dbcdc536833a327e35bd02a46726575b5fdab08939f233f2f744ef18fe66eb5f034dbbebdb73f5b18338e6938c WHIRLPOOL 9a9ef68894ab503dbc579f6276495adc4008b26c85edfc39f4d1e06a2a7407e819a887ce08d0447a69d35b108a39a29501e2079080acd1ef2f0272a1862fbae9
+AUX gwget-1.0.4-libnotify-0.7.patch 915 SHA256 c41b7959daeb796a4ffe7c386fe7f0ca433135c654ace4a2a2b2e8dcdcbcf9fc SHA512 475ea6e694d95d80629eb1e9283ebcbd3d830af9083fa918fcd77588cb56f14b7f0c6d62fe279538a22c030e7bb12c9f122e7a98dc5b3ef79cfc000a1bf7baa1 WHIRLPOOL da1099d7ec898b153da160316ff5ad2b6e2555821df62ae33aa8acdd48bce9cc05818fb583f2acedafd50107ac676f933361db49886ab17796e3fcf895b4de19
+DIST gwget-1.0.4.tar.bz2 444843 SHA256 a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f SHA512 fab9d5eb4e6fd9d061a51848d7f4df9a44925ef8c74386753a7250c4d92b0c95419a8355acf83611c83838e87d906613659e146132a086ada0bdb69cc2ac13cd WHIRLPOOL 1179c07d3330611573c9cfe61d0380289a4f71a7d1b6bafc02e111cc8964acf4c25c6fa5b0801fca4c4fc7e5b94428ca13745eba9bf9e8836da6b1324acf6fdd
+EBUILD gwget-1.0.4.ebuild 1119 SHA256 697f258ce6f6a6bc512936ee97fcc5e3083042a81c02932f283c4a0dee25edeb SHA512 d57479967c3f153fa699ddfc425a86e7b3eb26d39176653ce064e67e2deb1a0d1c52381340266d43c4380551682bee123bd2dfea7be539c4e5c91971eca245fc WHIRLPOOL 90329c2243a5a9d1839a7ec9119a2c54d8ba317309ccb465431c321d787ea3a250e4f63484214c75a8b01eb246f06780f32860c33ab91e15afab366f08eec85b
+MISC ChangeLog 2832 SHA256 5c9e2f5c7fac31e62a2251810ec501971ab55d3efe5f76d1945c7906c4851b59 SHA512 52b7594b32eb869db9c7915076803a594cf541a508c3c51d7cf80b9bd189c9ee5da5ee5f5afee982c2f8b13edc1339ee93758b863bc5d1edbbcc505025d2a6b6 WHIRLPOOL efc0afb2f37b0c9be6df8f1ac8e1b46877006794ae62f3d4c6ead9517828271afbad001f3ea266c9c85b82574e68df999a781ba3bc459ee3d926cc9890601306
+MISC ChangeLog-2015 5560 SHA256 03dece437f8f79fe5cdc11ff4ca929dd464bbb8c0dfd4778e493988b7ed1b143 SHA512 50bc2061f972ccfc7cb4245983b4b9f4fe8735093af9c6cb334ce923aeaa370e5cc8291efc0afbe930a1183e25d005691c6384a03e1a1e27e1d19e14c949bdbe WHIRLPOOL 5dbd43d88f50aac11219ee5873b0c0decbd4cd9758d9eea3c287df598f6153e6b52a3c2f581d552e020d6794fe5b34090b80ca99169d7487958d38ccfeddc4d2
+MISC metadata.xml 1245 SHA256 904a409eb9c089f9befea8ba9bb075731dbd5686efe5546ed5cd84caa7c5b92a SHA512 5198416ddc65e2da2f2f883b955d51b78a8443e129c7fc9f40f0a5dc86f12e7b0f2ca1a2b29f827afe9e6507971876cf4f76db1aee4ce8bb08a83fa7a7987555 WHIRLPOOL 350a5685dbd3b98a98fa5d0c191bf0beaf9a999b83ab4fe91a1377b2bc624ca7b4a5bcca763eafc036b4296f8a51e5753ab8a082d9e5f71f17c7bddc06945f92
diff --git a/net-misc/gwget/files/gwget-1.0.4-glib-single-include.patch b/net-misc/gwget/files/gwget-1.0.4-glib-single-include.patch
new file mode 100644
index 000000000000..a5cf4ee995bc
--- /dev/null
+++ b/net-misc/gwget/files/gwget-1.0.4-glib-single-include.patch
@@ -0,0 +1,13 @@
+Index: gwget-1.0.4/src/gwget-application.h
+===================================================================
+--- gwget-1.0.4.orig/src/gwget-application.h
++++ gwget-1.0.4/src/gwget-application.h
+@@ -18,7 +18,7 @@
+ #ifndef GWGET_APPLICATION_H
+ #define GWGET_APPLICATION_H
+ 
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <glib-object.h>
+ 
+ G_BEGIN_DECLS
diff --git a/net-misc/gwget/files/gwget-1.0.4-libnotify-0.7.patch b/net-misc/gwget/files/gwget-1.0.4-libnotify-0.7.patch
new file mode 100644
index 000000000000..8cecc197814b
--- /dev/null
+++ b/net-misc/gwget/files/gwget-1.0.4-libnotify-0.7.patch
@@ -0,0 +1,29 @@
+--- a/src/systray.c
++++ b/src/systray.c
+@@ -6,6 +6,12 @@
+ #include "systray.h"
+ #include "main_window_cb.h"
+ 
++#ifdef HAVE_NOTIFY
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++#endif
++
+ static GdkPixbuf *systray_load_icon (const gchar *filename);
+ static GdkPixbuf *systray_pixbuf_new_from_file(const gchar *filename);
+ static void systray_clicked(GtkStatusIcon *status_icon,guint button,guint activate_time,gpointer user_data);
+@@ -224,7 +230,12 @@
+        		if (!notify_is_initted ())
+ 			if (!notify_init ("gwget"))
+ 		               return;
+-       NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name,NULL);
++       NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++       );
++#else
++       ,NULL);
++#endif
+        notify_notification_show(notification,NULL);
+ #endif
+ 
diff --git a/net-misc/gwget/gwget-1.0.4.ebuild b/net-misc/gwget/gwget-1.0.4.ebuild
new file mode 100644
index 000000000000..1a843450cdef
--- /dev/null
+++ b/net-misc/gwget/gwget-1.0.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="GTK2 WGet Frontend"
+HOMEPAGE="https://gnome.org/projects/gwget/"
+
+KEYWORDS="amd64 ppc x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="epiphany libnotify"
+
+# FIXME: dbus should be optional
+#        needs patching for linguas/intltool
+RDEPEND="
+	net-misc/wget
+	>=x11-libs/gtk+-2.6:2
+	>=dev-libs/glib-2.16.0:2
+	>=gnome-base/gconf-2:2
+	>=gnome-base/libgnomeui-2
+	>=dev-libs/dbus-glib-0.70
+	epiphany? ( >=www-client/epiphany-1.4 )
+	libnotify? ( >=x11-libs/libnotify-0.2.2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35.0
+	>=sys-devel/gettext-0.10.4
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libnotify-0.7.patch
+	"${FILESDIR}"/${P}-glib-single-include.patch
+)
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable epiphany epiphany-extension) \
+		$(use_enable libnotify) \
+		--disable-static
+}
+
+src_install() {
+	gnome2_src_install
+
+	# remove /var/lib, which is created without any reason
+	rm -rf "${D}"/var || die "rm failed"
+}
diff --git a/net-misc/gwget/metadata.xml b/net-misc/gwget/metadata.xml
new file mode 100644
index 000000000000..25e77310cc10
--- /dev/null
+++ b/net-misc/gwget/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription>Gwget2 is a gtk2 front-end for the wget program. Wget is commonly used for retrieving files from the internet, and with an easy to use gtk2 interface, gwget2 brings the utility of wget to the GNOME desktop. Gwget2 supports drag and drop from most gtk2 compatible browsers, as well as the ability to pause and continue downloads over sessions.</longdescription>
+  <longdescription lang="ja">
+Gwget2 は wget プログラムの GTK2 フロントエンドです。wget とはインターネットからファイルを回収するのに一般的に
+使われているもので、gwget2 はGNOME デスクトップへ wget ユーティリティを統合し、GTK2 インターフェイスで使い易くします。
+Gwget2 は GTK2 互換のブラウザからのドラッグ・アンド・ドロップ及びセッションを越えた停止と再開をサポートします。
+</longdescription>
+  <use>
+    <flag name="epiphany">Build epiphany extensions</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
new file mode 100644
index 000000000000..2088dcd592a2
--- /dev/null
+++ b/net-misc/gwhois/Manifest
@@ -0,0 +1,6 @@
+AUX gwhois.xinetd 305 SHA256 5b181e76750645b06c7aa4bcd0f41ac3e759f7ca2f03e6002d8ed91e6ee65540 SHA512 33afac83df9f8d53b54144358cd50b1ea40e266fd5438d1f8a32954c4f05cdb608b5ebc688673f1866ac76e59dfb0b097884bb38077e50061639152899d68460 WHIRLPOOL 98afeb9cffa31e544f11d1dc4497b4dfd6db0c481386d85c9e6c40461395e9ce23ac8f3e751bd096b34d23af93e3a8f4c83d608b65aab050e5daff29d32d7dca
+DIST gwhois_20120626.tar.gz 41698 SHA256 8d72f3228ff3f4334d8d9455434fdf38284c3f6db70de815a387f19b28bcefd6 SHA512 8ffaa611389929435f70d3f020e28249e6e3109c4e822e9318b050f52cf09d6934adbb14ab67a6361574ce8645656d5eaf24808dea453f2187352fc2b2513e0e WHIRLPOOL 1aede56813b9eec3e37c425b267b8894fdf14cc3a24af281c325efbe93a9688de72821a15d7e5517d1f1134b02625251ed273298c5d71f862084f6ab3c425c2e
+EBUILD gwhois-20120626.ebuild 1168 SHA256 99a44160d07c765f681cbd2a6fa008eeea32795c90855cfe93b900a9947a8001 SHA512 b00cf5d6afdff787d090adbdaa75fda4add2f5daa07b70f1d7f428aaf797eb69b4894579c264b18dfe703a30c2d729a38809fb78a58b0eeb1854b25f45812692 WHIRLPOOL c0b1fa2cb9b5d001ef33cc3504603389a8183e3f700c699e7536edf9f10d6fad268f31d89b4c4c7ee8cd45e359749799796cca2d1fbe8b0710b3168f877d9a02
+MISC ChangeLog 2201 SHA256 2226c19a81ab9f1c47485274a4ffd1aad5020be8b8f2b4d28ed68a0223626974 SHA512 656ba19ec4da67757f29253933daa0282b73687db34327dcf5fbd68853dbdf66f22ef98cc8cd41d3b837dc6848ad6d032e876bc27b97255c061d9f8a45fcf815 WHIRLPOOL e76499358cd6bd32fc9ef71ab12cefaf49ef5c6b9429cfe97179db6c1eb3817960c7dec3610a050c185727911bf09b95a5afc59278a3648aa5f671bfbeb1374e
+MISC ChangeLog-2015 7566 SHA256 92a69218680308be9665cb8999365341ac6d2b0a090f15cb090ae8c1a3ddf7a2 SHA512 8e6e272402e9749d1d9f6faa54656cc69104d6dbf69a0549b7222134a5cacdaf8971c911e664b6fbf2a0640140146e9c763736db9b50ff1a93d0c1d7da1aae00 WHIRLPOOL 8a09745525a577c616ac37088eca65877d4f2e3d59c61670cb4eb98e84ab085a0ed5559e292cfc69fa1e22025bb38a819376a92220a62c9cbc051c463bd02b31
+MISC metadata.xml 656 SHA256 a1a83e768197800a76ad832e54f6c5371a87c0f6af603e6eb3b487c1d8540878 SHA512 8e5316be51de79a5ec0bcebae33a202a1f9ffc1f1d58f10fd7d4ef2a7e32559ed690d07454bc3720b1ae69531ae3aef6c967f30c8554cd51b2527621cfd601ec WHIRLPOOL 898a9684a2935aa69747cb99fc724cc7685929caf225be6c9c1b96900a57b06f10cd92a4d8604b3a73e61879a06fbdf2459653de4026dff7ebb3456737f7ac85
diff --git a/net-misc/gwhois/files/gwhois.xinetd b/net-misc/gwhois/files/gwhois.xinetd
new file mode 100644
index 000000000000..b518371dd9df
--- /dev/null
+++ b/net-misc/gwhois/files/gwhois.xinetd
@@ -0,0 +1,18 @@
+## whois service
+service whois
+{
+	disable = no
+	socket_type = stream
+	protocol = tcp
+	port = 43
+	wait = no
+	user = gwhois
+#	group = 
+	server = /usr/bin/gwhois
+#	server_args = 
+	only_from = 0.0.0.0
+	instances = 20
+	log_on_success += PID HOST DURATION USERID EXIT
+	log_on_failure += HOST USERID
+	nice = 5
+}
diff --git a/net-misc/gwhois/gwhois-20120626.ebuild b/net-misc/gwhois/gwhois-20120626.ebuild
new file mode 100644
index 000000000000..dea737cfdd30
--- /dev/null
+++ b/net-misc/gwhois/gwhois-20120626.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+MY_P=${P/_p/.}
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="generic whois"
+HOMEPAGE="http://gwhois.de/"
+SRC_URI="http://gwhois.de/gwhois/${MY_P/-/_}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="www-client/lynx
+	net-misc/curl
+	dev-lang/perl
+	dev-perl/libwww-perl
+	dev-perl/Net-LibIDN"
+
+src_install() {
+	dodir /etc/gwhois
+	insinto /etc/gwhois
+	doins pattern
+	dobin gwhois
+	doman gwhois.1
+	dodoc TODO "${FILESDIR}/gwhois.xinetd" README.RIPE
+	einfo ""
+	einfo "See included gwhois.xinetd for an example on how to"
+	einfo "use gwhois as a whois proxy using xinetd."
+	einfo "Just copy gwhois.xinetd to /etc/xinetd.d/gwhois"
+	einfo "and reload xinetd."
+	einfo ""
+}
+
+pkg_postinst() {
+	if [ -f /etc/gwhois/pattern.ripe ]; then
+		ewarn ""
+		ewarn "Will move old /etc/gwhois/pattern.ripe to removethis-pattern.ripe"
+		ewarn "as it causes malfunction with this version."
+		ewarn "If you did not modify the file, just remove it."
+		ewarn ""
+		mv /etc/gwhois/pattern.ripe /etc/gwhois/removethis-pattern.ripe
+	fi
+}
diff --git a/net-misc/gwhois/metadata.xml b/net-misc/gwhois/metadata.xml
new file mode 100644
index 000000000000..00c016332670
--- /dev/null
+++ b/net-misc/gwhois/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>wschlich@gentoo.org</email>
+	<name>Wolfram Schlich</name>
+	<description>Primary maintainer</description>
+</maintainer>
+<longdescription>
+gwhois is a generic whois client which can be used as a commandline
+whois client or as a whois proxy service using (x)inetd
+</longdescription>
+<longdescription lang="ja">
+gwhois は (x)inetd 経由のプロクシ・サービスとして利用できるコマンド
+ライン操作の一般的 whois クライアントです。
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/haeredes/Manifest b/net-misc/haeredes/Manifest
new file mode 100644
index 000000000000..0d8eb8e84465
--- /dev/null
+++ b/net-misc/haeredes/Manifest
@@ -0,0 +1,4 @@
+DIST haeredes-0.4.4.tar.gz 19382 SHA256 bdc2446b176c50d4f0fb5a52aaa7c0f4369999adc50be74935bea59a5f2964ac SHA512 4e8da1141daafe9ba2190f28d14eb19c8bf929c2ea225a06b7961ad378d688f8a191a8304c8390574e9ca7a28ec9b0a265ca2ef6f736dec0d245ab4baed0a57a WHIRLPOOL f48e76ec7266685b51f86c9aad1bda1ad9a901649829eb5bfcbd3ad159b4578336ceddfab6485d30ffd81f701587fdb09ca404bbedf6b2df3b2455941ee73fa2
+EBUILD haeredes-0.4.4.ebuild 887 SHA256 459935ad58b358a38895be31a8d25621222d5f6cb4b4ab8db8bff3f03350277d SHA512 fb951122c4af7d9ec9041cdfe12cd4d8ac3f1121b218226e616a99977a453132975c2e477fc779699325f05c78860bc7cfb118c3e440b3d3f66aacf65ac10ff6 WHIRLPOOL 67ba7cec16e19ed160737ca7802f1c99417718025f1e9224ba046445505bd7aebda96a20ada0a880250b2132c81e67ff5c01b6902d4012fae2187a48c60533a9
+MISC ChangeLog 480 SHA256 0dfb496efacb4d20b4a7f0550fdf61dfe5bb127b99c0c790f7d9e3dfedccf69b SHA512 816801ff8fe0d2f95d49a760904f86fd6fa7d58cee3020dacc4d6e8c9d549ceb550b6708b894e7bac2cb8453625f4c3f88c2fdff84b5bfb6b93e52411b4073b4 WHIRLPOOL b27e5b36cbc3bf94e81a36249386dd04eae9cf4d516df210215c34321b398cb67c7aeb52ba58ad1d297cfb2bb34e77ff9861bd3010fbb10b48cc50a22de96c1c
+MISC metadata.xml 252 SHA256 f12a15b7cc3ce0ff76c3dbbeba9d162cac9771fb6ecc0f965a34e93f73e67d52 SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742 WHIRLPOOL b7954a2a1cbccce0641aaf3dd273bf6dc64e7b5d39097eefe4d0c06eacc0b5f310db23e93a0a2fff7c8c735193acb1c5c8d4210bf77e78d457d50d05412796e0
diff --git a/net-misc/haeredes/haeredes-0.4.4.ebuild b/net-misc/haeredes/haeredes-0.4.4.ebuild
new file mode 100644
index 000000000000..92c316ab0de6
--- /dev/null
+++ b/net-misc/haeredes/haeredes-0.4.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Confirm delegation of NS and MX records"
+HOMEPAGE="http://michael.orlitzky.com/code/haeredes.php"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# The only test suite requires network access.
+RESTRICT="test"
+
+RDEPEND=">=dev-haskell/cmdargs-0.10:=
+	>=dev-haskell/dns-1.4:=
+	>=dev-haskell/iproute-1.2:=
+	>=dev-haskell/missingh-1.2:=
+	>=dev-haskell/parallel-io-0.3:=
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/doctest-0.9
+		>=dev-haskell/filemanip-0.3.6 )
+"
+
+src_install() {
+	haskell-cabal_src_install
+	doman "${S}/doc/man1/${PN}.1"
+}
diff --git a/net-misc/haeredes/metadata.xml b/net-misc/haeredes/metadata.xml
new file mode 100644
index 000000000000..45125b9b6e99
--- /dev/null
+++ b/net-misc/haeredes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/hashcash/Manifest b/net-misc/hashcash/Manifest
new file mode 100644
index 000000000000..c75ac44bfbb5
--- /dev/null
+++ b/net-misc/hashcash/Manifest
@@ -0,0 +1,5 @@
+DIST hashcash-1.22.tgz 195193 SHA256 0192f12d41ce4848e60384398c5ff83579b55710601c7bffe6c88bc56b547896 SHA512 b803c27df2acdce70c587d15d4158ca8841328fd89d90213a00be35f7c9f1905db728a785ee70fa43a4262dabe20c3f0a9fff381e3db0d44c3175ca22da5d5c2 WHIRLPOOL 2f353375e5462ad30a3feb549a02ee05e4003833c4c7f8175bb3f6c220fb80e70ed9a698f301e0e7e34cfe7106c8f0b63aff581a5326a880d613e54490bdfeb6
+EBUILD hashcash-1.22-r1.ebuild 680 SHA256 3e54cda17dc5dea43e7a3123a1e246254a92f72ac00520b6c570718672bfc3c7 SHA512 3569402fb73d99146994b9296d3aea50a690a4e3fe6b9fa41dc29166d5459000d4ff50cd7421fbf81a6c634b8a58b4325960d3e825e3eff569049f1d4dd6ecff WHIRLPOOL de9eb8515bedefe7d16461e5a257c6f2360a1108fe226341064a69746c094565b68398c1d311069ce627ec3b975a2b50b008be0092c5949c51ce1dad73f8059a
+MISC ChangeLog 2529 SHA256 a3a002c4c46076b139138c27857c66f5c89319ae8876f4851ec489fced40de1d SHA512 24d2ac75a6969530542e4d05e3e6ba4f3c6f7420aac05bbcd12c0d6c460e581895db6d9194d96bcd2a6a637867ce0d47b8052edfdf72f078b011177771eac062 WHIRLPOOL 97a6eb47646a37d53ff5c31476221afa2ca51f03e52716fdb2b2b669ff4a503a80828a5466d7cabdd73e91509741e968c4d190b8e655c0e8518f70edc11e15a2
+MISC ChangeLog-2015 2709 SHA256 14a4626c5d46c890b584196d536eefb5164e58885bc3967490d133c02a01ef1d SHA512 027baea583a7cec8aeaaedc8a197a2052aa2c957b0ddf3a19b0e4b14f8220ea4e3865151f5ab4403fa7dddb59a93e563a7bd105715b3404ae0966fbe0b960f57 WHIRLPOOL e06731f1502e34fde19b29fde79c700862dc858e19b614033999431c9db7e41ccd599dab8833d03128c41cf1db8672437961a04b3b7d365ed54fc5c761225f4f
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/hashcash/hashcash-1.22-r1.ebuild b/net-misc/hashcash/hashcash-1.22-r1.ebuild
new file mode 100644
index 000000000000..156cc6f24f3b
--- /dev/null
+++ b/net-misc/hashcash/hashcash-1.22-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+IUSE=""
+DESCRIPTION="Utility to generate hashcash tokens"
+HOMEPAGE="http://www.hashcash.org"
+SRC_URI="http://www.hashcash.org/source/${P}.tgz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "/COPT_GENERIC = -O3/d" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" generic || die
+}
+
+src_install() {
+	dobin hashcash
+	doman hashcash.1
+	dodoc CHANGELOG
+	insinto /usr/share/doc/${PF}/examples
+	doins contrib/hashcash-{request,sendmail{,.txt}} \
+		contrib/hashfork.{c,py,txt}
+}
diff --git a/net-misc/hashcash/metadata.xml b/net-misc/hashcash/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/hashcash/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/hath/Manifest b/net-misc/hath/Manifest
new file mode 100644
index 000000000000..47e300cfd262
--- /dev/null
+++ b/net-misc/hath/Manifest
@@ -0,0 +1,6 @@
+DIST hath-0.3.0.tar.gz 27747 SHA256 a1d7e9643a4f09395f1af453beffca2b371c4bac6003ba16fc5aa1b41c6177fe SHA512 424c1f95301160fe17d5358082a52ede90ceac14bf2a57d9e481bfb8c727c8314e47c0e871f4049c051d6f7112aee2c71ca256904fd9203cec9fce0bafcfe740 WHIRLPOOL 3ca66855281f53cc91468067d2ae74552e2670ca8387ad8cf1e45140e083f274cb87b6b52e1643c8ea1d3f14beabed0f53a10216083a9746a83f195888f12d6b
+DIST hath-0.4.1.tar.gz 30470 SHA256 9a2a660739258d4d25e17868f3eea09e21abfd17f58d9a08ac235841fc82c82d SHA512 b834ffa5ce762dd77be2bc8934c6f1287164158b33c6b2b607ea4dd4f12654da6a83128c6b7e269cf8d3ed52ee5904266b09e7ac796e3bf5d5e6abf33e6798aa WHIRLPOOL 07cd2681b7b95e4d898c88b228f3b56ad2d5d36ab2961e3d201f5ac586a8761fd5b98a02285cda4ce5fe91762b237af4eba69d9929fdb12c61a5495f16ba8ebd
+EBUILD hath-0.3.0.ebuild 808 SHA256 6c9f89a5051845c536edec52ef703d257f531aa98d11eb9c4540879ae0950191 SHA512 63947dfa8ecfa3639fbde80fc0d273aba5007fbfe480b10b512a79900a1524c554ddd4bf495745d5a173dd24616ad3889ddeda163e3a665cb509719c2908b18e WHIRLPOOL a8da0fc1c0de51a3cdbd604e9770089a891880749e24c9e2cbcc4fdab597f482a0e2ff49822bd1d58fdaafe5c2022013526056720edc5a8d0656bbd269b3eb9f
+EBUILD hath-0.4.1.ebuild 788 SHA256 90ed2322fae010563ecb5fe9fff8f13bdb89f759c386ec3e85e1b4d39c993507 SHA512 51c76d3a012500e0040084377ba7497530597a3e1e4d173a852b0a1bfdae19d5d98720cd9c22c7bfad05444ed2073380ecf81f02b8ed9781680e1872f5e49782 WHIRLPOOL 26a453e2f3ad1587a2487409285a60d53c5ee528ada124eae2ffa8e36be1cf3ab9ca8a142ba45ff5c9989dd43ec1976d969ff326705c26409dc9c6554ff31dc9
+MISC ChangeLog 471 SHA256 18aecf7fa8253dad97aca6da9954b156ecd5cea325df30c06977fc4b2997be4b SHA512 c09ac10035afd2d9c6d1251f1301dde7722e2ae4f98562d60a0e56fc4d88f1a20edd08d3142cc6cb4043ea45d94aab5cbc812f51c5459c902bfcca9dd7f4de27 WHIRLPOOL 8965f9cbe6d10857352631e991ca518f4b48c96c0c4ede66b0691f3f127fb1e389969af118686446e0173bff556809a7555cdc7b73f6435faf206a413810edbf
+MISC metadata.xml 252 SHA256 f12a15b7cc3ce0ff76c3dbbeba9d162cac9771fb6ecc0f965a34e93f73e67d52 SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742 WHIRLPOOL b7954a2a1cbccce0641aaf3dd273bf6dc64e7b5d39097eefe4d0c06eacc0b5f310db23e93a0a2fff7c8c735193acb1c5c8d4210bf77e78d457d50d05412796e0
diff --git a/net-misc/hath/hath-0.3.0.ebuild b/net-misc/hath/hath-0.3.0.ebuild
new file mode 100644
index 000000000000..4142638aaf6f
--- /dev/null
+++ b/net-misc/hath/hath-0.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hath manipulates network blocks in CIDR notation"
+HOMEPAGE="http://hackage.haskell.org/package/hath"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cmdargs-0.10
+	>=dev-haskell/missingh-1.2
+	>=dev-haskell/split-0.2
+	>=dev-haskell/tasty-0.8
+	>=dev-haskell/tasty-hunit-0.8
+	>=dev-haskell/tasty-quickcheck-0.8.1
+	>=dev-lang/ghc-7.6.1"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( dev-util/shelltestrunner )
+"
+
+src_install() {
+	cabal_src_install
+	doman "${S}/doc/man1/${PN}.1"
+}
diff --git a/net-misc/hath/hath-0.4.1.ebuild b/net-misc/hath/hath-0.4.1.ebuild
new file mode 100644
index 000000000000..36ab7c32af8d
--- /dev/null
+++ b/net-misc/hath/hath-0.4.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hath manipulates network blocks in CIDR notation"
+HOMEPAGE="http://michael.orlitzky.com/code/hath.xhtml"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cmdargs-0.10:=
+	>=dev-haskell/split-0.2:=
+	>=dev-haskell/tasty-0.8:=
+	>=dev-haskell/tasty-hunit-0.8:=
+	>=dev-haskell/tasty-quickcheck-0.8.1:=
+	>=dev-lang/ghc-8:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-util/shelltestrunner )
+"
+
+src_install() {
+	cabal_src_install
+	doman "${S}/doc/man1/${PN}.1"
+}
diff --git a/net-misc/hath/metadata.xml b/net-misc/hath/metadata.xml
new file mode 100644
index 000000000000..45125b9b6e99
--- /dev/null
+++ b/net-misc/hath/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/hlfl/Manifest b/net-misc/hlfl/Manifest
new file mode 100644
index 000000000000..54e6eab17c5b
--- /dev/null
+++ b/net-misc/hlfl/Manifest
@@ -0,0 +1,5 @@
+DIST hlfl-0.60.1.tar.gz 104913 SHA256 5572b42ae5d13fe15b230ff23541c031f4b4ddb5e0082ff772a85e94a5046549 SHA512 713898fe48ac7de65abdf5dfda6ae6224f83f2cc5bcc42b0f822a78438943297d5afa20c660d19c9bd17d204eba50896e81473adb1665c67183a55421ec91fa0 WHIRLPOOL e009d6a0c0b0c5e3088108ae034b247c039fa7671dd8313c55a836c827d924af7757dc7eebf16c33f5f383bd010501f744eee5d2e91de56204e5b5f8b951645a
+EBUILD hlfl-0.60.1.ebuild 710 SHA256 da622d150324b9d77bc44bb5ee1e32f614536aaa37943e50084f7066254a791a SHA512 cb77bfd648bb1f6e7bfbcb55a10200ddbe246e07a3397adb2b018fd0581be4298f679fe1fcd2f77af928014b4fa8e3a91ddf4539690d3146eb29d831ec0de175 WHIRLPOOL fa819df9daf5d62ffa181516d8dea87ffe0e11b32675d197f8db51657bbc8996a3fc5e129c46d0e42f9a83fa57cc8d470bf619ad2f1ad598f1bc025a2d8dac93
+MISC ChangeLog 2515 SHA256 92311813113086098c0ca245be2ce4a76c2c7a54f0f11afd3a89a10a66fe46a3 SHA512 c1f99e62194bb1208d77a6edb183aa3b04db378be6181bc888d6a47fa43e6ab9d5216ae6a821f2a70629dee29b857507000f970089ff7ba6252fe2b278ce8e8e WHIRLPOOL 5007548db5228ff997c0a0de530ef2837278f2992c98af866706cf59893c852913be8a5f4ad234329d638b64e53201e1f3211f5c9af027d2f9c82bc0c564adfe
+MISC ChangeLog-2015 1547 SHA256 90ce259eeabb0e0f21f652c74aa24d2b28fe91118b724a10ab3d59812332de13 SHA512 8f52f721bafe0aac90a11f9d9b39f7055db0c5aeac96ea4bdddc35940a4038f7244ff13e54cdc73a03be4f0ece5565c31d7dcf654c574edcc00798259ca69578 WHIRLPOOL 84c7c5476c90dd0b04931a85e8c9c679f86a1178828de9bff75081ef06c75f4d78993772d4da45326296f1761af4d93c2783755987538f3fc79b7747ffb56e4e
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/hlfl/hlfl-0.60.1.ebuild b/net-misc/hlfl/hlfl-0.60.1.ebuild
new file mode 100644
index 000000000000..3082e5b1e2a7
--- /dev/null
+++ b/net-misc/hlfl/hlfl-0.60.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE=""
+DESCRIPTION="High Level Firewall Language"
+SRC_URI="ftp://ftp.hlfl.org/pub/hlfl/${P}.tar.gz"
+HOMEPAGE="http://www.hlfl.org"
+LICENSE="GPL-2"
+KEYWORDS="~ppc sparc x86"
+SLOT="0"
+
+DEPEND=""
+
+src_compile() {
+	sed -i -e 's:${datadir}/hlfl:${datadir}:' configure
+	econf --datadir=/usr/share/doc/${PF}
+	emake || die
+}
+
+src_install () {
+	dobin src/hlfl
+	doman doc/hlfl.1
+	insinto /usr/share/doc/${PF}
+	doins doc/services.hlfl
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS \
+	TODO doc/RoadMap doc/sample_1.hlfl doc/sample_2.hlfl \
+	doc/test.hlfl doc/syntax.txt doc/sample_3.hlfl doc/CodingStyle
+}
diff --git a/net-misc/hlfl/metadata.xml b/net-misc/hlfl/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/hlfl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/hotot/Manifest b/net-misc/hotot/Manifest
new file mode 100644
index 000000000000..d78f87108877
--- /dev/null
+++ b/net-misc/hotot/Manifest
@@ -0,0 +1,6 @@
+DIST hotot-0.9.8.15_p20150812.tar.gz 1234481 SHA256 e79de77c6176e7af045cecbd787ab8ee5da7a7d779d7b866b7fd5bd8e40b1407 SHA512 8faffd583bc7bc2888acac5b33cf7ede285a5732c7349e9f84acf63788a9a96d6c0de0759605afcacb618d904f1a54e50581684d49bd637acd6036046f28bc7e WHIRLPOOL 7f4f005e745228495f0c0248868d6720a6420eb5c211c84d89a1210ccc7316039f2fa219b1af28cd6ba7ca1d9b9111f1b7585290217c699ff94227aedef73f09
+EBUILD hotot-0.9.8.15_p20150812-r2.ebuild 1198 SHA256 8aa7aa4197b0a68f4f4a10e837e8baaa2249b94c5b952aa9faa93b51d8ce8eca SHA512 3f884a548d773ae567ae902ad78016c9134a62af3e3d4907f7e9674d5e3904f9cd9373e6800b9d07d593cebdcea37fb0b1379b544d628aab2600c1d1fbabeb2c WHIRLPOOL 211c0509568f3c3c989af8f0b5e58ff38fe0fde95d79c489b4ef1d40468ba4d31a8591d18b28a74a4548fdc76a6702f904e898a59bd0e90233a1e44cf3816964
+EBUILD hotot-9999.ebuild 1166 SHA256 f66b810cbb277221376f58af8149b1ded1540308e1d4d4a1df3c86f369963f39 SHA512 e97babaeda233e04ab5fc02855ed43919ecb20d0df196f90ad0b553a6d3c32d67a9e372352c819e1b760c1caa1ea00491d4eaed170e3b917953d42d2f7ac18a0 WHIRLPOOL 59f975bfc3b0e9f03cb6bb6fec6be8945c142ec7e08846c614a32e1715ec83f17c5b4a25db4b94ebb068f713888bb6d3855d930a2ca968f7586fe7f91422ab0b
+MISC ChangeLog 3024 SHA256 b970304daafcc416e8591f43a5c916a5f5f32d22d786bc5ecb95c95646fd5431 SHA512 41ae759b682428a1a6162bb04f0fec095c7a974826501f7b98ebaff53bce94c531951e1a9d07627bda94db4f1689c0280c8d4c2eaa01de4e2bfa3119e9948d5d WHIRLPOOL db23c1b5b0fd301af91154de4410f40ebebd084864f77b22d5908fe05346e08db7d2e9e2e3671de25a40a5f91aa768d4e0aea494d5ed76839791122b1ac7b9bc
+MISC ChangeLog-2015 5597 SHA256 c040f51af2b6888dc4611b80039d9e89478e66d83f9ff909f2333e6182924619 SHA512 47539640e33e4da28666588dc0fd307200ff5162c8c6ed28f8a13bb5aca9b2a3795a074a0eeee8a62a0a425c703a9af230191cee040d45376f02f24e9ca8c429 WHIRLPOOL 45932e1e1c02756ff6fd8dae9ab8e89de1e72affe24f5830c87126278181fb0fdc7cc19aa477d389effb9788fb760e600303d4a71b5b942a311e5de68df5885a
+MISC metadata.xml 396 SHA256 267e8932ff544159d1c5a6ea3af32ecaf4822fd32afc0f5cf4975a6eb1ab9562 SHA512 2211ef5c04c0edbacd653777915b58e1cfdf55040a2242408e8422672ed83daa916132e064e03cb51394da9bc8430d24c8d65084702c3846862f381d89fa3b3a WHIRLPOOL 4a03fa2c5f6f1c775e68f8b63a281b6d77d1060835050e4ee114c088a564f1f767dc092cc36465702515ef10d568c93b78c0ab64a27c717ec32f7392972ad447
diff --git a/net-misc/hotot/hotot-0.9.8.15_p20150812-r2.ebuild b/net-misc/hotot/hotot-0.9.8.15_p20150812-r2.ebuild
new file mode 100644
index 000000000000..a15fe974e0db
--- /dev/null
+++ b/net-misc/hotot/hotot-0.9.8.15_p20150812-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1 vcs-snapshot
+
+DESCRIPTION="lightweight & open source microblogging client"
+HOMEPAGE="http://hotot.org"
+SRC_URI="https://github.com/lyricat/Hotot/tarball/452fc0924a98923b -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="chrome kde qt5"
+
+REQUIRED_USE="|| ( chrome qt5 ) ${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_configure() {
+	mycmakeargs=(
+		${mycmakeargs}
+		-DWITH_CHROME=$(usex chrome)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_QT5=$(usex qt5)
+		-DPYTHON_EXECUTABLE=${PYTHON} )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	find "${D}" -name "*.pyc" -delete
+}
+
+pkg_postinst() {
+	if use chrome; then
+		elog "TO install hotot for chrome, open chromium/google-chrome,"
+		elog "vist chrome://chrome/extensions/ and load /usr/share/hotot"
+		elog "as unpacked extension."
+	fi
+}
diff --git a/net-misc/hotot/hotot-9999.ebuild b/net-misc/hotot/hotot-9999.ebuild
new file mode 100644
index 000000000000..777e7d1e2bcd
--- /dev/null
+++ b/net-misc/hotot/hotot-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 python-single-r1 vcs-snapshot
+
+DESCRIPTION="lightweight & open source microblogging client"
+HOMEPAGE="http://hotot.org"
+EGIT_REPO_URI="https://github.com/lyricat/Hotot.git"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="chrome kde qt5"
+
+REQUIRED_USE="|| ( chrome qt5 ) ${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_configure() {
+	mycmakeargs=(
+		${mycmakeargs}
+		-DWITH_CHROME=$(usex chrome)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_QT5=$(usex qt5)
+		-DPYTHON_EXECUTABLE=${PYTHON} )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	find "${D}" -name "*.pyc" -delete
+}
+
+pkg_postinst() {
+	if use chrome; then
+		elog "TO install hotot for chrome, open chromium/google-chrome,"
+		elog "vist chrome://chrome/extensions/ and load /usr/share/hotot"
+		elog "as unpacked extension."
+	fi
+}
diff --git a/net-misc/hotot/metadata.xml b/net-misc/hotot/metadata.xml
new file mode 100644
index 000000000000..9fcc5c61b405
--- /dev/null
+++ b/net-misc/hotot/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="chrome">Build chrome browser extension</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">lyricat/Hotot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/hsc/Manifest b/net-misc/hsc/Manifest
new file mode 100644
index 000000000000..f5d4b16d48d0
--- /dev/null
+++ b/net-misc/hsc/Manifest
@@ -0,0 +1,9 @@
+AUX hsc-1.0b-cflags.patch 1457 SHA256 e68799c24a8caae3cd269e3d1d1a3af966e6c408dc02568227c505207a27e76a SHA512 064783365d4058b6ad163958e2bd7e643000dc1f19a97a97b6aad9fef24165614ad965796cb689a6ee443dae017e8f64a807fe12fd734a1e16f886e23c6ca187 WHIRLPOOL d8c4caaa9e06dee034cd08ae57e703d627fadb870b2dfe144dc3ecbfa3b90c4310514fe449e7c4b39ea205f476541234dbf2a3ddfb999edd5aec2c7b25472f3c
+AUX hsc-1.0b-glibc-2.10.patch 352 SHA256 ed559424b32ed0f3d5bfc03d67b1942208f86b22c2c1c478243ff98f9e9c9b43 SHA512 99310e6574f073dfa3112503a2a8bd5c91c5e28985f885c5626a6e97bf5b3ac4bc6f44804412e7a5980aaf4ee9db41e3d65317a01138893806e12f3f9878c75a WHIRLPOOL dcedd69f69944cff3197b06b421bcd08cc0cbe18eace00fdc368b9482386c385a885ddfd94b118c4d50d29aa80f7bf0aa24ad343e3ae46786adcf54c98ad2ec1
+AUX hsc-1.0b-nostrip.patch 709 SHA256 6781cd053b812e47f8059284c1fd9037ecd8b808475bb0a2817cb9a858b27c9a SHA512 e20880fa90f2ce359c9c92195019649880b601c3eb9e41770ba403bd3ffedc397e24bab8edc046d2d75c8d2a41bb09f8c4861bc1c229e62c6492a8cd7d1bd5b5 WHIRLPOOL a050dba9c9363dfc1f73b4fa8270c46c3032bc1c25bb77a3a990615f4a938020d479b4fd337cdcab0b3729bbd94871f28d95f59e782f9d4bc19a4b113d882a09
+AUX hsc-1.0b-parmake.patch 315 SHA256 8bb6afebbc15735d87577c1c22319f99f9d1e784bfc93304bbc282ce05a6a427 SHA512 33c4e194eecb5a6ba62cf88ff459283f54fbe632dc9e42234dbbf26862cecd9793268d481d57bbbc2daed7a3a606879f1f963b36c3ec7d13a4f519ff9da98426 WHIRLPOOL d6287b274baaecbeac7ab964efe16de996091744085872407caf5d55922f84027e97ab7084a89804535270181d9a41b0689a09135b62231c9ff478c5ac3f89c9
+DIST hsc-1.0b.tar.bz2 623192 SHA256 4c3e4b7a96851d8a8cd4c0ce7135c9730f2fb63b0ae3555183b0285d04b38a81 SHA512 2fec8eb932f30b6e46a4f87c2baa2d3070375a068bcdf57ee5dbbbe3839d11b18a376ddde3d66751a4b35099d37007334c2a9183e05393cc3ac31481cc75fe97 WHIRLPOOL c03cf11bb76c6ccf4b5162a512898768773006ef7a9c35f1c3e60b2b80428bb4a2fa8ddd75b78ef7dd7f98ca879371a70ab5628dd55acb567a7de91db65a547c
+EBUILD hsc-1.0b.ebuild 873 SHA256 1b14d0942bcd8f429a583145784fdfdaa9c71d600bf716d2dc3c07a4faf95209 SHA512 0798285ab4c13ea00bb7527a8fb90a5bec7a0ae957822351976c0a5a0f95b1bcd8e6c41e394c848dc3580f685be1f8c80d1a7ae16e8786e3f686693064c4dc1a WHIRLPOOL c0a291b46c1218af2f191280cabc512c97caf65de823375d5ac48b890aecf9929b95b1826c9d77aece86726908bc4438aced6caed577a31652d4b9b99dcc32e7
+MISC ChangeLog 2543 SHA256 5bdcc7f801aa7bb3db5cf6862d7cfe09bf77cdcc5fee44a6aafec01d12d50d9a SHA512 287041afd7fa0fc441a68cf1a54a74ca6da999d5b120aea2baadad96d472d56cd2b3e939da77e59a8f2fad018a6f677517357d44452ef3f27f254d6045a7b997 WHIRLPOOL 5ffdaecb6655ca3d995dc5919ced24badffcbd0c6111bb793f64de6e23eb61d25379e89f5b351df29e477361d37964498ea639ac6118d5dbaa495dbb7bbae7f1
+MISC ChangeLog-2015 2771 SHA256 72ca183df39765bf825b11b565d4a898e54940bc5c568a373b16c25421815bad SHA512 de2a0be5b951845b993a126d125bb319a043a0e9c3c7c96eebf6b7ca99e687fcc642eeb47b45cd29b68247ebb0e763d897c28b3582088a03101c8d46de8a3058 WHIRLPOOL 918b51e6733bc7ae1346f4d5cc2940c5d0e1311feb2f98ff41afc2d96a86e18b05cb85db36de5f046f5a0748d177ef173fa18959b51819b6bb13b09b59eb7d1e
+MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
diff --git a/net-misc/hsc/files/hsc-1.0b-cflags.patch b/net-misc/hsc/files/hsc-1.0b-cflags.patch
new file mode 100644
index 000000000000..1459d5ad049a
--- /dev/null
+++ b/net-misc/hsc/files/hsc-1.0b-cflags.patch
@@ -0,0 +1,45 @@
+Index: hsc-1.0/configure.in
+===================================================================
+--- hsc-1.0.orig/configure.in
++++ hsc-1.0/configure.in
+@@ -46,12 +46,12 @@ case $host in
+ 	;;
+ esac
+ echo "Configuring for $SYSTEM"
+-CFLAGS="-Wall -pedantic"
++CFLAGS="$CFLAGS -Wall -pedantic"
+ 
+ AC_ARG_ENABLE(debug,
+ 	      AS_HELP_STRING([--enable-debug],[Compile programs with GDB support and debugging output]),
+ 	      [CFLAGS="$CFLAGS -ggdb -g3 -DDEBUG"; REGEXDEBUG="regex/printchar.o"],
+-	      CFLAGS="$CFLAGS -fomit-frame-pointer -Os")
++	      CFLAGS="$CFLAGS")
+ AC_ARG_ENABLE(efence,
+ 	      AS_HELP_STRING([--enable-efence],[Link with efence library for memory debugging]),
+ 	      CFLAGS="$CFLAGS -lefence")
+Index: hsc-1.0/src/regex/Makefile.in
+===================================================================
+--- hsc-1.0.orig/src/regex/Makefile.in
++++ hsc-1.0/src/regex/Makefile.in
+@@ -29,7 +29,7 @@ version = 0.12
+ CPPFLAGS = 
+ 
+ # Likewise, you can override CFLAGS to optimize, use -Wall, etc.
+-CFLAGS = -g
++#CFLAGS = -g
+ 
+ # Ditto for LDFLAGS and LOADLIBES.
+ LDFLAGS =
+Index: hsc-1.0/src/Makefile.in
+===================================================================
+--- hsc-1.0.orig/src/Makefile.in
++++ hsc-1.0/src/Makefile.in
+@@ -27,7 +27,7 @@ DATADIR=@datadir@
+ 
+ CFLAGS	= @CFLAGS@ -D@SYSTEM@ -I.
+ COMP	= @CC@ -o $@ $(CFLAGS)
+-LINK	= @CC@ -o $@ $(CFLAGS)
++LINK	= @CC@ -o $@ $(CFLAGS) $(LDFLAGS)
+ LINKLIBS= @LINKLIBS@
+ MOVE	= mv
+ COPY	= cp
diff --git a/net-misc/hsc/files/hsc-1.0b-glibc-2.10.patch b/net-misc/hsc/files/hsc-1.0b-glibc-2.10.patch
new file mode 100644
index 000000000000..5c10efc0f9a2
--- /dev/null
+++ b/net-misc/hsc/files/hsc-1.0b-glibc-2.10.patch
@@ -0,0 +1,12 @@
+diff -ur hsc-1.0.orig/src/hsclib/css.c hsc-1.0/src/hsclib/css.c
+--- hsc-1.0.orig/src/hsclib/css.c	2006-04-03 17:18:37.000000000 +0300
++++ hsc-1.0/src/hsclib/css.c	2009-08-09 20:19:51.000000000 +0300
+@@ -129,7 +129,7 @@
+ #ifdef isblank
+ #undef isblank
+ #endif
+-static int isblank(int c)
++int isblank(int c)
+ {
+    return ((c == ' ') || (c == '\t'));
+ }
diff --git a/net-misc/hsc/files/hsc-1.0b-nostrip.patch b/net-misc/hsc/files/hsc-1.0b-nostrip.patch
new file mode 100644
index 000000000000..af4cc947d8fd
--- /dev/null
+++ b/net-misc/hsc/files/hsc-1.0b-nostrip.patch
@@ -0,0 +1,18 @@
+Index: hsc-1.0/src/Makefile.in
+===================================================================
+--- hsc-1.0.orig/src/Makefile.in
++++ hsc-1.0/src/Makefile.in
+@@ -87,10 +87,9 @@ rex:
+ # installation
+ #--------------------------------------------------------------------
+ install : all
+-	strip $(EXE_ALL)
+-	$(INSTALL) -Ds hsc/hsc $(BINDIR)/hsc
+-	$(INSTALL) -Ds hsctools/hscdepp $(BINDIR)/hscdepp
+-	$(INSTALL) -Ds hsctools/hscpitt $(BINDIR)/hscpitt
++	$(INSTALL) -D hsc/hsc $(BINDIR)/hsc
++	$(INSTALL) -D hsctools/hscdepp $(BINDIR)/hscdepp
++	$(INSTALL) -D hsctools/hscpitt $(BINDIR)/hscpitt
+ 
+ #--------------------------------------------------------------------
+ # cleanup - remove all objects and executables
diff --git a/net-misc/hsc/files/hsc-1.0b-parmake.patch b/net-misc/hsc/files/hsc-1.0b-parmake.patch
new file mode 100644
index 000000000000..8c93d32f4888
--- /dev/null
+++ b/net-misc/hsc/files/hsc-1.0b-parmake.patch
@@ -0,0 +1,13 @@
+Index: hsc-1.0/Makefile.in
+===================================================================
+--- hsc-1.0.orig/Makefile.in
++++ hsc-1.0/Makefile.in
+@@ -30,7 +30,7 @@ all: hsc docs
+ 
+ hsc:
+ 	make -C src
+-docs:
++docs: hsc
+ 	PATH="$(shell pwd)/src/hsc:$(PATH)" HSCEXTRAOPTS="IGNORE=21" make -C docs-source
+ 
+ install:
diff --git a/net-misc/hsc/hsc-1.0b.ebuild b/net-misc/hsc/hsc-1.0b.ebuild
new file mode 100644
index 000000000000..6ac7d764f452
--- /dev/null
+++ b/net-misc/hsc/hsc-1.0b.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit autotools eutils
+
+DESCRIPTION="An HTML preprocessor using ML syntax"
+HOMEPAGE="http://www.linguistik.uni-erlangen.de/~msbethke/software.html"
+SRC_URI="http://www.linguistik.uni-erlangen.de/~msbethke/binaries/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}-${PV/b/}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-cflags.patch"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	epatch "${FILESDIR}/${P}-parmake.patch"
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	eautoreconf
+}
+
+src_install() {
+	dodir /usr/share/hsc
+	emake BINDIR="${D}/usr/bin" DATADIR="${D}/usr/share/hsc" \
+		prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" \
+		datadir="${D}/usr/share/hsc" install || die "make install failed"
+}
diff --git a/net-misc/hsc/metadata.xml b/net-misc/hsc/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/net-misc/hsc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/htbinit/Manifest b/net-misc/htbinit/Manifest
new file mode 100644
index 000000000000..cf82095be419
--- /dev/null
+++ b/net-misc/htbinit/Manifest
@@ -0,0 +1,12 @@
+AUX htb.init-v0.8.5_tos.patch 1656 SHA256 0b2b595d4fbf9aeac17646bbfc999009431a97061ccd995bd08c2edd26e51afb SHA512 6b8c78cd75207d23b1786ddeff01ba96e45fdba575b51dcd9e96880518a3edc97604f2fb2ccf44243e697dbe86233d38a26be54db3981e93ca98e3bf95e9dd87 WHIRLPOOL 8f962344b16c34e9efe50de29dffae52933ee1f6d741c33108ca63c183efc8ddc10d14a9d0d8f89056b811f9bb3a95130e2347e692aa40f21b931ec6a2bcd5f5
+AUX htb.init_find_fix.patch 1165 SHA256 23b55a4d946d75d44fc697537a6fc9d381df15bf041644dd5b9518b43827c2c6 SHA512 dbca235aa92ac5b2486fe7a89a215c4e621965f72ce04336d2c04cc02f61f40ec5a92347c1515b6e1114d176ea29cf61d457d504bfcaccfbe149d20231145d07 WHIRLPOOL 6ddd8812bcd2dcbf18e6c14e42bc045c58e437b4e9295b10658f0c3ed245da6535ec32aea907ee37c83af237caac44d664898ab76ee1539c57823fd7798cd684
+AUX htb_0.8.5_esfq.diff 1844 SHA256 d4f5b79d64eb008e799e03b509fbfe3153b7722c0575423d2797dc95b87b7f90 SHA512 ffef80a68b7e84b7c3758322bc58120fa67cd813c4a688f4f4483fdb0d8c1efb180e373b2b510d72c8f13945a0c6137fea005a70ffbb7ace12f4865b69db1bdd WHIRLPOOL fec0697265724ce73fa9ceb3ea5b677bf7ccae454bf7df79eba2bcfb81cfd09ecd47dd209f66844bfa8c75dcde09aa73910672e48164a71acc66990baf5efd77
+AUX htb_0.8.5_ipv6.diff 4663 SHA256 34e59cfa5fa06694ceb3c2368e49376bd61ec968bd3ee9cbd8ab753353e4c339 SHA512 3e1265d912e055fb2188945a46bd23a0798d04b8d3faf62344b11bd5e434cb7119098f095dc9b954dfae9b1e315e841df4dc0f47620500a884f7cbdf4d8c79c6 WHIRLPOOL a6ebb26133b650c298c761691e4e0461306b2e3e9c2ed7d1906c937e889e8158332671b2126c226c2c6151f0a80e5a02511181a237bb67dbd2187cee8005de24
+AUX htbinit.rc 706 SHA256 4478b8a6456bbaa7b42d7b587dd3b97ea4794a9046f9ba161bf849fd84945461 SHA512 17ddfb3dcc2c0b069c3af3548b385cbb894364f7a0c1a37f612c45368d1241dda03fadd544663fe09e2b2c7f2a4c2286f10848fb0230eb520e204b63fb7a3b52 WHIRLPOOL 787ae7fe92822a1f8a6c7960666bd57bc63c7e6c9be720560177a370d71a2e47eaac8e1ca62eb94cc81534c067a0e8b5c311cbc94e8081e3d85d37be699629e0
+AUX prio_rule.patch 636 SHA256 9c922957a37ecba93555ab1cac8684b3ef340b9da8e039394738e627ef24171a SHA512 f56f054a3ae3770ad9f8de5d43a2f73c211f92db98bce067195b950c182443efee653205e1f86b18e17ba6096d1e574ea7c0a7cc0326a141f84a0cc6f80c8edf WHIRLPOOL a61ab49e05ba1ca156f1fbff99d91188e582889603b4b6a927594a3e11918d5486ff27230fe9c63f402e30b7bfc64b4b120f34beb21f6c88d2fe6370b917aebd
+AUX timecheck_fix.patch 1221 SHA256 af5579df10eb67a37f6a9d9b042d2347e483cff4b89b47c76cc9c17b2f68d68a SHA512 ece43ece3ef84865311f14e783434048604b6c9c55b174a95cdaa89dbbccd091044ab387aef887d5c67c14b448260ba6fbd849ea6e454c245ba2c7918cec650e WHIRLPOOL af147d807eb2ec9b0cd3eae6aaec220d29e89c017448d160dae72d954d687797744d4b13e56ca7a3a1d377a9353c6ae7340bdf990dab21a87aebab37aebf9e9c
+DIST htb.init-v0.8.5 32038 SHA256 acfda369dff72b9073a8b70f2b05b1397a61a1cdb23970e5ed216d632ff33586 SHA512 5f54f662e8b30c4efa6c8cac50eeddfec8650aa6f651065c0962c32067ca7ba17266d20860c296bac44d1f78caa50f6c948f3c55d468a76f9ce2069a43d3c6dd WHIRLPOOL e83c96c152f5e781e963585794df339d5b44fbbfdc3f9bf23defb3c37aa301e08b7324877c784411138ffa600c6ce3c3b45e3ae92ba3e274a09eeb05d2d12d05
+EBUILD htbinit-0.8.5-r7.ebuild 1565 SHA256 b139dca0e7c1a6d624d008507c570519b2a496b599d46e79adecc5ff5260e442 SHA512 60a087eed90e4280ef127027c537215acabe6c16352bf2067819ee633b04bad41d96bb8c32e5a364b533d568a5880a54361254071f862459ac23e4f08a6c9b2e WHIRLPOOL c2842e54542af26b746679cb8f6177fcb59a8b40ba71bd441021c0a2d6e5732d0b20fc6e9ad3ed74796b62cda75d3d9e8376e4ada108819e5f570b5071e2eab6
+MISC ChangeLog 3135 SHA256 14721491349249a0ceb909e25eb636eceda3b4104625bee8523a5a112c788eea SHA512 20c0e13fab94a34612c07df40af0c8417248ea5b2167d6a64511eada1fcee6a912274ad59b6c4578e09250d44d6938dc0f29aa1e162f812fe1e844f244b2d69c WHIRLPOOL b6a50f2dde5a96178c3a06751dd853f23e91aa77899fdab0ce1a661a1bcbbb587d91012eea3a36011a0fec5fb2ef0a3bae8e46b2f43d5bd05344670b16aa7f7d
+MISC ChangeLog-2015 4348 SHA256 a4e84527ecce4add39a6e338a66b97156a2419c21d57441b6d233d43cfac3744 SHA512 ae1cb320b647b1286f99d928ccebd425f7defc643ef136545bd44b0d76bd4c8bd758999783fc048081db356b37eb009fffe066af53882471fff2b84986d8399a WHIRLPOOL 2ebb5c645a43ffcb27db757f950b9a6141fd654f28fa09dedb9751be47ceae53b957fbfc39122cc4864bea7a1c44d842b3a1b796f9d7285723e4ac90e564274f
+MISC metadata.xml 1010 SHA256 bf480efc21c8746dc01974ba29d29c07c28cd8f388203e1802117f65e6ab11a5 SHA512 9de719a9c9a15cbac8cfcd43effee95eac182647a0f695c4ff6d791caa4aa19f76d32dea34fbcdaea089ffdd454e2da2d7bd497c070a4b79308d68328a2d0d41 WHIRLPOOL 10d01ca3960957fa845c9ddd13a5cc7bdf20baedbbf3c648b4cf80fcee631668b75ddd63eac15dacfa5871a19b2e2a306c726e341144de1f869b0ee8c402157b
diff --git a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
new file mode 100644
index 000000000000..a798508631d3
--- /dev/null
+++ b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
@@ -0,0 +1,51 @@
+--- htb.init.old	2005-03-15 14:56:08.328305288 +0200
++++ htb.init		2005-03-15 15:05:16.612953352 +0200
+@@ -240,6 +240,10 @@
+ #      Maximum packet size HTB creates rate maps for. The default should
+ #      be sufficient for most cases, it certainly is for Ethernet.
+ #
++# TOS=<number>                                 optional, default "none"
++#
++#      TOS field
++#
+ ### SFQ qdisc parameters
+ #
+ # The SFQ queueing discipline is a cheap way to fairly share class bandwidth
+@@ -435,6 +435,7 @@
+ HTB_CLASS="RATE\|CEIL\|BURST\|CBURST\|PRIO\|LEAF\|MTU"
+ HTB_CLASS="$HTB_CLASS\|PRIO_RULE\|PRIO_MARK\|PRIO_REALM"
+ HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB"
++HTB_CLASS="$HTB_CLASS\|TOS"
+ 
+ 
+ #############################################################################
+@@ -646,7 +647,7 @@
+ 	### Set defaults & load class
+ 	MTU=""; LEAF=none; PERTURB=10
+ 	RATE=""; BURST=""; CEIL=""; CBURST=""
+-	PRIO=""; LIMIT=""; QUANTUM=""
++	PRIO=""; LIMIT=""; QUANTUM=""; TOS=""
+ 	
+ 	PRIO_RULE=$PRIO_RULE_DEFAULT
+ 	PRIO_MARK=$PRIO_MARK_DEFAULT
+@@ -868,12 +869,19 @@
+ 		u32_d="${DPORT:+match ip dport $DPORT $DMASK}"
+ 		u32_d="${DADDR:+match ip dst $DADDR} $u32_d"
+ 
++
++		u32_tos=""
++                if [ -n "$TOS" ]; then
++                        u32_tos="match ip tos $TOS 0xff"
++                fi
++
++
+ 		### Uncomment the following if you want to see parsed rules
+ 		#echo "$rule: $u32_s $u32_d"
+ 
+ 		### Attach u32 filter to the appropriate class
+ 		tc filter add dev $DEVICE parent 1:0 protocol ip \
+-		prio $PRIO_RULE u32 $u32_s $u32_d classid 1:$CLASS
++		prio $PRIO_RULE u32 $u32_s $u32_d $u32_tos classid 1:$CLASS
+ 	done ### rule
+ 
+ 	[ "$1" = "compile" ] && echo
diff --git a/net-misc/htbinit/files/htb.init_find_fix.patch b/net-misc/htbinit/files/htb.init_find_fix.patch
new file mode 100644
index 000000000000..12222b3e32a5
--- /dev/null
+++ b/net-misc/htbinit/files/htb.init_find_fix.patch
@@ -0,0 +1,33 @@
+--- htb.init.old	2004-01-29 22:41:23.000000000 +0100
++++ htb.init		2006-09-08 00:22:11.000000000 +0200
+@@ -468,8 +468,8 @@
+ 	### List of classes in $HTB_PATH
+ 	htb_class_list () {
+ 		for dev in `htb_device_list`; do
+-			find $HTB_PATH \( -type f -or -type l \) \
+-			-name "$dev-*" -not -name '*~' -maxdepth 1 \
++			find $HTB_PATH -maxdepth 1 \( -type f -or -type l \) \
++			-name "$dev-*" -not -name '*~' \
+ 			-printf "%f\n"| sort
+ 		done
+ 	} # htb_class_list
+@@ -483,8 +483,8 @@
+ 	### Validate cache against config files
+ 	htb_valid_cache () {
+ 		for dev in `htb_device_list`; do
+-			[ `find $HTB_PATH \( -type f -or -type l \) \
+-			  -name "$dev*" -maxdepth 1 -newer $HTB_CACHE| \
++			[ `find $HTB_PATH -maxdepth 1 \( -type f -or -type l \) \
++			  -name "$dev*" -newer $HTB_CACHE| \
+ 			  wc -l` -gt 0 ] && VALID=0
+ 			[ $VALID -ne 1 ] && break
+ 		done
+@@ -493,7 +493,7 @@
+ 
+ 	### Find class config for device $1, which is newer than cache
+ 	htb_cache_older () {
+-		[ `find $HTB_PATH -type f -name "$1*" -maxdepth 1 \
++		[ `find $HTB_PATH -maxdepth 1 -type f -name "$1*" \
+ 		   -newer $HTB_CACHE| wc -l` -gt 0 ] && return 0
+ 		return 1
+ 	} # htb_cache_older
diff --git a/net-misc/htbinit/files/htb_0.8.5_esfq.diff b/net-misc/htbinit/files/htb_0.8.5_esfq.diff
new file mode 100644
index 000000000000..3130f6868a4f
--- /dev/null
+++ b/net-misc/htbinit/files/htb_0.8.5_esfq.diff
@@ -0,0 +1,53 @@
+--- htb.init.old	2004-01-29 22:41:23.000000000 +0100
++++ htb.init		2006-09-07 23:32:58.000000000 +0200
+@@ -226,7 +226,7 @@
+ #	priority. Also, classes with higher priority are offered excess
+ #	bandwidth first.
+ #
+-# LEAF=none|sfq|pfifo|bfifo			optional, default "none"
++# LEAF=none|sfq|esfq|pfifo|bfifo		optional, default "none"
+ #
+ #	Tells the script to attach specified leaf queueing discipline to HTB
+ #	class. By default, no leaf qdisc is used.
+@@ -261,6 +261,15 @@
+ #	will never take place which is what you probably don't want. The
+ #	default value of 10 seconds is probably a good value.
+ #
++### ESFQ qdisc parameters
++#
++# Same as SFQ and ...
++#
++# HASH=classic|src|dst
++#
++#     src mean is fair per source IP
++#     dsr mean is fair per destination IP
++#
+ ### PFIFO/BFIFO qdisc parameters
+ #
+ # Those are simple FIFO queueing disciplines. They only have one parameter
+@@ -427,14 +445,14 @@
+ 
+ ### Modules to probe for. Uncomment the last HTB_PROBE
+ ### line if you have QoS support compiled into kernel
+-HTB_PROBE="sch_htb sch_sfq cls_fw cls_u32 cls_route"
++HTB_PROBE="sch_htb sch_sfq sch_esfq cls_fw cls_u32 cls_route"
+ #HTB_PROBE=""
+ 
+ ### Config keywords
+ HTB_QDISC="DEFAULT\|DCACHE\|R2Q"
+ HTB_CLASS="RATE\|CEIL\|BURST\|CBURST\|PRIO\|LEAF\|MTU"
+ HTB_CLASS="$HTB_CLASS\|PRIO_RULE\|PRIO_MARK\|PRIO_REALM"
+-HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB"
++HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB\|HASH"
+ HTB_CLASS="$HTB_CLASS\|TOS"
+ 
+ 
+@@ -801,6 +819,8 @@
+ 			LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM}"
+ 		elif [ "$LEAF" = "pfifo" -o "$LEAF" = "bfifo" ]; then
+ 			LEAFPARM="${LIMIT:+limit $LIMIT}"
++		elif [ "$LEAF" = "esfq" ]; then
++			LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM} ${HASH:+hash $HASH}"
+ 		else
+ 			htb_fail_off "unknown leaf qdisc ($LEAF) in $classfile!"
+ 		fi
diff --git a/net-misc/htbinit/files/htb_0.8.5_ipv6.diff b/net-misc/htbinit/files/htb_0.8.5_ipv6.diff
new file mode 100644
index 000000000000..815f99545a61
--- /dev/null
+++ b/net-misc/htbinit/files/htb_0.8.5_ipv6.diff
@@ -0,0 +1,128 @@
+--- htb.init.old	2004-01-29 22:41:23.000000000 +0100
++++ htb.init		2006-09-07 23:32:58.000000000 +0200
+@@ -275,6 +284,7 @@
+ ### Filtering parameters
+ #
+ # RULE=[[saddr[/prefix]][:port[/mask]],][daddr[/prefix]][:port[/mask]]
++# RULEIPv6=[[saddr[/prefix]][_port[/mask]],][daddr[/prefix]][_port[/mask]]
+ #
+ #	These parameters make up "u32" filter rules that select traffic for
+ #	each of the classes. You can use multiple RULE fields per config.
+@@ -300,9 +310,13 @@
+ #	RULE=10.5.5.5:80,
+ #		selects traffic going from port 80 of single host 10.5.5.5
+ #
++#	RULEIPv6=3ffe:80fe:c28:1:45d1:3a1:5e2b:e6c8
++#		selects traffic going to IPv6 host 3ffe:80fe:c28:1:45d1:3a1:5e2b:e6c8
++#
+ #
+ #
+ # REALM=[srealm,][drealm]
++# REALMIPv6=[srealm,][drealm]
+ #
+ #	These parameters make up "route" filter rules that classify traffic
+ #	according to packet source/destination realms. For information about
+@@ -327,6 +341,7 @@
+ #
+ #
+ # MARK=<mark>
++# MARKIPv6=<mark>
+ #
+ #	These parameters make up "fw" filter rules that select traffic for
+ #	each of the classes accoring to firewall "mark". Mark is a decimal
+@@ -414,6 +429,9 @@
+ PRIO_RULE_DEFAULT=${PRIO_RULE:-100}
+ PRIO_MARK_DEFAULT=${PRIO_MARK:-200}
+ PRIO_REALM_DEFAULT=${PRIO_REALM:-300}
++PRIO_RULEIPv6=${PRIO_RULEIPv6:-150}
++PRIO_MARKIPv6=${PRIO_MARKIPv6:-250}
++PRIO_REALMIPv6=${PRIO_REALMIPv6:-350}
+ 
+ ### Default HTB_PATH & HTB_CACHE settings
+ HTB_PATH=${HTB_PATH:-/etc/sysconfig/htb}
+@@ -818,6 +838,13 @@
+ 		prio $PRIO_MARK handle $mark fw classid 1:$CLASS
+ 	done ### mark
+ 
++	### Create fw filter for MARKIPv6 fields
++	for mark in `htb_cfile_rules MARKIPv6`; do
++               ### Attach fw filter to root class
++               tc filter add dev $DEVICE parent 1:0 protocol ipv6 \
++               prio $PRIO_MARKIPv6 handle $mark fw classid 1:$CLASS
++	done ### markipv6
++
+ 	### Create route filter for REALM fields
+ 	for realm in `htb_cfile_rules REALM`; do
+ 		### Split realm into source & destination realms
+@@ -833,6 +860,21 @@
+ 		${DREALM:+to $DREALM} classid 1:$CLASS
+ 	done ### realm
+ 
++	### Create route filter for REALMIPv6 fields
++	for realm in `htb_cfile_rules REALMIPv6`; do
++               ### Split realm into source & destination realms
++               SREALM=${realm%%,*}; DREALM=${realm##*,}
++               [ "$SREALM" = "$DREALM" ] && SREALM=""
++
++               ### Convert asterisks to empty strings
++               SREALM=${SREALM#\*}; DREALM=${DREALM#\*}
++
++               ### Attach route filter to the root class
++               tc filter add dev $DEVICE parent 1:0 protocol ipv6 \
++               prio $PRIO_REALM route ${SREALM:+from $SREALM} \
++               ${DREALM:+to $DREALM} classid 1:$CLASS
++	done ### realmipv6
++
+ 	### Create u32 filter for RULE fields
+ 	for rule in `htb_cfile_rules RULE`; do
+ 		### Split rule into source & destination
+@@ -876,6 +918,49 @@
+ 		prio $PRIO_RULE u32 $u32_s $u32_d classid 1:$CLASS
+ 	done ### rule
+ 
++       ### Create u32 filter for RULEIPv6 fields
++       for rule in `htb_cfile_rules RULEIPv6`; do
++               ### Split rule into source & destination
++               SRC=${rule%%,*}; DST=${rule##*,}
++               [ "$SRC" = "$rule" ] && SRC=""
++
++
++               ### Split destination into address, port & mask fields
++               DADDR=${DST%%_*}; DTEMP=${DST##*_}
++               [ "$DADDR" = "$DST" ] && DTEMP=""
++
++               DPORT=${DTEMP%%/*}; DMASK=${DTEMP##*/}
++               [ "$DPORT" = "$DTEMP" ] && DMASK="0xffff"
++
++
++               ### Split up source (if specified)
++               SADDR=""; SPORT=""
++               if [ -n "$SRC" ]; then
++                       SADDR=${SRC%%_*}; STEMP=${SRC##*_}
++                       [ "$SADDR" = "$SRC" ] && STEMP=""
++
++                       SPORT=${STEMP%%/*}; SMASK=${STEMP##*/}
++                       [ "$SPORT" = "$STEMP" ] && SMASK="0xffff"
++               fi
++
++
++               ### Convert asterisks to empty strings
++               SADDR=${SADDR#\*}; DADDR=${DADDR#\*}
++
++               ### Compose u32 filter rules
++               u32_s="${SPORT:+match ip6 sport $SPORT $SMASK}"
++               u32_s="${SADDR:+match ip6 src $SADDR} $u32_s"
++               u32_d="${DPORT:+match ip6 dport $DPORT $DMASK}"
++               u32_d="${DADDR:+match ip6 dst $DADDR} $u32_d"
++
++               ### Uncomment the following if you want to see parsed rules
++               #echo "$rule: $u32_s $u32_d"
++
++               ### Attach u32 filter to the appropriate class
++               tc filter add dev $DEVICE parent 1:0 protocol ipv6 \
++               prio $PRIO_RULEIPv6 u32 $u32_s $u32_d classid 1:$CLASS
++	done ### ruleipv6
++
+ 	[ "$1" = "compile" ] && echo
+ done ### classfile
+ ;;
diff --git a/net-misc/htbinit/files/htbinit.rc b/net-misc/htbinit/files/htbinit.rc
new file mode 100644
index 000000000000..219ad04a37e7
--- /dev/null
+++ b/net-misc/htbinit/files/htbinit.rc
@@ -0,0 +1,46 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="stats list timecheck"
+extra_started_commands="reload"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting htbinit"
+	/usr/sbin/htb.init start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping htbinit"
+	/usr/sbin/htb.init stop
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading htbinit"
+	/usr/sbin/htb.init start invalidate
+	eend $?
+}
+
+stats() {
+	ebegin "Showing htbinit stats"
+	/usr/sbin/htb.init stats
+	eend $?
+}
+
+list() {
+	ebegin "Showing htbinit list"
+	/usr/sbin/htb.init list
+	eend $?
+}
+
+timecheck() {
+	ebegin "Showing htbinit timecheck"
+	/usr/sbin/htb.init timecheck
+	eend $?
+}
diff --git a/net-misc/htbinit/files/prio_rule.patch b/net-misc/htbinit/files/prio_rule.patch
new file mode 100644
index 000000000000..28471aabb84e
--- /dev/null
+++ b/net-misc/htbinit/files/prio_rule.patch
@@ -0,0 +1,20 @@
+--- htb.init.old	2004-01-29 22:41:23.000000000 +0100
++++ htb.init		2006-09-08 00:03:32.000000000 +0200
+@@ -453,7 +457,7 @@
+ 	### Load & filter file $HTB_PATH/$1
+ 	htb_filter_file () {
+ 		sed -n "s/#.*//; s/[^a-zA-Z0-9.,;:=/*-_]\+//g; \
+-		/^[a-zA-Z0-9]\+=[a-zA-Z0-9.,:;/*-_]\+$/ p" $HTB_PATH/$1
++		/^[a-zA-Z0-9_]\+=[a-zA-Z0-9.,:;/*-_]\+$/ p" $HTB_PATH/$1
+ 	} # htb_filter_file
+ 
+ 
+@@ -517,7 +521,7 @@
+ 
+ 	htb_filter_file () {
+ 		sed 's/#.*//; s/[^a-zA-Z0-9.,;:=/*-_]\+//g' $HTB_PATH/$1 \
+-		| grep '^[a-zA-Z0-9]\+=[a-zA-Z0-9.,;:/*-_]\+$'
++		| grep '^[a-zA-Z0-9_]\+=[a-zA-Z0-9.,;:/*-_]\+$'
+ 	} # htb_filter_file
+ 
+ 	htb_clsid_chain () {
diff --git a/net-misc/htbinit/files/timecheck_fix.patch b/net-misc/htbinit/files/timecheck_fix.patch
new file mode 100644
index 000000000000..de3791af997d
--- /dev/null
+++ b/net-misc/htbinit/files/timecheck_fix.patch
@@ -0,0 +1,42 @@
+--- htb.init.old	2004-01-29 22:41:23.000000000 +0100
++++ htb.init		2006-09-08 00:11:36.000000000 +0200
+@@ -891,7 +895,6 @@
+ TIME_TMP=`date +%w/%k:%M`
+ TIME_DOW=${TIME_TMP%%/*}
+ TIME_NOW=${TIME_TMP##*/}
+-TIME_ABS=`htb_time2abs $TIME_NOW`
+ 
+ ### Check all classes (if configured)
+ for classfile in `htb_class_list`; do
+@@ -914,6 +917,7 @@
+ 		### Compute interval boundaries
+ 		BEG_ABS=`htb_time2abs $BEG_TIME`
+ 		END_ABS=`htb_time2abs $END_TIME`
++		TIME_ABS=`htb_time2abs $TIME_NOW`
+ 
+ 		### Midnight wrap fixup
+ 		if [ $BEG_ABS -gt $END_ABS ]; then
+@@ -926,6 +930,23 @@
+ 		### If time period matches, remember params and set MATCH flag
+ 		if [ $TIME_ABS -ge $BEG_ABS -a $TIME_ABS -lt $END_ABS ]; then
+ 			RATESPEC=${PARAMS%%,*}; CEILSPEC=${PARAMS##*,}
++
++			RNAME=""; CNAME=""
++
++			[ "$RATESPEC" = "prate" ] && RNAME=RATE_$PARENT
++			[ "$RATESPEC" = "pceil" ] && RNAME=CEIL_$PARENT
++
++			if [ -n "$RNAME" ]; then
++				RATESPEC=${!RNAME}
++			fi
++
++			[ "$CEILSPEC" = "prate" ] && CNAME=RATE_$PARENT
++			[ "$CEILSPEC" = "pceil" ] && CNAME=CEIL_$PARENT
++
++			if [ -n "$CNAME" ]; then
++				CEILSPEC=${!CNAME}
++			fi
++
+ 			[ "$RATESPEC" = "$CEILSPEC" ] && CEILSPEC=""
+ 
+ 			NEW_RATE=${RATESPEC%%/*}; NEW_BURST=${RATESPEC##*/}
diff --git a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild
new file mode 100644
index 000000000000..551fa1f2136e
--- /dev/null
+++ b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils linux-info
+
+DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2"
+HOMEPAGE="http://www.sourceforge.net/projects/htbinit"
+SRC_URI="mirror://sourceforge/htbinit/htb.init-v${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="ipv6 esfq"
+
+DEPEND="sys-apps/iproute2"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	for i in NET_SCH_HTB NET_SCH_SFQ NET_CLS_FW NET_CLS_U32 NET_CLS_ROUTE4 ; do
+		CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
+	done
+	use esfq && CONFIG_CHECK="${CONFIG_CHECK} ~NET_SCH_ESFQ"
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	cp "${DISTDIR}"/htb.init-v${PV} "${S}"/htb.init || die
+}
+
+src_prepare() {
+	sed -i 's|/etc/sysconfig/htb|/etc/htb|g' "${S}"/htb.init
+	epatch "${FILESDIR}"/htb.init-v0.8.5_tos.patch
+	use ipv6 && epatch "${FILESDIR}"/htb_0.8.5_ipv6.diff
+	use esfq && epatch "${FILESDIR}"/htb_0.8.5_esfq.diff
+	epatch "${FILESDIR}"/prio_rule.patch
+	epatch "${FILESDIR}"/timecheck_fix.patch
+	epatch "${FILESDIR}"/htb.init_find_fix.patch
+	sed -i -e 's:/sbin/ip:/bin/ip:g' "${S}"/htb.init # bug #474700
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dosbin htb.init
+	newinitd "${FILESDIR}"/htbinit.rc htbinit
+	keepdir /etc/htb
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog 'Run "rc-update add htbinit default" to run htb.init at startup.'
+		elog 'Please, read carefully the htb.init documentation.'
+		elog 'New directory to store configuration is /etc/htb.'
+	fi
+}
diff --git a/net-misc/htbinit/metadata.xml b/net-misc/htbinit/metadata.xml
new file mode 100644
index 000000000000..0ebc62447849
--- /dev/null
+++ b/net-misc/htbinit/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-needed -->
+  <longdescription>
+HTB.init is a shell script derived from CBQ.init that allows for easy setup of HTB-based traffic control on Linux. HTB (Hierachical Token Bucket) is a new queueing discipline which attempts to address the weaknesses of current CBQ implementation.
+</longdescription>
+  <longdescription lang="ja">
+HTB.init は、Linux 上で HTB を基盤にしたトラフィック・コントロールのセットアップを簡単にする
+CBQ.init に由来したシェル・スクリプトです。HTB (Hierachical Token Bucket) は現在の CBQ の実装の弱点に処置を講じる
+キューの新しい規律です。
+</longdescription>
+  <use>
+    <flag name="esfq">Add support for Enhanced Stochastic Fairness queueing discipline.</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">htbinit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
new file mode 100644
index 000000000000..87ebf5953397
--- /dev/null
+++ b/net-misc/htpdate/Manifest
@@ -0,0 +1,11 @@
+AUX htpdate.conf 359 SHA256 cfcf98a0b41e4d5c8c04a72443bbb0c335b91db252d35e0050b82fca0682129b SHA512 28940548bb15484430cbc63d16eeb03934e6de82cb9729e85450f595712be9caf96e1cb84c55d17dd05f33661c2b657d76bfa8b40a3e0f649a0070aeb8be678b WHIRLPOOL a0fcdfe7700d799d3e7ba693239a413db0438d6dfe850f3e7053bee82a1c508da624e027026533b134dbf8b81b120bc28ce98cc320101a7ab0c0fb08036ea64c
+AUX htpdate.init-r1 507 SHA256 f06c78cdabf061118c013aba8cb9a2fbfc76e3c147c5e09632311a942c55795c SHA512 d18a91792787fdcb4808da042025d60bbe19335fd8492b33af33d33bc24d250bcc65c8ead7d443e4d37a9ca61428361db7b418a5fb3256b030b02b9a772fe10f WHIRLPOOL 3904a617ece44e312735f55265503121019e128a818a032f4774257c2fc70f003be92418a69c9f6726fb7b30dac26c18b31d62142568d0fe6c24d36c605f0e5e
+DIST htpdate-1.0.7.tar.gz 16848 SHA256 ba0b3f7b42306f2e2e146624785f80cc472eac9e7885007df50af0e1a21735c4 SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360 WHIRLPOOL e2e949d20b8d4afecd6c3c09aefa203417b16a4061e6d2fe05cf5e37d0dc736604ed5e1f0d8c03146eb3b5031ffc3ed8ec3213171513e6140a098bd1d5f268fb
+DIST htpdate-1.1.3.tar.gz 13421 SHA256 b1d84d16ea8755352d187c346e78316ee545e2fbc3719cea001cdfaa3326cf41 SHA512 b6924f49165768e65b2a843db176aa9e8208bdc9e7390fbd2e802dcb1016d9fc897c717743ae559f7a6b17b18a44294a7b8adfa68b547ed8bf66135a12cc5b30 WHIRLPOOL 32d13472a233102e2095e9c6cf27df40d51b4b160c865ae6ea569611721bac3650b3b05840fc70478dccf490c0a1f046c42d5293a36028e46598272e3f6a6621
+DIST htpdate-1.2.0.tar.gz 13618 SHA256 c5084d054b575b7f41261ada5632e1c5abb04e87f30084f2ebd1ef3d02559e52 SHA512 5447d54a54038cc3c33f7877410ae42022e01eb10a93bd79fe4937452a823c65c6bdb743213bc77a8506128d5b384e26812f1291a0ffa1aeafde0230c1b645d4 WHIRLPOOL 92387d6a24434b394e162cdf2634031e259c6939727d31803acfbfa6785a2fdd25a4af0adf4ca714ca66c0d0b9a6301b8e6ae0d48bad8c7a232b90a55dba2a86
+EBUILD htpdate-1.0.7.ebuild 1130 SHA256 977ccdaee6a052e2fa6e8a187cd137e8b1d749527199e0761f4fb7dc1f0f3822 SHA512 a1376b0c789910d96e83ae60416a80aa1c0835c83be9d26a6cb70555b8e21ae0cabf797ef658f9b4074a6ab97228ca52f14446f213ae372866bcc33c31cd7d38 WHIRLPOOL 750b03eb61667966bcb45a62a8c2c7bfe8ae90495ad2a30cdfee3d6a655dfe7fa4cf0dc227b2c311590d60980cac1e8d2cdcd643bf84c129dcd6b132a005898a
+EBUILD htpdate-1.1.3.ebuild 1035 SHA256 277b77d28746d1e75286c193b57ff35adb015e27bee6afb367ea2f4f7f5e74a3 SHA512 e7db07178353c6d4237fba1064b1867bf60b958a1664bb478c4655cf64941725fb8aaaf00d81ac59cc3bc675d63e4f0180dd053748cd375f8612c6868bee1ab4 WHIRLPOOL c03d67d1128ccf7afc06309004fa747ea2e721c63f86c83bf6eddc387e0cf8750f46c158df6b353c726f05c61c02335350fdc77e908649eedf0cc076772d044d
+EBUILD htpdate-1.2.0.ebuild 1048 SHA256 4dfa1c99551f8fae46992af6a923540817a9d514ef3b379695a4a5bad276ad59 SHA512 dc9bd915c482c830d564fcd202bb62902bbade7f7daed3ab1b4652141d73de256354126548f77fbb62d370f7e8f4c925d8820d7752abedb55dc6d8881fda3224 WHIRLPOOL ac45c1a03294813cf62bc0b4a6f3ea1742d3f43f47548ea2cd0af5d413e64ed73ba9e2e9853f8688db792b94ecedb72acc1660723affb8bb95ff9274f208c47f
+MISC ChangeLog 3158 SHA256 ed807324a014efdfb659685e2e091cc4cde8862633a21b603ccbd0c50538dcff SHA512 3be8a920498954f670ef3fc4cdddde4379cf33350209c372cf86f3951bb912e515ad0656a3ecf1641e4f65bde083b07b99e1b8680dcedecc2fc198c671d6218b WHIRLPOOL 2a6e420a8ecd744ad63abf31b583321f3939ffb3435295c103e8d0938d08b15ce1774aa49bc939df391e50448f587335ebafee3e8544d6b15ddabc357e209c81
+MISC ChangeLog-2015 7519 SHA256 8fd1552d7471a734964323a9d6fc3f52813ce669dd4d64abb4a08b577c23afec SHA512 53e9dd920abf3ba0cfb394163fe0ed4b1d880493029a46c0e80f480d7652d81773f019a4859bfc451b39aa502a1443e62c2ce8a9ee78a735f2e1cbb2c6163885 WHIRLPOOL 41cfb94cc5251d4f700d89523fec038c5d2b123a9de3ccfe135102138560a2bd90cc223a35195eb63cbe07a70064f8f5518a6194fdd584b1478b503885c9caea
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/net-misc/htpdate/files/htpdate.conf b/net-misc/htpdate/files/htpdate.conf
new file mode 100644
index 000000000000..1c7e02decf27
--- /dev/null
+++ b/net-misc/htpdate/files/htpdate.conf
@@ -0,0 +1,12 @@
+# config file for /etc/init.d/htpdate
+
+# Add at least one http server to use:
+#SERVERS="<servername>"
+
+# If you are using a proxy server to connect to the
+# internet comment out the following line and insert the
+# address and port of your proxy server.
+#PROXY="-P <proxy>:<port>"
+
+# Set additional options, see 'man htpdate' for refernce
+HTPDATE_OPTS="-D -s"
diff --git a/net-misc/htpdate/files/htpdate.init-r1 b/net-misc/htpdate/files/htpdate.init-r1
new file mode 100644
index 000000000000..950972df868b
--- /dev/null
+++ b/net-misc/htpdate/files/htpdate.init-r1
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Synchronizes local system with time offered by remote webservers over HTTP"
+pidfile="/run/htpdate.pid"
+command="/usr/sbin/htpdate"
+command_args="${HTPDATE_OPTS} ${PROXY} ${SERVERS}"
+
+depend() {
+	need net
+	use dns logger
+}
+
+start_pre() {
+	if [ -z "${SERVERS}" ] ; then
+		eerror "You need to set at least one http server to use in /etc/conf.d/htpdate"
+		return 1
+	fi
+}
diff --git a/net-misc/htpdate/htpdate-1.0.7.ebuild b/net-misc/htpdate/htpdate-1.0.7.ebuild
new file mode 100644
index 000000000000..a912c582f9f4
--- /dev/null
+++ b/net-misc/htpdate/htpdate-1.0.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo toolchain-funcs unpacker
+
+DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
+HOMEPAGE="http://www.vervest.org/fiki/bin/view/HTP/DownloadC"
+SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 sh x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=""
+
+DOC_CONTENTS="If you would like to run htpdate as a daemon, set
+appropriate http servers in /etc/conf.d/htpdate!"
+
+src_unpack() {
+	default
+
+	cd "${S}" || die "change directory to ${S} failed"
+	unpacker htpdate.8.gz
+}
+
+src_prepare() {
+	# Use more standard adjtimex() to fix uClibc builds.
+	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
+}
+
+src_compile() {
+	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin htpdate
+	doman htpdate.8
+	dodoc README Changelog
+
+	newconfd "${FILESDIR}"/htpdate.conf htpdate
+	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
+
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/htpdate/htpdate-1.1.3.ebuild b/net-misc/htpdate/htpdate-1.1.3.ebuild
new file mode 100644
index 000000000000..b37c01306f7a
--- /dev/null
+++ b/net-misc/htpdate/htpdate-1.1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo toolchain-funcs unpacker
+
+DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
+HOMEPAGE="http://www.vervest.org/fiki/bin/view/HTP/DownloadC"
+SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=""
+
+DOC_CONTENTS="If you would like to run htpdate as a daemon, set
+appropriate http servers in /etc/conf.d/htpdate!"
+
+src_prepare() {
+	# Use more standard adjtimex() to fix uClibc builds.
+	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
+}
+
+src_compile() {
+	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin htpdate
+	doman htpdate.8
+	dodoc README Changelog
+
+	newconfd "${FILESDIR}"/htpdate.conf htpdate
+	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
+
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/htpdate/htpdate-1.2.0.ebuild b/net-misc/htpdate/htpdate-1.2.0.ebuild
new file mode 100644
index 000000000000..6e891f5ab55c
--- /dev/null
+++ b/net-misc/htpdate/htpdate-1.2.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1 toolchain-funcs unpacker
+
+DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
+HOMEPAGE="http://www.vervest.org/fiki/bin/view/HTP/DownloadC"
+SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=""
+
+DOC_CONTENTS="If you would like to run htpdate as a daemon, set
+appropriate http servers in /etc/conf.d/htpdate!"
+
+src_prepare() {
+	default
+
+	# Use more standard adjtimex() to fix uClibc builds.
+	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
+}
+
+src_compile() {
+	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin htpdate
+	doman htpdate.8
+	dodoc README Changelog
+
+	newconfd "${FILESDIR}"/htpdate.conf htpdate
+	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
+
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/htpdate/metadata.xml b/net-misc/htpdate/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/net-misc/htpdate/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
new file mode 100644
index 000000000000..b2b9643c9fbe
--- /dev/null
+++ b/net-misc/httpie/Manifest
@@ -0,0 +1,11 @@
+DIST httpie-0.9.2.tar.gz 73153 SHA256 af3982d41743d986608f1fe6e437d0493df227993c7edf013cc1d61883d40d68 SHA512 5622caa2f3136137d85f91eba9b0a165ec987b696a5e001844c8ecb868d66cfc86b3f3fb3a1ac493d7603c67ca88de0e0ffc776dce855ad69364190607b4fb73 WHIRLPOOL e8a4aa09f7051176ee0340b6f6785bb57353bd4bf8c0dea66b9dc50a1e6aea254eafc7d54e128c78d6fdca2f44338bfcfe6f7aca7623dbf0cd5a7b79c9d1c739
+DIST httpie-0.9.3.tar.gz 73693 SHA256 30a8ff2a72b75cb6033cc84f5b76c336999f91c325f169e78dc6339351ee7f4b SHA512 a98aa19ddcc5223133f1081ce22457d21b838b5779788a08d0b65ea80f903ab577a55e0c73b3656486eec08c3c0910d3e987aed0f117c5f9b3e005c6001000cc WHIRLPOOL a25f0d89339c468eafb3cf79d4aa6e323f3346ced921f6ee907771265577347969185f797022d51f9f037065d1b9c82e366789b40084874b390b9aa39f30084c
+DIST httpie-0.9.4.tar.gz 79889 SHA256 0fc288a85d6c018c64bbc86dfcc9c7fad063e79816840dfa91e8d6c43654761e SHA512 eea4e0fce334d12f9438d89f87d119bc569f8042d95c87f6898b9110030674f49361bf8e119d815330aa117479557766d614510d81c42c9c3a6803c769f38b26 WHIRLPOOL 2a9bb6b45d8b5d62a1118aa09eb0fd4612b56b8fe158c9d8a5295dc3b53e52906afb9888e6724528b19a2b2738f43cc2eb4a124caacf8c1df93056315a1ab87f
+DIST httpie-0.9.9.tar.gz 85006 SHA256 f1202e6fa60367e2265284a53f35bfa5917119592c2ab08277efc7fffd744fcb SHA512 e9adb1ecf9a25b57c634f35199bf1f8fbe4136179c0ba0d6032a41ae786da9344f54436f91d89e624c154bdca325f94c637364a934fc2d5742b83056434f7e4c WHIRLPOOL 7897193ef98f6c8f39bbeef11e010df36374b9a2b9a18ae2cde1eab911d2d07972558ebe45c4d1af192075c7ff8e29349d13781d3f47b268b7060687a1f75be3
+EBUILD httpie-0.9.2.ebuild 516 SHA256 9d3dda991750c004f8ff3ad281bf2817f5a5dd6a9203f8e2202cb0732e2da2ac SHA512 f848c14bfe306c9db9dff0a0d441aec609f9b5947ad7f70d1dece5d829777e1261f3a960015842c4f3bd38591d902531d19e657d330798f698776a7394c342fe WHIRLPOOL a3cf731710b458b8563082d2bddb397169b37e23ee014784bd83408408135bcbd702a475af90c1fa0fd88ad6635b23fe68355c84409fdf6ee2a5b3fb629e460c
+EBUILD httpie-0.9.3.ebuild 516 SHA256 95ee2529b6462c010af108b488f3414e3219f8c2f1b3d14f6a4b5a74415584af SHA512 eb94a3c49e1a02ad2f1ef5b2347d0a65ad3ebbd4528537c43d5eba6b3f1d4037e44ad0d27b5b0dd4cfe9075f832294e493884cecee05a10b944968fa08405071 WHIRLPOOL e2c00faacee5877c1505089dcc23b86a2eea730a60ac4f21cb4bd981d03fc966bd29231192d7e58dd326fbd8856fcf9f7e42838cc41d262bad1233b1f18631ec
+EBUILD httpie-0.9.4.ebuild 516 SHA256 95ee2529b6462c010af108b488f3414e3219f8c2f1b3d14f6a4b5a74415584af SHA512 eb94a3c49e1a02ad2f1ef5b2347d0a65ad3ebbd4528537c43d5eba6b3f1d4037e44ad0d27b5b0dd4cfe9075f832294e493884cecee05a10b944968fa08405071 WHIRLPOOL e2c00faacee5877c1505089dcc23b86a2eea730a60ac4f21cb4bd981d03fc966bd29231192d7e58dd326fbd8856fcf9f7e42838cc41d262bad1233b1f18631ec
+EBUILD httpie-0.9.9.ebuild 531 SHA256 b5a1c4946aa14de151b0f5aed40ce7832751b433d49e8321ba7b49139edaa87b SHA512 301af5b91e82a73b86fcf6e4ac3d958af1b89206368c25750311cc5954fd355445e5613e943f8e4756ca2ea993fc38cd9b48d7ce95d60a71bff654539e842802 WHIRLPOOL 5453812d7c27de1f1b3a862a81825d967f744979f0c43661e5566c7fca41c0ac402f332cbcef22bcf749ab55158effd8085feea73f01c43373e027df40ba3e26
+MISC ChangeLog 3193 SHA256 7783948e1c3914b967f0c6b45ff7ce43dcfc22206d984d347f1a6e0faf718b3f SHA512 a849e712afccc3ee028ad173499c5ab0a6f2d5c65261b415b6e17c4d17870dc14b455802139eff23cea4a5648dbd0b15b7f75429fdab13994285c07a14e0ef8c WHIRLPOOL 87884f9c5aafa499b377efc97667089ad1cf456c6cb0b12edaec5beeace2710b89f887ba26028be616666cf446b317fb0efafb89843a986d030e1b378ab872aa
+MISC ChangeLog-2015 3111 SHA256 2dbbfce4a9fc53ec24626fca0e881a80550188586a758fe465a189949bb07d8d SHA512 63887fd56bb3244f6adcda46d6b897c480f7ef3d347aaec733fa1ca25e7d528752aed9749fab481f97ca44640a26c6d14babd5a673a2b0b2bd3e66d28dc29143 WHIRLPOOL 32ee26161eab2f45581286da75bb0a9ed95f3de1e1143b718c42b65ccaa2a8ec042b1fc4b11ba1aafd2edbf36e20342b9140a2360edb74098e8fa8092fa71913
+MISC metadata.xml 745 SHA256 7d1d3625b9a7c693776dbcf8d471e31f14b858c186305bd89abe51460a02bee9 SHA512 6db1abbb2a02899c6ba440780f4035f05da80dfdbf4ccb2484ab8141db77afba021cb9709802679e25038513511fa4a47b64ed618b4e70fe6ccd548290511c03 WHIRLPOOL a16561148e1f49ba2689f601d20a72cb915a24b8fbbfb1f3e5c5b5bef71fe0218ec9bb698beb091fd2e6f06cefbb2ccf6c010d5fcbdeaf01b13d8ca8bf907c1c
diff --git a/net-misc/httpie/httpie-0.9.2.ebuild b/net-misc/httpie/httpie-0.9.2.ebuild
new file mode 100644
index 000000000000..6eb1b8778479
--- /dev/null
+++ b/net-misc/httpie/httpie-0.9.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CLI, cURL-like tool for humans"
+HOMEPAGE="http://httpie.org/ https://pypi.python.org/pypi/httpie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-0.9.3.ebuild b/net-misc/httpie/httpie-0.9.3.ebuild
new file mode 100644
index 000000000000..3dff6954a669
--- /dev/null
+++ b/net-misc/httpie/httpie-0.9.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CLI, cURL-like tool for humans"
+HOMEPAGE="http://httpie.org/ https://pypi.python.org/pypi/httpie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-0.9.4.ebuild b/net-misc/httpie/httpie-0.9.4.ebuild
new file mode 100644
index 000000000000..3dff6954a669
--- /dev/null
+++ b/net-misc/httpie/httpie-0.9.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CLI, cURL-like tool for humans"
+HOMEPAGE="http://httpie.org/ https://pypi.python.org/pypi/httpie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-0.9.9.ebuild b/net-misc/httpie/httpie-0.9.9.ebuild
new file mode 100644
index 000000000000..437c7beb31ea
--- /dev/null
+++ b/net-misc/httpie/httpie-0.9.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CLI, cURL-like tool for humans"
+HOMEPAGE="http://httpie.org/ https://pypi.python.org/pypi/httpie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/metadata.xml b/net-misc/httpie/metadata.xml
new file mode 100644
index 000000000000..34aed7f5eb16
--- /dev/null
+++ b/net-misc/httpie/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vikraman@gentoo.org</email>
+		<name>Vikraman Choudhury</name>
+	</maintainer>
+	<longdescription lang="en">
+		HTTPie is a command line HTTP client. Its goal is to make CLI
+		interaction with web services as human-friendly as possible. It
+		provides a simple http command that allows for sending arbitrary HTTP
+		requests using a simple and natural syntax, and displays colorized
+		responses. HTTPie can be used for testing, debugging, and generally
+		interacting with HTTP servers.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">httpie</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/httptype/Manifest b/net-misc/httptype/Manifest
new file mode 100644
index 000000000000..ecf8841487e3
--- /dev/null
+++ b/net-misc/httptype/Manifest
@@ -0,0 +1,5 @@
+DIST httptype-1.3.9.tar.gz 15254 SHA256 2b3981af663c406ae7f3a4e36b2def3f7a7a45a032e2bae76fe2f14757464526 SHA512 4e23bb60596bcfb0665c1ef5c0588ffc8bfe9b74bd7998577816b2e351ad55b2d8d01caf8e884e00be1f743adc31cb40264c8c55c90d9fc91ac7bf8180c1803d WHIRLPOOL 4af1caf417758f746e5c4c49e82944d0b0c46ea46f4b49edb3e6ebd06c1f7506b918207c48819069433b146333ffe05c7aab4057eec8ba7f0f7b20fd1e4896e8
+EBUILD httptype-1.3.9-r1.ebuild 460 SHA256 8b62e6659084631b54e6ebd1693c86c1a2929398ee2e4cd3887e3b1d9ceea65f SHA512 0c21c5f53a4cf0f84628164eb62852c4d2c34a9ba852a869b3f5fea74b42b06e7f5b94b65046b983890feec7bbcb3052af72c5dd2e4ec3595adde0e5522a6c26 WHIRLPOOL 67ce09a2385561e4caaf1d3d34e6ec974b778f8cbe5e1e3aa46e76159a0d10dd7bd6abce458f3a47f6f9a3097157eeb1067e361a8083a865ab071a78ad8d7283
+MISC ChangeLog 2436 SHA256 7d5fa4d0a26c4056681f644708551808c1d634c029281e5e704a1a0db20b5448 SHA512 662b8a53d25adef0b4dded9c1bc7476fd190e9753b16b87ac45b1c62d5979a66e9271df5cfe81ec0b553afc0635fb3d5709c16b1f774bd697224cd473d16e237 WHIRLPOOL 62e941c442cdc0c68671dc9e74f5f89095a53fb4c6eadf6abe51c93f5cee1f739115772fd2f58f63b62b809d38bac603417ceff5d414fe386fe8a598fa458e1a
+MISC ChangeLog-2015 2357 SHA256 1f2ccf71d5f7adbc9d779890b8d3a6784c006d40f4ccb0ab0cf6e043c90aac95 SHA512 404145da2ecffe7abf80aa351afc13230ccd3045c9734bc6cad3344bb2d0be5fa58695268fab6d3234a3fe12790955e842a2032c3ecfda1a2150730c5e7564f1 WHIRLPOOL 8daa13ea21fd94ea311e99c753b6b36d52199c927002698da96d7f1d3c99de780373d0c4cd6bbcbd6aa9be020dfc985866de50717f8a2eac5520ae70841a72fa
+MISC metadata.xml 358 SHA256 d445ae2e01a6a23de40bf4edbf08cc2b9d6cc32270408513d26e510450dace64 SHA512 60a1aaebd1648b9d6e8a36e66f894bf2c1f14988cc9fe21399d588ab3ce5359517667c47044c97b37760155a52e30475432b5b98c1bca5cb2ba57aef3ff73993 WHIRLPOOL e0d9249a033ad4a71c7d8c77fec189df88340c6c9ddf887c7453d4a44e65918a32c52fbb04c40e75667cdba8e6fcc1be8882a40e031a821d1d585d90fa578c72
diff --git a/net-misc/httptype/httptype-1.3.9-r1.ebuild b/net-misc/httptype/httptype-1.3.9-r1.ebuild
new file mode 100644
index 000000000000..0065330dce82
--- /dev/null
+++ b/net-misc/httptype/httptype-1.3.9-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Returns the http host software of a website"
+HOMEPAGE="http://httptype.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux"
+
+RDEPEND="dev-lang/perl"
+
+src_compile() { :; }
+
+src_install() {
+	dobin httptype
+	doman httptype.1
+	dodoc Changelog README
+}
diff --git a/net-misc/httptype/metadata.xml b/net-misc/httptype/metadata.xml
new file mode 100644
index 000000000000..f2da4c7b57cd
--- /dev/null
+++ b/net-misc/httptype/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">httptype</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
new file mode 100644
index 000000000000..722b9b872a0e
--- /dev/null
+++ b/net-misc/hylafaxplus/Manifest
@@ -0,0 +1,9 @@
+AUX hylafax-cryptglibc.patch 3154 SHA256 e8939efe6535aa51e9cf70e40c2951175f70412c368d5921862b64918c21c92e SHA512 04e2253cbc8b1f71e984a3d80e98d8aa5a7c7ab7ae286ecbecf8fb6c8d5528085b719a9dbc9f5dae6c788cfa83a57393d9ae0c36525eac658d244f4fc500f0cb WHIRLPOOL c01cc89a63d05b488084651b568a211ea7414f97b9d097f984918a70f7c85180b673b59bb509ede1567552c169137736d256a1b0e71a39dba15527f1a8ec0051
+AUX hylafaxplus-conf 572 SHA256 bc8851e560282ebce22073c146acaf2e848c4c1bdb49c4862b7f66c2062c2942 SHA512 ee97c45e49ed03bf2d393b7861fb8d0a92ce927243b7f1843c52de452540e78633e1a6d7b6892e6f5e30b5518b4b3d998354a3cfebe7adfd84da3f9586585621 WHIRLPOOL 136dea535ce736336d872b0e9545b745415bade140468801e14971e5035b75353f838de7e45a3f8bffc9cae671d8e337a1df804d071512ddb82e6cf8d0cf69da
+AUX hylafaxplus-init 3140 SHA256 de4c44b4d352a672fdfebae45f6f6e5eb72a5f3104a6d01fe5a9ce7fad123900 SHA512 22ac7b13c622da5b4a73c856eb3e97c44b4d0fb4ba760d544f4d1205eded913b2952f1cecc194815b34700f0e02b8604f908acc632677a9fb77fb2232b23025a WHIRLPOOL d977f49b7ffc6ce1299aa38eafb77acbc73e4489fc14485a948ec5ec6eb7eef7feb5fa90123f55073f41fb117f00c3143a913b4363384b36de3d815085a9346e
+AUX ldconfig-patch 463 SHA256 7f2bef0bad6aa0c6474d3bdaf486a4637b75d3312348e6633a89fab66985786b SHA512 3729b8c1a7bc9e0a7fda33a7f57ead1fcbb3f3642f8639303acf079b32dc2856659a92bc39bf36606ffc042b0ba656b3b4e962eedda2cadca5247663893c0a9a WHIRLPOOL ae60a190e869ea1bf5ecc271af87d670eb1b093dd097e01d72eda28a55b8f6416c0fc575b5a7954e81221c8e0737c14b8d037853fa1d9ff31191691d7b45f7dc
+DIST hylafax-5.5.5.tar.gz 1353495 SHA256 2916fb7ed6141dd6433336ee3ec4f9d93183d1142d1ebbecf696c646348e1f12 SHA512 ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf WHIRLPOOL e0e387a60abe242011a88178000b91eb93a22363deb7df925e70f9a8293a55db79c859b89dd4d4ac8520c1f62f652edfcad1fbb9cb1be429e1b5765e7572bf23
+EBUILD hylafaxplus-5.5.5.ebuild 4715 SHA256 a526421d3781c4254788e6dcc0e2490cc93506c809bc0723e0ea40e872b24e81 SHA512 e3b531d0ea6ed7039abbf2488f8ac5955b41691d1fa47da7182c06e7f44ec2f59082f8b3a1b7493c6129859e477bc72c2b8f21dfc795530fcf5e89de01bab05f WHIRLPOOL 6ffc3e231119adeea28c0cb72ad4299355ed4d913513fba174fcf032a9493205fad06ab513588c1bd4eaf36e235c72afabcb2509e7a2f2d0a16163b3f610dffa
+MISC ChangeLog 3441 SHA256 70ece2b7a7a3a7348803b4d923b4eae57cff51daebcbf70956078bd949675752 SHA512 28cd969c4987d182c07228c1b3753206198807cb315f45c4d51830ff58578f90055409ac4c901b3f1e7db9a578a10b4c533bc4851bb7b9f0217096adc1f6aac2 WHIRLPOOL ee1c44068ee11037c02ffd2415099e711edaccda1d2e60476d37168098a3b77d5859c18bcdec5dbbe659d769fc1bad368e8a3619cd1c13b80c6a919170618760
+MISC ChangeLog-2015 2957 SHA256 445ce6431573173113219b4ba1b0866df68f491ec616e418e662e4f85ba6c2a7 SHA512 34cbc05f300f5a9858f361f14144a40e59132ec9494850fb190db8565fe90ff1e974d4ca95c70c8e1da54e2ee1c007c744679e2e9181a02a365fb9edc9486405 WHIRLPOOL e83f191d3aaf3feac08b79a2026c3a2f913b075a4dde48255a26dcc6fe4b7d7109f00fd8f263dcb32592eab035322fe043d32a886f0061f67ad4ec32ace42e85
+MISC metadata.xml 578 SHA256 36c3ae392881bcae06b044859f66b57bcb3ed34d200eda47abe38ab5ac7e89ba SHA512 1f8cbc639c7ed84086201f71010c2ed662ebad39a3529cf0d9450be66f2d0d4660dde88b16050ef6e112672ce5d23db2210ea3d14a44452233f55aa22f28215d WHIRLPOOL eacfa215af141a1a1cd2f554ae663d6d9cbd2e5fa689346745f2d39cf4c3c211f4b7b7c302e780360634e40d80553fea8b340ec4d50f0afd5e04bfc20573d1b5
diff --git a/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch b/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch
new file mode 100644
index 000000000000..dbfc8bac5393
--- /dev/null
+++ b/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch
@@ -0,0 +1,98 @@
+diff -urN hylafax-5.5.4/hfaxd/Login.c++ hylafax-5.5.4-libc217/hfaxd/Login.c++
+--- hylafax-5.5.4/hfaxd/Login.c++	2013-08-07 01:23:35.000000000 +0200
++++ hylafax-5.5.4-libc217/hfaxd/Login.c++	2013-11-13 12:56:02.000000000 +0100
+@@ -30,9 +30,6 @@
+ #include <ctype.h>
+ #include <fcntl.h>
+ #include <pwd.h>
+-#if HAS_CRYPT_H
+-#include <crypt.h>
+-#endif
+ 
+ void
+ HylaFAXServer::loginRefused(const char* why)
+@@ -434,7 +431,7 @@
+     /*
+      * Check hosts.hfaxd first, then PAM, and last, LDAP
+      */
+-    if (pass[0] == '\0' || !(strcmp(crypt(pass, passWd), passWd) == 0 || 
++    if (pass[0] == '\0' || !(strcmp(Sys::crypt(pass, passWd), passWd) == 0 || 
+ 			     pamCheck(the_user, pass) || 
+ 			     ldapCheck(the_user,pass)))
+     {
+@@ -513,7 +510,7 @@
+ {
+     fxAssert(IS(LOGGEDIN), "ADMIN command permitted when not logged in");
+     // NB: null adminWd is permitted
+-    if ((strcmp(crypt(pass, adminWd), adminWd) != 0) && !pamIsAdmin()) {
++    if ((strcmp(Sys::crypt(pass, adminWd), adminWd) != 0) && !pamIsAdmin()) {
+ 	if (++adminAttempts >= maxAdminAttempts) {
+ 	    reply(530, "Password incorrect (closing connection).");
+ 	    logNotice("Repeated admin failures from %s [%s]"
+diff -urN hylafax-5.5.4/hfaxd/SNPPServer.c++ hylafax-5.5.4-libc217/hfaxd/SNPPServer.c++
+--- hylafax-5.5.4/hfaxd/SNPPServer.c++	2013-08-07 01:23:35.000000000 +0200
++++ hylafax-5.5.4-libc217/hfaxd/SNPPServer.c++	2013-11-13 12:55:42.000000000 +0100
+@@ -36,9 +36,6 @@
+ #include "RE.h"
+ 
+ #include <ctype.h>
+-#if HAS_CRYPT_H
+-#include <crypt.h>
+-#endif
+ 
+ extern "C" {
+ #include <netdb.h>
+@@ -1003,7 +1000,7 @@
+ 
+     if (checkUser(loginID)) {
+ 	if (passWd != "") {
+-	    if (pass[0] == '\0' || !(streq(crypt(pass, passWd), passWd) || pamCheck(the_user, pass))) {
++	    if (pass[0] == '\0' || !(streq(Sys::crypt(pass, passWd), passWd) || pamCheck(the_user, pass))) {
+ 		if (++loginAttempts >= maxLoginAttempts) {
+ 		    reply(421, "Login incorrect (closing connection).");
+ 		    logNotice("Repeated SNPP login failures for user %s from %s [%s]"
+diff -urN hylafax-5.5.4/hfaxd/User.c++ hylafax-5.5.4-libc217/hfaxd/User.c++
+--- hylafax-5.5.4/hfaxd/User.c++	2013-08-07 01:23:35.000000000 +0200
++++ hylafax-5.5.4-libc217/hfaxd/User.c++	2013-11-13 12:55:19.000000000 +0100
+@@ -30,9 +30,6 @@
+ 
+ #include <ctype.h>
+ #include <pwd.h>
+-#if HAS_CRYPT_H
+-#include <crypt.h>
+-#endif
+ #include <math.h>
+ 
+ #ifndef CHAR_BIT
+@@ -374,7 +371,7 @@
+ #else
+     to64(&salt[0], random(), 2);
+ #endif
+-    result = crypt(pass, salt);
++    result = Sys::crypt(pass, salt);
+     return (true);
+ }
+ 
+diff -urN hylafax-5.5.4/util/Sys.h hylafax-5.5.4-libc217/util/Sys.h
+--- hylafax-5.5.4/util/Sys.h	2013-08-07 01:23:35.000000000 +0200
++++ hylafax-5.5.4-libc217/util/Sys.h	2013-11-13 12:56:26.000000000 +0100
+@@ -44,6 +44,10 @@
+ #include <osfcn.h>
+ #endif
+ 
++#if HAS_CRYPT_H
++#include <crypt.h>
++#endif
++
+ /*
+  * Wrapper functions for C library calls.
+  *
+@@ -140,5 +144,8 @@
+ 	{ return ::fopen(filename, mode); }
+ 
+     static int getOpenMax();
++
++    static const char* crypt(const char* key, const char* salt)
++	{ const char* enc = ::crypt(key, salt); return enc ? enc : ""; }
+ };
+ #endif /* _Sys_ */
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-conf b/net-misc/hylafaxplus/files/hylafaxplus-conf
new file mode 100644
index 000000000000..911a59db4078
--- /dev/null
+++ b/net-misc/hylafaxplus/files/hylafaxplus-conf
@@ -0,0 +1,29 @@
+# Spool directory for HylaFAX
+spooldir="/var/spool/fax"
+
+# Faxq program path
+faxq="/usr/sbin/faxq"
+
+# hfaxd program path
+hfaxd="/usr/sbin/hfaxd"
+
+# faxgetty program path
+faxgetty="/usr/sbin/faxgetty"
+
+# Port of the hfaxd daemon for new protocol
+faxport=hylafax
+
+# Address used by hfaxd as binding address.
+faxbind="127.0.0.1"
+
+# Port of the hfaxd daemon for SNPP protocol
+snppport=444
+
+# Port of the hfaxd daemon for old protocol
+oldprotoport=4557
+
+# newproto | oldproto | snpp | any
+mode="newproto"
+
+# Directory where the pidfiles of HylaFAX are saved.
+piddir="/var/run"
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-init b/net-misc/hylafaxplus/files/hylafaxplus-init
new file mode 100644
index 000000000000..851cd3b09777
--- /dev/null
+++ b/net-misc/hylafaxplus/files/hylafaxplus-init
@@ -0,0 +1,176 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Author Geaaru
+# Distributed under the terms of the GNU General Public License v2
+
+opts="zap"
+
+depend() {
+	use lo
+}
+
+checkconfig() {
+	ebegin "Check hylafax server configuration..."
+
+	if [ x$spooldir == x ] ; then
+		eerror "No spooldir directory defined"
+		return 1
+	else
+		SPOOL=$spooldir
+		einfo "Use spool directory $SPOOL"
+	fi
+
+	if [ x$mode == x ] ; then
+		eerror "No mode defined"
+		return 1
+	fi
+
+	if [ ! -f $SPOOL/etc/setup.cache ] ; then
+		eerror "No $SPOOL/etc/setup.cache file founded. Use faxsetup command"
+		return 1
+	fi
+
+	if [[ x$hfaxd == x || ! -f $hfaxd ]] ; then
+		eerror "No hfaxd daemon founded"
+		return 1
+	fi
+
+	if [[ x$faxq == x || ! -f $faxq ]] ; then
+		eerror "No faxq program founded"
+		return 1
+	fi
+
+	if [[ x$faxgetty == x || ! -f $faxgetty ]] ; then
+		eerror "No faxgetty program founded"
+		return 1
+	fi
+
+	if [ x$faxbind == x ] ; then
+		eerror "No binding address supply"
+		return 1
+	fi
+
+	if [ x$piddir == x ] ; then
+		PIDDIR=$SPOOL
+	else
+		PIDDIR=$piddir
+	fi
+
+
+	hfaxd_args="-l $faxbind -q $SPOOL"
+
+	case $mode in
+		newproto)
+			if [[ x$faxport == x ]] ; then
+				eerror "No faxport defined"
+				return 1
+			fi
+			hfaxd_args="$hfaxd_args -i $faxport"
+			;;
+		oldproto)
+			if [[ x$oldprotoport == x ]] ; then
+				eerror "No oldprotoport defined"
+				return 1
+			fi
+			hfaxd_args="$hfaxd_args -o $oldprotoport"
+			;;
+		snpp)
+			if [[ x$snppport == x ]] ; then
+				eerror "No snppport defined"
+				return 1
+			fi
+			hfaxd_args="$hfaxd_args -s $snppport"
+			;;
+		any)
+			if [[ x$faxport == x || x$snppport == x || x$oldprotoport == x ]] ; then
+				eerror "No port data founded for old services"
+				return 1
+			fi
+			hfaxd_args="$hfaxd_args -i $faxport -s $snppport -o $oldprotoport"
+			;;
+		*)
+			eerror "Invalid mode"
+			return 1
+			;;
+
+	esac
+
+	faxq_args="-q $SPOOL"
+
+	# workaround for manage save of pidfile with start-stop-daemon
+	hfaxd_args="$hfaxd_args -d"
+	faxq_args="$faxq_args -D"
+		
+	return 0
+}
+
+start() {
+	local result
+
+	checkconfig || return 1
+
+	ebegin "Starting HylaFAX server daemons"
+
+	start_faxq
+	result=$?
+
+	if [ $result -ne 0 ]  ; then
+		eerror "Error on start $faxq daemon"
+		return 1
+	fi
+
+	start_hfaxd
+	result=$?
+
+	eend $result
+}
+
+start_hfaxd() {
+	local arguments="--start \
+			 --make-pidfile --pidfile $PIDDIR/hfaxd.pid"
+	
+	einfo "Starting $hfaxd with args $hfaxd_args"
+
+	start-stop-daemon -b ${arguments} --exec $hfaxd -- $hfaxd_args > /dev/null 2>&1
+
+	return $?;
+}
+
+start_faxq() {
+	local arguments="--start \
+			 --make-pidfile --pidfile $PIDDIR/faxq.pid"
+	einfo "Starting $faxq ... "
+
+	start-stop-daemon -b ${arguments} --exec $faxq -- $faxq_args > /dev/null 2>&1
+	
+	return $?
+}
+
+stop() {
+	checkconfig || return 1
+
+	ebegin "Stopping HylaFAX server daemons"
+	
+	start-stop-daemon --stop --quiet --pidfile $PIDDIR/hfaxd.pid
+	start-stop-daemon --stop --quiet --pidfile $PIDDIR/faxq.pid
+	eend $?
+}
+
+zap() {
+	checkconfig || return 1
+
+	ebegin "Zap HylaFAX server daemon files"
+
+	if [ -f $PIDFILE/hfaxd.pid ] ; then
+		rm -f $PIDFILE/hfaxd.pid
+	fi
+
+	if [ -f $PIDFILE/faxq.pid ] ; then
+		rm -f $PIDFILE/faxq.pid
+	fi
+}
+
+restart() {
+	stop
+	start
+}
diff --git a/net-misc/hylafaxplus/files/ldconfig-patch b/net-misc/hylafaxplus/files/ldconfig-patch
new file mode 100644
index 000000000000..8b0f4352d51f
--- /dev/null
+++ b/net-misc/hylafaxplus/files/ldconfig-patch
@@ -0,0 +1,10 @@
+--- faxd/Makefile.LINUXdso.original	2011-12-30 18:17:59.000000000 +0100
++++ faxd/Makefile.LINUXdso	2011-12-30 18:18:51.000000000 +0100
+@@ -37,7 +37,6 @@
+ 
+ installDSO: libfaxserver.${DSO}
+ 	${PUTSERV} -root ${INSTALLROOT} -F ${LIBDIR} -m 755 -O libfaxserver.${DSO}
+-	[ `id -u` -eq 0 ] && ( PATH=${PATH}:/sbin ldconfig ${LIBDIR} ) || ( echo "ldconfig is required to be run as user root at install time" )
+ 
+ uninstallDSO::
+ 	${RM} -f ${LIBDIR}/libfaxserver.${DSO}
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
new file mode 100644
index 000000000000..4d2724cc8570
--- /dev/null
+++ b/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils multilib pam toolchain-funcs
+
+MY_PN="${PN/plus/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
+HOMEPAGE="http://hylafax.sourceforge.net"
+SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="hylafaxplus"
+KEYWORDS="amd64 x86"
+
+IUSE="jbig html ldap mgetty pam"
+
+DEPEND="
+	>=sys-libs/zlib-1.1.4
+	app-text/ghostscript-gpl
+	virtual/mta
+	media-libs/tiff:0[jbig?]
+	virtual/jpeg:0
+	jbig? ( media-libs/jbigkit )
+	virtual/awk
+	ldap? (  net-nds/openldap )
+	pam? ( virtual/pam )
+	mgetty? ( net-dialup/mgetty[-fax] )
+	!net-dialup/mgetty[fax]
+"
+RDEPEND="${DEPEND}
+	net-mail/metamail
+	!net-dialup/sendpage
+"
+
+S="${WORKDIR}/${MY_P}"
+
+export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
+
+src_prepare() {
+	epatch "${FILESDIR}/ldconfig-patch"
+	epatch "${FILESDIR}/hylafax-cryptglibc.patch"
+
+	# force it not to strip binaries
+	for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
+		hfaxd sendfax sendpage ; do
+			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
+				"${dir}"/Makefile.in || die "sed failed"
+	done
+
+	sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
+
+	# Respect LDFLAGS(at least partially)
+	sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
+
+	sed -i -e "s|-fpic|-fPIC|g" \
+		configure || die
+
+	epatch_user
+}
+
+src_configure() {
+	do_configure() {
+		echo ./configure --nointeractive ${1}
+		# eval required for quoting in ${my_conf} to work properly, better way?
+		eval ./configure --nointeractive ${1} || die "./configure failed"
+	}
+	local my_conf="
+		--with-DIR_BIN=/usr/bin
+		--with-DIR_SBIN=/usr/sbin
+		--with-DIR_LIB=/usr/$(get_libdir)
+		--with-DIR_LIBEXEC=/usr/sbin
+		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
+		--with-DIR_LOCALE=/usr/share/locale
+		--with-DIR_LOCKS=/var/lock
+		--with-DIR_MAN=/usr/share/man
+		--with-DIR_SPOOL=/var/spool/fax
+		--with-DIR_HTML=/usr/share/doc/${P}/html
+		--with-DIR_CGI="${WORKDIR}"
+		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
+		--with-PATH_IMPRIP=\"\"
+		--with-SYSVINIT=no
+		--with-REGEX=yes
+		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
+		--with-OPTIMIZER=\"${CFLAGS}\"
+		--with-DSO=auto
+		--with-HTML=$(usex html)"
+
+	if use mgetty; then
+		my_conf="${my_conf} \
+			--with-PATH_GETTY=/sbin/mgetty \
+			--with-PATH_EGETTY=/sbin/mgetty \
+			--with-PATH_VGETTY=/usr/sbin/vgetty"
+	else
+		# GETTY defaults to /sbin/agetty
+		my_conf="${my_conf} \
+			--with-PATH_EGETTY=/bin/false \
+			--with-PATH_VGETTY=/bin/false"
+	fi
+
+	#--enable-pam isn't valid
+	use pam || my_conf="${my_conf} $(use_enable pam)"
+	use ldap || my_conf="${my_conf} $(use_enable ldap)"
+	use jbig || my_conf="${my_conf} $(use_enable jbig)"
+
+	tc-export CC CXX AR RANLIB
+
+	do_configure "${my_conf}"
+}
+
+src_compile() {
+	# Parallel building is borked
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
+	dodir /var/spool /var/spool/recvq /var/spool/fax
+	fowners uucp:uucp /var/spool/fax
+	fperms 0600 /var/spool/fax
+	dodir "/usr/share/doc/${P}/samples"
+
+	emake DESTDIR="${D}" \
+		BIN="${D}/usr/bin" \
+		SBIN="${D}/usr/sbin" \
+		LIBDIR="${D}/usr/$(get_libdir)" \
+		LIB="${D}/usr/$(get_libdir)" \
+		LIBEXEC="${D}/usr/sbin" \
+		LIBDATA="${D}/usr/$(get_libdir)/fax" \
+		DIR_LOCALE="${D}/usr/share/locale" \
+		MAN="${D}/usr/share/man" \
+		SPOOL="${D}/var/spool/fax" \
+		HTMLDIR="${D}/usr/share/doc/${PF}/html" \
+		install
+
+	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
+	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
+
+	generate_files # in this case, it only generates the env.d entry
+
+	einfo "Adding env.d entry for ${PN}"
+	doenvd "${T}/99${PN}"
+
+	newconfd "${FILESDIR}/${PN}-conf" ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+
+	use pam && pamd_mimic_system ${MY_PN} auth account session
+
+	dodoc CONTRIBUTORS README TODO
+	docinto samples
+}
+
+pkg_postinst() {
+	elog
+	elog "The faxonly USE flag has been removed; since ${PN} does not"
+	elog "require mgetty, and certain fax files conflict, you must build"
+	elog "mgetty without fax support if you wish to use them both.  You"
+	elog "may want to add both to package.use so any future updates are"
+	elog "correctly built:"
+	elog
+	elog "	net-dialup/mgetty -fax"
+	elog "	net-misc/hylafax [-mgetty|mgetty]"
+	elog
+	elog "See the docs and man pages for detailed configuration info."
+	elog
+	elog "Now run faxsetup and (if necessary) faxaddmodem."
+	elog
+}
+
+generate_files() {
+	cat <<-EOF > "${T}/99${PN}"
+	PATH="/var/spool/fax/bin"
+	CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
+	EOF
+}
diff --git a/net-misc/hylafaxplus/metadata.xml b/net-misc/hylafaxplus/metadata.xml
new file mode 100644
index 000000000000..2a90e2a4335b
--- /dev/null
+++ b/net-misc/hylafaxplus/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		Enterprise client-server fax package for class 1 and 2 fax modems.
+	</longdescription>
+	<use>
+		<flag name="jbig">JBIG Fax Compression Support</flag>
+		<flag name="pam">hfaxd authentication via PAM</flag>
+		<flag name="mgetty">Receive faxes via serial port connections</flag>
+		<flag name="html">Convert faxes into html email</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">hylafax</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/iaxmodem/Manifest b/net-misc/iaxmodem/Manifest
new file mode 100644
index 000000000000..3776877345d7
--- /dev/null
+++ b/net-misc/iaxmodem/Manifest
@@ -0,0 +1,9 @@
+AUX iaxmodem.cfg 2684 SHA256 cb3cab672319a8cd63e9d87f032bcb7493e26be25c87caeef7ce863cb80021fc SHA512 f77d8d5c913f166256b2ab4f0de65b8fc6cfcca495f161163ea47beb6099f8dd7aa763c0015481a80d07f86446b40fca17fde0a8297fd9f36f0c19c38337af99 WHIRLPOOL 14333e90aaefea6474aeb11d889af1552419f29cbac99b18e3840b32d95f056d76967ab54778ca7f6aad8638ec174674c1571f1409d71dcc81b34971809d78ef
+AUX iaxmodem.confd 140 SHA256 15fb51ad1dbca1731b90070eb78c024a4fa8a20060cc363ee4a55ac01fe32297 SHA512 6c69283cad4485fd782fa0022a2788c3ec25c02388804f4df06f0948be9b1dab3cb2dca363a32bb326bdbce392b5f7c5015a1ca6b87f6ad00c05511479a630de WHIRLPOOL 8e170bd60a16c703b85da32ba6c55f0b843f98d508e64f252d8622a7ddd2b025078fec2450b2a57271eda77c162660645dc01cbc089b4b1d3f0eaabed8f46c9c
+AUX iaxmodem.initd 1162 SHA256 47e4b3a356efbfa1bc3b5bfec2cc9c5e42b77674576dfdf96b50f6aae28bcf9a SHA512 dc3dfd7f74501a1686a3bcebcd357339bc49e87d45e40659eb87f037b27ecb3f1b9fb67d780f71d4c765188436378f13290ac58865bcea12fd2d61158cf4773b WHIRLPOOL 57a645997ab817b4a794664fb6a94e7cb3289b748c8188ec745a932ad0437f03f99d33c288ac4b2d47bdf463ec85ab54504ffc6318b8e6f089f2d8f42ed0551c
+AUX iaxmodem.logrotated 164 SHA256 515f89aeaf50c30633c04329b084e56d8ee33454de318beb77f52f66d08a7273 SHA512 3f4734fec0ea1361f5ee58d75eb4b8cff5f557abc4a73996e40e5ed43050c79fb82da23b01412d9200f600226a5e66a220a2c56b112e0b0945c5f0ffa2d84c2d WHIRLPOOL 1a655473b3b262ae06cc6b98c843e10b64875265565a9df657f6729ae04d1886f1228c8463061b40d3047f2bf1eeeb4d031cfcaed43d4b232ef907468db19905
+DIST iaxmodem-1.3.0.tar.gz 2483995 SHA256 9dcff90bbc41846e5c3919ca92687df4b17f54d8df692940b8c67c4e98287535 SHA512 3add8fe1c228ee63f12a3d23fcc8bad5405b9fa6af70cadbcdb276d4e7dfe2a90f1b7c300d35659ab0247010c2315e25a5def5715e670071226bd89271d004f4 WHIRLPOOL 52502bdda06ec3bf128b738c0f7f59ea668961dbd70c31b873374c195bbbf23d0a1fb103d4b4baf313ec83a2c2d438e3a1db8bed772d5e5c0662f32741216c1e
+EBUILD iaxmodem-1.3.0-r1.ebuild 2728 SHA256 073655324862b812960e54e126b5150ce9cef2f4e8104039db985f1bddd4940d SHA512 90b5fae853c27127b887f3536ae74c10419bc307521e4cf93075db6f3cf707208a292e2bba40a843d01a174d51edf52575c2405c3c0db00a8aee8518d4bb208f WHIRLPOOL d2295cb2ebc712963858fb9c714b92fd9be11f0d80a6e3afaa2e6bbffda6a9f4a8c73f1fdd243c5c8b8e1c91631bc67f7e178baad2b28f3d75ef84d18a4a892b
+MISC ChangeLog 3742 SHA256 1c42f73d5eb78064d3a6d76fc8967f4fa739ebd357241a1def8110c38b35eb61 SHA512 0ef154b01850deb775d29028ff93fa5516264e5df6a41da47c570b8dd5bf3e2b060d8d134467329b2dabf408e3408c1e30ce0221e2908a82c7f85da59dddcabc WHIRLPOOL 763f1805d81324508dd4f01ec156447904906d968acc7980e5e05fd19f433c38e4161640370f04048cb58bc77fa3c3a97b7e8e378f151aec8b73492b0d55a0a7
+MISC ChangeLog-2015 1051 SHA256 60fd218fdbc70c7ef34e7d972a2fc49cbfda792c5fe39e49a8fe6f18d6b6f244 SHA512 93e8a2884c69caf45f1ac32bb0298f396d8232ba4673a9d35a00e8dc622356847804a3bdac908d2ab09a3b8c7b18942054c0ec7b638c49c57e6929bd195fdab7 WHIRLPOOL 4bcb3be723e667f5dcc65ca8f1a6a0b3d03d0ced4872071d63a216feafe41c1114d922c8cfe27bd3b5d8a132a30452a77e23bcc6bf2f233f7b584389f41104c3
+MISC metadata.xml 506 SHA256 d0b850f159435416792ea7a9299679fe02e52d1baf9d34b280cc190a69e937a2 SHA512 a5f0f8500bd6db8c294d0a9e207786227a5d523203977e300791ea23a7d9e40d9b50f90d2f47704a1fa8eda72efff48800108adf075cc7e529fb4559f86bb2ef WHIRLPOOL 3098db27592d421d30c2aba4b8b59d93703396d8c07e437963bf12cc8b1b63847098b581b609183a944cfd7c75bbbbc50600b7032f0b2f402d4d5d2b2388185e
diff --git a/net-misc/iaxmodem/files/iaxmodem.cfg b/net-misc/iaxmodem/files/iaxmodem.cfg
new file mode 100644
index 000000000000..8a30e912e58b
--- /dev/null
+++ b/net-misc/iaxmodem/files/iaxmodem.cfg
@@ -0,0 +1,88 @@
+; Sample Configuration for IAXmodem
+;
+; Comments can be placed into the IAXmodem configuration files by beginning
+; them with a semicolon (";").
+;
+; Copy this file to the /etc/iaxmodem directory with a unique file name.
+; The name of the file will serve as the identifier, if you choose to
+; launch iaxmodem in non-daemon mode.
+
+
+; The "nodaemon" entry exempts the modem from inclusion with daemon use.
+; Comment out this line, if you want to use this config in daemon mode!
+
+nodaemon
+
+; The "device" entry is the full name of the device that you will be using
+; in your modem application.  If running multiple instances of iaxmodem then
+; you will need a different device for each instance.
+
+device  /dev/ttyIAX
+
+; The "owner" entry (formatted "user:group") is the system user and group
+; that IAXmodem should use for the created device.
+
+owner  uucp:uucp
+
+; The "mode" entry is the permissions mode for the created device.
+
+mode  660
+
+; The "port" entry refers to the preferred port number on which to listen
+; for communications from the Asterisk server (so if you're using more than
+; one IAXmodem on a single IP address you will need to have each IAXmodem
+; configuration use a different port).  You should not use "4569" if Asterisk
+; is already listening on port 4569.
+
+port  4570
+
+; The "refresh" entry indicates the preference on how frequently to refresh
+; the registration with the Asterisk server.  (However, the actual refresh
+; value that is used will be negotiated between IAXmodem and the Asterisk
+; server.)  By setting this to a value of "0" (zero), IAXmodem will not
+; register with the server, and thus the server should be configured to
+; communicate with IAXmodem on a static address.
+
+refresh  300
+
+; The "server", "peername", and "secret" entries refer to the server name
+; (or address), the registered peer name for the IAXmodem client, and the
+; registered secret (password) for the IAXmodem client.
+
+server    127.0.0.1
+peername  iaxmodem
+secret    password
+
+; The entries "cidname" and "cidnumber" refer to the Caller*ID presentation
+; that will be made by IAXmodem to the Asterisk server.
+
+cidname    John Doe
+cidnumber  8005551212
+
+; The "codec" entry refers to the preferred audio codec. This can be
+; "slinear", "alaw", or "ulaw".
+
+codec	slinear
+;codec	alaw
+;codec	ulaw
+
+; The "record" entry causes audio files to be recorded.
+
+;record
+
+; The "replay" entry causes the audio files to be replayed back.
+
+;replay
+
+; The "nojitterbuffer" entry disables the very simple iaxmodem jitterbuffer
+
+;nojitterbuffer
+
+; The "iax2debug" entry enables debugging output for IAX2.
+
+;iax2debug
+
+; The "dspdebug" entry enables debugging output for the DSPs.
+
+;dspdebug
+
diff --git a/net-misc/iaxmodem/files/iaxmodem.confd b/net-misc/iaxmodem/files/iaxmodem.confd
new file mode 100644
index 000000000000..5998d8a36e96
--- /dev/null
+++ b/net-misc/iaxmodem/files/iaxmodem.confd
@@ -0,0 +1,6 @@
+# Configfile for /etc/init.d/iaxmodem
+
+# Set the priority of the iaxmodem process
+# Value: (highest) -20..19 (lowest)
+#
+#IAXMODEM_NICE="-5"
diff --git a/net-misc/iaxmodem/files/iaxmodem.initd b/net-misc/iaxmodem/files/iaxmodem.initd
new file mode 100644
index 000000000000..327b0843c922
--- /dev/null
+++ b/net-misc/iaxmodem/files/iaxmodem.initd
@@ -0,0 +1,42 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="IAXmodem"
+description_reload="Reread configuration file and make the appropriate changes"
+extra_started_commands="reload"
+command="/usr/sbin/iaxmodem"
+pidfile="/var/run/iaxmodem.pid"
+name="iaxmodem"
+
+depend() {
+	use asterisk
+	need net
+}
+
+start() {
+	ebegin "Starting ${description}"
+	start-stop-daemon --start --quiet --pidfile "${pidfile}" \
+		--env TMPDIR="/tmp" --nice ${IAXMODEM_NICE:-0} --exec "${command}"
+	eend ${?}
+}
+
+stop() {
+	local childs=""
+	ebegin "Stopping ${description}"
+	# start-stop-daemon doesn't kill childs reliable, so we
+	# use a combination of pgrep + start-stop-daemon + kill
+	[ -s "${pidfile}" ] && childs=$(pgrep -P $(cat "${pidfile}"))
+	start-stop-daemon --stop --quiet --pidfile "${pidfile}" --retry TERM/10/KILL/5
+	if eend ${?}; then
+		# if there're still childs running, kill them!
+		[ -n "${childs}" ] && kill -KILL ${childs} 2>/dev/null
+		return 0 
+	fi
+}
+
+reload() {
+	ebegin "Reloading ${description} configuration"
+	start-stop-daemon --stop --signal HUP --pidfile "${pidfile}"
+	eend ${?}
+}
diff --git a/net-misc/iaxmodem/files/iaxmodem.logrotated b/net-misc/iaxmodem/files/iaxmodem.logrotated
new file mode 100644
index 000000000000..037aa94ef9dd
--- /dev/null
+++ b/net-misc/iaxmodem/files/iaxmodem.logrotated
@@ -0,0 +1,9 @@
+/var/log/iaxmodem/* {
+    notifempty
+    missingok
+    size 1000k
+    sharedscripts
+    postrotate
+	/etc/init.d/iaxmodem --ifstarted --quiet reload
+    endscript
+}
diff --git a/net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild b/net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..af7d88a80cbe
--- /dev/null
+++ b/net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="Software modem that uses an IAX channel instead of a traditional phone line"
+HOMEPAGE="https://sourceforge.net/projects/iaxmodem/"
+SRC_URI="mirror://sourceforge/iaxmodem/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="media-libs/tiff:=
+	sys-process/procps"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# fix header file position
+	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c || die
+
+	# fix broken line terminators
+	sed -i -e 's:\r::g' -e 's:--s$:--:g' -e 's:$:\r:g' iaxmodem.inf || die
+
+	# fix installation of libiax2 headers (though we don't need them)
+	sed -i -e 's: \(\$(includedir)/\): $(DESTDIR)\1:g' lib/libiax2/src/Makefile.in || die
+
+	# patch configure (we compile libs for ourself)
+	sed -i -e 's:^\(cd\|./configure\):# \1:g' configure || die
+	sed -i -e 's:build-libiax build-libspandsp ::g' Makefile.in || die
+
+	# fix dumb x86_64 libdir handling
+	sed -i -e 's: \(x86_64-\*)\): _DISABLED_\1:g' lib/spandsp/configure || die
+}
+
+src_configure() {
+	cd "${S}/lib/libiax2" || die
+	econf --disable-static \
+		--libdir=/usr/$(get_libdir)/iaxmodem \
+		--datadir=/usr/share/iaxmodem/libiax2
+
+	cd "${S}/lib/spandsp" || die
+	econf --disable-static \
+		--libdir=/usr/$(get_libdir)/iaxmodem \
+		--datadir=/usr/share/iaxmodem
+
+	cd "${S}"
+	./configure || die "configure iaxmodem failed"
+}
+
+src_compile() {
+	cd "${S}/lib/libiax2" || die
+	emake
+
+	cd "${S}/lib/spandsp" || die
+	emake
+
+	cd "${S}"
+	emake OBJS="iaxmodem.o" CC=$(tc-getCC) \
+		LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/iaxmodem \
+			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax"
+}
+
+src_install() {
+	cd "${S}/lib/libiax2" || die
+	emake DESTDIR="${D}" install
+
+	cd "${S}/lib/spandsp" || die
+	emake DESTDIR="${D}" install
+
+	cd "${S}"
+	dosbin iaxmodem
+
+	# remove libiax and spandsp headers, we don't need them
+	rm -rf "${D}usr/include" "${D}usr/bin/iax-config" || die
+
+	# install init-script + conf
+	newinitd "${FILESDIR}/iaxmodem.initd" iaxmodem
+	newconfd "${FILESDIR}/iaxmodem.confd" iaxmodem
+
+	# install docs
+	doman iaxmodem.1
+	newdoc CHANGES ChangeLog
+	newdoc lib/libiax2/ChangeLog ChangeLog.libiax2
+	newdoc lib/spandsp/ChangeLog ChangeLog.spandsp
+	dodoc FAQ README lib/spandsp/DueDiligence
+
+	# install sample configs
+	insinto /etc/iaxmodem
+	newins "${FILESDIR}/iaxmodem.cfg" default
+	insinto /usr/share/iaxmodem
+	doins config.ttyIAX iaxmodem-cfg.ttyIAX iaxmodem.inf
+
+	# install logrotate rule
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/iaxmodem.logrotated" iaxmodem
+
+	# create log dir
+	keepdir /var/log/iaxmodem
+}
diff --git a/net-misc/iaxmodem/metadata.xml b/net-misc/iaxmodem/metadata.xml
new file mode 100644
index 000000000000..0b2db7eb138c
--- /dev/null
+++ b/net-misc/iaxmodem/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-needed -->
+	<longdescription lang="en">
+		IAXmodem is a software modem written in C that uses an IAX channel
+		(commonly provided by an Asterisk PBX system) instead of a traditional
+		phone line and uses a DSP library instead of DSP hardware chipsets.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">iaxmodem</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
new file mode 100644
index 000000000000..df914e57ec9c
--- /dev/null
+++ b/net-misc/icaclient/Manifest
@@ -0,0 +1,11 @@
+AUX 10ICAClient 88 SHA256 9178cf9a99a0ad43fae17bab5f5a13a9b50827a30223d64416bc4853da0fc7ee SHA512 1a9c405dd4e5629595cdbbd5a712432fd40531ef094c84fb64849a49885dca2e9e27687fe01568735a12c11282fa851aab7d26d0db8606acd7b577eae8339e57 WHIRLPOOL 11ac86fa78aaacee570a1aa72d4c3a35f1ec79d7082a3509f772698843c56a2b5ccec68e4634f19eef78786be10bce68c98f8438c5b236752f5339d6eee63ed1
+DIST linuxx64-13.6.0.10243651.tar.gz 20685306 SHA256 6e423be41d5bb8186bcca3fbb4ede54dc3f00b8d2aeb216ae4aabffef9310d34 SHA512 e28e417a3a4e8d292b243d894f954692a6042adc0851c595ae25107ac9d6e84cc8e6d232c759ba2a45d9571b3f673e0e3f8431bb6736508f310f990799e6f58f WHIRLPOOL 3a74736590ec4d60c99632ceb41a3ba90585bb02fcba1d7236b463185f71688bb4d3e935256a005a5d82819e1d747b8250fe25704c6bf62c7fc5ebe72124d3ac
+DIST linuxx64-13.7.0.10276927.tar.gz 19647618 SHA256 18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91 SHA512 30b05ca67ed5d53d01bd8e83473f9b71613562186c40479797d19ad665f9d73ba43f2af974878b78d9d86c67b7b5c6e88701427daaf0a46c45e13ba915e0fe58 WHIRLPOOL 0ca4763f03a491e0bf4ce849f8a172d6daa56dc6db0725c0c175665abeebf158caad258b8775c0d92953cf71aa16e08d2f07cb0f0bcf37956833bf33c8297789
+DIST linuxx86-13.6.0.10243651.tar.gz 22560063 SHA256 0ba3eba208b37844904d540b3011075ed5cecf429a0ab6c6cd52f2d0fd841ad2 SHA512 06fd3d738be851c8b75790bf5dac3897b71ebffb028864119a43053ab45815c6ffb04d3b8e37d79673d85179034d22da923e2972dc12807ac409e087e18919cd WHIRLPOOL eee6d5aaaf3c1164541d21d29a381ef9610110eb314117613447adb65033be6c43ff17444ac8e745b006c674e64e107eee7d7efaf479434d925bfe354b2b3084
+DIST linuxx86-13.7.0.10276925.tar.gz 21531393 SHA256 4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6 SHA512 7fb6efffe0fc7681197de00a86e15c7b2de30bcd8c581d4da59a8fdebcea4f2da41ad1f573e81761c5bcf554718a75716aa75b28b8c3ac77461246a5c9f48cd1 WHIRLPOOL 9fd4c92613a369856d8251d86b923bdb79794cdcae2c17364f09df36b0501f6ed2890e4c6c2297f8c346157b4653524e2c7c28ca9caa2e2eaafd220e91b5f856
+EBUILD icaclient-13.6.0.10243651.ebuild 4632 SHA256 9a7e4b268d13707ebcdf2ddf95c2d85f0449f85f2cfc8cb756e28d88a24648c0 SHA512 1bd702b09ed0e9c2265f0d40ff1451d510ec9de6a64384c5a0dcc51b9909e726edb93e8e2e7a37828568f77f1a143af070b8af0cbcf50d54b8a29aa86714886c WHIRLPOOL b5f2f4695598eb4ae7efc50bc13de440f6a03945e06708eac45fe109867c94695dae87a671a026e2de35004f6eeef8253d85e5da4f30c30f0e523c6272719fa9
+EBUILD icaclient-13.7.0.10276925.ebuild 4636 SHA256 e8c31e2ad4fc4cc14779b7604d3e3167971afaf399b9190268fed9a2bfa01233 SHA512 3273c929b5c1c5cf003ca61038d78c2615ac3d1484c74009550b7ad4adad1dcf86e413ecda99839172abea19242e92acb3502fe6eb7f83ab6f3b28d71501378e WHIRLPOOL 535bc6366c422e8aa0ed17ba092edf486933cacfa7bfb2eba333746383c93810a9f06965b264e9ac0073181020451a40340afbabebd2441c3fb1530627b7425b
+EBUILD icaclient-13.7.0.10276927.ebuild 4631 SHA256 369dbd5613e8d92c41c8ddc33ac57294bacc1ebdabc792c9b0d991c7c3a88948 SHA512 d7da197d63cd566abcb85a57ffd2aa967a656201c957c36b97fe414fea5c7fa318d03d9405ada93a996537778208b276a8ee0152852f391be2fa059ac2e8e16c WHIRLPOOL dfa098405a87c611d0fccf672016c2855f23adcfd9fc92aa1ae90c0bf2ba880aa23af8b7525a2cf2ea131aa44ec639170add0c55dfd9e339201ae7a6fec6dbbf
+MISC ChangeLog 5485 SHA256 009fa57de36fb783834ae53d8145d5b109ea5ab05a2656126d93f9088a9a869f SHA512 e8348a4327ac535c142bc8aa38fe3566f703921c6c78c6f4a9e09e2fa1334e26626d757f9398037ec02764ebab435660e8510bbff550fdf878b964b594fc3ed5 WHIRLPOOL a125971dd95f95d8415990136f73e2b0df154e7db4a7d5dbb5cafee2001283bd3c76cbc83a7e6f0d4f2b240f732bc521c7f817dafcb56e071561197530792883
+MISC ChangeLog-2015 15528 SHA256 779b76e7fcaf377474c26bf4f9d9f4bd0ba3207b5c830f5ed8b9ed1777220848 SHA512 ed28c508e6fe29616bafecb3167cf229fd44cc358ac418c67bb03578790930ab858ffeb1349b9b4409180cb3a189410dd4401deefe9b7ecd84835665e1722a24 WHIRLPOOL 402fda9fd006e6b064e232f78713896a2d20255c40f4f89985545933c541805a0e0543e98dca1a1f76f5047217a49867c94767de69193492891fa38b387b04ea
+MISC metadata.xml 731 SHA256 8053f5d6b49a39661b8df479948f2a1ce0d15d14c0dd664d4d90121c8c837620 SHA512 dab4b211f7d0b6e4c1b25ea2009de42a50d1ae69b05a5aeada2870282c2049e8212bf88a879a349b92a00669f8f3ab348e8513f12b5e8143b1258b58f0f610b0 WHIRLPOOL 63544b5d612679bef94dc658bb408522f37289b4f9f0ecf916fb1d5db16ec57143a5f424c2410c2d12e94c68f20adeb3ec09900d9e627a393957c1c75ceec749
diff --git a/net-misc/icaclient/files/10ICAClient b/net-misc/icaclient/files/10ICAClient
new file mode 100644
index 000000000000..31be24e3380a
--- /dev/null
+++ b/net-misc/icaclient/files/10ICAClient
@@ -0,0 +1,3 @@
+PATH=/opt/Citrix/ICAClient
+ROOTPATH=/opt/Citrix/ICAClient
+ICAROOT=/opt/Citrix/ICAClient
diff --git a/net-misc/icaclient/icaclient-13.6.0.10243651.ebuild b/net-misc/icaclient/icaclient-13.6.0.10243651.ebuild
new file mode 100644
index 000000000000..5a7c8f00a2d6
--- /dev/null
+++ b/net-misc/icaclient/icaclient-13.6.0.10243651.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils versionator
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="http://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
+	x86? ( linuxx86-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	media-fonts/font-xfree86-type1
+	media-fonts/font-misc-ethiopic
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/libcanberra[gtk]
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/speex
+	net-dns/libidn
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	sys-libs/e2fsprogs-libs
+	sys-libs/zlib
+	virtual/krb5
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+	gstreamer010? (
+		media-libs/gst-plugins-base:0.10
+		media-libs/gstreamer:0.10
+	)
+"
+DEPEND=""
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/citrix-receiver.html"
+	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
+}
+
+src_unpack() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		x86)
+			ICAARCH=linuxx86
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+
+	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+}
+
+src_install() {
+	local tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	doexe lib/*.so
+
+	if use nsplugin ; then
+		exeinto "${ICAROOT}"
+		doexe npica.so
+		dosym "${ICAROOT}"/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
+	fi
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"
+	doins -r usb
+
+	insinto "${ICAROOT}"/config
+	doins config/* config/.* nls/en/*.ini
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	LANGCODES="en"
+	use linguas_de && LANGCODES+=" de"
+	use linguas_es && LANGCODES+=" es"
+	use linguas_fr && LANGCODES+=" fr"
+	use linguas_ja && LANGCODES+=" ja"
+	use linguas_zh_CN && LANGCODES+=" zh_CN"
+
+	for lang in ${LANGCODES} ; do
+		insinto "${ICAROOT}"/nls/${lang}
+		doins nls/${lang}/*
+
+		insinto "${ICAROOT}"/nls/$lang/UTF-8
+		doins nls/${lang}.UTF-8/*
+
+		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+		doins nls/${lang}/LC_MESSAGES/*
+
+		insinto "${ICAROOT}"/nls/${lang}
+		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	rm -r "${S}"/keystore/cacerts || die
+	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+	exeinto "${ICAROOT}"/util
+	# echo_cmd, gst_aud_play and gst_aud_read still require gst-0.10
+	if use gstreamer010 ; then
+		doexe util/{echo_cmd,gst_aud_play,gst_aud_read,gst_play0.10,gst_read0.10,libgstflatstm0.10.so}
+	fi
+	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so}
+	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" > "${D}"/etc/revdep-rebuild/70icaclient
+}
+
+pkg_preinst() {
+	local old_plugin="/usr/lib64/nsbrowser/plugins/npwrapper.npica.so"
+	if use amd64 && [[ -f ${old_plugin} ]] ; then
+		local wrapper="/usr/bin/nspluginwrapper"
+		if [[ -x ${wrapper} ]] ; then
+			einfo "Removing npica.so from wrapper."
+			${wrapper} -r ${old_plugin}
+		fi
+	fi
+}
diff --git a/net-misc/icaclient/icaclient-13.7.0.10276925.ebuild b/net-misc/icaclient/icaclient-13.7.0.10276925.ebuild
new file mode 100644
index 000000000000..dd9cf49c6f73
--- /dev/null
+++ b/net-misc/icaclient/icaclient-13.7.0.10276925.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils versionator
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="http://www.citrix.com/"
+#SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
+SRC_URI="x86? ( linuxx86-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	media-fonts/font-xfree86-type1
+	media-fonts/font-misc-ethiopic
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/libcanberra[gtk]
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/speex
+	net-dns/libidn
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	sys-libs/e2fsprogs-libs
+	sys-libs/zlib
+	virtual/krb5
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+	gstreamer010? (
+		media-libs/gst-plugins-base:0.10
+		media-libs/gstreamer:0.10
+	)
+"
+DEPEND=""
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/citrix-receiver.html"
+	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
+}
+
+src_unpack() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		x86)
+			ICAARCH=linuxx86
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+
+	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+}
+
+src_install() {
+	local tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	doexe lib/*.so
+
+	if use nsplugin ; then
+		exeinto "${ICAROOT}"
+		doexe npica.so
+		dosym "${ICAROOT}"/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
+	fi
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"
+	doins -r usb
+
+	insinto "${ICAROOT}"/config
+	doins config/* config/.* nls/en/*.ini
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	LANGCODES="en"
+	use linguas_de && LANGCODES+=" de"
+	use linguas_es && LANGCODES+=" es"
+	use linguas_fr && LANGCODES+=" fr"
+	use linguas_ja && LANGCODES+=" ja"
+	use linguas_zh_CN && LANGCODES+=" zh_CN"
+
+	for lang in ${LANGCODES} ; do
+		insinto "${ICAROOT}"/nls/${lang}
+		doins nls/${lang}/*
+
+		insinto "${ICAROOT}"/nls/$lang/UTF-8
+		doins nls/${lang}.UTF-8/*
+
+		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+		doins nls/${lang}/LC_MESSAGES/*
+
+		insinto "${ICAROOT}"/nls/${lang}
+		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	rm -r "${S}"/keystore/cacerts || die
+	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+	exeinto "${ICAROOT}"/util
+	# echo_cmd, gst_aud_play and gst_aud_read still require gst-0.10
+	if use gstreamer010 ; then
+		doexe util/{echo_cmd,gst_aud_play,gst_aud_read,gst_play0.10,gst_read0.10,libgstflatstm0.10.so}
+	fi
+	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so}
+	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" > "${D}"/etc/revdep-rebuild/70icaclient
+}
+
+pkg_preinst() {
+	local old_plugin="/usr/lib64/nsbrowser/plugins/npwrapper.npica.so"
+	if use amd64 && [[ -f ${old_plugin} ]] ; then
+		local wrapper="/usr/bin/nspluginwrapper"
+		if [[ -x ${wrapper} ]] ; then
+			einfo "Removing npica.so from wrapper."
+			${wrapper} -r ${old_plugin}
+		fi
+	fi
+}
diff --git a/net-misc/icaclient/icaclient-13.7.0.10276927.ebuild b/net-misc/icaclient/icaclient-13.7.0.10276927.ebuild
new file mode 100644
index 000000000000..cdd7f6ba8c6a
--- /dev/null
+++ b/net-misc/icaclient/icaclient-13.7.0.10276927.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils versionator
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="http://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )"
+	#x86? ( linuxx86-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	media-fonts/font-xfree86-type1
+	media-fonts/font-misc-ethiopic
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/libcanberra[gtk]
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/speex
+	net-dns/libidn
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	sys-libs/e2fsprogs-libs
+	sys-libs/zlib
+	virtual/krb5
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+	gstreamer010? (
+		media-libs/gst-plugins-base:0.10
+		media-libs/gstreamer:0.10
+	)
+"
+DEPEND=""
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/citrix-receiver.html"
+	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
+}
+
+src_unpack() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		x86)
+			ICAARCH=linuxx86
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+
+	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+}
+
+src_install() {
+	local tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	doexe lib/*.so
+
+	if use nsplugin ; then
+		exeinto "${ICAROOT}"
+		doexe npica.so
+		dosym "${ICAROOT}"/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
+	fi
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"
+	doins -r usb
+
+	insinto "${ICAROOT}"/config
+	doins config/* config/.* nls/en/*.ini
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	LANGCODES="en"
+	use linguas_de && LANGCODES+=" de"
+	use linguas_es && LANGCODES+=" es"
+	use linguas_fr && LANGCODES+=" fr"
+	use linguas_ja && LANGCODES+=" ja"
+	use linguas_zh_CN && LANGCODES+=" zh_CN"
+
+	for lang in ${LANGCODES} ; do
+		insinto "${ICAROOT}"/nls/${lang}
+		doins nls/${lang}/*
+
+		insinto "${ICAROOT}"/nls/$lang/UTF-8
+		doins nls/${lang}.UTF-8/*
+
+		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+		doins nls/${lang}/LC_MESSAGES/*
+
+		insinto "${ICAROOT}"/nls/${lang}
+		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	rm -r "${S}"/keystore/cacerts || die
+	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+	exeinto "${ICAROOT}"/util
+	# echo_cmd, gst_aud_play and gst_aud_read still require gst-0.10
+	if use gstreamer010 ; then
+		doexe util/{echo_cmd,gst_aud_play,gst_aud_read,gst_play0.10,gst_read0.10,libgstflatstm0.10.so}
+	fi
+	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so}
+	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" > "${D}"/etc/revdep-rebuild/70icaclient
+}
+
+pkg_preinst() {
+	local old_plugin="/usr/lib64/nsbrowser/plugins/npwrapper.npica.so"
+	if use amd64 && [[ -f ${old_plugin} ]] ; then
+		local wrapper="/usr/bin/nspluginwrapper"
+		if [[ -x ${wrapper} ]] ; then
+			einfo "Removing npica.so from wrapper."
+			${wrapper} -r ${old_plugin}
+		fi
+	fi
+}
diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml
new file mode 100644
index 000000000000..c452a2ea9a4e
--- /dev/null
+++ b/net-misc/icaclient/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<use>
+		<flag name="gstreamer010">Enable audio support via
+			<pkg>media-libs/gstreamer</pkg> using SLOT 0.10
+		</flag>
+	</use>
+	<longdescription>
+		ICAClient is a Linux client to a Citrix Metaframe Server.
+	</longdescription>
+	<longdescription lang="ja">
+		ICAClient は Citrix Metaframe Server への Linux 用クライアントです。
+	</longdescription>
+	<longdescription lang="de">
+		ICAClient ist ein Programm zum Zugriff auf Citrix Metaframe Server.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
new file mode 100644
index 000000000000..eb9d4623a7e8
--- /dev/null
+++ b/net-misc/icecast/Manifest
@@ -0,0 +1,11 @@
+AUX icecast-2.3.3-fix-xiph_openssl.patch 648 SHA256 5804664e9add19dd679056b7ea07f19aa63205c7e5b84b2bc858c420e9688c57 SHA512 fa4014a3aad9886b14f6551cf72c8ae8d97b6879302fc11e8a7b120464540c077786a3209e5f87316393362a9e00d759686c9a3448dd00ec0503e025d28301f2 WHIRLPOOL 2b1e52069b970ecd2091236287c09034741959d61b9a18dcb66fc7059817367e5cabea7334d3887f432b4a26a578225cfb240ff68cdaa5c03ea35bfb2dd9077e
+AUX icecast-2.3.3-libkate.patch 1175 SHA256 880cef8feed886933eae495f547d10b3f9462a87f0812718bca6f454f25ecc40 SHA512 4ecacacb422ceb71bb6f8857228b2c00e2564d6926124aa8e9430b0f1466df934146fcbbc67194a6e644f6c4c16421474016909c385ec2271967730f80f5b8b3 WHIRLPOOL 0a2bea3dc404a61663b606bb14e862a3e2a985519133d80919406a7e4c86dddb3d2bb25e2af044cc02fd5d0528dcf7889e66b30dc5c05a3068cd3ab0af7b98d0
+AUX icecast.initd 431 SHA256 2b86cbceb69d2f9dffc9f238ff3d91c6be87e653127f1a55a22cd0f82c7a7490 SHA512 5f15d51057207976bc5b8219f44c73d7e01b1032630270c25c02f398668650d3f5ddf776c72235c8db6a8d227fc2f918c6bd473154bb412e2804f068f7667a0d WHIRLPOOL 1769abb73bafd91269bb648ae08c68f8e5a21baca9fed0c608a872cf2b4680d07fc7b1495fd316cce5f9707ace36c9162d596b4eac2cb6325d7a67fe0a58cac6
+AUX icecast.logrotate 140 SHA256 da38b3c3233bf7a4a059100361ecb1083fd74f22dbb5b8200a0eaad699ae1d0d SHA512 8aead6208b97b1d1cbd5d17a61dd3dd2493bdf68bfefc3ab6f9ae3e1acc856435942de7a129ef701c5379450428b9718e50701636e16d9e1ddccc8c752c2ccac WHIRLPOOL 88ae3b16f3e2c0a2e3defc86eabe24a83a94e23267a362652dc6282d04c31b8d33f6d377426c6a45b58fffb5569a7ba1e3303af9cc9d37318ea1d72a2b44c082
+AUX icecast.service 185 SHA256 fbb6dfff2d5075d5921138352c7242742fc1e8f228fa977ea704f0270e8e8817 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51 WHIRLPOOL 62657838fe2f43cb0a1881b7de58a763cd19541ca14a9ff5d487cd69380eeab0e8f1d061a8b6b7b2230c5f6ef94f98f100d3d014d6be42960ac6ff2df1223340
+AUX icecast.xml 6775 SHA256 4c9c2ffa6d2e50ac940df978b05acbdd94ffe128a8d54224ab43084b3602cb51 SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96 WHIRLPOOL 60822963e707ee0a9f7f2e9ac9fe9d28245bda7d84e0d00d43e22286dae2838c513093f989a3bc87aac89363b4d8f9fd22555e31552315cf84b9fdf5bfc29074
+DIST icecast-2.4.3.tar.gz 2393358 SHA256 c85ca48c765d61007573ee1406a797ae6cb31fb5961a42e7f1c87adb45ddc592 SHA512 70e755ee935e738f2b7310333823992517747897692d101b67d73d5cd40d6385a20c25d089a0430806c116021e6e2055761efee9fec27cd9bccb2b58a2bfd446 WHIRLPOOL ab75b4f09bff4725fa2bf27f6a49c7f8dd7c9f66e9333e6cfe3ec92e4e84a0562648407ebb891ec7fea8d7bc9680204572972875c76d20f131f43f3748ca5347
+EBUILD icecast-2.4.3.ebuild 2193 SHA256 880f9a04bcb5eecf395863ff2a5bc8c7840d273b62cbd691ea55568018b54d86 SHA512 a687f8a9b909a0beb8fb6dd533b8393668ec7d02faed1aaeb2245966ebfa6cd5bbe1d6ef147602ee71b27e4ca8e9df7252f00559d0e65c035a6eea4cdb7fe8fe WHIRLPOOL 8444f0d367a280ea73832200556612c3498484667faf87585ac73f625204fc338cd2b34906451828c19fc2b8c65d82b223f1c6b3c5c72681e635979769c279e4
+MISC ChangeLog 3056 SHA256 5916ed75b4ff76efde68ce52ae12505e8d64b31abd5da0459aef1b24bafbfdda SHA512 300263b1c88d54e84c2a971d3f6f17c7ac2a0dd1200187e0a568b3153df5298b1c9321d1cb3cd69333ad3dfddf7b5911c45f71dee0015a35cd8da6791d288780 WHIRLPOOL c5d982f683a7b6510a29811f4e7259088725f3587790c7f88352eb5049983ecc9becc779f14eb3fb01043d903c111e5e5fa8c8d035eccc777a32441cd68e5366
+MISC ChangeLog-2015 16489 SHA256 c8c9ebfc44854009cd8f9c40162e32028e9c41cea3eb1c81b62fb4b0e67b608a SHA512 c3284f446eb428c18d8fa7e42ed5e5329815fccbe90b8fa1e7d079592ebb38015376fa617b4bae2f742667ee2479a4ebddca1f94b3827e57b1000bb6b41af402 WHIRLPOOL cda21ecabed95e13b233359e487cb56bd01a3152ab6ef043542218709757cdbfbe658f860978ebb9a8721338eb7cb1fca592ef62ede013452a08063d1ba6b0ef
+MISC metadata.xml 520 SHA256 8c7e90c7039a6ff56f6beebb29fc93e716d03c1c38a891543189100c1401dbf8 SHA512 6d9ecf525b9ce4b5b6a49ce0621fe73bd2d692d1b1fbd3bd79081eecb234f7f32704b2d191a462d9bc650592010743d7de664696a5df5e901401832e8101c227 WHIRLPOOL 4c86955cc3984c5c613cf5578f854919f916e20a2d7da52b7cf0bde584751e1e51cf6001e7fab5955718539ab0596340364b1410a304f640bb0cd5f6c5e89d1c
diff --git a/net-misc/icecast/files/icecast-2.3.3-fix-xiph_openssl.patch b/net-misc/icecast/files/icecast-2.3.3-fix-xiph_openssl.patch
new file mode 100644
index 000000000000..7db5be1500de
--- /dev/null
+++ b/net-misc/icecast/files/icecast-2.3.3-fix-xiph_openssl.patch
@@ -0,0 +1,13 @@
+Index: icecast-2.3.3/m4/xiph_openssl.m4
+===================================================================
+--- icecast-2.3.3.orig/m4/xiph_openssl.m4
++++ icecast-2.3.3/m4/xiph_openssl.m4
+@@ -10,7 +10,7 @@ AC_ARG_WITH(openssl,
+     AC_HELP_STRING([--with-openssl=PFX],[Prefix where openssl is installed (optional)]),
+     openssl_prefix="$withval", openssl_prefix="")
+ 
+-if test "x$openssl_prefix" != "x" -a "x$openssl_prefix" != "xyes"; then
++if test "x$openssl_prefix" != "x" -a "x$openssl_prefix" != "xyes" -a "x$openssl_prefix" != "xno"; then
+     OPENSSL_LIBS="-L$openssl_prefix/lib -lssl"
+     OPENSSL_CFLAGS="-I$openssl_prefix/include"
+ else
diff --git a/net-misc/icecast/files/icecast-2.3.3-libkate.patch b/net-misc/icecast/files/icecast-2.3.3-libkate.patch
new file mode 100644
index 000000000000..32cbd78ed964
--- /dev/null
+++ b/net-misc/icecast/files/icecast-2.3.3-libkate.patch
@@ -0,0 +1,28 @@
+Index: icecast-2.3.3/configure.in
+===================================================================
+--- icecast-2.3.3.orig/configure.in
++++ icecast-2.3.3/configure.in
+@@ -81,14 +81,18 @@ XIPH_PATH_SPEEX(
+     [ AC_MSG_WARN([Speex support disabled!])
+     ])
+ 
+-AC_CHECK_LIB(kate, kate_decode_init,[have_kate=yes],[have_kate=no], -logg)
+-if test "x$have_kate" == "xyes"
++AC_ARG_ENABLE([kate], AS_HELP_STRING([--disable-kate], [Disable karaoke and text encapsulation support for ogg]))
++if test "x$enable_kate" != "xno"
+ then
+-  AC_CHECK_LIB(oggkate, kate_ogg_decode_headerin,[have_kate=yes],[have_kate=no],-lkate -logg)
++  AC_CHECK_LIB(kate, kate_decode_init,[have_kate=yes],[have_kate=no], -logg)
+   if test "x$have_kate" == "xyes"
+   then
+-    KATE_LIBS="-loggkate -lkate -logg"
+-    AC_DEFINE([HAVE_KATE],[1],[Define if you have libkate])
++    AC_CHECK_LIB(oggkate, kate_ogg_decode_headerin,[have_kate=yes],[have_kate=no],-lkate -logg)
++    if test "x$have_kate" == "xyes"
++    then
++      KATE_LIBS="-loggkate -lkate -logg"
++      AC_DEFINE([HAVE_KATE],[1],[Define if you have libkate])
++    fi
+   fi
+ fi
+ dnl we still use format_kate as it doesn't need libkate to work
diff --git a/net-misc/icecast/files/icecast.initd b/net-misc/icecast/files/icecast.initd
new file mode 100644
index 000000000000..cb658a3907d4
--- /dev/null
+++ b/net-misc/icecast/files/icecast.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+pidfile="/var/run/icecast.pid"
+command="/usr/bin/icecast"
+command_args="-c /etc/icecast2/icecast.xml"
+command_background="true"
+
+depend() {
+	need net
+}
+
+reload() {
+	ebegin "Reloading Icecast2 configuration"
+	start-stop-daemon --signal HUP --pidfile ${pidfile}
+	eend $?
+}
diff --git a/net-misc/icecast/files/icecast.logrotate b/net-misc/icecast/files/icecast.logrotate
new file mode 100644
index 000000000000..4e7aafb8edcb
--- /dev/null
+++ b/net-misc/icecast/files/icecast.logrotate
@@ -0,0 +1,8 @@
+/var/log/icecast/*log {
+	missingok
+	notifempty
+	sharedscripts
+	postrotate
+	/etc/init.d/icecast reload > /dev/null 2>&1 || true
+	endscript
+}
diff --git a/net-misc/icecast/files/icecast.service b/net-misc/icecast/files/icecast.service
new file mode 100644
index 000000000000..badb65e5d93c
--- /dev/null
+++ b/net-misc/icecast/files/icecast.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=An opensource alternative to shoutcast
+After=network.target
+ 
+[Service]
+ExecStart=/usr/bin/icecast -c /etc/icecast2/icecast.xml
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/icecast/files/icecast.xml b/net-misc/icecast/files/icecast.xml
new file mode 100644
index 000000000000..3415885deba4
--- /dev/null
+++ b/net-misc/icecast/files/icecast.xml
@@ -0,0 +1,180 @@
+<icecast>
+    <limits>
+        <clients>100</clients>
+        <sources>2</sources>
+        <queue-size>524288</queue-size>
+        <client-timeout>30</client-timeout>
+        <header-timeout>15</header-timeout>
+        <source-timeout>10</source-timeout>
+        <!-- If enabled, this will provide a burst of data when a client 
+             first connects, thereby significantly reducing the startup 
+             time for listeners that do substantial buffering. However,
+             it also significantly increases latency between the source
+             client and listening client.  For low-latency setups, you
+             might want to disable this. -->
+        <burst-on-connect>1</burst-on-connect>
+        <!-- same as burst-on-connect, but this allows for being more
+             specific on how much to burst. Most people won't need to
+             change from the default 64k. Applies to all mountpoints  -->
+        <burst-size>65535</burst-size>
+    </limits>
+
+    <authentication>
+        <!-- Sources log in with username 'source' -->
+        <source-password>hackme</source-password>
+        <!-- Relays log in username 'relay' -->
+        <relay-password>hackme</relay-password>
+
+        <!-- Admin logs in with the username given below -->
+        <admin-user>admin</admin-user>
+        <admin-password>hackme</admin-password>
+    </authentication>
+
+    <!-- Uncomment this if you want directory listings -->
+    <!--
+    <directory>
+        <yp-url-timeout>15</yp-url-timeout>
+        <yp-url>http://dir.xiph.org/cgi-bin/yp-cgi</yp-url>
+    </directory>
+    <directory>
+        <yp-url-timeout>15</yp-url-timeout>
+        <yp-url>http://www.oddsock.org/cgi-bin/yp-cgi</yp-url>
+    </directory>
+     -->
+
+    <!-- This is the hostname other people will use to connect to your server.
+    It affects mainly the urls generated by Icecast for playlists and yp
+    listings. -->
+    <hostname>localhost</hostname>
+
+    <!-- You can use these two if you only want a single listener -->
+    <!--<port>8000</port> -->
+    <!--<bind-address>127.0.0.1</bind-address>-->
+
+    <!-- You may have multiple <listener> elements -->
+    <listen-socket>
+        <port>8000</port>
+        <!-- <bind-address>127.0.0.1</bind-address> -->
+    </listen-socket>
+    <!--
+    <listen-socket>
+        <port>8001</port>
+    </listen-socket>
+    -->
+
+    <!--<master-server>127.0.0.1</master-server>-->
+    <!--<master-server-port>8001</master-server-port>-->
+    <!--<master-update-interval>120</master-update-interval>-->
+    <!--<master-password>hackme</master-password>-->
+
+    <!-- setting this makes all relays on-demand unless overridden, this is
+         useful for master relays which do not have <relay> definitions here.
+         The default is 0 -->
+    <!--<relays-on-demand>1</relays-on-demand>-->
+
+    <!--
+    <relay>
+        <server>127.0.0.1</server>
+        <port>8001</port>
+        <mount>/example.ogg</mount>
+        <local-mount>/different.ogg</local-mount>
+        <on-demand>0</on-demand>
+
+        <relay-shoutcast-metadata>0</relay-shoutcast-metadata>
+    </relay>
+    -->
+
+    <!-- Only define a <mount> section if you want to use advanced options,
+         like alternative usernames or passwords -->
+    <!--
+    <mount>
+        <mount-name>/example-complex.ogg</mount-name>
+
+        <username>othersource</username>
+        <password>hackmemore</password>
+
+        <max-listeners>1</max-listeners>
+        <dump-file>/tmp/dump-example1.ogg</dump-file>
+        <burst-size>65536</burst-size>
+        <fallback-mount>/example2.ogg</fallback-mount>
+        <fallback-override>1</fallback-override>
+        <fallback-when-full>1</fallback-when-full>
+        <intro>/example_intro.ogg</intro>
+        <hidden>1</hidden>
+        <no-yp>1</no-yp>
+        <authentication type="htpasswd">
+                <option name="filename" value="myauth"/>
+                <option name="allow_duplicate_users" value="0"/>
+        </authentication>
+        <on-connect>/home/icecast/bin/stream-start</on-connect>
+        <on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
+    </mount>
+
+    <mount>
+        <mount-name>/auth_example.ogg</mount-name>
+        <authentication type="url">
+            <option name="mount_add"       value="http://myauthserver.net/notify_mount.php"/>
+            <option name="mount_remove"    value="http://myauthserver.net/notify_mount.php"/>
+            <option name="listener_add"    value="http://myauthserver.net/notify_listener.php"/>
+            <option name="listener_remove" value="http://myauthserver.net/notify_listener.php"/>
+        </authentication>
+    </mount>
+
+    -->
+
+    <fileserve>1</fileserve>
+
+    <!-- set the mountpoint for a shoutcast source to use, the default if not
+         specified is /stream but you can change it here if an alternative is
+         wanted or an extension is required -->
+    <!--
+    <shoutcast-mount>/live.nsv</shoutcast-mount>
+    -->
+
+    <paths>
+		<!-- basedir is only used if chroot is enabled -->
+        <basedir>/usr/share/icecast</basedir>
+
+        <!-- Note that if <chroot> is turned on below, these paths must both
+             be relative to the new root, not the original root -->
+        <logdir>/var/log/icecast</logdir>
+        <webroot>/usr/share/icecast/web</webroot>
+        <adminroot>/usr/share/icecast/admin</adminroot>
+        <!-- <pidfile>/usr/share/icecast/icecast.pid</pidfile> -->
+
+        <!-- Aliases: treat requests for 'source' path as being for 'dest' path
+             May be made specific to a port or bound address using the "port"
+             and "bind-address" attributes.
+          -->
+        <!--
+        <alias source="/foo" dest="/bar"/>
+          -->
+        <!-- Aliases: can also be used for simple redirections as well,
+             this example will redirect all requests for http://server:port/ to
+             the status page
+          -->
+        <alias source="/" dest="/status.xsl"/>
+    </paths>
+
+    <logging>
+        <accesslog>access.log</accesslog>
+        <errorlog>error.log</errorlog>
+        <!-- <playlistlog>playlist.log</playlistlog> -->
+      	<loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+      	<logsize>10000</logsize> <!-- Max size of a logfile -->
+        <!-- If logarchive is enabled (1), then when logsize is reached
+             the logfile will be moved to [error|access|playlist].log.DATESTAMP,
+             otherwise it will be moved to [error|access|playlist].log.old.
+             Default is non-archive mode (i.e. overwrite)
+        -->
+        <!-- <logarchive>1</logarchive> -->
+    </logging>
+
+    <security>
+        <chroot>0</chroot>
+        <changeowner>
+            <user>icecast</user>
+            <group>nogroup</group>
+        </changeowner>
+    </security>
+</icecast>
diff --git a/net-misc/icecast/icecast-2.4.3.ebuild b/net-misc/icecast/icecast-2.4.3.ebuild
new file mode 100644
index 000000000000..0bb95c586543
--- /dev/null
+++ b/net-misc/icecast/icecast-2.4.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools systemd user
+
+DESCRIPTION="Opensource alternative to shoutcast that supports mp3, ogg and aac streaming"
+HOMEPAGE="http://www.icecast.org/"
+SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE="kate libressl logrotate +speex +ssl +theora +yp"
+
+#Although there is a --with-ogg and --with-orbis configure option, they're
+#only useful for specifying paths, not for disabling.
+DEPEND="dev-libs/libxslt
+	dev-libs/libxml2
+	media-libs/libogg
+	media-libs/libvorbis
+	kate? ( media-libs/libkate )
+	logrotate? ( app-admin/logrotate )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora )
+	yp? ( net-misc/curl )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewuser icecast -1 -1 -1 nogroup
+}
+
+PATCHES=(
+	# bug #368539
+	"${FILESDIR}"/${PN}-2.3.3-libkate.patch
+	# bug #430434
+	"${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--docdir=/usr/share/doc/${PF} \
+		--sysconfdir=/etc/icecast2 \
+		$(use_enable kate) \
+		$(use_with theora) \
+		$(use_with speex) \
+		$(use_with yp curl) \
+		$(use_with ssl openssl) \
+		$(use_enable yp)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
+	docinto html
+	dodoc doc/*.html
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	insinto /etc/icecast2
+	doins "${FILESDIR}"/icecast.xml
+	fperms 600 /etc/icecast2/icecast.xml
+
+	if use logrotate; then
+		dodir /etc/logrotate.d
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${PN}.logrotate ${PN}
+	fi
+	diropts -m0764 -o icecast -g nogroup
+	dodir /var/log/icecast
+	keepdir /var/log/icecast
+	rm -r "${D}"/usr/share/doc/icecast || die
+}
+
+pkg_postinst() {
+	touch "${ROOT}"var/log/icecast/{access,error}.log
+	chown icecast:nogroup "${ROOT}"var/log/icecast/{access,error}.log
+}
diff --git a/net-misc/icecast/metadata.xml b/net-misc/icecast/metadata.xml
new file mode 100644
index 000000000000..706360d136cc
--- /dev/null
+++ b/net-misc/icecast/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+	<name>Lars Wendler</name>
+  </maintainer>
+  <use>
+    <flag name="kate">Add karaoke and text encapsulation support for Ogg files</flag>
+	<flag name="logrotate">Install support files for <pkg>app-admin/logrotate</pkg>?</flag>
+    <flag name="yp">Build support for yp public directory listings</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
new file mode 100644
index 000000000000..e648d7442062
--- /dev/null
+++ b/net-misc/ices/Manifest
@@ -0,0 +1,9 @@
+AUX ices.initd 328 SHA256 5055ffd478b7f0ebb0dd9e387b486f98dbee59ed39d2c7b23b6349b5eae8a48e SHA512 55ad0dbde053d3d2b666e597b4720511c67adbd445b0c98fa1d096c400b77e1ed181b62859cdc97a071097b9abc194fea315052b35316537dac2f2d1cbf1b282 WHIRLPOOL 3b3efb7c67dc0cb2c946e373958826a323e2bd03ed192894b3de19730798f046abcd5811851f00645882dc697b72be4a718f3b0e7b65aa7e3056941ad0d7e4c1
+AUX ices.initd-r1 307 SHA256 4b288cd43a19e2f467fff31f66bdd30d5c54241b9edc61bf03bda804dee19359 SHA512 de3aa2919cb715c6036d1b993275560819528e8c6d616362e414e9bc6cf77a67393f68c1643ebfac1b43e8d3bf2ce3bde004894921d8bfdf66eb667fbaa7bae9 WHIRLPOOL 8abb1d822f4f28d84b62c6367ce7130b6697804589ac01b630a551669b90396a2f2fc9b0d0203db1d98a688b2e7fe9160e583e816aaaceb776ca204ca5e9bb9a
+DIST ices-2.0.1.tar.bz2 273805 SHA256 04ec784b5ca6f5a2951631252d61e01c6d16c6fcf17cbe32d702dbe761fc238d SHA512 324a50c01513221617921805e0d2d37170751a7bbfc331c988eeedbddebc2dcc62aaa1ac75c3ebec253589ba7be7dc6580c0c57689450730a68f99e6bc1abcf8 WHIRLPOOL 6aa17edfdcfcf576ddb2d268e4a62512d1ce6541552c6b0df5886e094db5733d7dd1da8fe739b54f98cb01582fa6708914f8d6cb347a70f3b1b19c32ea843339
+DIST ices-2.0.2.tar.bz2 293818 SHA256 96458df835033c39236ad3bb099286c033241f8ea7c138e7ccf714e7ade75900 SHA512 ff257b478a7237886ba59bf7d1a494ebd4c7c12fd74e8e10c00ea65710249ead1b5b1ae8d9540fab05f2e4486949c6e350f3da59a1d1bf261397ca257806b2c7 WHIRLPOOL a0523f412aae8cb967de4614fb549e7dfc31aef3980639bce13cfd5d8bec118a2ffa7962d3d59b3fc01ddd105c98554e2b1528ae93b5b41fc3244721abecdd0d
+EBUILD ices-2.0.1-r1.ebuild 1003 SHA256 410a324dc68278c5f458ad8f18513898075f5480ea2445ea31d6d139178c84ae SHA512 8133a91f44271c70205147e4b5e667fde88b037aee34946f4b1baacf43b21f3bab3dd8cc15dd1bba0cc0d8d50ba1395fd703aa81f5ab700e1a120d1d26ed8b77 WHIRLPOOL 6e646fa707bf1efc238f7dccd8bc8f50ac462257ad9105c2fac52517089dd03085234eb57d770d5c321e7adfbf1bdaa3c43b4d654da6e4be328b63ff775a46b5
+EBUILD ices-2.0.2.ebuild 881 SHA256 53dc260d49894e0bc9bcb0087579fee85d88eb1b39df5f810f1e9292c9157195 SHA512 008621d193fbaaa968053da1f86d9d60438d52222841b28d7614d900a20b1b620ef3eaf7a36ef2d66eb80107399591aa36487bfa6fe8b5f0e8f716320d0d8bda WHIRLPOOL 75977113f2ea4a03ba01ffd6637ec43367afd60fa194a04e285044d44f9412333d7bdfa33d6b6b9f4976fbeae8a94101ee85e5bd0b84aef9b5b974b88a29a647
+MISC ChangeLog 2663 SHA256 78539bb19d123d7b6deed7e030cdb8e55d53724dc2a3dd6d6bac9a92b58ce28b SHA512 ef4b14e1d8c095fa4e428b074e9ec97181f778a5c5b84da1d0419f1efb250f25baee821e444181393864592c30ac589e88223c58c7716f10ac83df20952f9641 WHIRLPOOL 35ac2f0e3c41f41a33b4832d7eed82c85554bd95292bf409056be40e5ed66a8951131fe1015a102e13038847dbb31a0699194f653afd28b800ce30f7e40ef5f5
+MISC ChangeLog-2015 3722 SHA256 03a1734758c4936cf58a19e27d9142cdacd01f12dbf21454386087ed0b49163d SHA512 4c7b8f6429de7b7335ccf12488af53b877d1c38add8266e3df5ad6c166db7c254619fe5294f5d87df41b53865d73bc04440295d07feb3c4a7518afe0f0c6b9ae WHIRLPOOL 0acee4e3b62be0246c2c37f25aafc02a990f7c23142fc98af3c0556850c36733954416a974fa3d88393b58454bb3d3067d9af5af350db044dc17fb83b9dbf85b
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/net-misc/ices/files/ices.initd b/net-misc/ices/files/ices.initd
new file mode 100644
index 000000000000..ada3b4943e28
--- /dev/null
+++ b/net-misc/ices/files/ices.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting IceS 2"
+	start-stop-daemon --background --start --pidfile /var/run/ices.pid --make-pidfile --exec /usr/bin/ices /etc/ices2/ices.xml
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping IceS 2"
+	start-stop-daemon --stop --pidfile /var/run/ices.pid --name ices
+	eend $?
+}
diff --git a/net-misc/ices/files/ices.initd-r1 b/net-misc/ices/files/ices.initd-r1
new file mode 100644
index 000000000000..dbc76374c359
--- /dev/null
+++ b/net-misc/ices/files/ices.initd-r1
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Icecast OGG streaming client"
+pidfile="/var/run/ices.pid"
+command="/usr/bin/ices"
+command_args="/etc/ices2/ices.xml"
+command_background="true"
+
+depend() {
+	need net
+}
diff --git a/net-misc/ices/ices-2.0.1-r1.ebuild b/net-misc/ices/ices-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..21cfe4fe3058
--- /dev/null
+++ b/net-misc/ices/ices-2.0.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils user
+
+DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
+HOMEPAGE="http://www.icecast.org/ices.php"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+	>=media-libs/libshout-2
+	>=media-libs/libvorbis-1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	enewgroup ices
+	enewuser ices -1 -1 -1 ices
+}
+
+src_compile() {
+	econf --sysconfdir=/etc/ices2
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS README TODO
+	insinto /etc/ices2
+	doins conf/*.xml
+	dohtml doc/*.{html,css}
+	newman debian/ices2.1 ices.1
+	newinitd "${FILESDIR}"/ices.initd ices
+	keepdir /var/log/ices
+	fperms 660 /var/log/ices
+	fowners ices:ices /var/log/ices
+	rm -rf "${D}"/usr/share/ices
+}
diff --git a/net-misc/ices/ices-2.0.2.ebuild b/net-misc/ices/ices-2.0.2.ebuild
new file mode 100644
index 000000000000..48cd3cf6e018
--- /dev/null
+++ b/net-misc/ices/ices-2.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
+HOMEPAGE="http://www.icecast.org/ices.php"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+	>=media-libs/libshout-2
+	>=media-libs/libvorbis-1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	enewgroup ices
+	enewuser ices -1 -1 -1 ices
+}
+
+src_configure() {
+	econf --sysconfdir=/etc/ices2
+}
+
+src_install() {
+	default
+	insinto /etc/ices2
+	doins conf/*.xml
+	dohtml doc/*.{html,css}
+	newinitd "${FILESDIR}"/ices.initd-r1 ices
+	keepdir /var/log/ices
+	fperms 660 /var/log/ices
+	fowners ices:ices /var/log/ices
+	rm -rf "${D}"/usr/share/ices
+}
diff --git a/net-misc/ices/metadata.xml b/net-misc/ices/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/net-misc/ices/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/ifenslave/Manifest b/net-misc/ifenslave/Manifest
new file mode 100644
index 000000000000..a3c70102c1f3
--- /dev/null
+++ b/net-misc/ifenslave/Manifest
@@ -0,0 +1,6 @@
+DIST ifenslave-2.6_1.1.0-17.debian.tar.gz 9406 SHA256 5d34e36dcdd83ec9615e2cb51951888939179be6350eab1cc6c978b0ff662a75 SHA512 90773620e15883f39f3bf3039133385d21d597f2051b81d98f96a2d7b9d7f69bf8f00bab0ffa2ad0fde5b2f4b83cac683b24925f26b6f014c0fa06f6d1023de5 WHIRLPOOL 5ab7bbe48c33efbad002270c704f2ff7149ff435b748a5aa6e1476dbf5ee14a23f71225fcb1f2da21e40b38897a58678d94be72828aa30fe8cb0dcd6c7f5e9ff
+DIST ifenslave-2.6_1.1.0.orig.tar.gz 8002 SHA256 7917bf34de80a2492eb225adf9168c83a4854ac8a008ed0fd5b3fd147ccd3041 SHA512 65d9b632e88c63dc4c2bae752a4561cc7f315278b301c906c6f023934d6af8cdb894d06e1582d831bf0ac88f8d27751115b4f2e8bea6cbb89a705e4bc04068c7 WHIRLPOOL badadeb1377ec29e8be108b4365137724473593f15bab8c57550b450889c6a41b5c5be2dc9c281c1cae9e2ef02dbbddab9d1bd716036e366b3ae5a203aa4e2b4
+EBUILD ifenslave-1.1.0-r6.ebuild 1543 SHA256 9b51c72c2d736ad8a4128b55974447d8a27ae1b050b594797ca4f3dcc47d8306 SHA512 8d8b9e7a250d4205d9d2f8429f2cf435d7f3466b0abb8b869ab4210ee81247c4533c0a165703b2c622377a2b03879692f7a4bb729688b5744683cbbfe5e6d35c WHIRLPOOL f788cdf88fab8277c60be2b3eba508b412131b8a0a809bc8270ab4fb9b9c4cd561f3f3974d03fd1a52ab5f0572d8f01335a7e224c1b65aaf85f97f9b994cf29d
+MISC ChangeLog 2188 SHA256 6307b196edd60298d33b3a33695dc2697ed5d7381a43fab5d24a845714b9a272 SHA512 eac73c755a93de923fa81a1e41f4060905b8c71fef2b5d3dcb5ecf26843ad4464bedf03d510c8a9c2f11ec2664ffbdf593ffc0af76c65e1cc671b96f2004f10d WHIRLPOOL 79ae5945b875e5a07b559f2d87718eddae8846dc0a0681253fb547db1d3296c0b06e0bf52623ea915b24871621697996b824a7d82ca78f53f9d4e22ab7bcefc9
+MISC ChangeLog-2015 5110 SHA256 f4559e20b0b19731c142e4500f3f3144454198005e48708020b59e51cc246fa1 SHA512 8e4f85d730c82cffad3fd15bd63552ba80886eb300fba4152fc01072d5fe1870c18def8afd12562758f7c60a687ef68ae4e3dc8145c93a7fbe419dc813ebc856 WHIRLPOOL d3f9eb6eb71d4c80c287d0318e734e8b98cc96abe833229aba95e3bfbc2802c90b8dd3950547bdcf368c7534a86a2dc5cb165221dfbbcdfee61c1dc9f9b440c3
+MISC metadata.xml 354 SHA256 3e0c109bef52ad516900e2dec8426701ab39a4f1f56376d9ffa27b7d3968e2ca SHA512 895e974387a0fc3f640cf539633dfb54ad0023caed577d902063d4b8abf87745c48c8b3272be051dc471db7e723db22baabab9e1b720de19a66e9f4cf1f761d2 WHIRLPOOL 5a1cec2480d4ba37efd59372950c65777e91cd9f9e41a8ef971d5387f7d3f1ec78530cda99ec79372be4821de72bd7da97eae699526807b7121cc786507cbd94
diff --git a/net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild b/net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild
new file mode 100644
index 000000000000..8199a0f5a180
--- /dev/null
+++ b/net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+MY_PN="ifenslave-2.6" # this is NOT an error
+DEBIAN_PV="17"
+DEBIANPKG_TARBALL="${MY_PN}_${PV}.orig.tar.gz"
+DEBIANPKG_PATCH="${MY_PN}_${PV}-${DEBIAN_PV}.debian.tar.gz"
+DEBIANPKG_BASE="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}"
+
+inherit toolchain-funcs linux-info
+
+DESCRIPTION="Attach and detach slave interfaces to a bonding device"
+HOMEPAGE="http://sf.net/projects/bonding/"
+SRC_URI="${DEBIANPKG_BASE}/${DEBIANPKG_TARBALL}
+	${DEBIANPKG_BASE}/${DEBIANPKG_PATCH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-devel/gcc
+	>=sys-kernel/linux-headers-2.4.22
+	${RDEPEND}"
+
+CONFIG_CHECK="~BONDING"
+WARNING_BONDING="CONFIG_BONDING is required to get bond devices in the kernel"
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -o ${PN} || die "Failed to compile!"
+}
+
+src_install() {
+	into /
+	dosbin ${PN}
+	into
+
+	# there really is no better documentation than the sourcecode :-)
+	dodoc ${PN}.c
+
+	doman "${WORKDIR}/debian/${PN}.8"
+}
+
+pkg_preinst() {
+	if [[ -f /etc/modules.d/bond ]] || [[ -f /etc/modprobe.d/bond ]]; then
+		elog "You may want to remove /etc/modules.d/bond and/or /etc/modprobe.d/bond"
+		elog "because it likely causes some deprecation warnings like:"
+		elog "Loading kernel module for a network device with CAP_SYS_MODULE (deprecated).  Use CAP_NET_ADMIN and alias netdev-bond0 instead"
+		elog "It may also cause unexpected behaviour."
+	fi
+}
diff --git a/net-misc/ifenslave/metadata.xml b/net-misc/ifenslave/metadata.xml
new file mode 100644
index 000000000000..c57573a31def
--- /dev/null
+++ b/net-misc/ifenslave/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
new file mode 100644
index 000000000000..3cbd5e3e2e6b
--- /dev/null
+++ b/net-misc/igmpproxy/Manifest
@@ -0,0 +1,8 @@
+AUX igmpproxy-conf.d 165 SHA256 f6c143334c1b2b6163b1f4d89cbce10d61df8559c5e717102868320c2e99a6df SHA512 c09d4ba3756d5a391b0738c4ef1e83f083a9b9b4f23af66c1378b2f0b4aec6abdd509e48288c1fc96c7f43fe004cdf0c090702d83d2b665ef701a064fc2da80d WHIRLPOOL 97fcdf071df84621a08878400e9e1bb18123cf6898ecaf80bf9a1ff3b941131c0a12304676f45fd0b4d4476111224378f50bcac590cc98ce4e19d3dda064ba1c
+AUX igmpproxy-init.d 514 SHA256 7848242bd17315cb4233803d002b85a93176550ddc7dbd9256ecc6bcb96a0b25 SHA512 7bb2812c27556d1355e415eaa8ebe5d3ed5a896e88c6813c4bce686b3268c6f0000507cea59afa37a3f474fa6e2ca20c91bf87a63cf4c8209cef2f5bbb01c1cf WHIRLPOOL bf543f64c80886c8fcf4b1360a8c91b5aa0aae7dc281f8818b4bc59bd0526cf22a392ef1ef9d5c4b837c2eb677d730f74722799d84e3ffe4a185ec30b467da18
+AUX igmpproxy.service 150 SHA256 c50fd8e9b871b9843606111ace1d9d26d6f24dc525b16225e50bff532915ed55 SHA512 675bfd38f542dfeb92372625058b443700726683a6f6ffc2e24a2f13e645b372cec5806957ec7aa6c764fd85b4d3b4a50d2640805eb8235fe30e9e269c974b09 WHIRLPOOL 5ab0082487b3df7c9f09878b4b4feecc77826ca2ca8842f3e06735ed3ceb7412420f6bebd0d9334c2b6b456254b1ab08a70e4f02c6d9ea26848b5efd49073c6b
+DIST igmpproxy-0.1.tar.gz 140159 SHA256 ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7ee6ae SHA512 1a569814d8984610402313d8c4adb78ff362f82ae28c968a8ba0fb411e12a704d1b51b387111b51517ab8fb2e86952bbd196f27eccd311c11ce288fc6fa25ad4 WHIRLPOOL b7e446c4c3a9c318d65cc51a54df4900ea334c521e8a8adfa487dc48c80ea81f4d17097b4bbd52eee9d7d76c5d45aca74d194ed31e002837b308e2bbcd95dea4
+EBUILD igmpproxy-0.1-r2.ebuild 597 SHA256 93adcf9787ef92871341708e3f0b336c30199049ffb4a0f322c59290fd95f5bb SHA512 c2b22d4e3fdf4a10c574357b87707a6eede03543ab7ca59a6ea892ea855465002c7fbba46d43432edf925a2fbab3197da400a8faf09c5e0a1506eb0fb0ff5e16 WHIRLPOOL db57882a4902fffe68d7bb47bf39ab10957b29c996cca9a7fa168fcecc1cb58d22cb1d55a87c1df2aa9c324fb0fcf23c79e16d8fca3fd205299d0941f887c351
+MISC ChangeLog 3137 SHA256 10be297bfb08b0d33f49704aca6884784947169b6f75e8da4f1ae985522d7124 SHA512 ef5cf738652f5514099935138e4d1710f420242c1803529abf505a671d0ac74db41a0ec655d63b7a6734542c8c85a9d9386baea5507ab8e46b3f186103cec4b3 WHIRLPOOL b5da41e6d703597052175778a036b10d02819d039fc9ac0c4498b51410c367fdd1416951a79a8246cafa16af51445e67ecf6067e6e3dbaea57f236b6ceda175d
+MISC ChangeLog-2015 1805 SHA256 f3a6142e7136308f341549e5cce1d9a3cd375a9958603ad08d772aff60df6b52 SHA512 f605a720c423637fa312fbfb2214bc80c48cdab4f6d4de71feeb860a3b900605dc9433cf1bb4845684bea021acde23c8a53c5484e9321ff2598b775114daa106 WHIRLPOOL d60fa7ef37b7d6faf34e7b2516c6fffb8dd705d679f5739cec8e47c3837e5a1537cefa8f98c111aa8a047884fe7f3a4602c60be65757443ff4b9f26454648937
+MISC metadata.xml 447 SHA256 5eeda33789e78cc722f2f6fba76cc09cc815e9996035f78fa7614ff2fb58d58e SHA512 4c6c8c0023027fa3ca7acc3d164fb14f381df30850964bad7f1ccd0ccd4d2fcb301b0b4aba9493f4bce1cf96ee59197970489648db5be7e085a140c282ff30a5 WHIRLPOOL 86f0a40ee42c72cc63808a3d660d4e310edffffb8327f885c508d6a3cbd49f9342800f85439162fb0d589cda3e927f652f5075fc55dee5847a8f03a44b8e641f
diff --git a/net-misc/igmpproxy/files/igmpproxy-conf.d b/net-misc/igmpproxy/files/igmpproxy-conf.d
new file mode 100644
index 000000000000..a7a2b348d2a5
--- /dev/null
+++ b/net-misc/igmpproxy/files/igmpproxy-conf.d
@@ -0,0 +1,6 @@
+# Specify a configuration file
+IGMPPROXY_CONFIG="/etc/igmpproxy.conf"
+
+# Additional command line options.
+# See igmpproxy(8) for more information.
+IGMPPROXY_OPTS=""
diff --git a/net-misc/igmpproxy/files/igmpproxy-init.d b/net-misc/igmpproxy/files/igmpproxy-init.d
new file mode 100644
index 000000000000..ca0b88032713
--- /dev/null
+++ b/net-misc/igmpproxy/files/igmpproxy-init.d
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	ebegin "Starting IGMPproxy"
+	start-stop-daemon --start --background \
+		--make-pidfile --pidfile /var/run/igmpproxy.pid \
+		--exec /usr/sbin/igmpproxy -- \
+		${IGMPPROXY_OPTS} "${IGMPPROXY_CONFIG:-/etc/igmpproxy.conf}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping IGMPproxy"
+	start-stop-daemon --stop --pidfile /var/run/igmpproxy.pid
+	eend $?
+}
+
diff --git a/net-misc/igmpproxy/files/igmpproxy.service b/net-misc/igmpproxy/files/igmpproxy.service
new file mode 100644
index 000000000000..a682bed09e0a
--- /dev/null
+++ b/net-misc/igmpproxy/files/igmpproxy.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=IGMP proxy
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/igmpproxy /etc/igmpproxy.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/igmpproxy/igmpproxy-0.1-r2.ebuild b/net-misc/igmpproxy/igmpproxy-0.1-r2.ebuild
new file mode 100644
index 000000000000..12ba0b99a436
--- /dev/null
+++ b/net-misc/igmpproxy/igmpproxy-0.1-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info systemd
+
+DESCRIPTION="Multicast Routing Daemon using only IGMP signalling"
+HOMEPAGE="https://sourceforge.net/projects/igmpproxy"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 Stanford"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}/${PN}-init.d" ${PN}
+	newconfd "${FILESDIR}/${PN}-conf.d" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/net-misc/igmpproxy/metadata.xml b/net-misc/igmpproxy/metadata.xml
new file mode 100644
index 000000000000..c2e066bde80c
--- /dev/null
+++ b/net-misc/igmpproxy/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		IGMPproxy is a simple dynamic Multicast Routing Daemon using only IGMP signalling.
+		It's intended for simple forwarding of Multicast traffic between networks.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">igmpproxy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/ip-sentinel/Manifest b/net-misc/ip-sentinel/Manifest
new file mode 100644
index 000000000000..99121e696547
--- /dev/null
+++ b/net-misc/ip-sentinel/Manifest
@@ -0,0 +1,8 @@
+AUX ip-sentinel.cfg 278 SHA256 e27ccda1fbdd551d71cbd0d15d8ae0ed40fb256aef549840bee0eb184d0e95e5 SHA512 315181c3ad90f677bb2ebca2309ae98cceb33ee74b0bae48138283c77612657a632af05a4467994b5b0981e835262f178515dfe8fb6787b4067ff749f97359d5 WHIRLPOOL 1d607e11a70f46f338f54cd366b151cf9659df66bc9ec395c1451f4c35f0c8c7fc5da44570179e7bf2c8f7b5babd3df3e5baccb53fef24c1e58534df35d3ffa5
+AUX ip-sentinel.conf.d 357 SHA256 9b694f986093ad4d25d2102b0a09729d6c9814d2e4116eac63f595383b7fa8c5 SHA512 c35614e812cc0b3caea671cf2703493030f6de96f8b5afc80455c93f3e6181ddaf7eb6c22d8b63244f219b506db4bddfdf9792bf89ec17d7c56d274d003d4506 WHIRLPOOL 661acacc217f3aaf24ae83fad6b45ee19357319d84d2dd9bfece671a0687659cd00da795cb7ee6e5477ca19f11349379bbaeebc0aed11d2c9826b7a3d564c7c5
+AUX ip-sentinel.init 1051 SHA256 1093cee9812247ca60fff11464adb34f84141b1453971ea914225e5ede3cdd21 SHA512 025be17c390e0e07b60bd4dcc1c8ed33dbb51f53b1dc4037b25b9a1275c2b7043cf5e147124f3ef11481771c20ad20a0fcd9543cbab5294fd412192ad221257a WHIRLPOOL 8f78f91d08106ddba21d3e08a7ccdd913989b1a574c34bbc0412c850009b33d9d012adcf2ef68a3202e4e9ec3665c83a8432142d881db376270e3beb68be071f
+DIST ip-sentinel-0.12.tar.bz2 165803 SHA256 1767fe155280361804cf1a62b2f77228bd764452668783050b6309cca888fb22 SHA512 dfa025fd96260073903ffe33dbaa5a146658dee2b8cb9bc04da0894a8de83207971a7f1e731128e42a0421052cdc352ed43a0298916f521d5f230533266e5077 WHIRLPOOL 5e377d38b5a6c5a70bc23044fa5103efdf48a3511df76ab7435e9445e5e85c2b910bd40bb6af2e0e40ab455c78754e7e97954f99a504a14e060086c6fbd27557
+EBUILD ip-sentinel-0.12.ebuild 2077 SHA256 4cbe2626aac9f998383dfee8b7b6b3f386999fe7f48e83d474779fb19b8c080f SHA512 09d5f004cc90df5f0460b8dfaddcd32e928d9b86e23e616acc784d02b7d77647d36de332c7f5c07cd784866b6c2926df46608123a4fe61543fa2d0765937b09e WHIRLPOOL 058be7ee2eb0236d2906e03736b7a1b8c0ddb2d9d4522c435b1dd829a00d4ffbd15adaf81bec894ff97ebad28acfa68519642f602d9bb49719a97972d02385dd
+MISC ChangeLog 2757 SHA256 cd8ea3b449ff3ef529952a61c73902292115af1dd5112de2797bf2829455aa76 SHA512 bb9d4e517572712261b44adb27d5606a802f72c74e79e838e262f02803bcac2e23f13104f61c5671868f42423fb3a0689467d5904a453ad16cbdb0422a830233 WHIRLPOOL 959a7532a031f299516596498d35cedb3b2a88ba0403e0229bc52d15424c6024af0e806eddfe1317581ba391beded43ecfb453e9e0e74e099a2d58d2854e33af
+MISC ChangeLog-2015 1863 SHA256 2f80c7ccd626017cb76fb7e3045db13cea2599d4392f2533a04fa51a85044a48 SHA512 ea0a7bae34d5342b9ff485f3361f8873a9a9b56ca91f48f9903b2c92bbbed490f517dd0c98b3cb1879b85b2eab4cb42986e0f50e7dd78bec159c95c0bf7f7098 WHIRLPOOL 9372047b3a9a3ca8d56c91ce55e8f174685f03bada0b2594ae4fb05f82d5c88484caff3f6136f142eff08f9e68af586dad562fa05bdbb122de4c0e53e1382e67
+MISC metadata.xml 1303 SHA256 50c75eec93bbf4740af949408b34571dbf82e056b65c26598493e1eddd774484 SHA512 9ca404d2b97faf88cf40cf991584dfb1888e78b41817cc6dacfb2ac2bf13afdbb9c8496f61236e85ce2932c12d889975758108df0229760a16fa4478e5c0ffed WHIRLPOOL fb875852d838863533d4c31f7e79f140b5d530877360d4629415b82e24234a0d4f59eab7e7dc84eed2cad20a0f54cc0dcea303bfeadc104747e640f94cc41b06
diff --git a/net-misc/ip-sentinel/files/ip-sentinel.cfg b/net-misc/ip-sentinel/files/ip-sentinel.cfg
new file mode 100644
index 000000000000..f767cd1d0d5f
--- /dev/null
+++ b/net-misc/ip-sentinel/files/ip-sentinel.cfg
@@ -0,0 +1,11 @@
+# This is configuration file for ip-sentinel
+
+# Next line blocks all computers inside network
+0.0.0.0/0
+
+# Now please add computers that are allowed to communicate
+# ! denotes not to block
+!10.10.146.1
+!10.10.146.236@be:ef:de:ad:be:ef
+
+# see "man ip-sentinel" for more details.
diff --git a/net-misc/ip-sentinel/files/ip-sentinel.conf.d b/net-misc/ip-sentinel/files/ip-sentinel.conf.d
new file mode 100644
index 000000000000..d61fc9f5bfc9
--- /dev/null
+++ b/net-misc/ip-sentinel/files/ip-sentinel.conf.d
@@ -0,0 +1,11 @@
+# Configure which interface for ip-sentinel to listen on.
+IFACE="eth0"
+
+# Insert any other options needed
+OPTS=""
+
+# If you wish to run ip-sentinel in a chroot, run:
+# emerge --config =net-misc/<ip-sentinel-version>
+# and un-comment the following line.
+# You can specify a different chroot directory but MAKE SURE it's empty.
+# CHROOT="/chroot/ip-sentinel"
diff --git a/net-misc/ip-sentinel/files/ip-sentinel.init b/net-misc/ip-sentinel/files/ip-sentinel.init
new file mode 100644
index 000000000000..923cedeac13c
--- /dev/null
+++ b/net-misc/ip-sentinel/files/ip-sentinel.init
@@ -0,0 +1,49 @@
+#!/sbin/openrc-run
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CFG_FILE="/etc/ip-sentinel.cfg"
+
+depend() {
+        need net
+}
+
+checkconfig() {
+	if [ ! -f "${CFG_FILE}" ] ; then
+		eerror "File ${CFG_FILE} does not exists!"
+		return 1
+	fi
+
+	if [ -n "${CHROOT}" ] ; then
+		local_opts="--user ipsentinel --group ipsentinel -r ${CHROOT}"
+	else
+		local_opts="--user ipsentinel --group ipsentinel -r /"
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting ip-sentinel..."
+	start-stop-daemon --start --quiet --exec /usr/sbin/ip-sentinel -- --ipfile ${CFG_FILE} ${local_opts} $OPTS $IFACE &
+	eend $? "Failed to start ip-sentinel"
+}
+
+stop() {
+	ebegin "Stoping ip-sentinel..."
+	start-stop-daemon --stop --quiet --pidfile /var/run/ip-sentinel.run
+	eend $? "Failed to stop ip-sentinel"
+}
+
+restart () {
+	svc_stop
+	echo "Please, wait while child process quit..."
+	while `ps aux | grep -v 'init.d' | grep [i]p-sentinel >/dev/null`
+	do
+		echo -n ". "
+		sleep 1
+	done
+	echo "[Done]"
+	svc_start
+}
+
diff --git a/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild b/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild
new file mode 100644
index 000000000000..97256539afd6
--- /dev/null
+++ b/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Prevent unauthorized usage of IPs in the local ethernet broadcastdomain by answering ARP-requests"
+HOMEPAGE="http://www.nongnu.org/ip-sentinel/"
+LICENSE="GPL-2"
+SRC_URI="https://savannah.nongnu.org/download/ip-sentinel/${P}.tar.bz2"
+SLOT="0"
+KEYWORDS="x86"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/ip-sentinel.init ip-sentinel
+	newconfd "${FILESDIR}"/ip-sentinel.conf.d ip-sentinel
+
+	insinto /etc
+	newins "${FILESDIR}"/ip-sentinel.cfg ip-sentinel.cfg
+}
+
+pkg_setup() {
+	enewgroup ipsentinel
+	enewuser ipsentinel -1 -1 -1 ipsentinel
+}
+
+pkg_postinst() {
+	elog "You can edit /etc/conf.d/ip-sentinel to customize startup daemon"
+	elog "settings."
+	elog
+	elog "Default ip-sentinel config is in /etc/ip-sentinel.cfg"
+	elog
+	elog "The ip-sentinel ebuild has chroot support."
+	elog "If you like to run ip-sentinel in chroot AND this is a new install OR"
+	elog "your ip-sentinel doesn't already run in chroot, simply run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Before running the above command you might want to change the chroot"
+	elog "dir in /etc/conf.d/ip-sentinel, otherwise /chroot/ip-sentinel will be used."
+	echo
+	ewarn "And please! DO NOT START THIS DAEMON thoughtlessly."
+	ewarn "If you DO this will BLOCK ALL communication inside your ethernet"
+	ewarn "segment!!! If you have any doubts do not start ip-sentinel."
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/ip-sentinel 2>/dev/null`
+
+	if [ ! -d "${CHROOT:=/chroot/ip-sentinel}" ] ; then
+		ebegin "Setting up the chroot directory"
+			mkdir -m 0755 -p "${CHROOT}/etc"
+			cp -R /etc/ip-sentinel.cfg "${CHROOT}/etc"
+		eend
+
+		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/ip-sentinel`" ] ; then
+			sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' \
+				-i /etc/conf.d/ip-sentinel
+		fi
+	else
+		eerror
+		eerror "${CHROOT} already exists. Quitting."
+		eerror
+	fi
+}
diff --git a/net-misc/ip-sentinel/metadata.xml b/net-misc/ip-sentinel/metadata.xml
new file mode 100644
index 000000000000..c89beb74d359
--- /dev/null
+++ b/net-misc/ip-sentinel/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+This program tries to prevent unauthorized usage of IPs within the local
+ethernet broadcastdomain by giving an answer to ARP-requests. After receiving
+such a faked reply, the requesting party stores the told MAC in its ARP-table
+and will send future packets to this MAC. Because this MAC is invalid, the host
+with the invalid IP can not be reached.
+</longdescription>
+<longdescription lang="ja">
+このプログラムは ARP リクエストへの応答を利用したローカルイーサネットの
+ブロードキャストドメイン内で認められていない IP パケットの使用法を阻止し
+ようと試みます。偽造された応答を受信すれば、そのリクエスト・パーティは 
+ARP テーブル内の該当する MAC アドレスを覚え、その後のパケットをこの MAC 
+アドレスへ送ります。何故ならばこの MAC アドレスは不正なもので、無効な IP 
+パケットはそのホストへ到達できないからです。
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
new file mode 100644
index 000000000000..91d07b4432ee
--- /dev/null
+++ b/net-misc/ipcalc/Manifest
@@ -0,0 +1,5 @@
+DIST ipcalc-0.41.tar.gz 21599 SHA256 dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a SHA512 089eb2b9a38b07caa182ff11547a93d86aed570311fc8cd9e636c7546ab4d15acc854b9d79bbba9c797dcfbbedd1d6f4d521aec97bf613905fe5198a29c9889d WHIRLPOOL 7fbc5393d68fed03a5f9fc97d45ab31280d7a0244b78c4874945b675deb06ba5e7c3acae375ed151993da047a15d8c9f93c1e19640cf1a4425b67e05848f70d9
+EBUILD ipcalc-0.41.ebuild 530 SHA256 e9c1af7a8b8ea54c78087693e8d6604ef39f61cf228f2a91806f61ee00460f10 SHA512 e893fc0114b672fb1b094766891bd320996018fab23795d570a65badb947a76bc40ccdab0707c874bd1fcc27aab45bd17b1de1366b392df7b23d411bb9feae54 WHIRLPOOL 5c27babbec7edf19674248a4ea67c0eddaad5df6f88b28fdb77a6cc70f6a057f03331507130b8b7a34596e53bd69c9031464a9d180ec28e4da3de21c239a9e32
+MISC ChangeLog 2548 SHA256 b083b38b568230eb3aad92b805f71116579db67d50d66df63e72321fc1f97f5e SHA512 cfa8473dbedf4f0d47253ae50d399923af4564a9ace698c2c80b10a72a61282c9a92c2f3f6a0f7fda6aa2f84b7f524fa36e9fb3a360af562c48bd2c008814051 WHIRLPOOL 61d03835f286849a5f77836a219dd15e818b66480a135b181a0db324b7fc66b080636d93c1036afce89d7f074810f4620117c12abed3e9c267bd203ca9f38560
+MISC ChangeLog-2015 5173 SHA256 840399d08274afdd2ebc8af0f5f58557121d601ac277c112300f7f5e5b2d64de SHA512 faa455f99ca61aa4fdc8eb7501fb3095dc714bb635db3d4f8828975bf11ddde23dc5d47093e60a64ee2c0cd08d8019d5b037878b585726a5fff4e4f87e232364 WHIRLPOOL 325f899926f9e7a9e99ce1865bdcd8e1afdb381463bcf4d2b68205ddd3825de8566a058b6911e584364262f9f2619ea1622653470332d6a69294792039f981bf
+MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328
diff --git a/net-misc/ipcalc/ipcalc-0.41.ebuild b/net-misc/ipcalc/ipcalc-0.41.ebuild
new file mode 100644
index 000000000000..d9393c0e876e
--- /dev/null
+++ b/net-misc/ipcalc/ipcalc-0.41.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="IP Calculator prints broadcast/network/etc for an IP address and netmask"
+LICENSE="GPL-2+"
+HOMEPAGE="http://jodies.de/ipcalc"
+SRC_URI="${HOMEPAGE}-archive/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+RDEPEND=">=dev-lang/perl-5.6.0"
+
+src_install () {
+	dobin ${PN}
+	dodoc changelog contributors
+}
diff --git a/net-misc/ipcalc/metadata.xml b/net-misc/ipcalc/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/net-misc/ipcalc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
new file mode 100644
index 000000000000..1cbb1938dd61
--- /dev/null
+++ b/net-misc/iperf/Manifest
@@ -0,0 +1,17 @@
+AUX iperf-3.0.5-flags.patch 1323 SHA256 239b00aa090e7cfbd45f14ef0dc88a90fa24760f05cf005a17bded6df342e01f SHA512 d5e106b9b6fdc704e1e8d5c87f767a912a3e643994b51f09fee34fffcf9007b3eb91adcf3b87e04f90c994e29691dff0e400fb2f13a94e68c58183a39d833403 WHIRLPOOL 9dee2ef383d5dcc39358964be09e0d19d1a5cb0fe864067c6274dacfd994380c1bd4a5afd0789bcd4052af31c36578dc3a62c196134442b27f5b2c844ed06768
+AUX iperf.confd 200 SHA256 d05069f670dc9eba848d43429dba5002db9e8cfc71b81c6ac4f95a312eb8992b SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551 WHIRLPOOL 8632eadb8f2b70e911170597bd558ce07fbf139d5b2ccbba41a49d296dee432e30a8b45f210fdea80f4f2ae1ecff4bb6cd504bdcb73a83dbb79aa563ee56c2e5
+AUX iperf.initd-r1 437 SHA256 ab6b75299b0e185e791705504de35e818ec999e97d3a6549767cba8a55da1bca SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1 WHIRLPOOL 0cf585a068e7d215873512d6365aeba08c668ac9cdc603150581692a56f2a58299b7d74387940439b7b1651560b6534386b13215e26f700d06d46e935e7cb292
+AUX iperf3.initd 287 SHA256 738d1acdc1603e497b940564b9c78f93f02d297a3ae8a9681a077800e2294271 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040 WHIRLPOOL 44341bd181e3828d3cc16b7d06cd49935c0613b4f63686b6f0714f102610e21bb10a1fca6b3f0828c46cabeb9fe5ea2971a602eddb81232b5c2850d47442a683
+DIST iperf-2.0.10.tar.gz 290282 SHA256 7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2 SHA512 74bf49133cd123243c179e174cbaa7d2f74ca9fb47c80ca2c88b2e68ce8bca0a73709e51b3aac6bd85b8c70483b70f33e8a2424e7e0e5922397967330f7e2ecc WHIRLPOOL 4fa4e3006bc6354653fcc249cf0e4660af2ea88e463fbf731a65c5ecab44c297d36b0079dab1b38cadd1962c52d4fb1bba71f700af0ddec3296e94c79b5f5180
+DIST iperf-2.0.9.tar.gz 277702 SHA256 a5350777b191e910334d3a107b5e5219b72ffa393da4186da1e0a4552aeeded6 SHA512 ff75e51af9d368eedb1e1dc4621f7575219525f0e438f1c8fa896aa7e990a6812a9a351db9004952057d81127f52b67350820e85c9ae1d8db2e6a60c1f2534d2 WHIRLPOOL 044a189931459dca8fc35d94d5d0518533a104cf3981d33f0ab768a98ed5bec971799468146d5d980b614341afcff81d939a35e6ba9bd4c221311520d8fa1c19
+DIST iperf-3.1.3.tar.gz 549466 SHA256 e34cf60cffc80aa1322d2c3a9b81e662c2576d2b03e53ddf1079615634e6f553 SHA512 67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9 WHIRLPOOL 0082f5156df751cbed49e86f794a48ff05857cd7cd4ee3bdb57f4df763a323d84f47d9e0b01e0b5932ae1e065bcf8ac706e6b96b6ac5ecee2daad6615ca4f38d
+DIST iperf-3.1.7.tar.gz 552793 SHA256 1d99e3b309aa94d8f4fe7b4e953f038396ab46c1fc809ac06fffbe21ffcb64b3 SHA512 9bcc011de99356467341bd9082d2a57d243a3543c65afc18f8027b1bc7e54c1544a750640fa5230b9610ac2241571395a1bd011812edd141607b59dd3cd08ce0 WHIRLPOOL 8b938ae6b38308c15cc22e918469433fa3fbd8bd782071e160195f5f068d4cff3a696120f07f8cb24f1f2bbe0cd111f94ffd764364a74cf678f4b3f70f3bee0d
+DIST iperf-3.2.tar.gz 588723 SHA256 cb20d3a33e07a3b45a49a358b044f4998f452ef9d1a8a5cbde476b6ab9e9b526 SHA512 5c49bb832dd53956d15b0a9374b052a4e4e03c7c3b6e8c150001a7aba07b6ad5f8cd2b9ac2d9876981be0adf8b0396535ec9e021d58c8fe909a0f92743b4f855 WHIRLPOOL b14b076bc6588407dedc6ee3d8236d11fb756e443ad851002f28d02ef86fa006275ed57ab97a8ab8657f2c8c51ac9170f92a408e7e3ff5a30d51f37408410032
+EBUILD iperf-2.0.10.ebuild 701 SHA256 f8e5e8a87cbaa29334e0f93fc57825c712a0dfa53b86400c39c94df0c2a16692 SHA512 7c2136a8ad639bbfc43929813ed43148daf6a3320ed729a2b41c464eb42f5f3eca6a5260654f21c132ac1190bfd0271fd8b5d3931f3d931ca2dbfb20750d785a WHIRLPOOL 97fd51a2c7d09319214139fb384db72e7ce9688c652231fed675405444f58c2cc6a80b011d5a3bc1aa0422078571b78e83c560e63606f95965e1bf2891fa873b
+EBUILD iperf-2.0.9.ebuild 695 SHA256 d837e32d58626610b98c31d23f5f86a735c4c9b3c23d87d55b2148fe92a0d97e SHA512 21438d1baed959f6203d23a62a0040ae2ceb289ffaa5b56a1e5d3a542d31d743041d5d6bd7c057c4bbb63086545a62bc7546996d90cde951bd2e4e116c948b7e WHIRLPOOL 283cc21cd35422add78ebdd73723fdf1beeb381523dd99b2e071e70bb61cbad1360ce91cd3bab4690d5d826a318e5f4db7a90f19fd3dae44a197d946e56d4ba1
+EBUILD iperf-3.1.3.ebuild 888 SHA256 d08f66cdffe833d094ef42f1e50e1faaaaed2e6558cb44ffe34d9a41032debdc SHA512 2dd6dfd2affb6d429c2a91f674e52390e1039c98df381e1ceb93f837b85631a27b615a7713d39c3797a8f873465c568214d717f92010f473792c17ff91683999 WHIRLPOOL 15e104622b54dd5d6339a96d2c61610d10f4f4571cf17a382b6e620431dfd31a844cd85a980f380fb1bdc6cb4cb6d81019e027f3e45b1cc705290859bc7656fd
+EBUILD iperf-3.1.7.ebuild 945 SHA256 457f9e44a764d64dc0d916b8206599edb3142a131508a6f2d3fed8a3109d5830 SHA512 5e4fc6ceda8feb42486ef6754ee185c9072b8344464b964b2f489a672ca07129f4c6d5c218fe03c633590037a45df69e82b5d76ffca9588756cc297091634281 WHIRLPOOL 7809211a2cc6b4f81ad700e4aad683e4c52c3125c6a6d32402bfe89a82353a41a3fd0e357e251a348b190455e98f2935ee3cdc3ec323fe85fae7ac51cae70ff3
+EBUILD iperf-3.2.ebuild 913 SHA256 82922329bb080bcebab3a72e0843b8c905614817c326130bec450784d897f0e9 SHA512 423c1d6feb7a0c864f165393ee8325c39ed4f6a570e2651d1db52d1f211994dddfaaac82be87e4f3fd6df6141c83ed5a7dd689ddc437c8b4c973dbd8fe1b8e1a WHIRLPOOL f8860cc94d53539175695e783263a72171d662ff658659452198997d44ee05c1c13834f456a36e801a3746c85a113d0bc055df64ff69a1d0aada2eb38389498a
+MISC ChangeLog 7066 SHA256 53bdb6751b6f5fab4decd1950326483842b67fa492c62363eae4d4069a6874d9 SHA512 35717f8f03877fed3548fae4fc1c0ea2755035bad01217265f66ac686e824eaaa462e102b33219508957457e7e10c55d629926959f9a925ea3449179d9a592ad WHIRLPOOL 8973bbf1de56c45702b3153071a0521073c42cb09bd0ff751727711a900df1f63982c4c43378714686841e2b99fa2ba71288ef1fb151dc6e78bab1bdcb13e748
+MISC ChangeLog-2015 9232 SHA256 a66a1c8b971ea90db0e055b706cd8af8778e04e0337297572baadd1b02c509ff SHA512 e04814dc84b7438914386bfc49f703993a6c447f3fbcfc3711d0c7e704c30274602028a4f07bb265181971c3bb374b26d07ca1f135d1db43c9c7c6f296754370 WHIRLPOOL a702b60e9c2a253890e5dd838050ade03b4ae212b85455e5352e3c3b8224cfce3b7a22e0430a80356a1b6641cec85a974456e3577cacca47376667f4bbcfeda7
+MISC metadata.xml 406 SHA256 83a84edbbf4f2c87428c10671bd34da8443aeef6e25beb8d08fd80aa51a8daa4 SHA512 98d8685483b308d70c56e436291e0229f53982bb78a953b13455eeddaba53ec4ad1d860fc1be4b9340cb89a06471d1caee938bc6213355179147923e0d7eaa17 WHIRLPOOL 7e5a6b27f7429419957a40fc6827255920b7d6f66f6f4d910940eb7b003900f8e25b6a8a0c9990693be4cf32a9dfa1e2229665460639bd524c9789ca0d37103b
diff --git a/net-misc/iperf/files/iperf-3.0.5-flags.patch b/net-misc/iperf/files/iperf-3.0.5-flags.patch
new file mode 100644
index 000000000000..9c11c282c339
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.0.5-flags.patch
@@ -0,0 +1,31 @@
+* Do not inject -g
+* Do not make a profiled build
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES         = libiperf.la                                   # Build and install an iperf library
+ bin_PROGRAMS            = iperf3                                        # Build and install an iperf binary
+-noinst_PROGRAMS         = t_timer t_units t_uuid iperf3_profile         # Build, but don't install the test programs and a profiled version of iperf3
++noinst_PROGRAMS         = t_timer t_units t_uuid         # Build, but don't install the test programs and a profiled version of iperf3
+ include_HEADERS         = iperf_api.h # Defines the headers that get installed with the program
+ 
+ 
+@@ -37,14 +37,13 @@
+ 
+ # Specify the sources and various flags for the iperf binary
+ iperf3_SOURCES          = main.c
+-iperf3_CFLAGS           = -g
++iperf3_CFLAGS           =
+ iperf3_LDADD            = libiperf.la
+-iperf3_LDFLAGS          = -g
++iperf3_LDFLAGS          =
+ 
+ # Specify the sources and various flags for the profiled iperf binary. This
+ # binary recompiles all the source files to make sure they are all profiled.
+-iperf3_profile_SOURCES  = main.c \
+-						  $(libiperf_la_SOURCES)
++iperf3_profile_SOURCES  = main.c
+ 
+ iperf3_profile_CFLAGS   = -pg -g
+ iperf3_profile_LDADD    = libiperf.la
diff --git a/net-misc/iperf/files/iperf.confd b/net-misc/iperf/files/iperf.confd
new file mode 100644
index 000000000000..7d82492a30f9
--- /dev/null
+++ b/net-misc/iperf/files/iperf.confd
@@ -0,0 +1,5 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# extra options (run iperf -h for a list of supported options)
+IPERF_OPTS="--format Mbytes"
diff --git a/net-misc/iperf/files/iperf.initd-r1 b/net-misc/iperf/files/iperf.initd-r1
new file mode 100644
index 000000000000..cd17a7b47e9e
--- /dev/null
+++ b/net-misc/iperf/files/iperf.initd-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="IP bandwidth measurement server"
+command="/usr/bin/iperf"
+
+command_background="yes"
+pidfile="/run/${SVCNAME}.pid"
+command_args="-s ${IPERF_OPTS}"
+
+# note: iperf has a -D/--daemon flag but we seem to hit a bug
+#       where it starts to eat all CPU after client disconnect,
+#       see bug #344875
diff --git a/net-misc/iperf/files/iperf3.initd b/net-misc/iperf/files/iperf3.initd
new file mode 100644
index 000000000000..281ebf5ae2d3
--- /dev/null
+++ b/net-misc/iperf/files/iperf3.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="IP bandwidth measurement server"
+command="/usr/bin/iperf3"
+
+command_background="yes"
+pidfile="/run/${SVCNAME}.pid"
+command_args="-s ${IPERF_OPTS}"
diff --git a/net-misc/iperf/iperf-2.0.10.ebuild b/net-misc/iperf/iperf-2.0.10.ebuild
new file mode 100644
index 000000000000..42c1e501eb05
--- /dev/null
+++ b/net-misc/iperf/iperf-2.0.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
+HOMEPAGE="http://iperf2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="ipv6 threads debug"
+
+DOCS="INSTALL README"
+
+src_configure() {
+	econf \
+		$(use_enable debug debuginfo) \
+		$(use_enable ipv6) \
+		$(use_enable threads)
+}
+
+src_install() {
+	default
+	dodoc doc/*
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-misc/iperf/iperf-2.0.9.ebuild b/net-misc/iperf/iperf-2.0.9.ebuild
new file mode 100644
index 000000000000..d4b7ac75be21
--- /dev/null
+++ b/net-misc/iperf/iperf-2.0.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
+HOMEPAGE="http://iperf2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="2"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="ipv6 threads debug"
+
+DOCS="INSTALL README"
+
+src_configure() {
+	econf \
+		$(use_enable debug debuginfo) \
+		$(use_enable ipv6) \
+		$(use_enable threads)
+}
+
+src_install() {
+	default
+	dodoc doc/*
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-misc/iperf/iperf-3.1.3.ebuild b/net-misc/iperf/iperf-3.1.3.ebuild
new file mode 100644
index 000000000000..5e4de0d86e81
--- /dev/null
+++ b/net-misc/iperf/iperf-3.1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf/"
+SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV/_beta/b} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="sctp static-libs"
+
+DEPEND="sctp? ( net-misc/lksctp-tools )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/_beta/b}
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.5-flags.patch )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	prune_libtool_files
+}
diff --git a/net-misc/iperf/iperf-3.1.7.ebuild b/net-misc/iperf/iperf-3.1.7.ebuild
new file mode 100644
index 000000000000..5e08d8feafa2
--- /dev/null
+++ b/net-misc/iperf/iperf-3.1.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf/"
+SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV/_beta/b} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="sctp static-libs"
+
+DEPEND="sctp? ( net-misc/lksctp-tools )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/_beta/b}
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.5-flags.patch )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	use sctp || export ac_cv_header_netinet_sctp_h=no
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	prune_libtool_files
+}
diff --git a/net-misc/iperf/iperf-3.2.ebuild b/net-misc/iperf/iperf-3.2.ebuild
new file mode 100644
index 000000000000..37399ff4a4d9
--- /dev/null
+++ b/net-misc/iperf/iperf-3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf/"
+SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="sctp static-libs"
+
+DEPEND="sctp? ( net-misc/lksctp-tools )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/_/}
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.5-flags.patch )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	use sctp || export ac_cv_header_netinet_sctp_h=no
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	prune_libtool_files
+}
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
new file mode 100644
index 000000000000..c2391d465b93
--- /dev/null
+++ b/net-misc/iperf/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">esnet/iperf</remote-id>
+		<remote-id type="sourceforge">iperf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/iprange/Manifest b/net-misc/iprange/Manifest
new file mode 100644
index 000000000000..317027a7db39
--- /dev/null
+++ b/net-misc/iprange/Manifest
@@ -0,0 +1,6 @@
+DIST iprange-1.0.3.tar.xz 107436 SHA256 e22d528eadff3486147aa0763bdc20d4f9b7af6c6f0e4ce9205bc3bc7ca18f53 SHA512 b1dd64c69d07512fb2df18a58866de9f3c644a8e7f9b242ede522f4e69725c397c9759c21826f78074a12a426a76d1b4f950068ddaaddf53ed5168d374c9a2df WHIRLPOOL 895332d62c740081ada9567e8f5593b70c21c7f1fa7a31c7f62fdd7452c9b1cd3003427c4b297dadf09fdcb78e61cb3b317bca9b3a787b10614d145177b63031
+DIST iprange-1.0.4.tar.xz 104336 SHA256 e138d18974fb65674e5ea53da1ffbdde19704208e5114cc6b32d01db3ce1d567 SHA512 28fa258c95e6a7b0bb304b8fee624cfd8ef1a5b24a98a80c3dafe44639e6dc0de22c3b61a33794533c3d9fc0ba41f5663a6bb6c85cf940d57c64db043ccbdac9 WHIRLPOOL 81a07325f2cf06eb041c4cd3916f21fef64a0a036e7e98bfa3638d0df69e61bab90e72880f05d562f470ccf4ed2b9d8371b1fd80f12dd752bbfb9cef348507c8
+EBUILD iprange-1.0.3.ebuild 342 SHA256 ff002f4b3258fa10aa17c5526acadec5b70d8665267b892a01e826fe95bef205 SHA512 d812e7b54d8174157f81ba7211f50f8283d3b852ca2ad08d8ba1d5892d2b89597a395fcb8197d49572203e11dcb316b7e1cca5b3a93fd0ac9fc1b761615582d4 WHIRLPOOL 6f62fa555e6b96cb1f02b2d577432ee4ba8f179400bf9a29e96ce8a935ab0bb682bf557b26ce855f448b8e87a6226d23f2a51df0798e171dbb493db39249f136
+EBUILD iprange-1.0.4.ebuild 349 SHA256 62733ec96829a99b8392e49e4333c5e7fa16adad866d0f6483c37da47eaae06a SHA512 fc1edfdbd95d19b09fac2b659d14ece275e76f5aa86431f30f1e1f1a39f7c4e9dec9f46b082d6fc1cf4688d15b25806cb490efed593547706cd23b64c6c3b50f WHIRLPOOL 94dcaf450fd45562da03f3d2dd3d198ebedd351e2588457ca6ed4d0ca5d315844e4f1e72ebf612b1de56cd77b93e65f47a05dcb9e26a6809b10f3117b73bb581
+MISC ChangeLog 981 SHA256 dd0805e44b096a64ed68e71a8bd2583158f103e9b1d08a05ff6eb449949f9475 SHA512 a790193abd20d673a96786fd48b2293fff3232b29bf65a43ef36a69a48ff53018585037d9ffd4ce0e02e2a45f31c4ebdf64fbe2e895abf95bdec7da9a0c398b7 WHIRLPOOL 4b45c066e5db3d7be61b8602245c07e9116d24fe23c7c0dce918434460385935555aa99be3db3dc4cdeedd183391d3cfe3d5c15330c4cf1cb6a200b9956dca8d
+MISC metadata.xml 217 SHA256 f1f54874177a53a98de2afc99139f9ca2eb3d15316f15521e5c48bb0c9df997f SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4 WHIRLPOOL d2946da8b8cd39dda0326cc591362d8dbdd25b721b4cc757fdd5675ca4e0dc93849c68362468d2c6ab0fdd7efb9aac96a4c409c458e8145412645647ac8f4024
diff --git a/net-misc/iprange/iprange-1.0.3.ebuild b/net-misc/iprange/iprange-1.0.3.ebuild
new file mode 100644
index 000000000000..e4cc2e425dd7
--- /dev/null
+++ b/net-misc/iprange/iprange-1.0.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="iprange utility"
+HOMEPAGE="https://firehol.org"
+SRC_URI=""https://firehol.org/download/iprange/releases/v${PV}/${P}.tar.xz
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/net-misc/iprange/iprange-1.0.4.ebuild b/net-misc/iprange/iprange-1.0.4.ebuild
new file mode 100644
index 000000000000..b4a82f68c670
--- /dev/null
+++ b/net-misc/iprange/iprange-1.0.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="iprange utility"
+HOMEPAGE="https://firehol.org"
+SRC_URI="https://github.com/firehol/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/net-misc/iprange/metadata.xml b/net-misc/iprange/metadata.xml
new file mode 100644
index 000000000000..041c1966b76b
--- /dev/null
+++ b/net-misc/iprange/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 type="person">
+		<email>alonbl@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/ipsc/Manifest b/net-misc/ipsc/Manifest
new file mode 100644
index 000000000000..a511912d8f5d
--- /dev/null
+++ b/net-misc/ipsc/Manifest
@@ -0,0 +1,5 @@
+DIST ipsc-0.4.3.2.tar.bz2 16764 SHA256 6b414cb3b5fd17cafd453259a29cafb14a389c74e8d6e8ad9f97c6df60de0db7 SHA512 7dd4fdf2fbfd21188d756254bd5192dcd2b723d835c1d2038d89fff8bf922059f1878029b7def5d751fc3dc71b6a3fddab36970e114029a6926c43675aba83f0 WHIRLPOOL 3c43653e1c94bf71a2cf14e9de5ab98faa08e3dd4ff4039665e01a05870503419ab41ce1871e9b9832e9d657ed351ad81039c85b1fbe1433046edab7c321431e
+EBUILD ipsc-0.4.3.2-r2.ebuild 732 SHA256 c67c6288b6652f02dc7bfebb2f2d6cc3249a23fbfdf73fef9c52844319e206f7 SHA512 dbe9e55545f92c0f497d47ff9e02c0676bdd64d6e6289efbe47a271e65728a16e27885d115b838c8755c31777e271f3c528bbdb9b1996e8df14a4c56823fcf51 WHIRLPOOL 9e60e336be5840cf888568b8b78f1d1fec314c6e9489a177c2d5c1774510ba5ba87dae8eba79c6f6e0f6bc08e33e39f495dbdfced7a3d493c755f8e82fec55a4
+MISC ChangeLog 2570 SHA256 fac077aaed01ebb4e09e382e46906b5fc21de7cc4c88cb3643953942ed0c21d5 SHA512 e234dcce1e72239cb90b02ef9de424f90df56750d55962b5f17d7c6b944709906f5ba9a121bd5e0acd8cc33d6ba9fe847705acfeff805d7f67b710bafb3dba40 WHIRLPOOL 356f22ca7e8e0eb44a82848133ca7f20e21e1983dc16a6bb419eb4ec55f507b7d6672e59ae6f23f9c7ed975f6ccea2993ca07c3f4e06721008faf5cdbc148e76
+MISC ChangeLog-2015 1739 SHA256 196ef2c23dba1e87ea76fbdcf93e6ad8d1c9712f8bce16376fa47aad2745843c SHA512 fbb989a5c692981ee28f7509e50b522089cde326af86e68c5773b673d443b9724f4f08d541945e756aee72287f2009e109591267a904c7fbc7d8396cc37a04a3 WHIRLPOOL fd1c2f87d4509b87fdaad9d352d15ca03c2c25518262d626324c9a6e23cf8036c09b35c7abc5b2327e3767ba7723783185353511aa2dde14deb604eec1ecc54d
+MISC metadata.xml 329 SHA256 461e91262540ecae7f16cad7fb572cdac5d961556048699411033848bc24ef41 SHA512 69341ab75175a761e609ac6fd420f38faf45f416e4411e392a1f916a0e24fcae63cea177213b994210d3b764836ddd7b78287f9a9b9c12ad6af13fbe58d921a9 WHIRLPOOL 74dacd097b9af5e089b315a7cd7707a513421e4c32db7a0b926b796e8b9d3e5025ee44dc2beba1f2d59bebb57030538a195064f4c8c7056f2eb9e8c34f8615d0
diff --git a/net-misc/ipsc/ipsc-0.4.3.2-r2.ebuild b/net-misc/ipsc/ipsc-0.4.3.2-r2.ebuild
new file mode 100644
index 000000000000..d0329c106782
--- /dev/null
+++ b/net-misc/ipsc/ipsc-0.4.3.2-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="IP Subnet Calculator"
+HOMEPAGE="http://packages.debian.org/unstable/net/ipsc"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "s:^CC = gcc:CC = $(tc-getCC):" \
+		-e "/^CFLAGS = .*/d" \
+		-e "s/^LIBS = /LDLIBS = /" \
+		-e '/$(CC).*\\$/,+1d' \
+		-e '/$(CC)/d' \
+		src/Makefile || die "Unable to sed upstream Makefile"
+}
+
+src_compile() {
+	cd src
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	dodoc README ChangeLog TODO CONTRIBUTORS
+	dobin src/ipsc
+	doman src/ipsc.1
+}
diff --git a/net-misc/ipsc/metadata.xml b/net-misc/ipsc/metadata.xml
new file mode 100644
index 000000000000..c16fe4dae016
--- /dev/null
+++ b/net-misc/ipsc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+    <description>This LINX engineer favourite is actively maintained.</description>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/ipsorcery/Manifest b/net-misc/ipsorcery/Manifest
new file mode 100644
index 000000000000..05b7ebbc502f
--- /dev/null
+++ b/net-misc/ipsorcery/Manifest
@@ -0,0 +1,8 @@
+AUX ipsorcery-2.0.9-_BSD_SOURCE.patch 203 SHA256 40545a3b1f1e9fbf6c253f1a62097defea0ce0e0b820d412b7466e2dce4617a1 SHA512 e3497b6d5f77288fd8627ecf610045177bd7a5db22b94ee87f91965ddfc13539736b23dc0245001f5d2726617c120d7133dc288b7fb2355d7648f83c08a06dcc WHIRLPOOL 5f8b72f233bd441dbb705322adc9cf38cea3a466b5da7c38398848c1cb1ba6cc12742d74202bac82de234c3e1bc39da3431a3db85d23c970a33913b1a02e1b75
+AUX ipsorcery-2.0.9-gentoo.patch 756 SHA256 51ccb5f277ba3f8e0598c67317c8e3ec157c5fca0e1dcef61d6b2d3ce899cabe SHA512 9619924c02996032584c4a0975dcce9d5d9ad5945f3320b0d4cca0f0bb2d938ce07644992db794c928aa84a1e0a3d46968516b6bdb6180e547a8a13b50de6f39 WHIRLPOOL ab42f6bf42538e70e728951cc6f8998952ccb769b4778107f06a1e79234cd353cba34943de94eb17dc7feb2dcfffcbd57be2a14cb144cae385455e378513ed7f
+DIST ipsorc-2.0.9.tar.gz 38600 SHA256 bf1d9d022861db216521a8227e76c680211d95c2942160091eeabfc914af8644 SHA512 a45454d70ecd928df36aa466dc886ab470ea3200e1b252288ea96f96e3fa8742af57bfe98f42d65c7e7abb07986092c2191aadee78ac785fffda40acc5ff8d66 WHIRLPOOL ea98de139ab563e063135f996de1e357d6c0372e13b9c11f622a55a8f4619be6c0271ca84fbef12480f9af1d31feb05cf49d34285cbcfad7cfaf64375e8f528c
+EBUILD ipsorcery-2.0.9-r1.ebuild 616 SHA256 f4c5d6ff21aaf18f3770e338d3e641e708ea78d02c0129fcd9acf5ce022d8d5a SHA512 5ce56c3e072b7cfa4cae49b058d9426a1d1161f0e742d7fb9c17f55c407c536a224d7b577fda2e77d7484ec1931a56f9cfc3d72c0918a6e9deebbce18b699496 WHIRLPOOL 7d6045c375fa9ea802e250278e31b4b4d7cad256b1ed20713cecc049fe96c0e86300a0d8e74b5f4c47485b96bb2102e6f30227d54ee325c400e8a6d82c483ff2
+EBUILD ipsorcery-2.0.9-r2.ebuild 770 SHA256 cdb15812a1b8a0da317f80397db2d192da659a0daec2fce2a466b8a9fee57fa9 SHA512 6d2bbb84c9671eb6cfffc68a100996996dea5397d8cbaf60ba272d77e9dd713b6c136985db99f28c378ccc27a65266bdfa2139693e685692893ee94f8d5eef8d WHIRLPOOL 816ffe13629081f23be4d4dc87dd00cad369adf2b1182eca3a5d784a602bcb2c399b027dd5ce76d8aef78ff32d78e520a77f9a4f2d85afb643a776b3862d459a
+MISC ChangeLog 2956 SHA256 4bd24d72a6607d7ba129885da6523c2d80e3a4ea6dc865c5f288e56bf7fcb5f8 SHA512 4c0bcea4af6026c4feb90deb4b2cc6e23cdd86f382ed8bbc5861f2da8eab32d745a2403446d9463f37fe362721d6ecdbbbba78acdac931e2e326baec6df17564 WHIRLPOOL 7bbe042c00a3dd21b13f60016a09a6240850127e906863c431eb2ae6a995816ab5fa1521e0be57de2a05591a292c1aaf56ea336774eeda7e50997e278bbed78a
+MISC ChangeLog-2015 2264 SHA256 34029626447ede3c0cc39f7d493366ffa3daa6d9b83f9baec23515fbf6d3926d SHA512 98e9caf50c8c126f7018d6b93d58462cbf8846dcbf25d5d2df572313032f999138d85fd17d00cac54beee648c1d3120b4871a40d34a7b568426c5eee9eae86d3 WHIRLPOOL 482b2255f8d63f0aee6c64af098fd7c012b0e3de0d1b43ec7f6270559d51356bf0ad8b98808f9ac711f00c600b5f447a037236a1398cbd857aa0a73f65dd85ed
+MISC metadata.xml 212 SHA256 ef6d10a336ba5ebed572570f722fcec589709255ae5fdfd80404f0072e65a35a SHA512 934c3c3ff6efab14f989c4b030de2bad2ce242d4402a68f90cb6e6fa9d5c3aa85cf0d6f5b92936acead641ebd9d05c870f4d5d59d1e94901c21cb9ebfa4ae685 WHIRLPOOL a39cb3794d546ff503ad33ce45324a7a6b0e4642cbe07919348a33a9ead0795fe4df62ac04ca4af2e0bfbec8d0f531d3b970cc8cfd03287b11fe3ca100ce05aa
diff --git a/net-misc/ipsorcery/files/ipsorcery-2.0.9-_BSD_SOURCE.patch b/net-misc/ipsorcery/files/ipsorcery-2.0.9-_BSD_SOURCE.patch
new file mode 100644
index 000000000000..ef0fca666f6c
--- /dev/null
+++ b/net-misc/ipsorcery/files/ipsorcery-2.0.9-_BSD_SOURCE.patch
@@ -0,0 +1,13 @@
+--- a/wand.h
++++ b/wand.h
+@@ -19,8 +19,8 @@
+ #ifndef _WAND_H
+ #define _WAND_H
+ 
+-#ifndef _BSD_SOURCE
+-#define _BSD_SOURCE
++#ifndef _DEFAULT_SOURCE
++#define _DEFAULT_SOURCE
+ #endif
+ 
+ #ifndef __FAVOR_BSD
diff --git a/net-misc/ipsorcery/files/ipsorcery-2.0.9-gentoo.patch b/net-misc/ipsorcery/files/ipsorcery-2.0.9-gentoo.patch
new file mode 100644
index 000000000000..6a0932c84e2f
--- /dev/null
+++ b/net-misc/ipsorcery/files/ipsorcery-2.0.9-gentoo.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,15 +12,15 @@
+ all:    con gtk
+ 
+ con:
+-	$(CC) -g -O2 -Wall -ansi -D_VERSION_=\"2.0.9\" -D_CON_ $(CON) -o ipmagic
++	$(CC) $(LDFLAGS) $(CFLAGS) -Wall -ansi -D_VERSION_=\"2.0.9\" -D_CON_ $(CON) -o ipmagic
+ 	
+ 
+ gtk:
+-	$(CC) -g -O2 -Wall -ansi -D_GTK_ -DGTK_ENABLE_BROKEN $(SRC) -o $(SPELL) `pkg-config --libs gtk+-2.0` `pkg-config --cflags gtk+-2.0` 
++	$(CC) $(LDFLAGS) $(CFLAGS) $(shell $(PKG_CONFIG) --cflags gtk+-2.0) -Wall -ansi -D_GTK_ -DGTK_ENABLE_BROKEN $(SRC) -o $(SPELL) $(shell $(PKG_CONFIG) --libs gtk+-2.0)
+ 
+ 
+ solaris:     
+-	$(CC) -g -O2 -Wall -ansi  -D_CON_  $(CON) -o $(SPELL)  -lsocket -lnsl
++	$(CC) $(LDFLAGS) $(CFLAGS) -Wall -ansi  -D_CON_  $(CON) -o $(SPELL)  -lsocket -lnsl
+ 
+ 
+ install: con-install
diff --git a/net-misc/ipsorcery/ipsorcery-2.0.9-r1.ebuild b/net-misc/ipsorcery/ipsorcery-2.0.9-r1.ebuild
new file mode 100644
index 000000000000..092da8b8b032
--- /dev/null
+++ b/net-misc/ipsorcery/ipsorcery-2.0.9-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/ipsorc-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+S=${WORKDIR}/ipsorc-${PV}
+
+src_prepare() {
+	sed -i \
+		-e 's:-g -O2:$(LDFLAGS) $(CFLAGS):' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" con || die
+}
+
+src_install() {
+	dosbin ipmagic || die
+	dodoc BUGS changelog HOWTO README
+}
diff --git a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
new file mode 100644
index 000000000000..ca13bb0f66ce
--- /dev/null
+++ b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/ipsorc-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gtk"
+
+DEPEND="
+	gtk? (
+		dev-libs/glib:2=
+		x11-libs/gtk+:2=
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+S=${WORKDIR}/ipsorc-${PV}
+PATCHES=(
+	"${FILESDIR}"/${P}-_BSD_SOURCE.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG=$(tc-getPKG_CONFIG) \
+		con $(usex gtk gtk '')
+}
+
+src_install() {
+	dosbin ipmagic $(usex gtk magic '')
+	dodoc BUGS changelog HOWTO README
+}
diff --git a/net-misc/ipsorcery/metadata.xml b/net-misc/ipsorcery/metadata.xml
new file mode 100644
index 000000000000..e0c359c11cc3
--- /dev/null
+++ b/net-misc/ipsorcery/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project"><email>netmon@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/net-misc/ipsvd/Manifest b/net-misc/ipsvd/Manifest
new file mode 100644
index 000000000000..c24c004e26bd
--- /dev/null
+++ b/net-misc/ipsvd/Manifest
@@ -0,0 +1,6 @@
+AUX ipsvd-1.0.0-fix-parallel-make.diff 1442 SHA256 64ceede5ec9c408073a4495a37f5afe8fa69b49165aa02a16341383fedbf65bb SHA512 f28e2f8f5bb857cf20df144aa45172c9b28b4b78c71eb27fe3a082395edcf01b526cb47a9a6bc74e53c157d87e28be311607a30576f433385e1a83ed0d3b7b3a WHIRLPOOL e2d65af5ef7b3f7e99f8473a369c0c5e54ad74426fb003e1c95fd473b75ec749c86e4ca34d09375da1a1557c21307d29851a96c9bce28789f73ab28fb4e41f07
+DIST ipsvd-1.0.0.tar.gz 77903 SHA256 ef7a725bc85acb5d09ab57658385bb470b3e4da5a4ffc88b5da6c6bd37d01fad SHA512 cbdb461bd5952d3533e1cbf23b4820cea12ec9f96b7c47796304260d8bf201764b95602364102d92e3feb7bf4275d22d8d6447f09a6788cf5cf17371be34b736 WHIRLPOOL 1b7ef984823a5fe72a912b05a55c253cd5569e4ae2c133cb7bf49679668849b1feef2edf40ac07e8830c6fdd9fdba34419d4f97422d73a4c79b5e924639658cd
+EBUILD ipsvd-1.0.0-r1.ebuild 953 SHA256 1f8d8335bd5e84f9dfc4a1b5cdfd439adb66fa99e5bbc060b48120b679e32bd9 SHA512 0315f73e2428837fcde43d7e16dba645ad5bc02a601fbc00627a98cc9a59c402102b09ca99ad552f0fe264cc54374119089eec7d2099374cdbfb0f4b70b59310 WHIRLPOOL 96e3dd687dd2150c8b09989048c03cde75f79f835a49d7c49f1f688eb5afca651231034bcfce5c8c676633cceb51b47f06676a34c43474eb612f9d572f4b67fe
+MISC ChangeLog 2567 SHA256 a3dd19f09b5379966f421fcac70f04ca5cb1cab9d81c387c09ff478a00cd6165 SHA512 285c767655f2c01f02564500dfc3c2496d0642e7da08a715ff4bfc1df5e51003064f08b4309eddf7d0d7887fb5f95f97d07228b803a0023fbf33600d7f6a4a83 WHIRLPOOL 6232428a5683f4c5d0a7f74c0accb2dc4736968f5abd21973ce860a8210b8f2692d848d50cd6a4b7c687ff4d88b097f275c2f16b66b00f108ef7a32b25027f2e
+MISC ChangeLog-2015 1630 SHA256 931cdf43ce8ccb262e0e13c7dd8c69310adef9fe895dd7a897a288099726f3d5 SHA512 4d70ed82507dbfd92188d3829fab4e8965927dda49d8b9607506fd12c8f186628b33390edf2e496435a9797f9e3401291794ead66908ebc8799af302bddea20d WHIRLPOOL d308df0da677b4d9f734074deeb2356b9d5cde03003a43dee3420e926cea3429d3392914a960c002d0dbc36f60595c00929f1ac30103b8586ce55be6ca24ff19
+MISC metadata.xml 1213 SHA256 a844a7863105d016662d75712a43b04edeb87db4acc20be128dea33469f7b0c3 SHA512 c80b068e9fb9ec3d63bb13c41386f119b448bcfaa3a7173483ef46c13fb8fd1c142cb4e4eeaaf73d25331326e5a8002d9545ae235bee244d9b272ea710adc456 WHIRLPOOL 7f64f040c0e84d6f43f0f44d99aad0a55e38a0b4800279926cd82f510b604e3933d9b79cd65328492d0f056e589fedbc9df07f12134f60bf6fb165df7e08b0af
diff --git a/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff b/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff
new file mode 100644
index 000000000000..0b29a8e8cbb1
--- /dev/null
+++ b/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff
@@ -0,0 +1,42 @@
+--- Makefile.orig	2011-01-21 00:43:02.000000000 +0100
++++ Makefile	2011-01-21 00:47:27.000000000 +0100
+@@ -61,7 +61,7 @@
+ check-ipsvd-cdb: load check-ipsvd-cdb.o uint32_unpack.o unix.a byte.a
+ 	./load check-ipsvd-cdb uint32_unpack.o unix.a byte.a
+ 
+-tcpsvd.o: compile sysdeps tcpsvd.c ipsvd_log.h
++tcpsvd.o: compile sysdeps tcpsvd.c ipsvd_log.h iopause.h
+ 	./compile tcpsvd.c
+ 
+ sslsvd.o: compile sysdeps tcpsvd.c ssl_io.c ipsvd_log.h matrixssl
+@@ -70,7 +70,7 @@
+ ssl_io.o: compile sysdeps ssl_io.c matrixssl
+ 	./compile -I./matrixssl ssl_io.c
+ 
+-udpsvd.o: compile sysdeps udpsvd.c ipsvd_log.h
++udpsvd.o: compile sysdeps udpsvd.c ipsvd_log.h iopause.h
+ 	./compile udpsvd.c
+ 
+ ipsvd-cdb.o: compile sysdeps ipsvd-cdb.c
+@@ -94,10 +94,10 @@
+ ipsvd_fmt.o: compile ipsvd_fmt.c
+ 	./compile ipsvd_fmt.c
+ 
+-ipsvd_check.o: compile ipsvd_check.c uint64.h
++ipsvd_check.o: compile ipsvd_check.c uint64.h iopause.h
+ 	./compile ipsvd_check.c
+ 
+-ipsvd_hostname.o: compile ipsvd_hostname.c uint64.h
++ipsvd_hostname.o: compile ipsvd_hostname.c uint64.h iopause.h
+ 	./compile ipsvd_hostname.c
+ 
+ ipsvd_phcc.o: compile ipsvd_phcc.c
+@@ -274,7 +274,7 @@
+ 	./compile dns_rcrw.c
+ 
+ dns_resolve.o: compile dns_resolve.c iopause.h taia.h tai.h uint64.h taia.h \
+-	  byte.h dns.h stralloc.h gen_alloc.h iopause.h taia.h
++	  byte.h dns.h stralloc.h gen_alloc.h taia.h
+ 	./compile dns_resolve.c
+ 
+ dns_sortip.o: compile dns_sortip.c byte.h dns.h stralloc.h gen_alloc.h \
diff --git a/net-misc/ipsvd/ipsvd-1.0.0-r1.ebuild b/net-misc/ipsvd/ipsvd-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..4540eca6c7df
--- /dev/null
+++ b/net-misc/ipsvd/ipsvd-1.0.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="ipsvd is a set of internet protocol service daemons for Unix"
+HOMEPAGE="http://smarden.org/ipsvd/"
+SRC_URI="http://smarden.org/ipsvd/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/net/${P}"
+
+src_prepare() {
+	cd "${S}"/src
+	epatch "${FILESDIR}"/${P}-fix-parallel-make.diff
+}
+
+src_configure() {
+	cd "${S}"/src
+	if use static ; then
+		append-ldflags -static
+	fi
+
+	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_compile() {
+	cd "${S}"/src
+	emake || die "make failed"
+}
+
+src_install() {
+	dobin src/{tcpsvd,udpsvd,ipsvd-cdb} || die "dobin"
+	dodoc package/{CHANGES,README}
+
+	dohtml doc/*.html
+	doman man/ipsvd-instruct.5 man/ipsvd.7 man/udpsvd.8 \
+		man/tcpsvd.8 man/ipsvd-cdb.8
+}
diff --git a/net-misc/ipsvd/metadata.xml b/net-misc/ipsvd/metadata.xml
new file mode 100644
index 000000000000..4de2fd17be93
--- /dev/null
+++ b/net-misc/ipsvd/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+ipsvd is a set of internet protocol service daemons for Unix. It currently
+includes a TCP/IP service daemon, an SSLv3 TCP/IP service daemon (Linux and
+MacOSX), and a UDP/IP service daemon. 
+
+An internet protocol service (ipsv) daemon waits for incoming connections on a
+local socket; for new connections, it conditionally runs an arbitrary program
+with standard input reading from the socket, and standard output writing to the
+socket (if connected), to handle the connection. Standard error is used for
+logging. 
+
+ipsv daemons can be told to read and follow pre-defined instructions on how to
+handle incoming connections; based on the client's IP address or hostname, they
+can run different programs, set a different environment, deny a connection, or
+set a per host concurrency limit. 
+
+Normally the ipsv daemons are run by a supervisor process, such as runsv from
+the runit package, or supervise from the daemontools package. 
+
+ipsvd can be used to run services normally run by inetd, xinetd, or tcpserver.
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
new file mode 100644
index 000000000000..5ca0d28c7f1a
--- /dev/null
+++ b/net-misc/iputils/Manifest
@@ -0,0 +1,34 @@
+AUX 021109-uclibc-no-ether_ntohost.patch 635 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b SHA512 29ccbbf19bd40e9c929af403227f49586a4cb79d7ef948710b34b0813d116017530ef1bf0082b093b4179edff1daa275906cfb9a565f61dd5bed10f24b66fd38 WHIRLPOOL e5390a41b0764d78cda651dd6fff2ebd4f206dc6f5b34da370c19cee7d44f373035fc1efa2bf90924b5a06ca48f344f80a2c902abe04eb588d01e0a9d59bf79d
+AUX iputils-20071127-nonroot-floodping.patch 497 SHA256 f0c7c2d4843873da96f795fb766a65ed39b6d8ab74ae4aa5a47444c9a3db0e52 SHA512 96ea32977cdb2e3c98341b75214a35e88296600d14bc929f7691951325be8e90e8ff6ccf83fb2419db3c910a8169fb2a4348000fab33679039ec5cf2d07a3ee8 WHIRLPOOL 1f880978cf70188d0d59e79396f8c5962655c00cbf7f7c7adb800316dea1b6748ddbc788681c9831edf0fbb1153e85b5ca35e0e3c131b0a5b4884fa511119c0c
+AUX iputils-20100418-so_mark.patch 597 SHA256 3c0c3e93d3b458a02f856be3681c2dd5bfb18933e4752e90dc277cdd353b3576 SHA512 453ef3f8c53e2c2cef54f19219b892e51a83a6109f73a4f10712aec729509f02e6b830ab7ca85843a70f3d9c9860f084b256290f638741d573a5205ba89fe469 WHIRLPOOL 502e9ee110555644fd7d19d64afba3d2777844faca6fe0111b4b7356e3262c011b8de13475db1e70dff9225e3883d7e3e27d1f96f240a80d4c5c9ab0a29c9560
+AUX iputils-20121221-crypto-build.patch 1325 SHA256 cafc281c70d46f2964489b4c19c981bcf203b4c6266d4f49437c3fe67e2027b2 SHA512 922daa01f00c19f8237515b2d3ab73b87daa957cfc491382def2ce1c098ffed943ad4952c94134f3155570f64353abf5348523ea773ce7eb457578f975cc92d2 WHIRLPOOL a39c7dbb9b37849cc3560dc1f814a8c18a9ff9b55e19c3587a7c49286d55323f96d42d33c6f2723d3868506c252272e1d2d6bc3370eb935b479c89514f03c9c5
+AUX iputils-20121221-makefile.patch 1791 SHA256 779632822e3440f3b898a50955cb8fb72177f0d1623c9da7c0a8afa68313435f SHA512 5899942b73d4d13e0ff85f22a81e9107b2a04c82cac6b59559a521c5d0bf25007e34b61b2dfdb40c21b221a108f6ba72c1a51fa59359a400ad045c9394c176db WHIRLPOOL c0c13046265ad44d23bde66cf48f64803591b4577861fde0ad7873001cbd9284c8593ce277a39d077b5bab635d0f8aa53ad124ea724bbc4584db36570028f90f
+AUX iputils-20121221-openssl.patch 2378 SHA256 cc1af5ccdd593b4fa43273cf7de8b9552f0a5d33a72a35fcc4f94cf2c6fc9a44 SHA512 05240c00d0a1f9f878a9826d54cbd0128c2ed5ce7cab4685907956156c3cf2131ccd563812b64490bf915a75f52851396966a590027fc4c1886b2d19f421718b WHIRLPOOL 66052233f933cf30fe1572578012faa380f53580307e880e9a94c001ea14e585b3e28693c8e3883ee6350bb6af04a6931732ebaa284c4e3851b64081e042d081
+AUX iputils-20121221-owl-pingsock.diff 6374 SHA256 915e18ee5a03f5636b408ff34a5576ad8899a3d93d5fe8182984c3565bd94375 SHA512 2f2577230d8bc864adc562c4c5bf33cde3bbabfde633406165b2b61df4e13e2dba74c8561f70d88c3932fc49a41a0276533b715ade208c8608348e4d065c8395 WHIRLPOOL 205179fa205e8bd88a9077cf628ec1a060189ee01d55c45dbe754f3bc36a496531cb9eab120507eff5d72140c934a7480d6a015fa6020f7dcecdfbc6ef590443
+AUX iputils-20121221-parallel-doc.patch 2042 SHA256 151aed9018976387d4001050b41ad5e28630a6e8ab88a0f8501ceb5c9424620e SHA512 cc3a0416c1380d4b799412769270f8fa522a8f931706b318f33add4b02b82e76b177ae6c976408405a83a6c84036f918a41cb3008ee17bf39ea30e8d1f5dc46d WHIRLPOOL adf1b6f7351dd3a255403529268b0c805198905123d6663ef860c72c6bf848029158419b701be39ce144f575de76b76140836ae30259aef2662df9e1c2a57659
+AUX iputils-20121221-printf-size.patch 1671 SHA256 a1ed939d0e008bca06208ae34e3f17a0ddc66b50f1679f82a630b52cdfbd111a SHA512 ff5491ad5a0396bee41fcbfc1384699d396c24da093bd2209dead67f52efcec462dbfb4a43008083742d0139da7bd52e922499b5f7eae028384c74930453dd33 WHIRLPOOL 8582495e9c58a01c3aafe6d0c968df910e672af20d420980ba7503800ad75e308c62cd53f86b5aaa8ef9d232ee7a0a4ea7bb3d9cd9735045ae0f6a21f8e419ee
+AUX iputils-20121221-strtod.patch 1133 SHA256 461a883439a09854b483bce02187aa78eb16cb88364a834257d52f00ca4941cc SHA512 2e4dc1bdc8192c7c028bacb7f82fc13de2529f1dfdba71bbb05f04b468a609b343f8e1798bf991a1326d03a701428256960b2c0b7601bc84b50076b64c5ee946 WHIRLPOOL c781f7cab0d0910a48f91eb24647c0fda29b986ed11d35b1f275fb9cc6c1c2e53c0ea062668fed2d560a6bac751d7fa7f50b907324a79bbe560cffc65078833a
+AUX iputils-20121221-tftpd-setid.patch 815 SHA256 8b1351b43b69a9147b93a0744e57d2634c1fd2abf99856a7447d633bde9cbce4 SHA512 55f7fe0d7312429dd1ec3a9232a4e6436b1115b1b555d5af52f5ee04fe54fdf782dbb018d0dbae1c2e38913057bfa42261a2e57d90c0063b8259029adfa08123 WHIRLPOOL df55138a63fb1b1998e5957eb33f8dfd008dbf9d0701f89dc1bb56a9841b4b9e66ec8d76b83652409655e9b4a953f858eec005fe19463283437a2e477f4ac448
+AUX iputils-20121221-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
+AUX iputils-20150815-nonroot-floodping.patch 406 SHA256 0a2409e1dd040620adc88720f1bb3955d2121762dc600865167332f9b90f3f57 SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 WHIRLPOOL 56d86953105832e589e2b75ea6a806c09ae21d8b9f82e6734cd0b5522b7dfb0291c6f65fdd4baffa120281dc176dd6a5d0bf6f730bd35147a6e654feb02eb5cf
+AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3
+AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
+AUX rarpd.conf.d 250 SHA256 86e79f5a4be44f8b15a8743b4b3128f2bcc40a553f81ebfd902c590f82d12a60 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 WHIRLPOOL bf9e8b6d15dfaa4e76e0af91781cfa675b6db547e9293ea67f0ced50ed2e7ccd880bcbdffac12a197f85f1d643148cb806a10ce9d586c89be1f26248c1fc6aaf
+AUX rarpd.init.d 583 SHA256 4b3efb6723a0c0b9ef7988ed9d3100ece49180483aa51fb69cf055e5d1565391 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada WHIRLPOOL aa25eb5ca849825842d9968ff0928552bb6070b1e8435e74b1af579c6382332941ae4f99c02c3a3eedd34474814e74733d9f15e4c88583aeb06003d508338e48
+DIST iputils-20160308.tar.gz 195348 SHA256 803d11b14af1bd3852c83111cc29e904bc3ca936c093dbb419d0671d3c9d964b SHA512 6b4d6e58ab8f1218f3ab52da695f252bd3e0004ffce755f2378b44fc3b4fbf9beb9beef51ff12f14348a07f6fe8525e64dba7f5d7b70997423d2c98c5ff7dde2 WHIRLPOOL 8a5691fdb70c6a9741adfc09206a4fac041616c6e81e9ef918435fed09c6085a35592eb72055dfbe2a237ab8ed1a018aa824968ff15ad842b923e28743f5cdbf
+DIST iputils-20161105.tar.gz 195879 SHA256 f813092f03d17294fd23544b129b95cdb87fe19f7970a51908a6b88509acad8a SHA512 1593077b6eff1e57eb8a32897dd9624a745d0c87db1501a96436b168b109ef22d41ee69406a4a2154d8d72c823c1df723b4c52eeec8d82ba2762fb01dc0d4797 WHIRLPOOL c5c693cca2dbe24c41e6cda123565bd4638641ddf7c69919d17d0ba9f45e1f289b9e5dd5819b24a9a1968f7f89a18d4ff295e963c299d3988aff71460677976c
+DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c WHIRLPOOL da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d
+DIST iputils-s20121221.tar.bz2 155344 SHA256 450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 WHIRLPOOL 64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9
+DIST iputils-s20151218-manpages.tar.xz 22336 SHA256 ae60dcf7a5a83d02008c03888935fd2dcff56c9f86734d4656b6284a7631a28d SHA512 964b9e22b18b67215ea48e046c45768cd86076b53db2131b00ac721be9e7de4edadefb74855d81861f12b4e10dcecd90d29f0098c2c4568d7601d97e756be0a3 WHIRLPOOL 82e3c9930861ed2df00c3b40488212dc36d5d65d62e1e7245d778ff77c6660a93bdd1dd8931cdddba4a631a9321741c0c2246d0cf48b22fc562ee7a066ac75fd
+DIST iputils-s20151218.tar.bz2 157187 SHA256 549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1 SHA512 4bf0eed0ae5603e872afb0e09be039df3822a7723e8cbb8cbe578d69d8c457ffac9bdbe2eb17b32c95968e5e4ad6204af955617482c5701671f0f476b560b65c WHIRLPOOL e5b1d89eeaf64c2be97217eff37ef9aea33f69925683067c5366eb8db30a0b8cd8e96c2c18eedb573c965a6508efcb9e67effa66da1ad8bd606a1c1ffff9adf7
+DIST iputils-s20160308-manpages.tar.xz 22684 SHA256 e21ef842d2eb4fa21f64cb872101bc9f979d24127fb680247d4a95ffc94a3958 SHA512 fe55ee334f1a99c6d93f4d18d97666d307676ced77175b73139f888af8f4f0ddc0f1d0511ab71d234f57909def606bf5c3aede2db28a0f73eb5628b9c8e16cac WHIRLPOOL 2675551b615efdf54a77bcb1dbe22c89b1ae5cd783c7bf33c703b81f54239096c1a7e13e7c8d6abd8b4ed5b0cbbd6f3b59d4102279c8cfb6f0a0bf6e070aab93
+DIST iputils-s20161105-manpages.tar.xz 22660 SHA256 5826862037e14d9c1b07ca4ba28d641822fd293e0d250de6b752c823209061a9 SHA512 10cf22e1c2bf4ab90818e2120638d250ccefd65f19545cc9662537a31ab525089309b505759a347f09f1439800e291d7fa22f38bdec5460d41bd40f323412279 WHIRLPOOL acc6b11be8f9832b333c0dc9ea83dd494c0e1643e44c36ac3364b4df672e0d4403aeb7b2407e27de5989fd0f917b021243bec9c69f22f6a36e0265c8a6a40069
+EBUILD iputils-20121221-r1.ebuild 2806 SHA256 2752c52905f1d82ad41a89672dc090bf7a3dc50fdaca59107b83ce01f788e0f3 SHA512 2779c0a778c877c9c57a0bf35f79ab5cf042aff5ebe3bcc76170135ccf602f9b44afc6823951fc86938fb1bc112482e4cd4eb7e1bc0151b5a31c599168535856 WHIRLPOOL e71918fb0873c4d594222e5d5744f877661ab689277e2c2e16eb7ed29857c5e92d861356fb98223a5a38864b74fa278cab6686f70cb9ec015691e48cf8b5985b
+EBUILD iputils-20121221-r2.ebuild 4051 SHA256 0a64b2b06d19398aeb897343331a6726c16efc3b835d0afd3143b912e0aa618b SHA512 0fa5bc1c56b41b38b277bfeaf1abdf47fa1f3e477bdc051fa6124c81c173810cdda69a826f1aa1920e0405b19d751fb9d1212040a3c64f3d628b0435ad370c27 WHIRLPOOL 8c4ded12a3fa983da07843820c2598ad296fdb1123faab59fca812f360ac655c0c6b5a4f5771bb357d3a9100bcfcc4ad7cc7ca7474dd9b4175dfac401904f79c
+EBUILD iputils-20151218.ebuild 3977 SHA256 9624dd416733b58c1a9815304144fbcb0de07940dc6e471ea9e8f26555660752 SHA512 b07ffea44d85ea3aa0a92ab606386d7d1a917eed700c421aabb4af6ae4b46b1fc5e9ef1f942a441441ec4171548b9dc04f7bd73b75804568579ec044b297dbc0 WHIRLPOOL 7b34b8d257060570c7d837c6ed055e7e2c5a56c312b3e9ff00254268ec52bdf77511dd7fee0501f2a39dd11d3c12df67331c901655491165c9bd8104fa36a701
+EBUILD iputils-20160308.ebuild 3838 SHA256 7d5e1ea302cb909cad75f3caae438cec9c7b9d98170a13972d9d284da363fb5b SHA512 596ab450370cb8883d3480e8e0a21cc27ecaa19ba7499296a0c67e84fa8bce3c085f66d87eea03be19d54b780a8933f752999196b13d2b3d0a66faec2f756d08 WHIRLPOOL 39f3b25e0ebbde84a1935aced624b3c4004c40d992bb84542cd214003fdd2d6169a0c5374a11e8116177d4fd9b27ac0437547b3fc1ab9fcf2b2b9a411730bc20
+EBUILD iputils-20161105.ebuild 3870 SHA256 2a735d03e5d5e68917eff814f785ece65814b796ad7c82fb995bb0510fb05fd2 SHA512 64f9077c8e69b02db0560a1213293d27cfebbd5a02d62f75b53f6ee3d76b46c64ce2995ca1c6e7b3fb22185f33fd40a0da4a1796307883adcbbb47ed123b9611 WHIRLPOOL 0ce5472affdeec7294d315f446bb4ea44cb645c11af82a6e2b9278d4b5cbe41162eb2c98d36bf8e325153c8c390b17f7fc65f9cec2a54e11b3d95d8458c071a1
+EBUILD iputils-99999999.ebuild 3782 SHA256 587d4ab16e53b0956626bcfee225c4f8d56fce7fc7b343038c18979eaeb06305 SHA512 ddb3c5f8c70bd80011b876773a77ef825913a1b21840d68c511eb5015e52aebc8860c6fc65e81618ec6b247fcf90416cf3593fab60e6cef7d3a9867332435bad WHIRLPOOL b0ac4f70d18ce2c24e61620488b9fc88b253ef2ad21cc408de30d5fb6dca0d1bd2ef488c2774bee84adc26cd2e0bf61711c15e29e4db2b5a1d5863d36c537cc6
+MISC ChangeLog 9602 SHA256 b860b10f98c5ce47173ef3e78599cc524579114a8fcfb2a0ea4e3938cc42244e SHA512 7824d23cb1249c0008aa507cea0d30be9d2dcce0053bf1a20a12df3527357530120c9559c7f4ac353e880ca1c3d07c4c56a29301e59ed43ca3a5362e552f7015 WHIRLPOOL 63cde37c69f443e03196145b99456ebf254d766988272002c38484e1139bf42efd57b7d976ce2064a41398346fe67d3a27b275ec84a998f300422b528782d2a9
+MISC ChangeLog-2015 22418 SHA256 9558c8a0c5143189ef51deae9371d71bd200f5f08a8aff2de94786c42a06b400 SHA512 01a5bbc5d9f4cadd403c4a455d029792278e23c5d78c830fcc685e5706bc19ec240e3807e48da80d0ed84e103e7ddf465f7b9500af42b31bd6fb8d22465e76cb WHIRLPOOL 3aa152858f0cca507036021355ce50823635655e932d51c3f4e7915b1239385931f07385d19a0e04e6795b628f356cdf8a7e6b39b20280c9de7eaf7e4cf6fade
+MISC metadata.xml 1698 SHA256 f42c67ff65e69eecd35829e42ad6f7ecddc6a92c79996557146f1c2099eaedf4 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc WHIRLPOOL 745fa143c468727485be53de43f4748f170588a9d2f36a2d5aff4681c1e1a484866b7e59e91db724fb5948d383f61ff232791966fe112bd6a2e34d4d671d521e
diff --git a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch b/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
new file mode 100644
index 000000000000..e790d2b51038
--- /dev/null
+++ b/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
@@ -0,0 +1,24 @@
+--- iputils/rarpd.c.mps	2004-06-10 15:27:01.000000000 +0200
++++ iputils/rarpd.c	2004-06-10 15:26:29.000000000 +0200
+@@ -42,7 +42,9 @@ int listen_arp;
+ char *ifname;
+ char *tftp_dir = "/etc/tftpboot";
+ 
++#ifndef __UCLIBC__
+ extern int ether_ntohost(char *name, unsigned char *ea);
++#endif
+ void usage(void) __attribute__((noreturn));
+ 
+ struct iflink
+@@ -305,7 +307,11 @@ struct rarp_map *rarp_lookup(int ifindex
+ 				6,
+ 			};
+ 
++#ifndef __UCLIBC__
+ 			if (ether_ntohost(ename, lladdr) != 0 ||
++#else
++			if (
++#endif
+ 			    (hp = gethostbyname(ename)) == NULL) {
+ 				if (verbose)
+ 					syslog(LOG_INFO, "not found in /etc/ethers");
diff --git a/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
new file mode 100644
index 000000000000..cae87791dc21
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
@@ -0,0 +1,11 @@
+--- iputils-s20071127/ping_common.h.orig	2008-06-10 11:16:06.000000000 +0100
++++ iputils-s20071127/ping_common.h	2008-06-10 11:16:18.000000000 +0100
+@@ -28,7 +28,7 @@
+ 
+ #define	MAXWAIT		10		/* max seconds to wait for response */
+ #define MININTERVAL	10		/* Minimal interpacket gap */
+-#define MINUSERINTERVAL	200		/* Minimal allowed interval for non-root */
++#define MINUSERINTERVAL	0		/* Minimal allowed interval for non-root */
+ 
+ #define SCHINT(a)	(((a) <= MININTERVAL) ? MININTERVAL : (a))
+ 
diff --git a/net-misc/iputils/files/iputils-20100418-so_mark.patch b/net-misc/iputils/files/iputils-20100418-so_mark.patch
new file mode 100644
index 000000000000..ad92254d6f8d
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20100418-so_mark.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/335347
+
+fix building with older linux headers that don't define SO_MARK
+
+--- ping_common.c
++++ ping_common.c
+@@ -485,6 +485,7 @@
+ 			fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n");
+ 	}
+ #endif
++#ifdef SO_MARK
+ 	if (options & F_MARK) {
+ 		if (setsockopt(icmp_sock, SOL_SOCKET, SO_MARK,
+ 				&mark, sizeof(mark)) == -1) {
+@@ -494,6 +495,7 @@
+ 			fprintf(stderr, "Warning: Failed to set mark %d\n", mark);
+ 		}
+ 	}
++#endif
+ 
+ 	/* Set some SNDTIMEO to prevent blocking forever
+ 	 * on sends, when device is too slow or stalls. Just put limit
diff --git a/net-misc/iputils/files/iputils-20121221-crypto-build.patch b/net-misc/iputils/files/iputils-20121221-crypto-build.patch
new file mode 100644
index 000000000000..1ec3c101d525
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-crypto-build.patch
@@ -0,0 +1,35 @@
+From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001
+From: Arjan van de Ven <arjanvandeven@gmail.com>
+Date: Wed, 16 Jan 2013 03:12:15 +0900
+Subject: [PATCH [iputils]] ping6: Fix build command line argument with gnutls.
+
+The ping6 command can use either openssl or gnutls...
+and the Makefile has a bunch of setup for defining which of the two to use.
+
+Unfortunately, the final -D define on the commandline to enable gnutls
+inside the ping6.c file didn't actually make it onto the gcc
+commandline.
+This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap.
+
+Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com>
+Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c62d9df..89249f5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP)
+ DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
+ DEF_ping  = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
+ LIB_ping  = $(LIB_CAP) $(LIB_IDN)
+-DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR)
++DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO)
+ LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO)
+ 
+ ping: ping_common.o
+-- 
+1.8.0.2
+
diff --git a/net-misc/iputils/files/iputils-20121221-makefile.patch b/net-misc/iputils/files/iputils-20121221-makefile.patch
new file mode 100644
index 000000000000..66424c85cf8e
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-makefile.patch
@@ -0,0 +1,61 @@
+From c66609d2c830d6fe06f48f5d38c54eb5cc6f2975 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 24 Jan 2013 23:36:16 -0500
+Subject: [PATCH [iputils]] fix handling of CFLAGS
+
+This defaults CFLAGS to -O3 without clobbering settings people have set
+up in the environment already.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2c49940..ecabac3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,8 +2,6 @@
+ # Configuration
+ #
+ 
+-# CC
+-CC=gcc
+ # Path to parent kernel include files directory
+ LIBC_INCLUDE=/usr/include
+ # Libraries
+@@ -48,11 +46,10 @@ ENABLE_RDISC_SERVER=no
+ 
+ # -------------------------------------
+ # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
+-# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
+-CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g
+-CCOPTOPT=-O3
+-GLIBCFIX=-D_GNU_SOURCE
+-DEFINES=
++# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
++CFLAGS?=-O3 -g
++CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
++CPPFLAGS+=-D_GNU_SOURCE
+ LDLIB=
+ 
+ FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2))
+@@ -113,7 +110,6 @@ IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
+ IPV6_TARGETS=tracepath6 traceroute6 ping6
+ TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
+ 
+-CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
+ LDLIBS=$(LDLIB) $(ADDLIB)
+ 
+ UNAME_N:=$(shell uname -n)
+@@ -132,6 +128,7 @@ all: $(TARGETS)
+ 	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -S -o $@
+ %.o: %.c
+ 	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@
++LINK.o += $(CFLAGS)
+ $(TARGETS): %: %.o
+ 	$(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@
+ 
+-- 
+1.8.0.2
+
diff --git a/net-misc/iputils/files/iputils-20121221-openssl.patch b/net-misc/iputils/files/iputils-20121221-openssl.patch
new file mode 100644
index 000000000000..1c6ba81dab8b
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-openssl.patch
@@ -0,0 +1,92 @@
+From b57d77dcfa5cb363b7eba5b331324669a8505ac4 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 24 Jan 2013 23:32:39 -0500
+Subject: [PATCH [iputils]] ping6: allow disabling of openssl support
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile |  5 ++++-
+ ping6.c  | 14 +++++++++++++-
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 89249f5..2c49940 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
+ 
+ # GNU TLS library for ping6 [yes|no|static]
+ USE_GNUTLS=yes
+-# Crypto library for ping6 [shared|static]
++# Crypto library for ping6 [shared|static|no]
+ USE_CRYPTO=shared
+ # Resolv library for ping6 [yes|static]
+ USE_RESOLV=yes
+@@ -63,7 +63,10 @@ ifneq ($(USE_GNUTLS),no)
+ 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_GNUTLS),$(LDFLAG_GNUTLS))
+ 	DEF_CRYPTO = -DUSE_GNUTLS
+ else
++ifneq ($(USE_CRYPTO),no)
+ 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
++	DEF_CRYPTO = -DUSE_OPENSSL
++endif
+ endif
+ 
+ # USE_RESOLV: LIB_RESOLV
+diff --git a/ping6.c b/ping6.c
+index c39864d..f2f90af 100644
+--- a/ping6.c
++++ b/ping6.c
+@@ -168,8 +168,10 @@ static int icmp_sock;
+ 
+ #ifdef USE_GNUTLS
+ # include <gnutls/openssl.h>
+-#else
++# define USE_CRYPTO
++#elif defined USE_OPENSSL
+ # include <openssl/md5.h>
++# define USE_CRYPTO
+ #endif
+ 
+ /* Node Information query */
+@@ -326,6 +328,7 @@ static void niquery_init_nonce(void)
+ #if !PING6_NONCE_MEMORY
+ static int niquery_nonce(__u8 *nonce, int fill)
+ {
++# ifdef USE_CRYPTO
+ 	static __u8 digest[MD5_DIGEST_LENGTH];
+ 	static int seq = -1;
+ 
+@@ -348,6 +351,10 @@ static int niquery_nonce(__u8 *nonce, int fill)
+ 			return -1;
+ 		return ntohsp((__u16 *)nonce);
+ 	}
++# else
++	fprintf(stderr, "ping6: function not available; crypto disabled\n");
++	exit(3);
++# endif
+ }
+ #endif
+ 
+@@ -502,6 +509,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg)
+ 
+ static int niquery_option_subject_name_handler(int index, const char *arg)
+ {
++#ifdef USE_CRYPTO
+ 	static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
+ 	unsigned char *dnptrs[2], **dpp, **lastdnptr;
+ 	int n;
+@@ -627,6 +635,10 @@ errexit:
+ 	free(idn);
+ 	free(name);
+ 	exit(1);
++#else
++	fprintf(stderr, "ping6: function not available; crypto disabled\n");
++	exit(3);
++#endif
+ }
+ 
+ int niquery_option_help_handler(int index, const char *arg)
+-- 
+1.8.0.2
+
diff --git a/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff b/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff
new file mode 100644
index 000000000000..283aa989f322
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff
@@ -0,0 +1,224 @@
+http://openwall.info/wiki/people/segoon/ping
+
+--- iputils-s20101006/ping.c
++++ iputils-s20101006/ping.c
+@@ -88,6 +88,7 @@ struct sockaddr_in whereto;	/* who to pi
+ int optlen = 0;
+ int settos = 0;			/* Set TOS, Precendence or other QOS options */
+ int icmp_sock;			/* socket file descriptor */
++int using_ping_socket = 0;
+ u_char outpack[0x10000];
+ int maxpacket = sizeof(outpack);
+ 
+@@ -123,7 +124,11 @@ main(int argc, char **argv)
+ 	char *target, hnamebuf[MAX_HOSTNAMELEN];
+ 	char rspace[3 + 4 * NROUTES + 1];	/* record route space */
+ 
+-	icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
++	icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
++	if (icmp_sock != -1)
++		using_ping_socket = 1;
++	else
++		icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+ 	socket_errno = errno;
+ 
+ 	uid = getuid();
+@@ -377,13 +382,35 @@ main(int argc, char **argv)
+ 		}
+ 	}
+ 
+-	if ((options&F_STRICTSOURCE) &&
+-	    bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
+-		perror("bind");
+-		exit(2);
++	if (!using_ping_socket) {
++		if ((options&F_STRICTSOURCE) &&
++		    bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
++			perror("bind");
++			exit(2);
++		}
++	} else {
++		struct sockaddr_in sa;
++		socklen_t sl;
++
++		sa.sin_family = AF_INET;
++		sa.sin_port = 0;
++		sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ?
++			source.sin_addr.s_addr : 0;
++		sl = sizeof(sa);
++
++		if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) {
++			perror("bind");
++			exit(2);
++		}
++
++		if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) {
++			perror("getsockname");
++			exit(2);
++		}
++		ident = sa.sin_port;
+ 	}
+ 
+-	if (1) {
++	if (!using_ping_socket) {
+ 		struct icmp_filter filt;
+ 		filt.data = ~((1<<ICMP_SOURCE_QUENCH)|
+ 			      (1<<ICMP_DEST_UNREACH)|
+@@ -398,6 +425,12 @@ main(int argc, char **argv)
+ 	hold = 1;
+ 	if (setsockopt(icmp_sock, SOL_IP, IP_RECVERR, (char *)&hold, sizeof(hold)))
+ 		fprintf(stderr, "WARNING: your kernel is veeery old. No problems.\n");
++	if (using_ping_socket) {
++		if (setsockopt(icmp_sock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
++			perror("WARNING: setsockopt(IP_RECVTTL)");
++		if (setsockopt(icmp_sock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
++			perror("WARNING: setsockopt(IP_RETOPTS)");
++	}
+ 
+ 	/* record route option */
+ 	if (options & F_RROUTE) {
+@@ -566,6 +599,7 @@ int receive_error_msg()
+ 		nerrors++;
+ 	} else if (e->ee_origin == SO_EE_ORIGIN_ICMP) {
+ 		struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
++		int error_pkt;
+ 
+ 		if (res < sizeof(icmph) ||
+ 		    target.sin_addr.s_addr != whereto.sin_addr.s_addr ||
+@@ -576,9 +610,18 @@ int receive_error_msg()
+ 			goto out;
+ 		}
+ 
+-		acknowledge(ntohs(icmph.un.echo.sequence));
++		error_pkt = (e->ee_type != ICMP_REDIRECT &&
++			     e->ee_type != ICMP_SOURCE_QUENCH);
++		if (error_pkt) {
++			acknowledge(ntohs(icmph.un.echo.sequence));
++			net_errors++;
++			nerrors++;
++		}
++		else {
++			saved_errno = 0;
++		}
+ 
+-		if (!working_recverr) {
++		if (!using_ping_socket && !working_recverr) {
+ 			struct icmp_filter filt;
+ 			working_recverr = 1;
+ 			/* OK, it works. Add stronger filter. */
+@@ -589,15 +632,14 @@ int receive_error_msg()
+ 				perror("\rWARNING: setsockopt(ICMP_FILTER)");
+ 		}
+ 
+-		net_errors++;
+-		nerrors++;
+ 		if (options & F_QUIET)
+ 			goto out;
+ 		if (options & F_FLOOD) {
+-			write_stdout("\bE", 2);
++			if (error_pkt)
++				write_stdout("\bE", 2);
+ 		} else {
+ 			print_timestamp();
+-			printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
++			printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
+ 			pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
+ 			fflush(stdout);
+ 		}
+@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc, 
+ 	struct iphdr *ip;
+ 	int hlen;
+ 	int csfailed;
++	struct cmsghdr *cmsg;
++	int ttl;
++	__u8 *opts;
++	int optlen;
+ 
+ 	/* Check the IP header */
+ 	ip = (struct iphdr *)buf;
+-	hlen = ip->ihl*4;
+-	if (cc < hlen + 8 || ip->ihl < 5) {
+-		if (options & F_VERBOSE)
+-			fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
+-				pr_addr(from->sin_addr.s_addr));
+-		return 1;
++	if (!using_ping_socket) {
++		hlen = ip->ihl*4;
++		if (cc < hlen + 8 || ip->ihl < 5) {
++			if (options & F_VERBOSE)
++				fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
++					pr_addr(from->sin_addr.s_addr));
++			return 1;
++		}
++		ttl = ip->ttl;
++		opts = buf + sizeof(struct iphdr);
++		optlen = hlen - sizeof(struct iphdr);
++	} else {
++		hlen = 0;
++		ttl = 0;
++		opts = buf;
++		optlen = 0;
++		for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
++			if (cmsg->cmsg_level != SOL_IP)
++				continue;
++			if (cmsg->cmsg_type == IP_TTL) {
++				if (cmsg->cmsg_len < sizeof(int))
++					continue;
++				ttl = *(int *) CMSG_DATA(cmsg);
++			} else if (cmsg->cmsg_type == IP_RETOPTS) {
++				opts = (__u8 *) CMSG_DATA(cmsg);
++				optlen = cmsg->cmsg_len;
++			}
++		}
+ 	}
+ 
+ 	/* Now the ICMP part */
+@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc, 
+ 			return 1;			/* 'Twas not our ECHO */
+ 		if (gather_statistics((__u8*)icp, sizeof(*icp), cc,
+ 				      ntohs(icp->un.echo.sequence),
+-				      ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
++				      ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
+ 				      pr_echo_reply))
+ 			return 0;
+ 	} else {
+@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc, 
+ 	}
+ 
+ 	if (!(options & F_FLOOD)) {
+-		pr_options(buf + sizeof(struct iphdr), hlen);
++		pr_options(opts, optlen + sizeof(struct iphdr));
+ 
+ 		if (options & F_AUDIBLE)
+ 			putchar('\a');
+@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3
+ 			printf("Redirect, Bad Code: %d", code);
+ 			break;
+ 		}
+-		if (icp)
+-			printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway));
++		printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info));
+ 		if (icp && (options & F_VERBOSE))
+ 			pr_iph((struct iphdr*)(icp + 1));
+ 		break;
+@@ -1217,7 +1284,7 @@ void install_filter(void)
+ 		insns
+ 	};
+ 
+-	if (once)
++	if (once || using_ping_socket)
+ 		return;
+ 	once = 1;
+ 
+--- iputils-s20101006/ping_common.c
++++ iputils-s20101006/ping_common.c
+@@ -515,7 +515,8 @@ void setup(int icmp_sock)
+ 			*p++ = i;
+ 	}
+ 
+-	ident = htons(getpid() & 0xFFFF);
++	if (!ident)
++		ident = htons(getpid() & 0xFFFF);
+ 
+ 	set_signal(SIGINT, sigexit);
+ 	set_signal(SIGALRM, sigexit);
diff --git a/net-misc/iputils/files/iputils-20121221-parallel-doc.patch b/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
new file mode 100644
index 000000000000..22bfb8811ed3
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
@@ -0,0 +1,74 @@
+From 4e322b85a12ba3ef5e8118724e3442b2ebb0f6d6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 1 Aug 2012 11:43:34 -0400
+Subject: [PATCH iputils] doc: fix parallel build of html/man pages
+
+The use of the same tempdir prevents building of these files in parallel.
+So build all of them in unique tempdirs so we can do them in parallel.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ doc/Makefile | 37 ++++++++++++++++++++++++-------------
+ 1 file changed, 24 insertions(+), 13 deletions(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 7ec4f1c..4f930a3 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -12,29 +12,40 @@ man: $(MANFILES)
+ # lots of some strange temporary junk directories and files.
+ # So, scope it to a temporary dir and clean all after each run.
+ 
+-$(HTMLFILES): index.db
+-	@-rm -rf tmp.db2html
+-	@mkdir tmp.db2html
+-	@set -e; cd tmp.db2html; docbook2html ../$< ; mv *.html ..
+-	@-rm -rf tmp.db2html
++SETUP_TMPDIR = \
++	t="tmp.db2html.$@"; \
++	rm -rf $$t; \
++	mkdir $$t; \
++	cd $$t
++CLEAN_TMPDIR = \
++	cd ..; \
++	rm -rf $$t
++
++MAKE_HTML = \
++	@set -e; \
++	$(SETUP_TMPDIR); \
++	docbook2html ../$<; \
++	mv *.html ..; \
++	$(CLEAN_TMPDIR)
+ 
++$(HTMLFILES): index.db
++	$(MAKE_HTML)
+ iputils.html: iputils.db
+-	@-rm -rf tmp.db2html
+-	@mkdir tmp.db2html
+-	@set -e; cd tmp.db2html; docbook2html -u -o html ../$< ; mv html/$@ ..
+-	@-rm -rf tmp.db2html
++	$(MAKE_HTML)
+ 
+ # docbook2man produces utterly ugly output and I did not find
+ # any way to customize this but hacking backend perl script a little.
+ # Well, hence...
+ 
+ $(MANFILES): index.db
+-	@-mkdir tmp.db2man
+-	@set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ;	mv $@ ..
+-	@-rm -rf tmp.db2man
++	@set -e; \
++	$(SETUP_TMPDIR); \
++	nsgmls ../$< | sgmlspl ../docbook2man-spec.pl; \
++	mv $@ ..; \
++	$(CLEAN_TMPDIR)
+ 
+ clean:
+-	@rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man
++	@rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html* tmp.db2man*
+ 
+ snapshot:
+ 	@date "+%y%m%d" > snapshot.db
+-- 
+2.3.5
+
diff --git a/net-misc/iputils/files/iputils-20121221-printf-size.patch b/net-misc/iputils/files/iputils-20121221-printf-size.patch
new file mode 100644
index 000000000000..6d6c3b7d2580
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-printf-size.patch
@@ -0,0 +1,64 @@
+From 23fcb10ae15a96aa9e5a823cfe0b612d9522691c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 14 Aug 2010 01:16:42 -0400
+Subject: [PATCH [iputils]] tracepath: re-use printf return in print_host
+
+Since the printf funcs already return the length of chars displayed,
+use that value instead of re-calculating the length with strlen.
+
+This also fixes the handling of the strlen return -- it's a size_t,
+not an int.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tracepath.c  | 11 ++++-------
+ tracepath6.c | 11 ++++-------
+ 2 files changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/tracepath.c b/tracepath.c
+index 8a08f1d..f155816 100644
+--- a/tracepath.c
++++ b/tracepath.c
+@@ -73,13 +73,10 @@ void data_wait(int fd)
+ 
+ void print_host(const char *a, const char *b, int both)
+ {
+-	int plen = 0;
+-	printf("%s", a);
+-	plen = strlen(a);
+-	if (both) {
+-		printf(" (%s)", b);
+-		plen += strlen(b) + 3;
+-	}
++	int plen;
++	plen = printf("%s", a);
++	if (both)
++		plen += printf(" (%s)", b);
+ 	if (plen >= HOST_COLUMN_SIZE)
+ 		plen = HOST_COLUMN_SIZE - 1;
+ 	printf("%*s", HOST_COLUMN_SIZE - plen, "");
+diff --git a/tracepath6.c b/tracepath6.c
+index 126fadf..bee95c3 100644
+--- a/tracepath6.c
++++ b/tracepath6.c
+@@ -86,13 +86,10 @@ void data_wait(int fd)
+ 
+ void print_host(const char *a, const char *b, int both)
+ {
+-	int plen = 0;
+-	printf("%s", a);
+-	plen = strlen(a);
+-	if (both) {
+-		printf(" (%s)", b);
+-		plen += strlen(b) + 3;
+-	}
++	int plen;
++	plen = printf("%s", a);
++	if (both)
++		plen += printf(" (%s)", b);
+ 	if (plen >= HOST_COLUMN_SIZE)
+ 		plen = HOST_COLUMN_SIZE - 1;
+ 	printf("%*s", HOST_COLUMN_SIZE - plen, "");
+-- 
+1.8.0.2
+
diff --git a/net-misc/iputils/files/iputils-20121221-strtod.patch b/net-misc/iputils/files/iputils-20121221-strtod.patch
new file mode 100644
index 000000000000..303acf5c42c4
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-strtod.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/472592
+
+From dd0aa192626f94d08e399fc2a743ee72c50853fb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 24 Apr 2015 20:41:31 -0400
+Subject: [PATCH iputils] ping: fix -i number parsing in locales
+
+Always use #.# format for the -i flag even when the current locale uses
+a different separator.  Locale de_DE which uses #,# normally.
+
+Simple testcase:
+$ make USE_IDN=1
+$ LANG=de_DE.UTF8 ./ping -i 0.5 localhost
+
+Reported-by: Sergey Fionov <fionov@gmail.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ ping_common.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/ping_common.c b/ping_common.c
+index 62f53a6..0a37e09 100644
+--- a/ping_common.c
++++ b/ping_common.c
+@@ -269,9 +269,17 @@ void common_options(int ch)
+ 		double dbl;
+ 		char *ep;
+ 
++#ifdef USE_IDN
++		setlocale(LC_ALL, "C");
++#endif
++
+ 		errno = 0;
+ 		dbl = strtod(optarg, &ep);
+ 
++#ifdef USE_IDN
++		setlocale(LC_ALL, "");
++#endif
++
+ 		if (errno || *ep != '\0' ||
+ 		    !finite(dbl) || dbl < 0.0 || dbl >= (double)INT_MAX / 1000 - 1.0) {
+ 			fprintf(stderr, "ping: bad timing interval\n");
+-- 
+2.3.5
+
diff --git a/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch b/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch
new file mode 100644
index 000000000000..0ea56685d26d
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch
@@ -0,0 +1,34 @@
+From d81a44625b04d487c895473aa77af13420b7afdd Mon Sep 17 00:00:00 2001
+From: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>
+Date: Thu, 19 Jun 2014 17:25:49 +0900
+Subject: [PATCH iputils] tftpd: Exit if setuid()/setgid() failed.
+
+Signed-off-by: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>
+---
+ tftpd.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/tftpd.c b/tftpd.c
+index 2a39ec4..e3af2f4 100644
+--- a/tftpd.c
++++ b/tftpd.c
+@@ -111,8 +111,14 @@ int main(int ac, char **av)
+ 
+ 	/* Sanity. If parent forgot to setuid() on us. */
+ 	if (geteuid() == 0) {
+-		setgid(65534);
+-		setuid(65534);
++		if (setgid(65534)) {
++			syslog(LOG_ERR, "setgid");
++			exit(1);
++		}
++		if (setuid(65534)) {
++			syslog(LOG_ERR, "setuid");
++			exit(1);
++		}
+ 	}
+ 
+ 	ac--; av++;
+-- 
+2.3.5
+
diff --git a/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch b/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch
new file mode 100644
index 000000000000..ad34f3b5f646
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch
@@ -0,0 +1,38 @@
+From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 19 Apr 2014 10:39:39 -0400
+Subject: [PATCH iputils] tftpd: fix syslog setup
+
+Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking
+the set*id calls, but would call syslog() before it had called openlog().
+Move the call up earlier to fix that.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tftpd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tftpd.c b/tftpd.c
+index e3af2f4..7ddc8eb 100644
+--- a/tftpd.c
++++ b/tftpd.c
+@@ -109,6 +109,8 @@ int main(int ac, char **av)
+ 	register int n = 0;
+ 	int on = 1;
+ 
++	openlog("tftpd", LOG_PID, LOG_DAEMON);
++
+ 	/* Sanity. If parent forgot to setuid() on us. */
+ 	if (geteuid() == 0) {
+ 		if (setgid(65534)) {
+@@ -125,7 +127,6 @@ int main(int ac, char **av)
+ 	while (ac-- > 0 && n < MAXARG)
+ 		dirs[n++] = *av++;
+ 
+-	openlog("tftpd", LOG_PID, LOG_DAEMON);
+ 	if (ioctl(0, FIONBIO, &on) < 0) {
+ 		syslog(LOG_ERR, "ioctl(FIONBIO): %m\n");
+ 		exit(1);
+-- 
+2.3.5
+
diff --git a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch
new file mode 100644
index 000000000000..50e108b09e85
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch
@@ -0,0 +1,11 @@
+--- iputils-s20150815/ping.h
++++ iputils-s20150815/ping.h
+@@ -61,7 +61,7 @@
+ 
+ #define	MAXWAIT		10		/* max seconds to wait for response */
+ #define MININTERVAL	10		/* Minimal interpacket gap */
+-#define MINUSERINTERVAL	200		/* Minimal allowed interval for non-root */
++#define MINUSERINTERVAL	0		/* Minimal allowed interval for non-root */
+ 
+ #define SCHINT(a)	(((a) <= MININTERVAL) ? MININTERVAL : (a))
+ 
diff --git a/net-misc/iputils/files/iputils-99999999-openssl.patch b/net-misc/iputils/files/iputils-99999999-openssl.patch
new file mode 100644
index 000000000000..13f5639a6fb6
--- /dev/null
+++ b/net-misc/iputils/files/iputils-99999999-openssl.patch
@@ -0,0 +1,97 @@
+From 321d64b9f94653322e678e34ac214ddb73a71db8 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 24 Jan 2013 23:32:39 -0500
+Subject: [PATCH iputils] ping6: allow disabling of openssl support
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile         |  5 ++++-
+ iputils_md5dig.h |  4 +++-
+ ping6.c          | 10 ++++++++++
+ 3 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 54e5a6d..7147f08 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
+ 
+ # Libgcrypt (for MD5) for ping6 [yes|no|static]
+ USE_GCRYPT=yes
+-# Crypto library for ping6 [shared|static]
++# Crypto library for ping6 [shared|static|no]
+ USE_CRYPTO=shared
+ # Resolv library for ping6 [yes|static]
+ USE_RESOLV=yes
+@@ -63,7 +63,10 @@ ifneq ($(USE_GCRYPT),no)
+ 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_GCRYPT),$(LDFLAG_GCRYPT))
+ 	DEF_CRYPTO = -DUSE_GCRYPT
+ else
++ifneq ($(USE_CRYPTO),no)
+ 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
++	DEF_CRYPTO = -DUSE_OPENSSL
++endif
+ endif
+ 
+ # USE_RESOLV: LIB_RESOLV
+diff --git a/iputils_md5dig.h b/iputils_md5dig.h
+index 4cec866..d6c4d46 100644
+--- a/iputils_md5dig.h
++++ b/iputils_md5dig.h
+@@ -5,8 +5,10 @@
+ # include <stdlib.h>
+ # include <gcrypt.h>
+ # define IPUTILS_MD5DIG_LEN	16
+-#else
++# define USE_CRYPTO
++#elif defined(USE_OPENSSL)
+ # include <openssl/md5.h>
++# define USE_CRYPTO
+ #endif
+ 
+ #ifdef USE_GCRYPT
+diff --git a/ping6.c b/ping6.c
+index 7085f31..7b7c1af 100644
+--- a/ping6.c
++++ b/ping6.c
+@@ -324,6 +324,7 @@ static void niquery_init_nonce(void)
+ #if !PING6_NONCE_MEMORY
+ static int niquery_nonce(__u8 *nonce, int fill)
+ {
++# ifdef USE_CRYPTO
+ 	static __u8 digest[MD5_DIGEST_LENGTH];
+ 	static int seq = -1;
+ 
+@@ -346,6 +347,10 @@ static int niquery_nonce(__u8 *nonce, int fill)
+ 			return -1;
+ 		return ntohsp((__u16 *)nonce);
+ 	}
++# else
++	fprintf(stderr, "ping6: function not available; crypto disabled\n");
++	exit(3);
++# endif
+ }
+ #endif
+ 
+@@ -500,6 +505,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg)
+ 
+ static int niquery_option_subject_name_handler(int index, const char *arg)
+ {
++#ifdef USE_CRYPTO
+ 	static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
+ 	unsigned char *dnptrs[2], **dpp, **lastdnptr;
+ 	int n;
+@@ -625,6 +631,10 @@ errexit:
+ 	free(idn);
+ 	free(name);
+ 	exit(1);
++#else
++	fprintf(stderr, "ping6: function not available; crypto disabled\n");
++	exit(3);
++#endif
+ }
+ 
+ int niquery_option_help_handler(int index, const char *arg)
+-- 
+2.3.5
+
diff --git a/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch b/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
new file mode 100644
index 000000000000..ad34f3b5f646
--- /dev/null
+++ b/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
@@ -0,0 +1,38 @@
+From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 19 Apr 2014 10:39:39 -0400
+Subject: [PATCH iputils] tftpd: fix syslog setup
+
+Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking
+the set*id calls, but would call syslog() before it had called openlog().
+Move the call up earlier to fix that.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tftpd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tftpd.c b/tftpd.c
+index e3af2f4..7ddc8eb 100644
+--- a/tftpd.c
++++ b/tftpd.c
+@@ -109,6 +109,8 @@ int main(int ac, char **av)
+ 	register int n = 0;
+ 	int on = 1;
+ 
++	openlog("tftpd", LOG_PID, LOG_DAEMON);
++
+ 	/* Sanity. If parent forgot to setuid() on us. */
+ 	if (geteuid() == 0) {
+ 		if (setgid(65534)) {
+@@ -125,7 +127,6 @@ int main(int ac, char **av)
+ 	while (ac-- > 0 && n < MAXARG)
+ 		dirs[n++] = *av++;
+ 
+-	openlog("tftpd", LOG_PID, LOG_DAEMON);
+ 	if (ioctl(0, FIONBIO, &on) < 0) {
+ 		syslog(LOG_ERR, "ioctl(FIONBIO): %m\n");
+ 		exit(1);
+-- 
+2.3.5
+
diff --git a/net-misc/iputils/files/rarpd.conf.d b/net-misc/iputils/files/rarpd.conf.d
new file mode 100644
index 000000000000..ef7fc48e17bf
--- /dev/null
+++ b/net-misc/iputils/files/rarpd.conf.d
@@ -0,0 +1,8 @@
+# Config file for /etc/init.d/rarpd
+
+# You probably want to select the interface for this to listen on.
+# By default it uses loopback which most likely won't help.
+RARPD_IFACE="lo"
+
+# See the rarpd(8) manpage for more info.
+RARPD_OPTS="-b /tftpboot"
diff --git a/net-misc/iputils/files/rarpd.init.d b/net-misc/iputils/files/rarpd.init.d
new file mode 100644
index 000000000000..27081fc760c0
--- /dev/null
+++ b/net-misc/iputils/files/rarpd.init.d
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/rarpd.pid"
+command="/usr/sbin/rarpd"
+# The -d option keeps it from forking.  This way s-s-d can do the fork and
+# set up the pidfile with the right value below.
+command_args="-d ${RARPD_OPTS} ${RARPD_IFACE}"
+start_stop_daemon_args="--background --make-pidfile"
+
+start_pre() {
+	if [ ! -f /etc/ethers ] ; then
+		eerror "Please create /etc/ethers with the following content:"
+		eerror "[MAC address] [name or IP]"
+		return 1
+	fi
+	return 0
+}
diff --git a/net-misc/iputils/iputils-20121221-r1.ebuild b/net-misc/iputils/iputils-20121221-r1.ebuild
new file mode 100644
index 000000000000..15da76e4a2e0
--- /dev/null
+++ b/net-misc/iputils/iputils-20121221-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and when the jade/sgml packages are broken (which
+# seems to be more common than would be nice).
+
+EAPI="4"
+
+inherit flag-o-matic eutils toolchain-funcs fcaps
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
+	inherit git-2
+else
+	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
+		mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
+	ipv6? ( ssl? (
+		gnutls? (
+			net-libs/gnutls[openssl(+)]
+			net-libs/gnutls[static-libs(+)]
+		)
+		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+	) )"
+RDEPEND="!net-misc/rarpd
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="
+		app-text/openjade
+		dev-perl/SGMLSpm
+		app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+	"
+fi
+
+S=${WORKDIR}/${PN}-s${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
+	epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436
+	epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch
+	epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
+	epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
+	epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
+	epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
+	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		USE_GNUTLS=$(usex gnutls) \
+		USE_CRYPTO=$(usex ssl) \
+		$(use ipv6 || echo IPV6_TARGETS=)
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake -j1 html man
+	fi
+}
+
+ipv6() { usex ipv6 "$*" '' ; }
+
+src_install() {
+	into /
+	dobin arping ping $(ipv6 ping6)
+	into /usr
+	dobin clockdiff
+	dosbin rarpd rdisc ipg tftpd tracepath $(ipv6 tracepath6)
+
+	dodoc INSTALL RELNOTES
+	use ipv6 \
+		&& dosym ping.8 /usr/share/man/man8/ping6.8 \
+		|| rm -f doc/*6.8
+	rm -f doc/{setkey,traceroute6}.8
+	doman doc/*.8
+
+	use doc && dohtml doc/*.html
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/{ar,}ping \
+		$(ipv6 bin/ping6) \
+		usr/bin/clockdiff
+}
diff --git a/net-misc/iputils/iputils-20121221-r2.ebuild b/net-misc/iputils/iputils-20121221-r2.ebuild
new file mode 100644
index 000000000000..19967149735e
--- /dev/null
+++ b/net-misc/iputils/iputils-20121221-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and when the jade/sgml packages are broken (which
+# seems to be more common than would be nice).
+
+EAPI="4"
+
+inherit flag-o-matic eutils toolchain-funcs fcaps
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
+	inherit git-2
+else
+	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
+		mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gnutls idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
+	ipv6? ( ssl? (
+		gnutls? (
+			net-libs/gnutls[openssl(+)]
+			net-libs/gnutls[static-libs(+)]
+		)
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	) )"
+RDEPEND="arping? ( !net-misc/arping )
+	rarpd? ( !net-misc/rarpd )
+	traceroute? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="
+		app-text/openjade
+		dev-perl/SGMLSpm
+		app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+	"
+fi
+
+S=${WORKDIR}/${PN}-s${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
+	epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436
+	epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch
+	epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
+	epatch "${FILESDIR}"/${PN}-20121221-tftpd-setid.patch
+	epatch "${FILESDIR}"/${PN}-20121221-tftpd-syslog.patch
+	epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
+	epatch "${FILESDIR}"/${PN}-20121221-parallel-doc.patch
+	epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
+	epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
+	epatch "${FILESDIR}"/${PN}-20121221-strtod.patch #472592
+	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	IPV4_TARGETS=(
+		ping
+		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+	)
+	IPV6_TARGETS=(
+		ping6
+		$(usex tracepath 'tracepath6' '')
+		$(usex traceroute 'traceroute6' '')
+	)
+	use ipv6 || IPV6_TARGETS=()
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		USE_GNUTLS=$(usex gnutls) \
+		USE_CRYPTO=$(usex ssl) \
+		IPV4_TARGETS="${IPV4_TARGETS[*]}" \
+		IPV6_TARGETS="${IPV6_TARGETS[*]}"
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake html man
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping $(usex ipv6 'ping6' '')
+	use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8
+	doman doc/ping.8
+
+	if use arping ; then
+		dobin arping
+		doman doc/arping.8
+	fi
+
+	into /usr
+
+	local u
+	for u in clockdiff rarpd rdisc tftpd tracepath ; do
+		if use ${u} ; then
+			case ${u} in
+			clockdiff) dobin ${u};;
+			*) dosbin ${u};;
+			esac
+			doman doc/${u}.8
+		fi
+	done
+
+	if use tracepath && use ipv6 ; then
+		dosbin tracepath6
+		dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8
+	fi
+
+	if use traceroute && use ipv6 ; then
+		dosbin traceroute6
+		doman doc/traceroute6.8
+	fi
+
+	if use rarpd ; then
+		newinitd "${FILESDIR}"/rarpd.init.d rarpd
+		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+	fi
+
+	dodoc INSTALL RELNOTES
+
+	use doc && dohtml doc/*.html
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex ipv6 'bin/ping6' '') \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/iputils-20151218.ebuild b/net-misc/iputils/iputils-20151218.ebuild
new file mode 100644
index 000000000000..175a6c8feeae
--- /dev/null
+++ b/net-misc/iputils/iputils-20151218.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and when the jade/sgml packages are broken (which
+# seems to be more common than would be nice).
+
+EAPI=5
+
+inherit flag-o-matic eutils toolchain-funcs fcaps
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
+	inherit git-2
+else
+	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
+		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
+	ipv6? ( ssl? (
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+		!gcrypt? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	) )"
+RDEPEND="arping? ( !net-misc/arping )
+	rarpd? ( !net-misc/rarpd )
+	traceroute? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="
+		app-text/openjade
+		dev-perl/SGMLSpm
+		app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+	"
+fi
+
+S=${WORKDIR}/${PN}-s${PV}
+
+PATCHES=(
+	"${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
+	"${FILESDIR}"/${PN}-99999999-openssl.patch #335436
+	"${FILESDIR}"/${PN}-99999999-tftpd-syslog.patch
+	"${FILESDIR}"/${PN}-20121221-makefile.patch
+	"${FILESDIR}"/${PN}-20121221-parallel-doc.patch
+	"${FILESDIR}"/${PN}-20121221-strtod.patch #472592
+)
+
+src_prepare() {
+	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch )
+	epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	IPV4_TARGETS=(
+		ping
+		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+	)
+	IPV6_TARGETS=(
+		ping6
+		$(usex tracepath 'tracepath6' '')
+		$(usex traceroute 'traceroute6' '')
+	)
+	use ipv6 || IPV6_TARGETS=()
+}
+
+ldflag_resolv() {
+	# See if the system includes a libresolv. #584132
+	echo "main(){}" > "${T}"/resolv.c
+	if ${CC} ${CFLAGS} ${LDFLAGS} "${T}"/resolv.c -lresolv -o "${T}"/resolv 2>/dev/null ; then
+		echo -lresolv
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		USE_GCRYPT=$(usex gcrypt) \
+		USE_CRYPTO=$(usex ssl) \
+		LDFLAG_RESOLV=$(ldflag_resolv) \
+		IPV4_TARGETS="${IPV4_TARGETS[*]}" \
+		IPV6_TARGETS="${IPV6_TARGETS[*]}"
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake html man
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping $(usex ipv6 'ping6' '')
+	use ipv6 && dosym ping.8 /usr/share/man/man8/ping6.8
+	doman doc/ping.8
+
+	if use arping ; then
+		dobin arping
+		doman doc/arping.8
+	fi
+
+	into /usr
+
+	local u
+	for u in clockdiff rarpd rdisc tftpd tracepath ; do
+		if use ${u} ; then
+			case ${u} in
+			clockdiff) dobin ${u};;
+			*) dosbin ${u};;
+			esac
+			doman doc/${u}.8
+		fi
+	done
+
+	if use tracepath && use ipv6 ; then
+		dosbin tracepath6
+		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+	fi
+
+	if use traceroute && use ipv6 ; then
+		dosbin traceroute6
+		doman doc/traceroute6.8
+	fi
+
+	if use rarpd ; then
+		newinitd "${FILESDIR}"/rarpd.init.d rarpd
+		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+	fi
+
+	dodoc INSTALL RELNOTES
+
+	use doc && dohtml doc/*.html
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex ipv6 'bin/ping6' '') \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/iputils-20160308.ebuild b/net-misc/iputils/iputils-20160308.ebuild
new file mode 100644
index 000000000000..b9e06d386f8c
--- /dev/null
+++ b/net-misc/iputils/iputils-20160308.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and when the jade/sgml packages are broken (which
+# seems to be more common than would be nice).
+# Required packages for doc generation:
+# app-text/docbook-sgml-utils
+
+EAPI=5
+
+inherit flag-o-matic eutils toolchain-funcs fcaps
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
+	ipv6? ( ssl? (
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+		nettle? ( dev-libs/nettle[static-libs(+)] )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	) )"
+RDEPEND="arping? ( !net-misc/arping )
+	rarpd? ( !net-misc/rarpd )
+	traceroute? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="
+		app-text/openjade
+		dev-perl/SGMLSpm
+		app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+	"
+fi
+
+REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
+
+S=${WORKDIR}/${PN}-s${PV}
+
+PATCHES=(
+	"${FILESDIR}/021109-uclibc-no-ether_ntohost.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	TARGETS=(
+		ping
+		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+	)
+	if use ipv6 ; then
+		TARGETS+=(
+			$(usex tracepath 'tracepath6' '')
+			$(usex traceroute 'traceroute6' '')
+		)
+	fi
+
+	myconf=(
+		USE_CRYPTO=no
+		USE_GCRYPT=no
+		USE_NETTLE=no
+	)
+
+	if use ipv6 && use ssl ; then
+		myconf=(
+			USE_CRYPTO=$(usex openssl)
+			USE_GCRYPT=$(usex gcrypt)
+			USE_NETTLE=$(usex nettle)
+		)
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
+		TARGETS="${TARGETS[*]}" \
+		${myconf[@]}
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake html man
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping
+	dosym ping /bin/ping4
+	if use ipv6 ; then
+		dosym ping /bin/ping6
+		dosym ping.8 /usr/share/man/man8/ping6.8
+	fi
+	doman doc/ping.8
+
+	if use arping ; then
+		dobin arping
+		doman doc/arping.8
+	fi
+
+	into /usr
+
+	local u
+	for u in clockdiff rarpd rdisc tftpd tracepath ; do
+		if use ${u} ; then
+			case ${u} in
+			clockdiff) dobin ${u};;
+			*) dosbin ${u};;
+			esac
+			doman doc/${u}.8
+		fi
+	done
+
+	if use tracepath && use ipv6 ; then
+		dosbin tracepath6
+		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+	fi
+
+	if use traceroute && use ipv6 ; then
+		dosbin traceroute6
+		doman doc/traceroute6.8
+	fi
+
+	if use rarpd ; then
+		newinitd "${FILESDIR}"/rarpd.init.d rarpd
+		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+	fi
+
+	dodoc INSTALL RELNOTES
+
+	use doc && dohtml doc/*.html
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/iputils-20161105.ebuild b/net-misc/iputils/iputils-20161105.ebuild
new file mode 100644
index 000000000000..1714b54c3e39
--- /dev/null
+++ b/net-misc/iputils/iputils-20161105.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and when the jade/sgml packages are broken (which
+# seems to be more common than would be nice).
+# Required packages for doc generation:
+# app-text/docbook-sgml-utils
+
+EAPI=5
+
+inherit flag-o-matic eutils toolchain-funcs fcaps
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
+	ipv6? ( ssl? (
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+		nettle? ( dev-libs/nettle[static-libs(+)] )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	) )"
+RDEPEND="arping? ( !net-misc/arping )
+	rarpd? ( !net-misc/rarpd )
+	traceroute? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="
+		app-text/openjade
+		dev-perl/SGMLSpm
+		app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+	"
+fi
+
+REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
+
+S="${WORKDIR}/${PN}-s${PV}"
+
+PATCHES=(
+	"${FILESDIR}/021109-uclibc-no-ether_ntohost.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	TARGETS=(
+		ping
+		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+	)
+	if use ipv6 ; then
+		TARGETS+=(
+			$(usex tracepath 'tracepath6' '')
+			$(usex traceroute 'traceroute6' '')
+		)
+	fi
+
+	myconf=(
+		USE_CRYPTO=no
+		USE_GCRYPT=no
+		USE_NETTLE=no
+	)
+
+	if use ipv6 && use ssl ; then
+		myconf=(
+			USE_CRYPTO=$(usex openssl)
+			USE_GCRYPT=$(usex gcrypt)
+			USE_NETTLE=$(usex nettle)
+		)
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
+		TARGETS="${TARGETS[*]}" \
+		${myconf[@]}
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake html man
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping
+	dosym ping /bin/ping4
+	if use ipv6 ; then
+		dosym ping /bin/ping6
+		dosym ping.8 /usr/share/man/man8/ping6.8
+	fi
+	doman doc/ping.8
+
+	if use arping ; then
+		dobin arping
+		doman doc/arping.8
+	fi
+
+	into /usr
+
+	local u
+	for u in clockdiff rarpd rdisc tftpd tracepath ; do
+		if use ${u} ; then
+			case ${u} in
+			clockdiff) dobin ${u};;
+			*) dosbin ${u};;
+			esac
+			doman doc/${u}.8
+		fi
+	done
+
+	if use tracepath && use ipv6 ; then
+		dosbin tracepath6
+		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+	fi
+
+	if use traceroute && use ipv6 ; then
+		dosbin traceroute6
+		doman doc/traceroute6.8
+	fi
+
+	if use rarpd ; then
+		newinitd "${FILESDIR}"/rarpd.init.d rarpd
+		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+	fi
+
+	dodoc INSTALL.md RELNOTES
+
+	if use doc ; then
+		docinto html
+		dodoc doc/*.html
+	fi
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
new file mode 100644
index 000000000000..ce003cbf4fee
--- /dev/null
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and when the jade/sgml packages are broken (which
+# seems to be more common than would be nice).
+# Required packages for doc generation:
+# app-text/docbook-sgml-utils
+
+EAPI=5
+
+inherit flag-o-matic eutils toolchain-funcs fcaps
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
+	ipv6? ( ssl? (
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+		nettle? ( dev-libs/nettle[static-libs(+)] )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	) )"
+RDEPEND="arping? ( !net-misc/arping )
+	rarpd? ( !net-misc/rarpd )
+	traceroute? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="
+		app-text/openjade
+		dev-perl/SGMLSpm
+		app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+	"
+fi
+
+REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
+
+[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
+
+src_prepare() {
+	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	TARGETS=(
+		ping
+		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+	)
+	if use ipv6 ; then
+		TARGETS+=(
+			$(usex tracepath 'tracepath6' '')
+			$(usex traceroute 'traceroute6' '')
+		)
+	fi
+
+	myconf=(
+		USE_CRYPTO=no
+		USE_GCRYPT=no
+		USE_NETTLE=no
+	)
+
+	if use ipv6 && use ssl ; then
+		myconf=(
+			USE_CRYPTO=$(usex openssl)
+			USE_GCRYPT=$(usex gcrypt)
+			USE_NETTLE=$(usex nettle)
+		)
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
+		TARGETS="${TARGETS[*]}" \
+		${myconf[@]}
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake html man
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping
+	dosym ping /bin/ping4
+	if use ipv6 ; then
+		dosym ping /bin/ping6
+		dosym ping.8 /usr/share/man/man8/ping6.8
+	fi
+	doman doc/ping.8
+
+	if use arping ; then
+		dobin arping
+		doman doc/arping.8
+	fi
+
+	into /usr
+
+	local u
+	for u in clockdiff rarpd rdisc tftpd tracepath ; do
+		if use ${u} ; then
+			case ${u} in
+			clockdiff) dobin ${u};;
+			*) dosbin ${u};;
+			esac
+			doman doc/${u}.8
+		fi
+	done
+
+	if use tracepath && use ipv6 ; then
+		dosbin tracepath6
+		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+	fi
+
+	if use traceroute && use ipv6 ; then
+		dosbin traceroute6
+		doman doc/traceroute6.8
+	fi
+
+	if use rarpd ; then
+		newinitd "${FILESDIR}"/rarpd.init.d rarpd
+		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+	fi
+
+	dodoc INSTALL.md RELNOTES
+
+	use doc && dohtml doc/*.html
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
new file mode 100644
index 000000000000..8fb0527115b6
--- /dev/null
+++ b/net-misc/iputils/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <use>
+    <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag>
+    <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag>
+    <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for md5 support</flag>
+    <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for md5 support</flag>
+    <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for md5 support</flag>
+    <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag>
+    <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag>
+    <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag>
+    <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag>
+    <flag name="traceroute">Build and install traceroute -- tool for tracing network paths (see also <pkg>net-analyzer/traceroute</pkg>)</flag>
+    <flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
+    <remote-id type="github">iputils/iputils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
new file mode 100644
index 000000000000..86a30809d9df
--- /dev/null
+++ b/net-misc/ipv6calc/Manifest
@@ -0,0 +1,9 @@
+DIST ipv6calc-0.97.4.tar.gz 1037582 SHA256 ed2c9e895fdbffa3bee2e46591e0a010eacdefc1bf8eace5fbee9abaa9c3df39 SHA512 133f4e281da8eb1ea13b7c37123ae9f1b88e100553de758ceaa6cc63b0306e4711447bc7a4c171508fc5ce1ed447daec9749c5a75e5288deef0efcdc095bfcde WHIRLPOOL f6a9eb3201045851705f3631cd35e2aead26a167687b4c2064829ae530a803d6e48c57ac5d47996124b8e41706c1cc91850b9b42f225552640b4dbc9ebf17cb8
+DIST ipv6calc-0.99.2.tar.gz 1287951 SHA256 f2eeec1b8d8626756f2cb9c461e9d1db20affccf582d43ded439bdb2d12646ef SHA512 f757a4a7d69b5dea34051125b96b9f9f36957bfabb1568ddae2aaefe6551aac7b9edb6abfdb3ac90aeaf32e517720157614cb7552b4e9dc18180904674e48f09 WHIRLPOOL cf1c202de81df5b8ff35fff4bdc437db90388665dab15a35cccc1b8533d32f4009f566389f76248b706a10bbf0a27b8e839c5907326b272e3727b3e9d029fef9
+DIST ipv6calc-1.0.0.tar.gz 1342987 SHA256 74b0455e61834843bf8a5e7e0e0f39dd2b148114ff896d590eb2d826714594bd SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209 WHIRLPOOL b9ac8d318b72fa26b106bf8939cb8caf93c7924379f0a188dfabaa432d10979bcf0bfb30cfdefe2ae2ec64daca6641cc5d824a8effc20efec631748f8e633e3f
+EBUILD ipv6calc-0.97.4.ebuild 1261 SHA256 489c3659484fe001239126238fae3d833f3f8a841454336ec8194325e47cff71 SHA512 d80802c0164be4d04daf115945b0addf1e2821f8c6af49371378f39bc2df09b0431300ca76657b4149fa8865304074e07d63fb3d7e557d2acd3cb38a756b65bb WHIRLPOOL db8ca405d631902ca9778da198e29627042fafbf559c45f863544f89c3e227ac94270cd23cbef7daa5bcf1cdec289eed4fc263ac94a2226457f0dbff3c2bf810
+EBUILD ipv6calc-0.99.2.ebuild 1510 SHA256 9fd8c40f171c4c85478b4aa4e32f59e6fb813f4b500017b5633ab06d4f8a7771 SHA512 2a8217f79a3c043b17691af4bc25d72ff21a69a12eb36187fd016d1afbaf631e1c08800f327b5e0c0ef905335cedc88efebe8ed9b1fd72cf2b4a6a44c8012528 WHIRLPOOL 11a312332bf13103562cc56a81447ec6665c7c76b2fedaf43f9af8191bca5f34ea5974b559bbd9cdf5b24e41a748e4c294a3717fc9c9fdb48c3e7a88e201b26e
+EBUILD ipv6calc-1.0.0.ebuild 1514 SHA256 e990e17ee74fca1cbdb530857f1b9658c009893f0bc068cf9dd3bbee6c10e4cd SHA512 618f534e7feb55ea0ec9c92c4a159b187c363797c5e6fa3be2045ae1d26d930529dea2c505c329d1d8de6cb4569489e5d83ad03d70bd79151de042134fac1c4c WHIRLPOOL 30a804b14a049517aa4c988fe5b3f5354e1735838b86ef0568a33a261ed2c7f43f808fd076fdb37f3710e48b52279f1c5bb06f8351d73d304489350413b1bc58
+MISC ChangeLog 4186 SHA256 c56a6a4758c36e9d297df234d86f28da34b4bb6918dc76f8c4ae7e6344fbf729 SHA512 676b2a068964153f804d21b5ad163706599f23c111f2f266a7c81317a46163ff9b02ad21f4c1865fef092ea11bf716594032a70c3b82d09f6dc833038265a948 WHIRLPOOL 3e203a36223db42575cb12a5d038e3d161cc5362d727ac6e57ed1827869f291803863044d5c28348e5417c75a2cf0e53cb6f0274a9d0590c7421e61c9214e969
+MISC ChangeLog-2015 10608 SHA256 71d9bf9ec0306432103e0d42e7033901b467068020b9599121df5bfd31b6ea9d SHA512 0b4e81777284473cc7d4c131ae0662874b3b41a73b41e2ba014f1fe6b60faccb70f596648b59bbbb9f6139a7c098e7726656073ef814e1ca2402387e58b0ef9a WHIRLPOOL ab1fb2209096dfde7660bad3aff02299e56236cc331cd448d00631bfefac0a3c21c4a3b253d8db9d91836930339bd89db67d32964bb888d7694c3ed352503abe
+MISC metadata.xml 252 SHA256 a590e5133cd97a615db4f977b0e28e5c60c56cac76eb3d339109cdf379003b60 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 WHIRLPOOL b209a730a169969b9e3c4d4612368bc5b30bfa5fae275d98d83ba96fd0ad01d308a8fed4f7d67a7c9fa417c624dfeb23ce89ab58923a8a0b5b1bd68ee73f288c
diff --git a/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild b/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
new file mode 100644
index 000000000000..0d08524686b5
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux"
+IUSE="geoip test"
+
+RDEPEND="
+	dev-libs/openssl:=
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+	if use geoip; then
+		myconf=$(use_enable geoip)
+		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+	fi
+	econf \
+		--disable-bundled-getopt \
+		--disable-bundled-md5 \
+		--enable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--enable-db-ipv6 \
+		--disable-ip2location \
+		${myconf}
+}
+
+src_compile() {
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/ipv6calc/ipv6calc-0.99.2.ebuild b/net-misc/ipv6calc/ipv6calc-0.99.2.ebuild
new file mode 100644
index 000000000000..47d2fa7d338f
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-0.99.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
+IUSE="geoip libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	if use geoip; then
+		myconf=$(use_enable geoip)
+		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+	fi
+	econf \
+		--disable-bundled-getopt \
+		--disable-bundled-md5 \
+		--enable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--enable-db-ipv6 \
+		--disable-dbip \
+		--disable-external \
+		--disable-ip2location \
+		${myconf}
+}
+
+src_compile() {
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
new file mode 100644
index 000000000000..6ea0a78da694
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="geoip libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	if use geoip; then
+		myconf=$(use_enable geoip)
+		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+	fi
+	econf \
+		--disable-bundled-getopt \
+		--disable-bundled-md5 \
+		--enable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--enable-db-ipv6 \
+		--disable-dbip \
+		--disable-external \
+		--disable-ip2location \
+		${myconf}
+}
+
+src_compile() {
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/ipv6calc/metadata.xml b/net-misc/ipv6calc/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/net-misc/ipv6calc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/ipx-utils/Manifest b/net-misc/ipx-utils/Manifest
new file mode 100644
index 000000000000..c6c8d6e297ed
--- /dev/null
+++ b/net-misc/ipx-utils/Manifest
@@ -0,0 +1,10 @@
+AUX ipx-utils-1.1-gcc-warnings.patch 1817 SHA256 9dd3e831b697f4dd716abe16700e122bcd87d499c5fadc970ab1bdb5cea2331c SHA512 176b72fdabd206ddace98cc9a58b7f0bca51af395b3fd36ec8ba579ab5682d377180edca30062a6834841e556d04462808ef1a8e54bd4f643ef6560b70e8096e WHIRLPOOL 839ba68672c6cb2986b048811b245b5e345f47e81c7902e87a66d1cf1b03121495fc5dc5cda3fb38dff5897c77151dc90071edc7555c3b589fc57da4048ce630
+AUX ipx-utils-1.1-makefile.patch 795 SHA256 6ed677088c01aa21405e9b16571a2b0db2c62be0618d2d16370e9b75ce794321 SHA512 fb5f8d35eb00c762140309031f508ed6fb2591eaf9c3c841565464f1d472f93bcd2404fdb3e85e10e4c4e1652767f9ca9bdbc44c80731ce4ff3939c81f96fd1d WHIRLPOOL 2bf565c55d55d246a9801c97caf59674d0b6a24b73bdc815bff47092e1d58a76b4212cd3333e430c425e89ebe3fc13a5e218c48e19bd758ecfd94c845acc5103
+AUX ipx-utils-1.1-proc.patch 426 SHA256 23847e45eebff117c4320448880c90022ad5e4c9d33935aa1e2a5ebf3654821d SHA512 0af00b0ac0e40a3de1788173609a49683ecb33ec6450c296dadfd1736f95f7ae7f94d8c5ef96091c68f6eede799b83fef19a913493acc86fd92d3f9dcf2dde6c WHIRLPOOL 7b0510c291cbde6baa3e13c47dba3b12f96bb5e12e0aa0db8b5617f130d452078ea5e9412fe3f6427a2f3c33d8a6ba227185a55b87c44b77795a80e3b8a6aa48
+AUX ipx.confd 552 SHA256 1168eb59d4ab913339c0359d8c0b9259a3f06062f13f6770d90092b9ca11f736 SHA512 ba7de25e2ee3b9997d51a4eed0b8eb6ede232b627962cbc0efe6c318c1b34911cb64e4c19786e44800d8b573c8730e355e71f78aaf17391f019cc17a49c6c84d WHIRLPOOL fcadb7c95ccbc8c2e1e9a8b492b8bd2fc582598fdb8ca2ba6667a3b133e0ec30add926cba5f631d6c2992ebc09ebdaf4d566013413155276f48d62450be03a0a
+AUX ipx.init 868 SHA256 acea8342e7032d3412f357008dfde54cac37ed3310a757415f310140c0a4ecd0 SHA512 afbd7e506c4616cb5ae469e8c818a4ce1ebadf733e43d938d4f1911ce41cd0ffb0e65614b8b230cfffa56163b1975287e1573a70ead6d0d73c5e3c9357689004 WHIRLPOOL a673be68af94c33b181f21143b3551ed08bbb65e9d6c21a02c8aab4c3a54ad39ce1c53901fcef73e03aba9ece6caa8a3aba65087bbb849fcb43715d3550805c0
+DIST ipx-1.1.tar.gz 8177 SHA256 c59c3dbb8cfb8ef5b3cb76a302d5f38254e9dbbbd99fae3f048e3751605d7fb8 SHA512 cb1bcf0c28939ab5ff1e1cf36f1cb8cbfcb7c019d65df5fc56a1b43673406cdf4abffa3d6164615e42ce955f078c05f721da90ca54353870e552c01bb3c2973d WHIRLPOOL 829715dd9e0b3d1cf7ee5443fe3081bf2534b4f5e85ea096f0cf722d94e068c53141a3504ac9dc51457747d4038e249bd187dced1d07cb867fd106575ae07d65
+EBUILD ipx-utils-1.1-r4.ebuild 834 SHA256 91721717b4398ba038abddff9f7888c556a71b680f5ad064424be952faf59b00 SHA512 008011de2d570c03a504b81c5007fc08c8ff487b18b1c66ed1ebd6fb036821e37d2383e0c3719e4c9aa952f0c15feded9ee896608ee228839f14562035b5234b WHIRLPOOL daf345ab62b2777b9b2a8a41c8d5afd949557b722a795e5a5db836fad81321d560a8478f9be4ec9f149d4c3c19ff859fbc42d801e6e6b1814e8822ce019bdeb6
+MISC ChangeLog 3926 SHA256 288ddd273b4b6271fba7801cd3af4e4844d276c60d305ced7f84cdbe5df337ef SHA512 c791506055473504ad416f0e15acf741526bdf094b8ec7f1afc8bfd097e075f69769e77545232b08a9984278a120035f798be188b0e9dc76ac1534d681556647 WHIRLPOOL a33c2134704d77f972a6703a51899666e2098ac93ddb0fb2aa64c10dde6e658f3dd1f0979bf27189e58207a2bad3dd5eabf8c4ad62a09a5794aedf08e2357969
+MISC ChangeLog-2015 2691 SHA256 15b380da92e1efef1725686080836916622e000800c2a5911fa8e44e9508c87f SHA512 cfc5db65f31df7b262094500ee30db950b63cb49db58e41a87df355aa4d976a793c22b65a5633cd7d3c4f80b467e518a102d971f034fc4cfc74699b438826a0f WHIRLPOOL c95e6af0cf8df10014daeb09c7051aff6781b07bb6a3b5a4e537c2c74edb758e6256765fba2c91ecf43ff18942766bce775a2cee48911f7ef3112414dea72d52
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch
new file mode 100644
index 000000000000..3fc928f00e2d
--- /dev/null
+++ b/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch
@@ -0,0 +1,51 @@
+Binary files ipx-1.1.orig/ipx_configure and ipx-1.1/ipx_configure differ
+diff -ur ipx-1.1.orig/ipx_configure.c ipx-1.1/ipx_configure.c
+--- ipx-1.1.orig/ipx_configure.c	2016-05-04 21:08:46.606264315 +0000
++++ ipx-1.1/ipx_configure.c	2016-05-04 21:21:46.139346843 +0000
+@@ -7,6 +7,7 @@
+ #include <unistd.h>
+ #include <ctype.h>
+ #include <getopt.h>
++#include <stdlib.h>
+ #include <strings.h>
+ #include <netipx/ipx.h>
+ #include <sys/types.h>
+Binary files ipx-1.1.orig/ipx_interface and ipx-1.1/ipx_interface differ
+diff -ur ipx-1.1.orig/ipx_interface.c ipx-1.1/ipx_interface.c
+--- ipx-1.1.orig/ipx_interface.c	2016-05-04 21:08:46.606264315 +0000
++++ ipx-1.1/ipx_interface.c	2016-05-04 21:20:27.414995860 +0000
+@@ -8,7 +8,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+-#include <strings.h>
++#include <string.h>
+ #include <netinet/in.h>
+ #include <netipx/ipx.h>
+ #include <linux/if.h>
+Binary files ipx-1.1.orig/ipx_internal_net and ipx-1.1/ipx_internal_net differ
+diff -ur ipx-1.1.orig/ipx_internal_net.c ipx-1.1/ipx_internal_net.c
+--- ipx-1.1.orig/ipx_internal_net.c	2016-05-04 21:08:46.606264315 +0000
++++ ipx-1.1/ipx_internal_net.c	2016-05-04 21:20:14.814299490 +0000
+@@ -7,7 +7,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <errno.h>
+-#include <strings.h>
++#include <string.h>
+ #include <netinet/in.h>
+ #include <netipx/ipx.h>
+ #include <linux/if.h>
+Binary files ipx-1.1.orig/ipx_route and ipx-1.1/ipx_route differ
+diff -ur ipx-1.1.orig/ipx_route.c ipx-1.1/ipx_route.c
+--- ipx-1.1.orig/ipx_route.c	2016-05-04 21:08:46.606264315 +0000
++++ ipx-1.1/ipx_route.c	2016-05-04 21:20:17.954473064 +0000
+@@ -8,7 +8,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <errno.h>
+-#include <strings.h>
++#include <string.h>
+ #include <netinet/in.h>
+ #include <netipx/ipx.h>
+ #include <sys/types.h>
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
new file mode 100644
index 000000000000..5a596f818d19
--- /dev/null
+++ b/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
@@ -0,0 +1,24 @@
+--- ipx-1.1.orig/Makefile
++++ ipx-1.1/Makefile
+@@ -10,17 +10,8 @@ clean:
+ install: $(UTILS)
+ 	for i in $(UTILS); \
+ 	do \
+-		install --strip $$i /sbin; \
+-		install $$i.8 /usr/man/man8; \
++		install $$i ${DESTDIR}/sbin; \
++		install $$i.8 ${DESTDIR}/usr/share/man/man8; \
+ 	done
+-	install init.ipx /etc/rc.d/init.d/ipx
+-	install -m 0644 config.ipx /etc/sysconfig/ipx
+-	rm -f /etc/rc.d/rc2.d/S15ipx
+-	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc2.d/S15ipx
+-	rm -f /etc/rc.d/rc3.d/S15ipx
+-	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc3.d/S15ipx
+-	rm -f /etc/rc.d/rc5.d/S15ipx
+-	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc5.d/S15ipx
+-	rm -f /etc/rc.d/rc6.d/K55ipx
+-	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc6.d/K55ipx
+-
++#	install init.ipx /etc/rc.d/init.d/ipx
++#	install -m 0644 config.ipx /etc/sysconfig/ipx
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
new file mode 100644
index 000000000000..d82d228ff139
--- /dev/null
+++ b/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
@@ -0,0 +1,13 @@
+--- ipx-1.1/ipx_interface.c.orig	2004-10-16 13:14:40.677964152 -0400
++++ ipx-1.1/ipx_interface.c	2004-10-16 13:15:18.464219768 -0400
+@@ -191,7 +191,9 @@
+ 		exit(-1);
+ 	}
+ 
+-	fp = fopen("/proc/net/ipx_interface", "r");
++	fp = fopen("/proc/net/ipx/interface", "r");
++	if (fp == NULL)
++		fp = fopen("/proc/net/ipx_interface", "r");
+ 	if (fp == NULL) {
+ 		fprintf(stderr, 
+ 			"%s: Unable to open \"/proc/net/ipx_interface.\"\n",
diff --git a/net-misc/ipx-utils/files/ipx.confd b/net-misc/ipx-utils/files/ipx.confd
new file mode 100644
index 000000000000..da14fd6e6605
--- /dev/null
+++ b/net-misc/ipx-utils/files/ipx.confd
@@ -0,0 +1,26 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/ipx
+
+# Automatically selecting a primary interface.
+IPX_AUTO_PRIMARY=on
+
+# Automatically creating interfaces.
+IPX_AUTO_INTERFACE=on
+
+# Interface to which IPX sockets are bound.
+IPX_DEVICE=eth0
+
+# The IPX frame type to use
+IPX_FRAME=802.2
+
+# Create a special kind of IPX interface that does not
+# have a physical device or frame type.
+IPX_INTERNAL_NET=no
+
+# Network number
+IPX_NETNUM=1
+
+# Node number
+IPX_NODENUM=1
diff --git a/net-misc/ipx-utils/files/ipx.init b/net-misc/ipx-utils/files/ipx.init
new file mode 100644
index 000000000000..891505926b63
--- /dev/null
+++ b/net-misc/ipx-utils/files/ipx.init
@@ -0,0 +1,42 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#NB: Config is in /etc/conf.d/ipx
+
+depend() {
+	use net
+}
+
+start() {
+	local retval=0
+	
+	ebegin "Bringing IPX up"
+	if [ ${IPX_INTERNAL_NET} = "yes" ]
+	then
+		/sbin/ipx_internal_net add ${IPX_NETNUM} ${IPX_NODENUM}
+		retval=$?
+	else
+		/sbin/ipx_interface add -p ${IPX_DEVICE} \
+			${IPX_FRAME} ${IPX_NETNUM}
+		retval=$?
+	fi
+	
+	ipx_configure \
+		--auto_primary=${IPX_AUTO_PRIMARY} \
+		--auto_interface=${IPX_AUTO_INTERFACE}
+	retval=$(( $retval + $? ))
+	eend ${retval} "Failed to bring IPX up"
+}
+
+stop() {
+	local retval=0
+	
+	ebegin "Bringing IPX down"
+	/bin/umount -v -a -tncpfs
+	/sbin/ipx_configure --auto_primary=off --auto_interface=off
+	retval=$?
+	/sbin/ipx_interface delall
+	retval=$(( $retval + $? ))
+	eend ${retval} "Failed to down IPX"
+}
diff --git a/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild
new file mode 100644
index 000000000000..ce29d24d766c
--- /dev/null
+++ b/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils
+
+DESCRIPTION="The IPX Utilities"
+HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/"
+SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/${P/-utils}.tar.gz"
+
+LICENSE="ipx-utils GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+RDEPEND="!!net-fs/ncpfs" # conflicts on manpages
+
+S=${WORKDIR}/${P/-utils}
+
+src_prepare() {
+	sed -i "s:-O2 -Wall:${CFLAGS}:" "${S}"/Makefile
+	eapply "${FILESDIR}"/${P}-makefile.patch
+	eapply "${FILESDIR}"/${P}-proc.patch #67642
+	eapply "${FILESDIR}"/${P}-gcc-warnings.patch
+
+	default
+}
+
+src_install() {
+	doman *.8
+	newconfd "${FILESDIR}"/ipx.confd ipx
+	newinitd "${FILESDIR}"/ipx.init ipx
+
+	into /sbin
+	default
+}
diff --git a/net-misc/ipx-utils/metadata.xml b/net-misc/ipx-utils/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/ipx-utils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/java-wakeonlan/Manifest b/net-misc/java-wakeonlan/Manifest
new file mode 100644
index 000000000000..39e9a42ad9f5
--- /dev/null
+++ b/net-misc/java-wakeonlan/Manifest
@@ -0,0 +1,6 @@
+AUX java-wakeonlan-1.0.0-build.xml.patch 1134 SHA256 ce7bc0637fb69d4eb293a94640bc2b66160f7d736b3db124e7ba20e81f368e98 SHA512 5b4c6e81a7835dfd841349a69443c988ae8803fe5777089b76fadbd07bbd6b50b013160d79b9b97a3282f4914d645b8643f9f085193184df6a361f886d2bed13 WHIRLPOOL 67e1af85739b76e535511c90a874bdce90bb95dc28bc1963fbee94d8ee9d252fdc0085a6e8f1bd772b7ac16b10256452619dad4a82d27a90ac9b1dc011b7e702
+DIST wakeonlan-1.0.0.zip 352181 SHA256 dfcdb54eb1333b5f9be74d7f493f68fce496d031b9b81656740e8b2fd1d62e43 SHA512 286cba36b70fae8a85dfdbb1fa4c0e3345f1d3b67187571d9134fc7cb432874613f6a713d40c1d9d9874af09dc03214441a5f88f9ea3d3cf29ce0d059fddcdee WHIRLPOOL e0424946eae1f646eb4c5fd527bfc24257884655a808a434c484125604fff5df213a8613746062b24e1c3d164e7f18f93c4192ce6bf0af0b08529b6bebc78a0a
+EBUILD java-wakeonlan-1.0.0-r2.ebuild 1201 SHA256 4e4b8cd148c9f58ae93b4c490461b225d7d11aa3702a940f9400080fea1a88c3 SHA512 f7a4e13e1dcbf658192f3a85b428a67b30642c2c8540009004785c8e3b7341df5ac2cf7a75880d2b3f9dfa866e328b402872cc42f8be131e832e5a54082c875b WHIRLPOOL 9c2613b7f0c7296b01fb2277f2fdb81780750ccd964cb73196054c6057ac2d247a3479ea44d946fda1e525fea1759e011122d2e289dc64e6d9d4410555408703
+MISC ChangeLog 2651 SHA256 087f001c128df2561982102c04e6f5c483a145f6f9621619718d195a3491c9e6 SHA512 cb648acd5c0ba662303e874a41b4e3db669b69b257e46cba1fc9325e62735b785bded923c8af6f32aebc56ea6442cc3a6cb39949c0acd0a1d1ed0c574c71939e WHIRLPOOL a46c3d42e40ccaf15eb3c499a184caa5f6cca05f3a1d7aebfe75a0438a24e379cfc86210835600a26ac40a18839f58b6f15f8eec68787c14d4d5fe82ff796e1e
+MISC ChangeLog-2015 2673 SHA256 bd208f1203f84c0d1d509b45e62d2ed2101db85b36821e094244d31b5d82cc2b SHA512 2d9fd37590b91b5237e4e31f84226cd7497d1db2d76407702eae53b766660737f00ed31b34d927d13341c720339a389f55d25ef4e0e8976c2d89c4f44fb7d89f WHIRLPOOL c1dbcf19820a60fac9df6c39a51b2d07ead78f8614944a1de5904e9d0afd3db01a570045e9698bbdfa229151ff6174ef5bebb027e7055fbe6fcd2bd97acb848f
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/net-misc/java-wakeonlan/files/java-wakeonlan-1.0.0-build.xml.patch b/net-misc/java-wakeonlan/files/java-wakeonlan-1.0.0-build.xml.patch
new file mode 100644
index 000000000000..d3c352bd52d1
--- /dev/null
+++ b/net-misc/java-wakeonlan/files/java-wakeonlan-1.0.0-build.xml.patch
@@ -0,0 +1,43 @@
+--- build.xml	2004-06-03 16:21:44.000000000 +0300
++++ build.xml.fixed	2009-01-31 11:48:56.000000000 +0200
+@@ -38,7 +38,6 @@
+ 			target="${build.target}" 
+ 			classpathref="build.classpath" >
+ 			<src path="${src.dir}" />
+-			<src path="${testsrc.dir}" />
+ 		</javac>
+ 		<copy todir="${build.classes.dir}" overwrite="true">
+ 			<fileset dir="${src.dir}">
+@@ -56,6 +55,16 @@
+ 		</copy>
+ 	</target>
+ 	
++	<target name="build-test">
++		<javac destdir="${build.classes.dir}" 
++			debug="${build.debug}" 
++			optimize="${build.optimize}" 
++			target="${build.target}" 
++			classpathref="build.classpath" >
++			<src path="${testsrc.dir}" />
++		</javac>
++	</target>
++	
+ 	<target name="init.javadoc">
+ 		<mkdir dir="${deploy.javadoc.dir}"/>
+ 	</target>
+@@ -74,7 +83,7 @@
+ 		</javadoc>
+ 	</target>
+ 	
+-	<target name="test" depends="build">
++	<target name="test" depends="build-test">
+ 		<junit showoutput="true" printsummary="true">
+ 			<classpath >
+ 				<path refid="build.classpath" />
+@@ -179,4 +188,4 @@
+ 		<antcall target="deploy.ws" />
+ 		<antcall target="deploy.zip" />
+ 	</target>
+-</project>
+\ Dosya sonunda yenisatır yok.
++</project>
diff --git a/net-misc/java-wakeonlan/java-wakeonlan-1.0.0-r2.ebuild b/net-misc/java-wakeonlan/java-wakeonlan-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..61ffce601346
--- /dev/null
+++ b/net-misc/java-wakeonlan/java-wakeonlan-1.0.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A wakeonlan commandline tool and Java library"
+SRC_URI="http://www.moldaner.de/wakeonlan/download/wakeonlan-${PV}.zip"
+HOMEPAGE="http://www.moldaner.de/wakeonlan/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="dev-java/jsap:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit:0
+	)
+	${CDEPEND}"
+
+S=${WORKDIR}/wakeonlan-${PV}
+
+EANT_GENTOO_CLASSPATH="jsap"
+EANT_BUILD_TARGET="deploy"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+src_unpack() {
+	unpack ${A}
+}
+
+java_prepare() {
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+	find -name "*.jar" | xargs rm -v
+	java-ant_rewrite-classpath
+}
+
+EANT_TEST_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_TARGET="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar deploy/wakeonlan.jar
+	java-pkg_dolauncher ${PN} --main wol.WakeOnLan
+	dodoc doc/README
+	use doc && java-pkg_dojavadoc deploy/doc/javadoc
+	use source && java-pkg_dosrc src/wol
+}
diff --git a/net-misc/java-wakeonlan/metadata.xml b/net-misc/java-wakeonlan/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/net-misc/java-wakeonlan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/jlj/Manifest b/net-misc/jlj/Manifest
new file mode 100644
index 000000000000..022340f8cf0d
--- /dev/null
+++ b/net-misc/jlj/Manifest
@@ -0,0 +1,5 @@
+DIST jlj_2.12.tar.gz 32480 SHA256 da3e1626338c5337e28bb4bc8da0b64d7a8ab441a52aa2364037e9eea152bc27 SHA512 e0d14520c584ca6bca473286cadef46c7deefc47d48fc39e3bd61e01189fe445a9452406a3aec1ed05d9d44925042589cc1396991b56f02018ea01df11ab8594 WHIRLPOOL 4b8667c422e5c456d5deb3d7e3a6b6666f917c4bc2e0d03bb773959c5a060fccf569e85713f2651e8288e06d5edfb30d92186428e992983207f61685bd88d5f4
+EBUILD jlj-2.12.ebuild 630 SHA256 37b71521f030b04c3bc1d11835e60ec400d7ea546a36a736d2d18d4ada3fd8c8 SHA512 3bc78817aae7e7da69083df1532e8f8eaade66b320b02684a960931f8df27ed31802e32cbbfff1fb77c7d1d9a3b7b21dc5088d38c8f332aa835fe9a6ea88d0ab WHIRLPOOL cf92b5f1e8573e3cca8e3af38d830044bfba2c858b3a24c2e9dc567c375ba3c8d6d9ef71e882eb9f3e3c56074634e19e90649f81994c36f63efae056ab6c02f7
+MISC ChangeLog 2901 SHA256 f1e0db4e4d847459dc9d9adc0fc6e4708362558152a0aac22e53415d98489267 SHA512 1e315658497dc6b8b1ab975f00dcd8bac3f3bfababae41008a7120e42163a1c28eea5ca0c8266d246f8171f5326958ea4b264e648eb277f0deecaf7020a5813e WHIRLPOOL df613ff5bb21a0b762afac4a9bc27033db859f1c5d4d05200f1e5961161c77c6373548c78d2dddfc249c111989ad2b520cb7888bc86ad5454e6a2071a8f9ac78
+MISC ChangeLog-2015 1345 SHA256 0d6c76f8ac9291b0e84b91ba704f24c6bd6d3faf265f277afad809b05c342388 SHA512 9d6f2bfd05c2fd91a74489a48021539d9c43ccc9f036fbd6ec3eff055a05b46fe27286171ab12f8df1fc8b052c768c724ba5b05aed3ae1d307a421b3a3c259d8 WHIRLPOOL b7beb5168d1ee7773ccb2b6d6abf38c93d35ec3567f4d912bb6cb75f17447a3d5648fd69728e141817a1b6972be2701347f5a03a2e56bd5a37df77edc30bbb86
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/jlj/jlj-2.12.ebuild b/net-misc/jlj/jlj-2.12.ebuild
new file mode 100644
index 000000000000..036f61ab0231
--- /dev/null
+++ b/net-misc/jlj/jlj-2.12.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A simple console LiveJournal entry system"
+HOMEPAGE="http://umlautllama.com/projects/perl/#jlj"
+SRC_URI="http://umlautllama.com/projects/perl/${PN}_${PV}.tar.gz"
+LICENSE="freedist"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	newbin ${PN}.pl ${PN} || die
+	newdoc .livejournal.rc livejournal.rc
+	dodoc README.JLJ
+}
+
+pkg_postinst() {
+	elog "README.JLJ and a sample livejournal.rc have been installed to"
+	elog "/usr/share/doc/${PF}/"
+}
diff --git a/net-misc/jlj/metadata.xml b/net-misc/jlj/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/jlj/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/jrdesktop/Manifest b/net-misc/jrdesktop/Manifest
new file mode 100644
index 000000000000..4fbdd2e21767
--- /dev/null
+++ b/net-misc/jrdesktop/Manifest
@@ -0,0 +1,5 @@
+DIST jrdesktop-source-0.3.1.0.tar.gz 228134 SHA256 9b9cccd6c62c0487bd2a124fb3ed9159c750340d6d7139a28df002e67c384f40 SHA512 dc18187349f2526c027bf45acffa638d4d32692fdcf60b016a540a9245269e4ef49e4893fd666b8ad084dff0c83eb05a0549bcdf112c038f29224ff5a451cca6 WHIRLPOOL 9ea2c4445baba5cdc4e9191b4ce47630593cdc8721045b9fa03114e50001efd260270bc0b374c86dc1d2068780ad9ea1180c3163f1260fc2889bcef6c0200afe
+EBUILD jrdesktop-0.3.1.0.ebuild 731 SHA256 df499da7d5d1174a2f6ac67bb540ab65eec21072d7e2c04eea697eb459b91129 SHA512 91ddf8425f4a39fca027e6da3eb19c484a22c4985fc270cf15061b1ba359ec075e995f2ed18694cbe6475b660c70d1a16d62dfcd4afab735e321288d1a330af1 WHIRLPOOL 284fdb6acf5e33a9e60a871617c512c796c47875316afe1995f0ca720d18de6e119495368b34eff4612b2276c6794c2a89a26a5a03958f7eb9f2333636fc9688
+MISC ChangeLog 2437 SHA256 22bc236b74b5872f887c01b0514255536d64649d79a20315fc2b735ce6c5c27d SHA512 3e0f0270a1608534c81f1811b245708666f7cd6dec6aa86863fe018b574712fef5bbcc9abdd32f6cef3d5a4827230ae43f443220455d17031387cc3241c9649a WHIRLPOOL 4b844148cde123f374128b82911afdcba35f55e25124dd62b0bdef8f05409668e57ac1406e43bd2c1e4dbe7393688cccc24a5cc0ef40356532a0052e6d65b587
+MISC ChangeLog-2015 1311 SHA256 829a11f6577c652c85f6b63eb26883f85401ca023b34b8919b6a65f5619f38a5 SHA512 e33f082bae2e245ba45edc8c89004c2f7710877ca923a65d413f0f0ca79c3ab0f428e1312afe62264431f568feb31f8bbac3ac8abddc70562feb507a83f9fcfc WHIRLPOOL bad5f7514d65b8ac09e8bf00e07410780b53fbc5a2863960f9985a3f514d6454e4c4ef6a595ba8a01769bbd5d5302cf01276493a913b6fef4de182953af76ad4
+MISC metadata.xml 771 SHA256 a2f152c67489093384258f3b37fb742944445c6f9191e43db0608aab9195348b SHA512 78cc2e431a41c93973fc11e2a345d56fd8b6a3a564871866802d089015c981ce45efa2f70295e8ccde06cf3255d4592de7e396956e659801857fc7f1860200ae WHIRLPOOL 77d42b4d4587316a0ef521e8f4af85376e99ea815bea099477462005b82da1d7042fa46abbb46ffeda764e9291db99a318db9315eae9f6ce6c7e8d34ef7cb81b
diff --git a/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild b/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild
new file mode 100644
index 000000000000..b283a896fab2
--- /dev/null
+++ b/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+JAVA_PKG_IUSE="source doc"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Remote Desktop (jrdesktop) software for viewing and/or controlling a distance PC"
+HOMEPAGE="http://jrdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+EANT_EXTRA_ARGS="-Djnlp.enabled=false"
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc dist/javadoc
+
+	java-pkg_dolauncher
+}
diff --git a/net-misc/jrdesktop/metadata.xml b/net-misc/jrdesktop/metadata.xml
new file mode 100644
index 000000000000..dccb14c6e984
--- /dev/null
+++ b/net-misc/jrdesktop/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		Java Remote Desktop (jrdesktop) is an open source software for viewing and/or controlling a distance PC.
+
+Besides then screenshots, keyboard and mouse events transfer, jrdesktop includes many additional features (like: file transfer, data compression, color conversion, ...).
+
+jrdesktop uses RMI (Remote Method Invocation) with SSL/TLS to establish a secured connection between the viewer and the server.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jrdesktop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
new file mode 100644
index 000000000000..666e04c6c6f9
--- /dev/null
+++ b/net-misc/jwhois/Manifest
@@ -0,0 +1,10 @@
+AUX jwhois-3.2.3-whois-de.patch 462 SHA256 cb6dba5ea51fc39e444daa00b8476f97138afbce2ea331ee20e1896a941f1b73 SHA512 19777491b1fc46df06cb54e136cb7faff595e4524c65f79e887b326cec7cd50e9b90014a30de4c436f711e324124bb39761b1bf24fb738e11174f857783e010c WHIRLPOOL 86fe99816d3377eb9ac443303af1bd7251c52472453cc6254125f21d8de2621b1dfe485bf4bb0c0927cde9c6b4728bf0c011d3496cc566f71d97755ad048493a
+AUX jwhois-4.0-connect-logic.patch 425 SHA256 9ec8525049d35583a5a9974384cc6bba8b28b48c5c6310a88ab58503fefcbfbb SHA512 7cd437dabdc332cf5068b98a7d87380572f4e94c3fa6554b62377491018deb6aa94e36339069e5628b0965405446f8fcc41ec44c6e4f6ac8e087b06819533c83 WHIRLPOOL fc096f6c0547d9eb758988eca131d66fe97400929870d60382dd361ff6080b3a08dd78dbc38bc7c4e5d69604d9790547635e17e54abb478d6c6aab43fc5bcdb8
+DIST jwhois-3.2.3.tar.gz 430792 SHA256 ada17cb751ec09f91d4f22938bf9a83e7cc548f2cfce09fcc00101c142583f24 SHA512 92ffeef5d9134800d54326c2281eb38c030acf812d2420031438e1f9171875403384ac847bb6d9670aae3e3efa8cdfe2079c822f82550dc8b0450dcb05baf60d WHIRLPOOL 44d6b0fc1d2b74774c4c2a3f921de3779ad5fdee50054ddfbb2351d89c62084cedb1b9b51135002d93f1a1dcc88b994902de52a0e06a67af3263565c7246f946
+DIST jwhois-4.0.tar.gz 493007 SHA256 fa9bb86782b915c6d730bb723f876dc9b345a617db375aaf3416ec22553cd64e SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae WHIRLPOOL 9584e765df94bddaf4ac705e0b487e8ee5533374a633cb3ead2178189bfe16b7c7ee572b58e5f724097342599851afbdf3a3c96a687c6427e6f16d46fa96ab4a
+EBUILD jwhois-3.2.3-r1.ebuild 739 SHA256 44dfb265d7c53848a3ff1f4fb74a5f697cff08552402d72b98f981ce7c46e2b2 SHA512 7125bcc8a28ce013ffaed3a9d8fbbf36c63d3cd710beafcae9ceeb080444e6a382d9b863d6bfbb57b1326d13a0300ee2dec5ec9fcc38e71b8a1f47789e3be8c2 WHIRLPOOL 8586b302bd3ba77f68619f0a2c414e283e8600e9b2292181826fe2ba88ac57cf3610a3f8b7ec1dcc4fe09d226cd0e06b34af82de899ed442c043ed1422297b40
+EBUILD jwhois-4.0-r1.ebuild 683 SHA256 548e4fa267cf0ee6509283031a77c92e218812352bf8209d40c1ad4aaf0ed1e1 SHA512 5d97c6b37ad8a42de8236ae3a4aaf7499aa443124dbfbe978ee30f687133e58df5a5f8177c315f92b28d1412a346a06a0d244da7013ee3cb9578da7eba7ae0e1 WHIRLPOOL d73dae8216609b66bc12561ee2cd93358c31a1da50f596039e129b093bfc804c2ff03efb8aa027917e193000652566219f8724572ee0e44ed6441d1c6c70d83f
+EBUILD jwhois-4.0.ebuild 687 SHA256 41d91f08a2ae2aad32e58962ab1d2c77ec741644aed2295134ee5fe42e80a41f SHA512 1c70ec656876a66f1060dcceefa4aeb575ddc0dba6725e8dcc5247b6ffb94e0a0ad828c674782ed52e3f740d4e82e3bcb639113a058f0f36e037a37506d12210 WHIRLPOOL 7ab46cd3bd2b4d7cc97c9f484d81b808d54bdeca2f53a1ce4eaace13ea3eb8c4b1c3c8f2bfe726fda78d48434d5975b7b2ec3791b6e57bb627ef8e75b761c85a
+MISC ChangeLog 2806 SHA256 0f1550d1cbec50a24005d13bd85b46d0a8159c1ee74d20f59ec8c5ffa649bf06 SHA512 49306ca04104e6c429c8cd2da70c1c38d33e491ed2d27e90947da0219ea1d3d43eee9b1a837c2b8486937a6fb457695b1fc00e149a2b644dc4e729374d13becb WHIRLPOOL 58935df3d47a2e6e5a348b324d42bef860d3779a1e9e9158f458b1cdeaccfba81ce940874d0c881ece04fe69bd8a6b0685b667b828619aca62288f8124fe8ee5
+MISC ChangeLog-2015 5316 SHA256 0e2b56693f31c0c2a8515a94938ec6930efb81059942e2de27d727cd86b28bd7 SHA512 67b339464d98a0293faf9aae3c01ccba874a3c14f3549a7eadafb828e9e6607d2ab6878a99fc7f286418e72fd92384b9023067bec3f9904ca88d2682dbc51a18 WHIRLPOOL e42e356120dcab7b95316784ff5ce7c4215db4df8cc21e3bef8883633936f3ef9fc77be2152074704b22f4e10b4a6cef1f79af3b7eea09b142fda27f0d09267f
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/net-misc/jwhois/files/jwhois-3.2.3-whois-de.patch b/net-misc/jwhois/files/jwhois-3.2.3-whois-de.patch
new file mode 100644
index 000000000000..9bd56b5b2eda
--- /dev/null
+++ b/net-misc/jwhois/files/jwhois-3.2.3-whois-de.patch
@@ -0,0 +1,18 @@
+fix from upstream cvs
+
+http://bugs.gentoo.org/159776
+
+--- jwhois-3.2.3/example/jwhois.conf
++++ jwhois-3.2.3/example/jwhois.conf
+@@ -180,7 +180,10 @@
+ 	"\\.cx$" = "whois.nic.cx";
+ 	"\\.cy$" = "whois.ripe.net";
+ 	"\\.cz$" = "whois.nic.cz";
+-	"\\.de$" = "www.denic.de";
++	"\\.de$" {
++		whois-server = "whois.denic.de";
++		query-format = "-C UTF-8 -T dn,ace $*";
++	}
+ 	"\\.dk$" = "whois.dk-hostmaster.dk";
+ 	"\\.do$" = "whois.nic.do";
+ 	"\\.dz$" = "whois.ripe.net";
diff --git a/net-misc/jwhois/files/jwhois-4.0-connect-logic.patch b/net-misc/jwhois/files/jwhois-4.0-connect-logic.patch
new file mode 100644
index 000000000000..e0b10f6b50b9
--- /dev/null
+++ b/net-misc/jwhois/files/jwhois-4.0-connect-logic.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/208875
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542148
+https://savannah.gnu.org/bugs/index.php?37135
+
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -288,7 +288,7 @@ make_connect(const char *host, int port)
+ 
+       retlen = sizeof(retval);
+       error = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &retval, &retlen);
+-      if (error < 0 || retval)
++      if (error == 0 && !retval)
+ 	{
+ 	  break;
+ 	}
diff --git a/net-misc/jwhois/jwhois-3.2.3-r1.ebuild b/net-misc/jwhois/jwhois-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..576f18066d78
--- /dev/null
+++ b/net-misc/jwhois/jwhois-3.2.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
+HOMEPAGE="https://www.gnu.org/software/jwhois/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="nls"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-whois-de.patch #159776
+}
+
+src_compile() {
+	econf \
+		--localstatedir=/var/cache \
+		--without-cache \
+		$(use_enable nls) \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/net-misc/jwhois/jwhois-4.0-r1.ebuild b/net-misc/jwhois/jwhois-4.0-r1.ebuild
new file mode 100644
index 000000000000..aa43e9ef17ad
--- /dev/null
+++ b/net-misc/jwhois/jwhois-4.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
+HOMEPAGE="https://www.gnu.org/software/jwhois/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="idn nls"
+
+RDEPEND="idn? ( net-dns/libidn )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-connect-logic.patch #208875
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var/cache" \
+		--without-cache \
+		$(use_enable nls) \
+		$(use_with idn libidn)
+}
diff --git a/net-misc/jwhois/jwhois-4.0.ebuild b/net-misc/jwhois/jwhois-4.0.ebuild
new file mode 100644
index 000000000000..9d2179ecedbf
--- /dev/null
+++ b/net-misc/jwhois/jwhois-4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
+HOMEPAGE="https://www.gnu.org/software/jwhois/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86"
+IUSE="idn nls"
+
+DEPEND="idn? ( net-dns/libidn )"
+
+src_compile() {
+	econf \
+		--localstatedir=/var/cache \
+		--without-cache \
+		$(use_enable nls) \
+		$(use_with idn libidn) \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/net-misc/jwhois/metadata.xml b/net-misc/jwhois/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/net-misc/jwhois/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
new file mode 100644
index 000000000000..676b28f56635
--- /dev/null
+++ b/net-misc/kafka-bin/Manifest
@@ -0,0 +1,23 @@
+AUX kafka-zookeeper.init.d 506 SHA256 18ac63afc84634f89b879f5950a1f8527f2edb83c85a7aa6cf48739aea912e30 SHA512 96656e81a296c989fa5dcbab4831b6ca12841ef8e902d32b3100196e0dfc1984ba6d4eb426ade14ef8b4299ea9665753a0af22e8e7f4b7947424d5529d2f7010 WHIRLPOOL 96769057f186f7c99841d8a0fd9014123062b6ee1635bde0b5861548ff35b9551d665d2df11330d2dc384207ad926ef363e94a021a892c09ecebf978d2872792
+AUX kafka.init.d 497 SHA256 18fc61669652d7e8930cc7b29414685db7c46c8c83def7866eff87ed3ad42d2a SHA512 2e0ff5d5b95e39b08b234b38535a5fa4b3cb1d63ed1af7f107f1babdcded77f296999c0f9fa5e253408f4003b1a9a11a33533502a07fbdb0911314005bb98148 WHIRLPOOL 9f9f660b16bb65cae2f5bb9fa85d10777dd7aa613af64d6b9731607501884aabaffaf50da6b47c0f6459e0d2e79d0694552b23cacaff54285bac32616485d2fc
+AUX kafka.init.d.2 668 SHA256 83c82b4f6db22ea7aeddef6fb3b9a67a89b9b3acd7cf8bd91ee7689da8c81642 SHA512 1a7b0c6ba64ed5b9697776dc49688e53b55846b0f65ae97e3cd551db3fe700f319f78bb2c6f0f4e77102f754f1c2d3a7bbd303e2cbeb17c0ed99ef878313a5f5 WHIRLPOOL a8144bdc7b95ba3130e3dbcb02dd3189889f2dfd1f949f8e3a16bbf658d35cd97ebfc6660511af2c74a3ad2fc9b33c005bcc809fa88582fb43725fc070020733
+AUX kafka.init.d.3 671 SHA256 1cd1206d53cdec1963f7c29a6efbeba44ee018daa1ca85577709f4040c6a1376 SHA512 45478ae4733a498a6bf3604359943f003056dc77f3eb382bd7e7c04a5e9cee34fb07170c67bf306e4b09a49b3e0665fe760d1ceb37a09b174b3e9c3f519bdddc WHIRLPOOL 4fe1f37101b92ac378471d421b5a736679ecc304e754cfbc14e78eea7e10190a6b44b3c7d42b6ca9c90da77fe9d761f7e8b4244a0b9910b819a89823b2e3c364
+DIST kafka_2.11-0.10.0.1.tgz 31831257 SHA256 2d73625aeddd827c9e92eefb3c727a78455725fbca4361c221eaa05ae1fab02d SHA512 ab89c1d0cf4e05e823f45629e7bc5778173fd7420ebfa259f566071c6b474b08abf808508c7fd6fcca2233b20e76cbf6a235563709bfa019455386f80f0b5d71 WHIRLPOOL 5928d39afdaa4b7cc3839b2555229d42ecc9b3ccd6c76cb2dfd1a7fd4f2fcb2ac9abd055b7c698b5d82232df10e10d4c2f2fd525e880a9c0ed78550e2cf2d28e
+DIST kafka_2.11-0.10.1.0.tgz 34373824 SHA256 6d9532ae65c9c8126241e7b928b118aaa3a694dab08069471f0e61f4f0329390 SHA512 b47a26813395b5bed5bb3f874727d4a1cae13480732aee3014d66afdbe1ec8ed6ed8c9de4feff67d18492088b5e927516a8ce13f355ce985ec0144608509d30b WHIRLPOOL ce23da1e53bb8ec65d0235f932454ef1f9c9a425f259328b1ec142c230fa92da75c1f279c66df53755cdd439bad7d8a7d6ea0c2864fccf22d79e1546c73cf588
+DIST kafka_2.11-0.10.1.1.tgz 34424602 SHA256 1540800779429d8f0a08be7b300e4cb6500056961440a01c8dbb281db76f0929 SHA512 6d996946ee5d798f0af8ffa2bddc1dc23632761488556e765ba731acae28e2d65f4ca3f0648caa7bbb14947daf3e1862d9959f271eff5e0625c780a7169c6f72 WHIRLPOOL 8762937838dc0ca4b2fa943d4714a691b77bcfaa52c5cff1fde3bff6296600fb5754c464b04dd1a53571bcb34637890f10cc2a82ba1a7c8366c8914d06ad7c9a
+DIST kafka_2.11-0.10.2.0.tgz 37630750 SHA256 4c9e73059dea2dcb5022135f8e7eff5f187ffcc27a27b365b326ee61040214cd SHA512 3d972cdccdbe889b73b8d5ec68e8a0bc5daabed29ec8f1f217e22887534eba8f3127886c07950a673c55d289a9dbd077763141eb883b5f9e2fe8b56b4524941c WHIRLPOOL 75ecf95f80ed2295eebb910fdd50e6cb44aba0fe79cee724bbace6f024a34d2d2fc1fd84f987877476e8f1c46a7f61000b833c0422be6d5daa8ce175e8a9a28a
+DIST kafka_2.12-0.10.2.1.tgz 34046244 SHA256 e523b448b24a908202c35f12fd0caaa49ce70070305c360f7ed2270bb2c95f47 SHA512 48884838980ff182fe1bb089b5f8db91aaa190dad9f9cbf24d762ba8afb897546f66d66ce110eef87ad1541e06564e5ea455e4698a23fbd296d971e033953bbc WHIRLPOOL f6fa89a778828d84824e867db84bd3e7d40ceb389beb29bef079ef9220ab8010a2d39e51a42a12abb3446bb96bcee560bfa6966c1681185532eabfc75f065a0f
+DIST kafka_2.12-0.11.0.0.tgz 36644420 SHA256 ab6310dd0d9fce1e6e8045b51b471fb35c3e197714e6e6b03bc5864898785f2d SHA512 60b44930700ab42e4a0e3945b6eb32db422d2e62388b4fee68aef97aea939fd252ebd0be39b36a4e6149aff9dcbd5b0578095d8a8812bd75111a65299aa5af55 WHIRLPOOL 33485fab4501501b608d8709ed59e9a0531b0adaaf1cdbd54c5f5cfb1e36b6a00cb8e0cc0d1f5eb6068b00bd5ebe1d26d3aa39d5096a52cf71c498f7912fa6ae
+DIST kafka_2.12-0.11.0.1.tgz 37227486 SHA256 c776f2dbb7f4e1af6b61e32d482b513a1788bf5f39602746b005ab92601a46f2 SHA512 e85b152a0865e068309d3117b874010895389761da43ec62c87e2e4cffa5c8ea0eed6ea6beceae87d437ffabb143d6bc36408b1387985f2b90fe8b9c8201f29e WHIRLPOOL 9e06a4a9e0d2aea98b12f4fa20f7a8c9a58c7e845283ea0508ecbbe81d7f91eb7ffba054a40da47fa35fec1da777c6c6934c6ec9fbeb6cee8a0e3a05bac8872b
+EBUILD kafka-bin-0.10.0.1.ebuild 1440 SHA256 7a333d25b37eb1417fdf4669813796f7d181f79bfd8cd55580c4e6ded162c809 SHA512 f2bb54ee5bb241b93c964f0ec2ac8298c86dca304f857194864580bddf65764cb8b27961d4e3b750d6624e1747a4284d69d557a4ba7eba9775400c131cc05829 WHIRLPOOL 3a91d315890e1c04a0c813565015afa91853a3679f4fa8f3eeaee1e10c4d23877b3caa9c59e4c203b3e620aa153eaac3e37e1743506e0ecd68c0a3e4b34a69a9
+EBUILD kafka-bin-0.10.1.0-r1.ebuild 1471 SHA256 14b239e79368b43ad8dc3fa3ec81b3bd67551ed73c2ed801a2873084e2bcc6a3 SHA512 cca27e43b7dd964699e3de6dc1b69f4a6e102516280656f0c5e171ab49e9ad731bd645001dbda4cf22b9c66202b36e9565ff354056c81b19b97bf71954f6d463 WHIRLPOOL b7ffadb5313fbbacc22f72f0da239cdf89948331b5deee4e7a00fd8b56ea8295fdc29ba5845bad53357677901665f8d588c35587a37db02d3eadf218334adb8a
+EBUILD kafka-bin-0.10.1.0.ebuild 1440 SHA256 7a333d25b37eb1417fdf4669813796f7d181f79bfd8cd55580c4e6ded162c809 SHA512 f2bb54ee5bb241b93c964f0ec2ac8298c86dca304f857194864580bddf65764cb8b27961d4e3b750d6624e1747a4284d69d557a4ba7eba9775400c131cc05829 WHIRLPOOL 3a91d315890e1c04a0c813565015afa91853a3679f4fa8f3eeaee1e10c4d23877b3caa9c59e4c203b3e620aa153eaac3e37e1743506e0ecd68c0a3e4b34a69a9
+EBUILD kafka-bin-0.10.1.1.ebuild 1471 SHA256 14b239e79368b43ad8dc3fa3ec81b3bd67551ed73c2ed801a2873084e2bcc6a3 SHA512 cca27e43b7dd964699e3de6dc1b69f4a6e102516280656f0c5e171ab49e9ad731bd645001dbda4cf22b9c66202b36e9565ff354056c81b19b97bf71954f6d463 WHIRLPOOL b7ffadb5313fbbacc22f72f0da239cdf89948331b5deee4e7a00fd8b56ea8295fdc29ba5845bad53357677901665f8d588c35587a37db02d3eadf218334adb8a
+EBUILD kafka-bin-0.10.2.0.ebuild 1471 SHA256 75401f0a9137ede098c4c1ad0660fc2bf7fa4ab53ec5ed384695e09c216e8835 SHA512 0bb15ebc348ae68a0eee243ea3102779e6a00a3357afae770e3cdd8346e42508052b58fbe2e495b37d234c3d258dfb10e76e0b792d6002f4425ef0914a91c228 WHIRLPOOL d17a9607c4c73e32cc654e04caaa0ea61eac6d82f22a51b5c2a442cb07846ee3b8a23ab256e76c1ef8d8a0e0c797b28722777c11cb5d71ee2afb7e06ab38bd74
+EBUILD kafka-bin-0.10.2.1-r1.ebuild 1473 SHA256 a97c66866c3fef06ea807587c80bad996f34a6ad0dacc401be908ada3c0c0920 SHA512 00004f94903a431797858689d162545e57c40d3e62e7c9ed3250338744b2c5c48433d5c1184d731663d156650ad08676030cb6066188a15eafbd038818a425fb WHIRLPOOL 5cded0566f96ab21a7fa90e44c5e8702e76e6eea3356d363cc4a44cf5162e498c638fc147f55777dd007ceb2f31a26514c920dcf2bff7dcf306f15291685a930
+EBUILD kafka-bin-0.10.2.1.ebuild 1471 SHA256 0d2428fd1232c7fb2f357f454470749ba5a5b02975f1698af51e9ad265494dd5 SHA512 202e2f909043c380ef42bab813749490ab7ec57d738eaad6cf79e5cb7ceb8f2e0baf285a63ccaf3e12f00cc22d325f9aa7d421a5662d0f472249bd06e933b493 WHIRLPOOL a982f19ada8906cc285248b5c567a56bef2cc68d03f11e4e7ecf3640043ff1ef0a6fc226215c8124f419cc3fd0060cb70bfb197ce7865ca3b93697080194dbf5
+EBUILD kafka-bin-0.11.0.0-r1.ebuild 1473 SHA256 a97c66866c3fef06ea807587c80bad996f34a6ad0dacc401be908ada3c0c0920 SHA512 00004f94903a431797858689d162545e57c40d3e62e7c9ed3250338744b2c5c48433d5c1184d731663d156650ad08676030cb6066188a15eafbd038818a425fb WHIRLPOOL 5cded0566f96ab21a7fa90e44c5e8702e76e6eea3356d363cc4a44cf5162e498c638fc147f55777dd007ceb2f31a26514c920dcf2bff7dcf306f15291685a930
+EBUILD kafka-bin-0.11.0.0.ebuild 1471 SHA256 0d2428fd1232c7fb2f357f454470749ba5a5b02975f1698af51e9ad265494dd5 SHA512 202e2f909043c380ef42bab813749490ab7ec57d738eaad6cf79e5cb7ceb8f2e0baf285a63ccaf3e12f00cc22d325f9aa7d421a5662d0f472249bd06e933b493 WHIRLPOOL a982f19ada8906cc285248b5c567a56bef2cc68d03f11e4e7ecf3640043ff1ef0a6fc226215c8124f419cc3fd0060cb70bfb197ce7865ca3b93697080194dbf5
+EBUILD kafka-bin-0.11.0.1.ebuild 1473 SHA256 7e0dc4409ea4beeb9c2996368770881cab42800c6a32542706121ba8f8b79a76 SHA512 c4c99f4f2cd3519002d12b0fa59ed79470896e6bacfae6147bae6079338f3b8c850a80f19945ba272f08818440d7726c4bf51a2f744d0ee8314002ff9cb04977 WHIRLPOOL d1500a205e193f6ef3d485735b381974d232079f1ae98c8f57e0414768194a9bba10701f961a4a5eb3888142bc76cecb6d478102823a4497f59cf9434e43438f
+MISC ChangeLog 974 SHA256 d06420e9e44c48f6841e32da1190c8382b8143d515b9830d24725771f9d61b57 SHA512 d9b1f5ef3d5eb48e84c703f673bd4d36694be545fad51b2f8ce7d934170ffdbb642aa3438c2d8ffa0a20b87fdcb9a9ed356d124cf1c721c28042653c2fcbe67e WHIRLPOOL 8528e11289aecc0561c2b73f9b6f852a4cb624e8c4fc48d8568c4fadad2bb063bb7c83bf07b62dfec03d57d8ff54921df9599be806dcf1e3a6200ed5561f404d
+MISC metadata.xml 339 SHA256 19ef725201582ea15102779ce1b3f05261602a0ae719e9b92c09d1e29e9fbd09 SHA512 6aa179782d22d0b46934d90984c983aae6876461e077bebff7aaaf58687400881b76b658e468f780a88b1b6fb8f1d7d75c061fd16767d658af80c9e54cb3bfe4 WHIRLPOOL 055b6350a71e9d409936898b070f19c514e78f6a61c861b6d3ed728497284837b2c4792cf6dc2bc7647aec47b0d474d3ec6ba7acd02683ec1995a5b9de503a0d
diff --git a/net-misc/kafka-bin/files/kafka-zookeeper.init.d b/net-misc/kafka-bin/files/kafka-zookeeper.init.d
new file mode 100644
index 000000000000..fd70cdc5aa74
--- /dev/null
+++ b/net-misc/kafka-bin/files/kafka-zookeeper.init.d
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Zookeeper for Kafka distributed messaging system"
+
+logfile="/var/log/kafka-zookeeper.log"
+
+command="/opt/kafka/bin/zookeeper-server-start.sh"
+command_args="/etc/kafka/zookeeper.properties"
+start_stop_daemon_args="--chdir /opt/kafka --stdout $logfile --stderr $logfile"
+
+command_background=yes
+pidfile=/run/kafka-zookeeper.pid
+
+depend() {
+	need net
+	after bootmisc
+}
diff --git a/net-misc/kafka-bin/files/kafka.init.d b/net-misc/kafka-bin/files/kafka.init.d
new file mode 100644
index 000000000000..3b23a7fac7c9
--- /dev/null
+++ b/net-misc/kafka-bin/files/kafka.init.d
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Kafka distributed messaging system"
+
+logfile="/var/log/kafka/kafka.log"
+
+command="/opt/kafka/bin/kafka-server-start.sh"
+command_args="/etc/kafka/server.properties"
+start_stop_daemon_args="--user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile"
+
+command_background=yes
+pidfile=/run/kafka.pid
+
+depend() {
+       after zookeeper kafka-zookeeper
+}
diff --git a/net-misc/kafka-bin/files/kafka.init.d.2 b/net-misc/kafka-bin/files/kafka.init.d.2
new file mode 100755
index 000000000000..87b4b47a4469
--- /dev/null
+++ b/net-misc/kafka-bin/files/kafka.init.d.2
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Kafka distributed messaging system"
+
+logfile="/var/log/kafka/kafka.log"
+
+command="/opt/kafka/bin/kafka-server-start.sh"
+command_args="/etc/kafka/server.properties"
+
+command_background=yes
+pidfile=/run/kafka.pid
+
+start() {
+	start-stop-daemon --start --background --user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile \
+	--env KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS}" \
+	--pidfile $pidfile --exec /opt/kafka/bin/kafka-server-start.sh -- /etc/kafka/server.properties
+}
+depend() {
+       after zookeeper kafka-zookeeper
+}
diff --git a/net-misc/kafka-bin/files/kafka.init.d.3 b/net-misc/kafka-bin/files/kafka.init.d.3
new file mode 100644
index 000000000000..c355f21612ca
--- /dev/null
+++ b/net-misc/kafka-bin/files/kafka.init.d.3
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Kafka distributed messaging system"
+
+logfile="/var/log/kafka/kafka.log"
+
+command="/opt/kafka/bin/kafka-server-start.sh"
+command_args="/etc/kafka/server.properties"
+
+command_background=yes
+pidfile=/run/kafka.pid
+
+start() {
+	start-stop-daemon --start --background --user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile \
+	-m --env KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS}" \
+	--pidfile $pidfile --exec /opt/kafka/bin/kafka-server-start.sh -- /etc/kafka/server.properties
+}
+depend() {
+       after zookeeper kafka-zookeeper
+}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
new file mode 100644
index 000000000000..f4a9a59a79ec
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.11
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.1.0-r1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.1.0-r1.ebuild
new file mode 100644
index 000000000000..819491ebdd47
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.10.1.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.11
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.1.0.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.1.0.ebuild
new file mode 100644
index 000000000000..f4a9a59a79ec
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.10.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.11
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.1.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.1.1.ebuild
new file mode 100644
index 000000000000..819491ebdd47
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.10.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.11
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.0.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.2.0.ebuild
new file mode 100644
index 000000000000..e75d073295aa
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.10.2.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.11
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.1-r1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.2.1-r1.ebuild
new file mode 100644
index 000000000000..36e9ed9e938d
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.10.2.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.12
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.2" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.2.1.ebuild
new file mode 100644
index 000000000000..e5705a4e5401
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.10.2.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.12
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.0-r1.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.0-r1.ebuild
new file mode 100644
index 000000000000..36e9ed9e938d
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.11.0.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.12
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.2" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.0.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.0.ebuild
new file mode 100644
index 000000000000..e5705a4e5401
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.11.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.12
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild
new file mode 100644
index 000000000000..a3d76ba672ca
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.12
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.3" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/metadata.xml b/net-misc/kafka-bin/metadata.xml
new file mode 100644
index 000000000000..0cd421684a02
--- /dev/null
+++ b/net-misc/kafka-bin/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 type="person">
+                <email>patrick@gentoo.org</email>
+        </maintainer>
+	<use>
+		<flag name="internal-zookeeper">Use bundled local zookeeper instance</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/kafkacat/Manifest b/net-misc/kafkacat/Manifest
new file mode 100644
index 000000000000..a64058654254
--- /dev/null
+++ b/net-misc/kafkacat/Manifest
@@ -0,0 +1,3 @@
+DIST kafkacat-1.3.1.tar.gz 52117 SHA256 385f231d7edee417c71b43f6f9d6dd843e9e41bff1bd30483792c6271c09b12b SHA512 98e51c7ad4a3bb1eda8587af5e4d9ce164d26a9511470799a8379e89d2462397eb51e80ccde6a5c9240b99b014f7ca2c6d494a576de3e0be65df744ebc56d758 WHIRLPOOL 7f501fc7ed9bd2d5a83cc50b70bb31176a7878905d3d3f3c2682b0ac5f82b43bb356b5066622d4a9216ef73e9689d1827cd657b4820233b82b52404fc09c82d3
+EBUILD kafkacat-1.3.1.ebuild 597 SHA256 cb4574b71ac981a436a1f6d3bb9cd6e367eb22a55c2c8c973a937b752fee22a1 SHA512 21b21afcb4fcd66a463f91fbd770d18e5b7dfa3a0e023bf1f8c2eb795df8cdbe60d41767f1012b056cdd466663ab0ee575faa7ee447e862774d4dab996d9a5c0 WHIRLPOOL e8d9421db9915915fe134a73768ed8a3d17ba69a7cfe5f97d8e79f60b2b1e1a3a51d4704fed61fc7fa74bfbf7dca33178a0370a629d3b5e24ef88145caa74918
+MISC metadata.xml 311 SHA256 504c0bb46de132bd3dc488d7961d3f22748503305d9dc8e5190238d325991294 SHA512 7096d36c4522ece29f5d517f67a1c6904ed56fbf4c8e2e28b85360ec7df65de055470f310a0d79855c89df092b844e1361f545b2858be3ff50e7a0bda66f0aa5 WHIRLPOOL 324db9e13d7f2a6423cd8b3640fb7e1d8ead9ca7f6e73fefd175d8e5b0f223fc7a0cfb75abfe7ee092a6e8aa32836a0fcc368bc3650496f59528bbe2de25e24f
diff --git a/net-misc/kafkacat/kafkacat-1.3.1.ebuild b/net-misc/kafkacat/kafkacat-1.3.1.ebuild
new file mode 100644
index 000000000000..607a27250bd7
--- /dev/null
+++ b/net-misc/kafkacat/kafkacat-1.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generic command line non-JVM Apache Kafka producer and consumer"
+HOMEPAGE="https://github.com/edenhill/kafkacat"
+SRC_URI="https://github.com/edenhill/kafkacat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+json"
+
+DEPEND=">=dev-libs/librdkafka-0.9.4
+	json? ( dev-libs/yajl )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_enable json) --cc=$(tc-getCC)
+}
+
+src_install() {
+	default
+	doman ${PN}.1
+}
diff --git a/net-misc/kafkacat/metadata.xml b/net-misc/kafkacat/metadata.xml
new file mode 100644
index 000000000000..6bb4d4fe2c81
--- /dev/null
+++ b/net-misc/kafkacat/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-needed -->
+	<use>
+		<flag name="json">Enable json support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">edenhill/kafkacat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
new file mode 100644
index 000000000000..d1ca1f01a222
--- /dev/null
+++ b/net-misc/kea/Manifest
@@ -0,0 +1,8 @@
+AUX kea-confd 87 SHA256 1be5baf13ec4a9f0f2c2b1cbd6897200f48f1cf573d0f1e4c107c64bb7a0d21c SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab WHIRLPOOL 2079e9787b4b1a2e816deeda2f92f7bbe93731d66355aeb3cb516e5f3b023a4008d877b03ea987e92a657791746b8f8058abeb60fb9fe451dcc58a6dbd26c15b
+AUX kea-initd 1814 SHA256 95836d7a015d701dce79027649e85c79c726a0b6bf86ab26040c98cce31730cc SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31 WHIRLPOOL 4676d62cdf06438e6df7e11528f666f8369ed3d2229c7c70ad7924bec4c7bb03006a3646e5197e44d22413973c88613d460167da4ff2bed5d6de3247c56cb417
+DIST kea-1.1.0.tar.gz 4934875 SHA256 c3d97aee4faa19653ffe6d37e797e2fbf632124cd0b98bb502f9b97b5a383c2d SHA512 4ccc2ac493e8ce31d8a0574acac430137965aef11c7dd98a5e11ee88a157503a6efbdbf39e89b04cf7349474051affa993dd0aa65420bd783209e0a8a1d253ea WHIRLPOOL e666a81b8e645f503acefbdc4a9ca79da12eb7028d6d03d4ca1e03debfdc642f633d6ef4910692f30edf1193a0c74bd65378fa75abed596bcdac1e29371c1553
+DIST kea-1.2.0.tar.gz 5720941 SHA256 22d15945b13600b56c37213797ca1f3ee9851e6119120aeae08033c4cc52d129 SHA512 d90571027edbce9eeb75d9ac889865dc24c2fd3ab17e44e23337ff623ca098ffd02560f01273da3c28f13734d95d5950110bc116bed527a295a9dc70addcc240 WHIRLPOOL 0a91707b70396354abebba6807f44f509d95eaa8c4a4a4766fe8cea953a7c73d36d0cbea85588ec0d88d1cce0e4bc91c1ae10de92de756295b4595ec890b2e74
+EBUILD kea-1.1.0.ebuild 1063 SHA256 fbe3cf0a4c51f03c69f7f8e3f135747542f8f806541121bc37056c25e936a2fe SHA512 3b18dfe146e9c4c86ab78ee03d561e0a3a882eca0c990acfe3efcce01ff7c2ea914aa9e50c9b5b39531a7525efdc70adb046e7bbb9c35a331f443fb8564676be WHIRLPOOL f963f58098b36dddd93613fd00a7c6b9e86f109403a63fbdc946417c271b032038107f7445309e0dc91ae5780ff31d384ea75a999b00e09038cd5801fd62afd1
+EBUILD kea-1.2.0-r1.ebuild 1318 SHA256 721410da2c1c65c3c2848330122e9db2f466d5ab9078d1103132b086c4f50efb SHA512 f2696db0fc768b9522d00051720ee03ea41c7c30b031eccab289ae37ed7200516ad42b024079a0dd5174c8369a3ecd099f40226095501a38e6ed2275df6e5bfa WHIRLPOOL 6c28b4ddd153621554caae28dd48c2b7d4978a8a0cf0ce695b3a81ace1777b18225eac1350bd13a7fc2b8279908f065b32f4836b202759ac4dce92be75a1b7b5
+MISC ChangeLog 1116 SHA256 74cf1d7d499e411048291938dcd2dc3147515047b2cb73532ca464a44c3721d9 SHA512 4650b641143f72d20de5cf44efbc8c4d2fbabbf38c235c5406737b4a359155dd9bfa6ebd058aa15f2b2c075d2c646d87dcd2447be4f1668ada613afee9c1a754 WHIRLPOOL 6042cd4ecfadf49f7274a70a1b69c1f1ec775ceeb45245374d0ff9e9030bd105a62e71011b9ac2f7c271c554dcb106e147ac57cb0769fb0ff2616f44fbde3d79
+MISC metadata.xml 522 SHA256 4f5cf303a5f21a1a300b7788fa37ef0736391587730fe79b58153512c2a2f17d SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975 WHIRLPOOL 4370903ee0094234593957f3389444fd732944ac631faaca49ec6b0b63b4ad2639ff9c65588f7af6a67320e90c7c5ca41e5c7b3ea2168fb993b840429bc8d022
diff --git a/net-misc/kea/files/kea-confd b/net-misc/kea/files/kea-confd
new file mode 100644
index 000000000000..568468eb3a1d
--- /dev/null
+++ b/net-misc/kea/files/kea-confd
@@ -0,0 +1,4 @@
+# Which services should be taken into account?
+DHCP4="true"
+DHCP6="false"
+DDNS="false"
diff --git a/net-misc/kea/files/kea-initd b/net-misc/kea/files/kea-initd
new file mode 100644
index 000000000000..85fdd56b9ec2
--- /dev/null
+++ b/net-misc/kea/files/kea-initd
@@ -0,0 +1,78 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="kea dhcp services"
+
+dhcp4_command="/usr/sbin/kea-dhcp4"
+dhcp6_command="/usr/sbin/kea-dhcp6"
+ddns_command="/usr/sbin/kea-dhcp-ddns"
+config_file="/etc/kea/kea.conf"
+dhcp4_pidfile="/run/kea-dhcp4.pid"
+dhcp6_pidfile="/run/kea-dhcp6.pid"
+ddns_pidfile="/run/kea-ddns.pid"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ ! -f "${config_file}" ] ; then
+		eerror "Please create a ${config_file} config file."
+		return 1
+	fi
+
+	if ${DHCP4:-false} ; then
+		if ! ${dhcp4_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then
+			eerror "Error in config file."
+			return 1
+		fi
+	fi
+	if ${DHCP6:-false} ; then
+		if ! ${dhcp6_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then
+			eerror "Error in config file."
+			return 1
+		fi
+	fi
+	if ${DDNS:-false} ; then
+		if ! ${ddns_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then
+			eerror "Error in config file."
+			return 1
+		fi
+	fi
+}
+
+start() {
+	einfo "Starting kea dhcp services"
+	if ${DHCP4:-false} ; then
+		start-stop-daemon -m -b -p ${dhcp4_pidfile} \
+			-x ${dhcp4_command} -- -c ${config_file} \
+			|| return 1
+	fi
+	if ${DHCP6:-false} ; then
+		start-stop-daemon -m -b -p ${dhcp6_pidfile} \
+			-x ${dhcp6_command} -- -c ${config_file} \
+			|| return 1
+	fi
+	if ${DDNS:-false} ; then
+		start-stop-daemon -m -b -p ${ddns_pidfile} \
+			-x ${ddns_command} -- -c ${config_file} \
+			|| return 1
+	fi
+}
+
+stop() {
+	einfo "Stopping kea dhcp services"
+	if ${DHCP4:-false} ; then
+		start-stop-daemon --stop -p ${dhcp4_pidfile} \
+			|| return 1
+	fi
+	if ${DHCP6:-false} ; then
+		start-stop-daemon --stop -p ${dhcp6_pidfile} \
+			|| return 1
+	fi
+	if ${DDNS:-false} ; then
+		start-stop-daemon --stop -p ${ddns_pidfile} \
+			|| return 1
+	fi
+}
diff --git a/net-misc/kea/kea-1.1.0.ebuild b/net-misc/kea/kea-1.1.0.ebuild
new file mode 100644
index 000000000000..21512a24568c
--- /dev/null
+++ b/net-misc/kea/kea-1.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
+HOMEPAGE="http://www.isc.org/kea/"
+SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
+	ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-cpp/gtest
+	dev-libs/boost
+	dev-libs/botan:0
+	dev-libs/log4cplus
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--disable-install-configurations \
+		--disable-static \
+		--without-werror
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+}
diff --git a/net-misc/kea/kea-1.2.0-r1.ebuild b/net-misc/kea/kea-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..3000688d7291
--- /dev/null
+++ b/net-misc/kea/kea-1.2.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
+HOMEPAGE="http://www.isc.org/kea/"
+SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
+	ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="openssl samples"
+
+DEPEND="
+	dev-libs/boost
+	dev-cpp/gtest
+	dev-libs/log4cplus
+	!openssl? ( dev-libs/botan:0= )
+	openssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with openssl)
+		$(use_enable samples install-configurations)
+		--disable-static
+		--without-werror
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/${PN}-confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd ${PN}
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+}
diff --git a/net-misc/kea/metadata.xml b/net-misc/kea/metadata.xml
new file mode 100644
index 000000000000..0d2b93d2ea0e
--- /dev/null
+++ b/net-misc/kea/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> instead of Botan</flag>
+		<flag name="samples">Install sample configuration files</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
new file mode 100644
index 000000000000..226f98e051b6
--- /dev/null
+++ b/net-misc/keychain/Manifest
@@ -0,0 +1,9 @@
+DIST keychain-2.8.1.tar.gz 43866 SHA256 2ef5a85479783b80a52308dcd25c8f9c365e67699828ead95d4418bed399be95 SHA512 d04868f66e3dd3f75a550a261b3ee0dcc1e2f1dfa058f673305bc60c20eda867099d6ae53f4e92be521a66c630ca3e585bc1a19f58eaadad1441ad5ebe27f926 WHIRLPOOL 64d39f06eb9fd5ca36b4e2981c462509537c5561d4c0de88e0c6d8192703def2c73765fe7f102439265656bb6e586bd3ecfe59b8f1f4225f09f3d4ebe3cce91a
+DIST keychain-2.8.2.tar.gz 44211 SHA256 70fa782fb701b0893ab69832214b2d9158fa7f0c18cec36bbd94ac6402816af2 SHA512 741cffb5affaeaf2cea701d76e3bae8a0cbc2b781bf5d578001e763cee531011aacfb1754974afcb63e6d46588716e62e5f96fff63eff76dd5ad8ee7e16ac196 WHIRLPOOL 2edcc8d07fd087001b7075709bdded482e3b17f0f297c45ccf7ce5d9680c79f3fbcf58b3fd7adeea5c435727075d6bdcf4ae47b7cc865efcd83577eb00375c82
+DIST keychain-2.8.3.tar.gz 44205 SHA256 23e672a15a25687eefd04bf97f7c2605245ac5ddcb3ac5de53a257a78921c2a8 SHA512 493f376fff386069202eadcbef61140e8e66d195e7f73574948e69d8e778bd8f2c2926a174cd25b4380c17f0fb769d423a3b36af4a98aa39f55db22c45216447 WHIRLPOOL 6a55439ebf10d873c62dc4f7f94801f4b644a1efc14f40952f7b38eb0efdcc558b1fe4a8b323119337eb52495cb618bbd9b8a38d7af979329db99dfda8e6b20a
+EBUILD keychain-2.8.1.ebuild 705 SHA256 6ff29d53a952a62c295864312e81dd8fa4eae2f212a8dfdca2e68eccaf56d2b6 SHA512 608bba609fd88133fec2f767644bc259d4516ae9ba4001199490a5962a4e1ec1b207a9bf885b51877a9dab212e8e26e8b9e3ca46714c0c43ac79455d7092722d WHIRLPOOL 40873edffd955289953ecb58e8ec5fe8f147e39b2583d40b98b7d2da8ab1453aebb60378d6f04848ce820e1bfe2880c7c09d88a063817aa03a5633cbbbe5f193
+EBUILD keychain-2.8.2.ebuild 718 SHA256 f946d2f87c8ad85e04f57b49e839fec6393782c8767a4d50c785f8526fce37f2 SHA512 b3e58f2d3fd2ca236f3386924f2dfa333188ed3eb0cee8dde8500b5dd14b60e78e0a4a205dc7f7da78b4eb369b82223a9033fa3636ec947ab892e22ce5dd6c89 WHIRLPOOL 3eaa75aeed9588282015bdee50b8476d8bf02878e3acf798b0906dd2dd82245fc526fe996d4a7b8d45f952b499f880b03f2164071cc0ff474d3ed3b92321dc93
+EBUILD keychain-2.8.3.ebuild 715 SHA256 b4a741342ff029266a1210a3e7ef41258fc2dfaf3d8ded57fd502aab69af53b7 SHA512 9463aaf2684ce0491c2905e5d11c227e1e7b856b1ce68a627bdb06c404919da9afd251066b7d908a4b58902c6c9f1ebc8cffd68de4a842a0ff8cb3738dc0d734 WHIRLPOOL 761c3b25fc71a2091b4c85a61bd4f4cc649b6a05d866b38f85883d620cb296db574ac1ff0bf24714b968f5799424332332b2e904a007c82d043608251aa2cb09
+MISC ChangeLog 3943 SHA256 398bcd4031f3b71d873e358f651cd701fd97a88cb0f2cccdd44a11f7bcccacd4 SHA512 173d997957fa5eb17a8ece720480abc63e1b56d34c3d9cedc6074910f3035449f0fe9d8cd6f46c4d5d882be6fb3693bf701e0b715ae25d07f32951ea2e58065b WHIRLPOOL a12c0a6fbeb8e1c49e2392d03373d1019db9cd89ac52a6c9e00026e844a385fb52b4b13cbac81a2c3b602f302ede336d834f071b16e6ec669f7b6286984fa447
+MISC ChangeLog-2015 18718 SHA256 d5cfa8c4416c777fbe312396149e69d9682b8b86af6f4fefb1bfe189fc0bbdb3 SHA512 ccb56097e9303af6771e7fba207e20edcc9b5a8207513fc0be85122975a397404b46abbea2a337f4cc342db05fce5848774639f9aceebaeb73741cf11f773a88 WHIRLPOOL 7226c079a27b76d6d97ea73a9bf2f28cdbbb66c8d2506ec80bf99ec6452b12a733e49b476fb86437de266c1bea2ca49dadc21856e7ef12ae2a3541eeb0e869f9
+MISC metadata.xml 512 SHA256 e35a0877699ed5938ad30300d0b43ab12cc5a0d33d744f446d375c5d48f505b0 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a WHIRLPOOL c764b0acf6a32a15eac655f8af41ce16c2a45adb7b6e5c3065f843a06ff8b567d1aa88aff8de4ff805430c086d740fca00d0a9386b9e31aba1a309e0573fb897
diff --git a/net-misc/keychain/keychain-2.8.1.ebuild b/net-misc/keychain/keychain-2.8.1.ebuild
new file mode 100644
index 000000000000..67e765fe3a52
--- /dev/null
+++ b/net-misc/keychain/keychain-2.8.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner"
+HOMEPAGE="http://www.funtoo.org/Keychain"
+SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README.md
+}
diff --git a/net-misc/keychain/keychain-2.8.2.ebuild b/net-misc/keychain/keychain-2.8.2.ebuild
new file mode 100644
index 000000000000..708ffe25db4d
--- /dev/null
+++ b/net-misc/keychain/keychain-2.8.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner"
+HOMEPAGE="http://www.funtoo.org/Keychain"
+SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README.md
+}
diff --git a/net-misc/keychain/keychain-2.8.3.ebuild b/net-misc/keychain/keychain-2.8.3.ebuild
new file mode 100644
index 000000000000..4a14fc7ba283
--- /dev/null
+++ b/net-misc/keychain/keychain-2.8.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG"
+HOMEPAGE="http://www.funtoo.org/Keychain"
+SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README.md
+}
diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml
new file mode 100644
index 000000000000..41ea37ccc337
--- /dev/null
+++ b/net-misc/keychain/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>drobbins@funtoo.org</email>
+		<name>Daniel Robbins</name>
+		<description>Upstream contact, please CC on bugs</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">funtoo/keychain</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/knemo/Manifest b/net-misc/knemo/Manifest
new file mode 100644
index 000000000000..199e35c24764
--- /dev/null
+++ b/net-misc/knemo/Manifest
@@ -0,0 +1,5 @@
+DIST knemo-0.8.0_pre20161211.tar.xz 408160 SHA256 e8c5e6f338d8617233636ba83979f545323bff502fe5f1c8a54b18194f8bcc85 SHA512 5d035e8a48c528ddec9fa0e288cf65df2810516a9d545b1ca4e56b1e2e4369fe82baab355a4950791a515395275931f04db743f82d4e570ea012dab83e6ae22c WHIRLPOOL 42ec8ffab1ae0d0ef3a2cbeef6a269d59bb84e0ca2b2ddf8578f8b1201eab0124e5db2f118bd1bcca93da3416068264ded0bb2c06e332062ae31e67c4b1363e7
+EBUILD knemo-0.8.0_pre20161211.ebuild 1347 SHA256 24ccb2a328d8f266c737288fa362658f7054a19b50f8d97ca5ad143f21636c63 SHA512 796e5587f25447f3e4b65e5e4deec873d7989bbcfbd7d033577b7a039f80d098b0b76ebee6e0eb6b89c39d752a12cd6884b110a803135a4a468257f72f699178 WHIRLPOOL f0896f43d98d4e560714acebc284cd2df3a7be1b20e9d137493ac79882b256340d2cbd5a632da701072bc570e17065c248196f8dbbe55283ceb7151b7fddf6ed
+MISC ChangeLog 4404 SHA256 5f560a2a0bc39d79579a1f0e009c148133813582388ba7492ac7baa840a4ab3e SHA512 505c6269c1b8c4db58bf51c585ffec1a6f28f5a89c75d89eacbc98116794c851fcdc580db693cc9b19051b131c026b7fbbb53e53f675a0e72aa06eb19ccf539f WHIRLPOOL 8e5ed95afe171bf46eeea19438d08eb2d56ec8eb7d167f363f2bd17aa64ef0eeceaee85963326225bc874229592bd502f9f24a41cb45c5da43766847958b1931
+MISC ChangeLog-2015 9431 SHA256 9163c52ebc0a79fbe2e29f543de9ba28b73855681a41d9eebcb9aa485d212d94 SHA512 4f69fc8f8f62769113f49c9e58069314c880455762a5e99088af91fb2300081279272cc36bac27d84ec78ff3492775cc24c759639413ea400ddd2e51e2d5ab85 WHIRLPOOL 9fae3a64f45192fa364dcd96f5cd9ea242395ded65aa8f4d5c9fa8fed63bbbf3ae70c69a9bc4ce74bd2f7bcad2d90b0d3ea59376b75c3451cd5dc42f2f8b7611
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/net-misc/knemo/knemo-0.8.0_pre20161211.ebuild b/net-misc/knemo/knemo-0.8.0_pre20161211.ebuild
new file mode 100644
index 000000000000..fff209a338d2
--- /dev/null
+++ b/net-misc/knemo/knemo-0.8.0_pre20161211.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="frameworks"
+inherit kde5
+
+DESCRIPTION="Plasma Network Monitor"
+HOMEPAGE="http://kde-apps.org/content/show.php?content=12956"
+LICENSE="GPL-2"
+IUSE="wifi"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="amd64 x86"
+	SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
+fi
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep libksysguard)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libnl:3
+	sys-apps/net-tools
+	wifi? ( net-wireless/wireless-tools )
+"
+RDEPEND="${DEPEND}
+	!net-misc/knemo:4
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_WIRELESS_SUPPORT=$(usex !wifi)
+	)
+
+	kde5_src_configure
+}
diff --git a/net-misc/knemo/metadata.xml b/net-misc/knemo/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/net-misc/knemo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest
new file mode 100644
index 000000000000..fcb742d6daf1
--- /dev/null
+++ b/net-misc/knock/Manifest
@@ -0,0 +1,9 @@
+AUX knockd.confd.2 189 SHA256 2868234c98cef615976deec683517faa3fd9c063491877e9f7254d47c32d3a45 SHA512 75a483770c31f8de3744c9c3119c5cf818b9ff780bf9cffb49c1f4a78b2f384dc392218ea2a0df9fd7178a19b0b1f5a59d8a81cdb56f952cd4c8e5a91c9cf25a WHIRLPOOL 5168aef5799f6db5fa7a3397e5a3f978d84f3499932831386b47407a539d216e07c24c3f9eff217c3c3b066755377f6882a82ac9c5958218f9358c018cff6019
+AUX knockd.initd.2 527 SHA256 317d7ec0304bd07e5e70185b93f649b908ef039a0efe2cebe0b5a8266bf0d659 SHA512 dc66e53bdc42487609d978a538dec26712f25c87b9a2e4a70e1a833fedfbacf3b8618f87cbe110ed54938f6620fd2e5f7a79143d7f8503927686dfa26eb9acff WHIRLPOOL 82a64d75abffc4e7de626ddfbe9f8c5cbbe2a5b9c4699857246e048c5d0d698501743a1a9d76ce1932f1d703bbef0ceec00c3fc70a576ad8c851523be3bfb6c3
+DIST knock-0.6.tar.gz 125772 SHA256 75a4e8ef8c59efa2cc910375191162adf0deeca20b7ab80d9eb0072f696ca541 SHA512 79179fe0358abfeb001b787522154b5045f9dd679e8b6bea0f375a064e56ed5166c20dee094b42d56338afdf19041c94f4c86b8d5d385d1cc02ca525c1b73714 WHIRLPOOL 556c27ac8dfaf58fa866b3644bbb4557dbbaf3f42896024825eccaf25896fa436685a1f1afce2ffe617c7948e368e189c1b00ddf83e19761886fde0c9c33ac02
+DIST knock-0.7.tar.gz 110791 SHA256 9938479c321066424f74c61f6bee46dfd355a828263dc89561a1ece3f56578a4 SHA512 eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7 WHIRLPOOL 6d25c5d68edf5f1da9eeb8814f965fd0cdbb5c9cadd08895566200d61373481e8f9100818809c6048909112e37c7c95dc0fa558dd9f01e95cb22207583d2d64f
+EBUILD knock-0.6.ebuild 1127 SHA256 9880d25076434c2f5374942fe7714e8103acb5d450cdd87e501ce66dc45e98d8 SHA512 51ed99834624fa07025cc16f7cd2f6f019dba76efc1d275d8c4459eab9b69f4d7bfa02705ec37efbb4353bc0293683b572f28c7070adf28aa61b078af240d933 WHIRLPOOL 1534e0dbd1618e4b30e252b102bb1ae2548fc2f8817072323d61b6608233887699e7ce08e5ff1fdf52415532af05d657949da9b0cd34d1b36d0eb7b985e096f6
+EBUILD knock-0.7.ebuild 1127 SHA256 7bcb7892b90d543b379a45e2dab55413de16b8115823f419dabc26ba24c6c03e SHA512 cb6805c8e4c04c8eaf4cd8ee2607ecace433cd8fbcfab88b99f4de8262a73ce137cdf70126d65ed396ddf3017a34ef9b0827ce8f0690293fbba7f921ca1b67fe WHIRLPOOL 5e6a03f61c23c4182ccd6437c0a4ab57571b3c4f3bf5ccd6441a781cfa1d6f9c195de6ddec0017e2927ef2faa389ae497c582342e888772a3304c67074b7bde3
+MISC ChangeLog 2780 SHA256 dc6e6ee5d52c31ecf4f2071536f218a056cfdd3271b9db4091d156c17d8604fe SHA512 3959046a3c138176dc4fa912348cbcded79b9c424b330660d86827adcab2efd5600b2e40cf3f1b3500cd5e72f980518957e93cd47cdaa061caec220dada4090b WHIRLPOOL bdfc201ef63748ad8425fc79deb4861eea27f76ec3ac77100c01646b103b2a7d62821b3f982e37bbdeab22a84c7a375ad85807e0731efabf20f933361302a095
+MISC ChangeLog-2015 6367 SHA256 fae642384aad9a5cdb46fa5f6651a82ceb28c636d62ef4a0908056fcef0825ba SHA512 262fd64daf8e8d2e8f8efe18ecf4dc7580bc4d1d6470b8264ad5437b8990435414780285d2084cdbf772b6083c3c7fdf142194b3303bd586ced86b2ddbe088b2 WHIRLPOOL a96a659d08fc9a19dd5ecd3cbff4006d70d0dd48f0c0767f52f61e8f67ebfb39e2e9876138b71999bdfaecaee58646c5fdb7349a5ae52b91cc08654d4f95d50c
+MISC metadata.xml 329 SHA256 b169dad31f7d5a659a306b476a6523ef63edb2b246f5c19af71e837bcf6abfbe SHA512 63dcbc6ad7c410cbc4c272afb60025a09f43929f54a16f23fa33e7f3f32f6cd34b2c4002298c6e27b9e115c0970cd3b5d0ddc626a6fd9bc2b75e5eaadbd56db5 WHIRLPOOL dac3e513a35bdbbd0c4b42216d978ac850ddf480fefbede24eef8582b97d35a440d8a526a2e6c9a2bfc408d9aebc0ab1d061dc2147d173a8e8bc16ada0abb1eb
diff --git a/net-misc/knock/files/knockd.confd.2 b/net-misc/knock/files/knockd.confd.2
new file mode 100644
index 000000000000..335a522fccb9
--- /dev/null
+++ b/net-misc/knock/files/knockd.confd.2
@@ -0,0 +1,8 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# interface to listen to
+IFACE="eth0"
+
+# extra options for knockd daemon
+OPTS=""
diff --git a/net-misc/knock/files/knockd.initd.2 b/net-misc/knock/files/knockd.initd.2
new file mode 100644
index 000000000000..1d80f5980afc
--- /dev/null
+++ b/net-misc/knock/files/knockd.initd.2
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+: ${CONFIGFILE:=/etc/knockd.conf}
+: ${IFACE:=eth0}
+
+get_config() {
+	[ -f ${CONFIGFILE} ] && conf=$(awk 'tolower($1) == "'$1'" { print $3 }' ${CONFIGFILE})
+
+	echo ${conf:-$2}
+}
+
+depend() {
+	need net
+	use net.${IFACE}
+
+	[ "$(get_config usesyslog no)" != "no" ] && use logger
+}
+
+pidfile=$(get_config pidfile /var/run/knockd.pid)
+
+command=/usr/sbin/knockd
+command_args="-d -i ${IFACE} ${OPTS}"
diff --git a/net-misc/knock/knock-0.6.ebuild b/net-misc/knock/knock-0.6.ebuild
new file mode 100644
index 000000000000..d2885f75f620
--- /dev/null
+++ b/net-misc/knock/knock-0.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A simple port-knocking daemon"
+HOMEPAGE="http://www.zeroflux.org/projects/knock"
+SRC_URI="http://www.zeroflux.org/proj/knock/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="+server"
+
+DEPEND="server? ( net-libs/libpcap )"
+RDEPEND="${DEPEND}
+	server? ( sys-apps/openrc )"
+
+src_prepare() {
+	sed -e "/^AM_CFLAGS/s: -g : :" \
+		-e "/dist_doc_DATA/s:COPYING::" \
+		-i Makefile.in || die
+	sed -e "s:/usr/sbin/iptables:/sbin/iptables:g" \
+		-i knockd.conf || die
+}
+
+src_configure() {
+	econf $(use_enable server knockd)
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EROOT}/usr/share/doc/${PF}" install
+
+	if use server ; then
+		newinitd "${FILESDIR}"/knockd.initd.2 knock
+		newconfd "${FILESDIR}"/knockd.confd.2 knock
+	fi
+}
+
+pkg_postinst() {
+	if use server && ! has_version net-firewall/iptables ; then
+		einfo
+		elog "You're really encouraged to install net-firewall/iptables to"
+		elog "actually modify your firewall and use the example configuration."
+		einfo
+	fi
+}
diff --git a/net-misc/knock/knock-0.7.ebuild b/net-misc/knock/knock-0.7.ebuild
new file mode 100644
index 000000000000..4d4cd638c54a
--- /dev/null
+++ b/net-misc/knock/knock-0.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A simple port-knocking daemon"
+HOMEPAGE="http://www.zeroflux.org/projects/knock"
+SRC_URI="http://www.zeroflux.org/proj/knock/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="+server"
+
+DEPEND="server? ( net-libs/libpcap )"
+RDEPEND="${DEPEND}
+	server? ( sys-apps/openrc )"
+
+src_prepare() {
+	sed -e "/^AM_CFLAGS/s: -g : :" \
+		-e "/dist_doc_DATA/s:COPYING::" \
+		-i Makefile.in || die
+	sed -e "s:/usr/sbin/iptables:/sbin/iptables:g" \
+		-i knockd.conf || die
+}
+
+src_configure() {
+	econf $(use_enable server knockd)
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EROOT}/usr/share/doc/${PF}" install
+
+	if use server ; then
+		newinitd "${FILESDIR}"/knockd.initd.2 knock
+		newconfd "${FILESDIR}"/knockd.confd.2 knock
+	fi
+}
+
+pkg_postinst() {
+	if use server && ! has_version net-firewall/iptables ; then
+		einfo
+		elog "You're really encouraged to install net-firewall/iptables to"
+		elog "actually modify your firewall and use the example configuration."
+		einfo
+	fi
+}
diff --git a/net-misc/knock/metadata.xml b/net-misc/knock/metadata.xml
new file mode 100644
index 000000000000..8d375f5d42e9
--- /dev/null
+++ b/net-misc/knock/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+  </maintainer>
+  <use>
+    <flag name="server">Installs the knockd server daemon.</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/knutclient/Manifest b/net-misc/knutclient/Manifest
new file mode 100644
index 000000000000..583b2f64f0c0
--- /dev/null
+++ b/net-misc/knutclient/Manifest
@@ -0,0 +1,7 @@
+AUX knutclient-1.0.5-desktop.patch 360 SHA256 d0a25c5aaaa1e1c05023d84b883799fe3d96b08cc18653ed94acc5aa70497822 SHA512 8a0c194d5600fab6521cec39e48da5269b0fbdb45a17ec7230e6443f98391a57707c9885aad16ca36e1516def218e68f9edf825be1338c1f4e5d69b5e9f48813 WHIRLPOOL 907f5eb00840a8b4e2b3664bda6b512272e269addb52a2245af42b86a19779e48ec083653320d95cacb4c8fbb6b44ca0212552e77ab61ef41f8a44553dbe0d3b
+AUX knutclient-1.0.5-gcc6.patch 644 SHA256 59474401230cf15d2725e12a4f8bbcb948515ecbc703e09171d633a62763254a SHA512 4522c1dfcfc91f7942e9a4a6c81aac466a48a46c8cb209e2a780b20fbb38d7cd69ed9ee692bf4193f75c6df6ce12e5141cee4a29e4dee644113f64793a963bae WHIRLPOOL bef42b39aad97f87afc3fd92ad28e4eccaa4c23397d0af007e3ef267e8beecf07775f0ce58f20a459fe048c12fcc7cb75c71c0c399da60914220bc0bca9f8926
+DIST knutclient-1.0.5.tar.gz 1413989 SHA256 470ab12d5a8edf67f17ed1a52a12bd1977c22c68d5b0348ba812a24dc960b126 SHA512 24e8495f1c3d31e76885bbda3f3c4459e7426271c8bc1410d3e0cb37b829ed660cd87db7c57a54d522e1788297f6d23ab617a44e8dcf7f3f48b5077a58bfc2d6 WHIRLPOOL 552d133ff96182688a5bc8be7406715470c874a40256b1b423c2d04e4ed282408507ad5d95e1ec35dc54f757291e641c6509302340e36c35648040c22047340d
+EBUILD knutclient-1.0.5.ebuild 600 SHA256 4f4afdd2273fe3b8b7593f9db6182357aa69405a0b4b947beab0e165161cf0d5 SHA512 ff512e4fb67b05a0ee253a440a4845f332e03c25ff1d69b5eca8486b28d55eecb56dcd5c0a4fda3687c60801d1458cc83d8ffd0e5afd6f63022050e5cf4ad5d1 WHIRLPOOL 7abc0b7304568afc2435d0e04481a40a873dd8010e209845c46108899333e1069b4ee82e2f71d49553916e1899bc58e712147dafaad475f07204d6fd6dc3c2f1
+MISC ChangeLog 2635 SHA256 653ce1b29bc30ce93a2466e6a388dd5ab4b0c4dffa19d7c7aeaad6f0f3c1f880 SHA512 70f87d0668addd02aa01517ed13d67aa825e857b0890cf50a3673c2d97d02ca272516eccdab2131cc84c604e55bc0d94c1c99d5f25a1eae91982b3b2658216f7 WHIRLPOOL 63dcac88a02050bdfb92972a118d243211785ce26697696da4f3514594c69c31c834c38c2a33f4d9ea9edfe1ab1fdcce3ee2f9b66061f206c8f31b63d58eb2fc
+MISC ChangeLog-2015 1053 SHA256 78158a010ecf78dec55e366af2bb2a830800e52f23bdf3cdd4feff057a169313 SHA512 7d59b1c2c110a7d6d3126f07f3c2e428407e2c944f581d06abd6ce129d91d6e90a811f1cd0b5786a6129e92c7afc842e129d65ce5544edca4dbd50f90c921d83 WHIRLPOOL 5cb0d5b5e3335c4989d6d554d93d7332e06c43159c033d3b6f8240b88e1e2f40c8655b9497c2d2908e68994b492168c4f8e8514aff511221f37db7d5dda683b7
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/net-misc/knutclient/files/knutclient-1.0.5-desktop.patch b/net-misc/knutclient/files/knutclient-1.0.5-desktop.patch
new file mode 100644
index 000000000000..4548a44d39f3
--- /dev/null
+++ b/net-misc/knutclient/files/knutclient-1.0.5-desktop.patch
@@ -0,0 +1,15 @@
+Removes deprecated and useless items.
+
+--- a/knutclient.desktop
++++ b/knutclient.desktop
+@@ -6,9 +6,8 @@
+ Comment[de]=
+ Comment[cs]=Klient pro UPS syst� NUT
+ Comment[es]=Cliente KDE para NUT
+-Exec=knutclient -caption "%c" %i %m
++Exec=knutclient
+ Icon=knutclient
+-MiniIcon=knutclient
+ Type=Application
+ X-DocPath=knutclient/index.html
+ GenericName=KNutClient
diff --git a/net-misc/knutclient/files/knutclient-1.0.5-gcc6.patch b/net-misc/knutclient/files/knutclient-1.0.5-gcc6.patch
new file mode 100644
index 000000000000..f52f6b4b089e
--- /dev/null
+++ b/net-misc/knutclient/files/knutclient-1.0.5-gcc6.patch
@@ -0,0 +1,18 @@
+Forwarded: no
+Description: Fix the build with gcc 6
+Author: Adrian Bunk <bunk@stusta.de>
+Bug-Debian: https://bugs.debian.org/811882
+
+--- a/src/knutprefdlg.cpp
++++ b/src/knutprefdlg.cpp
+@@ -957,9 +957,9 @@
+ 
+   QHBoxLayout *setFontLayout = new QHBoxLayout();
+   QStringList fontsList;
+   KFontChooser::getFontList(fontsList, KFontChooser::SmoothScalableFonts);
+-  m_fontWidget = new KFontChooser(mainPageWidget, false, fontsList);
++  m_fontWidget = new KFontChooser(mainPageWidget, KFontChooser::NoDisplayFlags, fontsList);
+   setFontLayout->addWidget (m_fontWidget ,0);
+   topLayout->addLayout(setFontLayout);
+ 
+   topLayout->addStretch( 20 );
diff --git a/net-misc/knutclient/knutclient-1.0.5.ebuild b/net-misc/knutclient/knutclient-1.0.5.ebuild
new file mode 100644
index 000000000000..389a781a3bd3
--- /dev/null
+++ b/net-misc/knutclient/knutclient-1.0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+KDE_LINGUAS="cs de es fr it pl pt_BR ru uk"
+KDE_HANDBOOK="optional"
+MY_P="knc${PV//./}"
+
+inherit kde4-base
+
+DESCRIPTION="Visual client for UPS systems based on kdelibs-4"
+HOMEPAGE="https://sites.google.com/a/prynych.cz/knutclient/"
+SRC_URI="ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+)
+
+DOCS=( ChangeLog )
+
+S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/knutclient/metadata.xml b/net-misc/knutclient/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/net-misc/knutclient/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/l7-filter-userspace/Manifest b/net-misc/l7-filter-userspace/Manifest
new file mode 100644
index 000000000000..571c8bf342bf
--- /dev/null
+++ b/net-misc/l7-filter-userspace/Manifest
@@ -0,0 +1,12 @@
+AUX l7-filter-userspace-0.11-arm-ppc-getopt-help-fix.patch 544 SHA256 7a490acdc8033e0a198a1e581c7d1efa93142bd7af1a576bdb6d9c1332d9de43 SHA512 d541dc919d715bd591a145c0c39dfee86f953761461bef7cfe10c462d99115bac94ad32ebe2cb2f53acb4ae7a4e537a0039c805343f8f26bda3e74a3c6a71a62 WHIRLPOOL e58b589767ab224da0147a573a7070f8ca9c4c48ecaeaa44f5f78c00523e9000b1bc59fdf53b47a8d165b3cc327dccbaae7fa894af86a2afdcdcf668e3514633
+AUX l7-filter-userspace-0.11-datatype.patch 439 SHA256 b2f93241b82ba1b8181e189e8910f64db9bc01b49fba5693ac5fa9d249363d85 SHA512 1dd2830ad2ad0e25a618d2e90c25b46d8c25b2753b5e82fde662abad95ec9135ca05defe2ce7519500a413c4dd996d86574a7225000fc1d2bcdeec7931254bc0 WHIRLPOOL bab2680d967863c43652ffa35b613acb432037101375cb3214ccb43cc0c6cbacd50238c192f9274b454b077cd17b2ddf03aebccdbe7bc9d77a25cea25c84d20c
+AUX l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch 3991 SHA256 bc3469249333f42df8f67226099d23d22c0fb640ad5b0b770fc846716a0f849e SHA512 5c5addfa5887c280cb98ad72aa2c9f10b28055847593c21c90087a7330138e1b0a12b5ed962cd5fb08eddd7436a21694aaef5b298d862c328dda27471001d89a WHIRLPOOL 627fa99e16c352ae9515e299ae2cc28f651fff8c102e17c2ffa70d77c3f92ff3ce91cac87149bf3299f66a309feedfcff2064e7383f529fc9c1aac7a29e923cd
+AUX l7-filter-userspace-0.11-map-access-threadsafe.patch 1642 SHA256 b9f7fee22a5ce6d43750b3aa303bbf2116dac7c7420ae860dcaf447ad3a5e09c SHA512 f2c2f7d4c265648b4400f5bc955d8632ac54858f8adc26894b866044079b951e1146d8c09fa40fc3514005c6ed9f4cf86c595b3c24652aaf0d021f139d15dc25 WHIRLPOOL 0f2ebd77124321c0b63e946b361886e1e69251608fe552ea78b9d2e0cb30ab632d49856d974efc342b106ba5d63ccab45a624022480b41036b279c52fa38bd1e
+AUX l7-filter-userspace-0.11-pattern-loading-leak.patch 436 SHA256 6a948eed1080f22d372801eb6c8aac27053c7e2f3426694adebe55d625eafaf2 SHA512 3cff06e0320eb2190f622367c9f0c59b81daf6c119ca0b2e0949741b9c1ef61d071a668cf85dbd524a8ed0f723fc61a95cd6ec3fd0fb9ad8ffa7e6c1153c9a07 WHIRLPOOL 749140285555f470a5034aa2ccf543846a4aefc58449f57c4b924cc342c6b185004b60c8537739f28a71380957dbd9225f02fa7ec64c294aa9591c3f19a13a90
+DIST l7-filter-userspace-0.11.tar.gz 129986 SHA256 008a62430f95a162fd209d4bf3d7359c588ca4b27f89c7bcaa7a10ff48591d97 SHA512 5362a9e7392afd6dcb40bd9f602bddd34c040dcecbcc4570f56168310bd0e243561a1c946c7e912448518fe30c6bcff866c000b9e026dc96b2f3b47b4299cb81 WHIRLPOOL a0ea019ccb2b1753b3ba3a3fafb27bd456325ac1098f984d198f37eebdc48d3f737dd6b9fbbd0023d383e63f8f7a24d2db7e3d9c76325242f82c0762bdf9f65b
+DIST l7-filter-userspace-0.12-beta1.tar.gz 130254 SHA256 1f4503c219334fba9c696c2243a3e926e5b299916baf1512ff6969da2d399d29 SHA512 9c49b7e951ced6a44f8ee6f3a261ba14b1e3fe44a83e175f7f5a5821616ec8bc2b0a287f10b4485120e7783c9623c34aae2ee1d8997c258cdfb8230c1f87d137 WHIRLPOOL 719bd6fb3513a676fdd4de828095e847565040993676cadcc4e5dda46459edb578355a13086d5f8bb5575fe32e2df1e835029cfd0bb0e50884e75f37c409ccfc
+EBUILD l7-filter-userspace-0.11.ebuild 835 SHA256 00e8a08386e0e1d981e20841f6fdfaabcec5704625b77311cfbbaef366e21e82 SHA512 a1208d48000c5d9059a4747bc9a9e026fc80c9687f4380d65fd34c15635e08141617220024da27af0a9270990e5dc9f305039c8b033291d88cd0e42e2f0ea50d WHIRLPOOL b736d1c474a804c8b83977fbf6e7187552ffafab156e41f9c79cb3bfee7cb9548ca4d656bda21dd025ce4a92387553afcae32758e8cd55c60417009f54e11483
+EBUILD l7-filter-userspace-0.12_beta1.ebuild 784 SHA256 96eff689195456b2084cf9831f04287bf9b41a0d05500796a00d14e9313feaf8 SHA512 ba9ea52595538ab267b21ef060c626c5ca50a0f4696430010c73a63ffe011ae62e6aa3e81a417267f9f351bf4d16fe1ff7de0d231c0f673debe63ed676b90556 WHIRLPOOL b545231bd9979c767becb6b1ec49d1385b4dc3507781e6c03bbd67b2124f30a607d65a2fc66835dd1ac591b60dfe30a3d80e50254a7de8a1df546c8fd9f88a49
+MISC ChangeLog 3156 SHA256 c0046e4a51db408ba26811878639b2968530a126e24ee8d747e836f72ce56860 SHA512 f34b9e17b350e836cbe99f2e1eece726f01add2d2e21bfcde154d5944fd710bd6058d1bbe620d299a73369dee121a9679139e91c77e5ffbbcfe2eb3d615bdbfb WHIRLPOOL 7c3674c3d5dd36fb5b0046b7f14b63522d84aed6f5392caf244cbc597ffb8e0eb3d51c612dcb284bcc24b9e8a4e3cf2865e04b533699ebb2e3740de5c6751ab2
+MISC ChangeLog-2015 4101 SHA256 29b027ba8848ef9044fd708fa17196d99825d3bfe033ea052f59c21ddbd6c501 SHA512 ce2c959ffcd9dd552facf80ba90c9d56b32324cfdac0265ce4b62e6ae0ac25ed41aed1322fac6c560599f3871b5758c5f0721e69497bff7598b2b092f7da8cdd WHIRLPOOL a004c808dc0627eae0155195d2669734ebeea8ac052d7df5d8da53f97453be45e77c1a056fbbbd084ebc1d8d6a29c4e6e3f76c852f8b81e6c45b0ad333e22018
+MISC metadata.xml 339 SHA256 254b3ba1a037a9a7a91621c6e30f0c38e79b333f5a4d945f7741194eb281ae2f SHA512 0469b7f26947f80af251def403ef1710c26ac6a0aab162fdfd2f506b5a3262aca62cca0540200702e8e865199d565ca3a782297eed2ba58e28f098145248280c WHIRLPOOL 695b5c3a91fdc4d926c680e5f8876e0853b012a50e0215360d2dfdcacb240877fca96612c00d8a1fadd4f15768f6a3ccadff363235ee420ad25199a8beea2f20
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-arm-ppc-getopt-help-fix.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-arm-ppc-getopt-help-fix.patch
new file mode 100644
index 000000000000..29801ceed31a
--- /dev/null
+++ b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-arm-ppc-getopt-help-fix.patch
@@ -0,0 +1,21 @@
+--- l7-filter-userspace-0.11/l7-filter.cpp.old	2010-07-12 10:43:58.485002456 +0100
++++ l7-filter-userspace-0.11/l7-filter.cpp	2010-07-12 11:14:38.825001868 +0100
+@@ -186,15 +186,11 @@
+   conffilename = ""; 
+   const char *opts = "f:q:vh?sb:dn:p:m:cz";
+ 
+-  int done = 0;
+-  while(!done)
++  int c;
++  while ((c = getopt (argc, argv, opts)) != -1)
+   {
+-    char c;
+-    switch(c = getopt(argc, argv, opts))
++    switch(c)
+     {
+-      case -1:
+-        done = 1;
+-        break;
+       case 'f':
+         conffilename = optarg;
+         break;
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-datatype.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-datatype.patch
new file mode 100644
index 000000000000..eb49c595844b
--- /dev/null
+++ b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-datatype.patch
@@ -0,0 +1,11 @@
+--- l7-filter-userspace-0.11/l7-queue.cpp.orig	2008-09-27 10:51:01.000000000 +0400
++++ l7-filter-userspace-0.11/l7-queue.cpp	2011-11-05 03:11:08.595773935 +0400
+@@ -196,7 +196,7 @@
+   ifi = nfq_get_outdev(tb);
+   if(ifi) l7printf(4, "outdev = %d ", ifi);
+ 
+-  ret = nfq_get_payload(tb, &data);
++  ret = nfq_get_payload(tb, (unsigned char**)&data);
+   if(ret >= 0) l7printf(4, "payload_len = %d\n", ret);
+   
+   char ip_protocol = data[9];
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch
new file mode 100644
index 000000000000..6cc941ddd1a6
--- /dev/null
+++ b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch
@@ -0,0 +1,104 @@
+diff -Naur l7-filter-userspace-0.11-orig/l7-conntrack.cpp l7-filter-userspace-0.11-ptch/l7-conntrack.cpp
+--- l7-filter-userspace-0.11-orig/l7-conntrack.cpp	2009-02-26 21:40:28.000000000 +0000
++++ l7-filter-userspace-0.11-ptch/l7-conntrack.cpp	2009-10-19 17:40:42.000000000 +0000
+@@ -121,25 +121,10 @@
+   return (char *)buffer;
+ }
+ 
+-static int sprintf_conntrack_key(char *buf, struct nfct_conntrack *ct, 
+-                          unsigned int flags) 
+-{
+-  int size = 0;
+-
+-  size += nfct_sprintf_protocol(buf, ct);
+-  size += nfct_sprintf_address(buf+size, &ct->tuple[NFCT_DIR_ORIGINAL]);
+-  size += nfct_sprintf_proto(buf+size, &ct->tuple[NFCT_DIR_ORIGINAL]);
+-
+-  /* Delete the last blank space */
+-  buf[size-1] = '\0';
+-
+-  return size;
+-}
+-
+-static string make_key(nfct_conntrack* ct, int flags)
++static string make_key(nfct_conntrack* ct, int flags, int type)
+ {
+   char key[512];
+-  int keysize = sprintf_conntrack_key(key, ct, flags);
++  int keysize = nfct_snprintf(key, sizeof(key), (const nf_conntrack *)ct, type, NFCT_O_DEFAULT, flags);
+   if(keysize >= 512){
+     cerr << "Yike! Overflowed key!\n";
+     exit(1);
+@@ -148,28 +133,28 @@
+   return key;
+ }
+ 
+-static int l7_handle_conntrack_event(void *arg, unsigned int flags, int type, 
++static int l7_handle_conntrack_event(enum nf_conntrack_msg_type type, struct nf_conntrack* arg,
+ 					void *data)
+ {
+   l7_conntrack * l7_conntrack_handler = (l7_conntrack *) data;
+ 
+   nfct_conntrack* ct = (nfct_conntrack*)arg;
++  u_int8_t protonum = *(u_int8_t *)nfct_get_attr((const nf_conntrack *)ct, ATTR_ORIG_L4PROTO);
+ 
+   // I don't think there is any demand for ICMP. These are enough work for now.
+-  if(ct->tuple[0].protonum != IPPROTO_TCP && 
+-     ct->tuple[0].protonum != IPPROTO_UDP) return 0;
++  if(protonum != IPPROTO_TCP && protonum != IPPROTO_UDP) return 0;
+ 
+-  if(type == NFCT_MSG_DESTROY) l7printf(3, "Got event: NFCT_MSG_DESTROY\n");
+-  if(type == NFCT_MSG_NEW)     l7printf(3, "Got event: NFCT_MSG_NEW\n");
+-  if(type == NFCT_MSG_UPDATE)  l7printf(3, "Got event: NFCT_MSG_UPDATE\n");
+-  if(type == NFCT_MSG_UNKNOWN) l7printf(3, "Got event: NFCT_MSG_UNKNOWN\n");
++  if(type == NFCT_T_DESTROY) l7printf(3, "Got event: NFCT_T_DESTROY\n");
++  if(type == NFCT_T_NEW)     l7printf(3, "Got event: NFCT_T_NEW\n");
++  if(type == NFCT_T_UPDATE)  l7printf(3, "Got event: NFCT_T_UPDATE\n");
++  if(type == NFCT_T_UNKNOWN) l7printf(3, "Got event: NFCT_T_UNKNOWN\n");
+ 
+   // On the first packet, create the connection buffer, etc.
+-  if(type == NFCT_MSG_NEW){
+-    string key = make_key(ct, flags);
++  if(type == NFCT_T_NEW){
++    string key = make_key(ct, 0, NFCT_T_NEW);
+     if (l7_conntrack_handler->get_l7_connection(key)){
+       // this happens sometimes
+-      cerr << "Received NFCT_MSG_NEW but already have a connection. Packets = " 
++      cerr << "Received NFCT_T_NEW but already have a connection. Packets = " 
+            << l7_conntrack_handler->get_l7_connection(key)->get_num_packets() 
+            << endl;
+       l7_conntrack_handler->remove_l7_connection(key);
+@@ -179,9 +164,9 @@
+     l7_conntrack_handler->add_l7_connection(thisconnection, key);
+     thisconnection->key = key;
+   }
+-  else if(type == NFCT_MSG_DESTROY){
++  else if(type == NFCT_T_DESTROY){
+     // clean up the connection buffer, etc.
+-    string key = make_key(ct, flags);
++    string key = make_key(ct, 0, NFCT_T_DESTROY);
+     if(l7_conntrack_handler->get_l7_connection(key)){
+       l7_conntrack_handler->remove_l7_connection(key);
+     }
+@@ -193,7 +178,7 @@
+ 
+ l7_conntrack::~l7_conntrack() 
+ {
+-  nfct_conntrack_free(ct);
++  free(ct);
+   nfct_close(cth);
+ }
+ 
+@@ -230,9 +215,9 @@
+ {
+   int ret;
+ 
+-  nfct_register_callback(cth, l7_handle_conntrack_event, (void *)this);
+-  ret = nfct_event_conntrack(cth); // this is the main loop
++  nfct_callback_register(cth, NFCT_T_NEW, l7_handle_conntrack_event, (void *)this);
++  ret = nfct_catch(cth); // this is the main loop
+   
+   nfct_close(cth);
+-  nfct_conntrack_free(ct);
++  free(ct);
+ }
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-map-access-threadsafe.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-map-access-threadsafe.patch
new file mode 100644
index 000000000000..fea0f5bbb5a6
--- /dev/null
+++ b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-map-access-threadsafe.patch
@@ -0,0 +1,55 @@
+--- l7-filter-userspace-0.11/l7-conntrack.cpp.orig	2009-02-26 21:40:28.000000000 +0000
++++ l7-filter-userspace-0.11/l7-conntrack.cpp	2010-07-23 13:03:23.000000000 +0100
+@@ -195,11 +195,13 @@
+ {
+   nfct_conntrack_free(ct);
+   nfct_close(cth);
++  pthread_mutex_destroy(&map_mutex);
+ }
+ 
+ l7_conntrack::l7_conntrack(void* l7_classifier_in) 
+ {
+   l7_classifier = (l7_classify *)l7_classifier_in;
++  pthread_mutex_init(&map_mutex, NULL);
+   
+   // Now open a handler that is subscribed to all possible events
+   cth = nfct_open(CONNTRACK, NFCT_ALL_CT_GROUPS);
+@@ -211,19 +213,27 @@
+ 
+ l7_connection *l7_conntrack::get_l7_connection(const string key) 
+ {
+-  return l7_connections[key];
++  l7_connection *conn;
++  pthread_mutex_lock(&map_mutex);
++  conn = l7_connections[key];
++  pthread_mutex_unlock(&map_mutex);
++  return conn;
+ }
+ 
+ void l7_conntrack::add_l7_connection(l7_connection* connection, 
+ 					const string key) 
+ {
++  pthread_mutex_lock(&map_mutex);
+   l7_connections[key] = connection;
++  pthread_mutex_unlock(&map_mutex);
+ }
+ 
+ void l7_conntrack::remove_l7_connection(const string key) 
+ {
++  pthread_mutex_lock(&map_mutex);
+   delete l7_connections[key];
+   l7_connections.erase(l7_connections.find(key));
++  pthread_mutex_unlock(&map_mutex);
+ }
+ 
+ void l7_conntrack::start() 
+--- l7-filter-userspace-0.11/l7-conntrack.h.orig	2010-07-23 13:04:49.000000000 +0100
++++ l7-filter-userspace-0.11/l7-conntrack.h	2010-07-23 13:05:56.000000000 +0100
+@@ -52,6 +52,7 @@
+   l7_map l7_connections;
+   struct nfct_conntrack *ct;
+   struct nfct_handle *cth; // the callback
++  pthread_mutex_t map_mutex;
+ 
+  public:
+   l7_conntrack(void * foo);
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-pattern-loading-leak.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-pattern-loading-leak.patch
new file mode 100644
index 000000000000..835fc8ffb9f1
--- /dev/null
+++ b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-pattern-loading-leak.patch
@@ -0,0 +1,10 @@
+diff --git a/l7-filter-userspace/trunk/l7-classify.cpp b/l7-filter-userspace/trunk/l7-classify.cpp
+index 8b5b77e..1c80d4d 100644
+--- a/l7-filter-userspace/trunk/l7-classify.cpp
++++ b/l7-filter-userspace/trunk/l7-classify.cpp
+@@ -59,6 +59,7 @@ l7_pattern::l7_pattern(string name, string pattern_string, int eflags,
+     cerr << "error compiling " << name << " -- " << pattern_string << endl;
+     exit(1);
+   }
++  free(preprocessed);
+ }
diff --git a/net-misc/l7-filter-userspace/l7-filter-userspace-0.11.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.11.ebuild
new file mode 100644
index 000000000000..d5178dfc6379
--- /dev/null
+++ b/net-misc/l7-filter-userspace/l7-filter-userspace-0.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="Userspace utilities for layer 7 iptables QoS"
+HOMEPAGE="http://l7-filter.clearfoundation.com/"
+SRC_URI="mirror://sourceforge/l7-filter/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="0"
+DEPEND=">=net-libs/libnetfilter_conntrack-0.0.100
+		net-libs/libnetfilter_queue"
+RDEPEND="net-misc/l7-protocols
+		${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-map-access-threadsafe.patch"
+	epatch "${FILESDIR}/${P}-arm-ppc-getopt-help-fix.patch"
+	epatch "${FILESDIR}/${P}-libnetfilter_conntrack-0.0.100.patch"
+	epatch "${FILESDIR}/${P}-pattern-loading-leak.patch"
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README TODO BUGS THANKS AUTHORS
+}
diff --git a/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild
new file mode 100644
index 000000000000..1a02e9456171
--- /dev/null
+++ b/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils versionator
+
+MY_P=${PN}-$(replace_version_separator 2 '-')
+
+DESCRIPTION="Userspace utilities for layer 7 iptables QoS"
+HOMEPAGE="http://l7-filter.clearfoundation.com/"
+SRC_URI="http://download.clearfoundation.com/l7-filter/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+SLOT="0"
+
+DEPEND=">=net-libs/libnetfilter_conntrack-0.0.100
+	>=net-libs/libnetfilter_queue-1.0.0
+	net-libs/libnfnetlink"
+RDEPEND="${DEPEND}
+	net-misc/l7-protocols"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( README TODO BUGS THANKS AUTHORS )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.11-libnetfilter_conntrack-0.0.100.patch" \
+		"${FILESDIR}/${PN}-0.11-datatype.patch"
+}
diff --git a/net-misc/l7-filter-userspace/metadata.xml b/net-misc/l7-filter-userspace/metadata.xml
new file mode 100644
index 000000000000..d204a62cf580
--- /dev/null
+++ b/net-misc/l7-filter-userspace/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">l7-filter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/l7-protocols/Manifest b/net-misc/l7-protocols/Manifest
new file mode 100644
index 000000000000..712d6dfba22e
--- /dev/null
+++ b/net-misc/l7-protocols/Manifest
@@ -0,0 +1,5 @@
+DIST l7-protocols-2009-05-28.tar.gz 142050 SHA256 d6bf98a69268558543bd32fccea287cb3f14b37521d18c790e2b6f8dcfaa5381 SHA512 020730d0170537213080dcefd847439a2306eea759317e4054549d12e344520e9db222ca48f74c184cb17ba5ff244270b688fb7e89ed0dd21a196e02721e4477 WHIRLPOOL d40993652acac332261fba3555cbce1196e3d35cc52e68ac1fc71b6e5623bce31caa059f021823a6e8225e1d6bcf0a2f529921bd25a15403e912e8f11cbb6245
+EBUILD l7-protocols-2009.05.28.ebuild 1595 SHA256 926c8f4a047299b6393f4dd020a2a5df5d60b4ae3341c38679a20252a5854bf0 SHA512 9d4fe158c99110bfc3f7dcb58130b887aef282ef259db04952fab0e47cd54b71d41e85c64395af01dcacfc63ddc5f3bd7e64d6c370a14ac0abfb6a518c7d03c0 WHIRLPOOL c55f3018ab4e91858732195fcf2a8ad4ad6ebf23030401701867642fb2045615e55b0408043ef661a33a0f2e22c766dedd702c677f48ea8117e2fb7270e2e0e5
+MISC ChangeLog 2201 SHA256 32aade3520460236f5eb94a09e9632dc10dd09b42c482614dc6e2f5d49c4e1df SHA512 af06a1fcb685afed7407e1b07355ee48ffa99de0e8f2bab33b02bb99b53f825592587efa03db32e3c4f809bf098a4f09490711925e76e0c86cf81cef93e16637 WHIRLPOOL 03a0c4e04745e6777ab720192ddf282c60aa101de11e3d3249e7623dc4b238d237fba01f6086981ff771a9d7fb25b36d1d977aab1386cb023c61aecee8378144
+MISC ChangeLog-2015 12428 SHA256 b80bd7cdf31071eaadac4e0496cc8a116deac7c6a56035ff16abe28c584adf32 SHA512 85975d2b9749472be1b81003dd7a13ce3b57c855adbab8868720a2ecf15113a29cdec05066ee39447afc71dee1f9c6f88dba191d3f00be0efc3635a38ea67113 WHIRLPOOL a9c2b4e29a992c107c9f822b7e2967e19c32a41823733143c8affd4916bc50e235b494a0abc034c4411f959385879e284dd5f1876986c9f9c0313d12379a64ec
+MISC metadata.xml 675 SHA256 fc64297fcff50b259b5c0f4b951cb795c1a3ebbc438f53390e478111070860b7 SHA512 de1be10711122953af535fc50b2a15a32fbed1daf550b2b50bea0be912167a01ea2e3d1ae4a6d591ee7697e1b0c1738d5c76fbfd76f4620e03c0f271bde487d6 WHIRLPOOL 647bfbcf45639200e8c841d2106268b905d6d15f6c8c3463fbed1e390f2d535477a04d5856a973c61446bbe4599a8e728e0a289ad493642076fa9bc9da69ba4a
diff --git a/net-misc/l7-protocols/l7-protocols-2009.05.28.ebuild b/net-misc/l7-protocols/l7-protocols-2009.05.28.ebuild
new file mode 100644
index 000000000000..89bc410ceb78
--- /dev/null
+++ b/net-misc/l7-protocols/l7-protocols-2009.05.28.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils fixheadtails toolchain-funcs
+
+IUSE=""
+
+MY_P=${PN}-${PV//./-}
+
+DESCRIPTION="Protocol definitions of l7-filter kernel modules"
+HOMEPAGE="http://l7-filter.sourceforge.net/protocols"
+
+SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	sed -e "s|gcc.*\-o|$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o|g" \
+		-e "s|g++.*\-o|$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o|g" \
+			-i testing/Makefile
+	ht_fix_file testing/*.sh
+}
+
+src_compile() {
+	emake -C testing || die
+}
+
+# NOTE Testing mechanism is currently broken:
+#  stack smashing attack in function main()
+
+# Is also extraordinarly inefficent getting random data.
+#
+#src_test() {
+#	cd testing
+#	find ${S} -name \*.pat -print -exec ./test_match.sh {} \; \
+#		-exec ./timeit.sh {} \; || die "failed tests"
+#	einfo "patterns past testing"
+#}
+
+src_install() {
+	dodir /usr/share/${PN}
+	pushd testing > /dev/null
+	cp -pPR randprintable randchars test_speed-{kernel,userspace} README \
+		match_kernel *.sh data "${D}"/usr/share/${PN}
+	popd > /dev/null
+	mv example_traffic "${D}"/usr/share/${PN}
+
+	dodoc README CHANGELOG HOWTO WANTED || die
+	for dir in extra file_types malware ; do
+		newdoc ${dir}/README README.${dir}
+	done
+	rm -rf README CHANGELOG HOWTO LICENSE Makefile WANTED */README testing
+
+	dodir /etc/l7-protocols
+	cp -R * "${D}"/etc/l7-protocols
+	chown -R root:0 "${D}"
+}
diff --git a/net-misc/l7-protocols/metadata.xml b/net-misc/l7-protocols/metadata.xml
new file mode 100644
index 000000000000..30de8b041c0b
--- /dev/null
+++ b/net-misc/l7-protocols/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <longdescription>
+  These are patterns (protocol definitions) for the Linux layer 7 packet
+  classifier (l7-filter). To use them, you need the kernel and iptables patches
+  (or l7-filter userspace version) available trough ebuild tree as
+  net-misc/l7-filter and net-firewall/iptables built with l7filter USE flag.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">l7-filter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/lambdamoo/Manifest b/net-misc/lambdamoo/Manifest
new file mode 100644
index 000000000000..b7f9ffb223ad
--- /dev/null
+++ b/net-misc/lambdamoo/Manifest
@@ -0,0 +1,8 @@
+AUX 1.8.1-enable-outbound.patch 451 SHA256 932f25662c080d66b6e60641f00907cf99a6397ab73c10d208095155839513aa SHA512 16aec9e348a2b6ae4d773f12d007fda90d38c0d7113120fcfd63d44ffeb8f2fbfbddd428e3f091581e054cf2c650b92d737c5c63178c6db526f7e2bff9a9c712 WHIRLPOOL e2bd8908b6ced71fa7484dc7d3c73cfc4026db627fc98e92505ad43eb754a7b898e8f6e310eb463c123a984c960d09086e48a44dbebc7e3a799818713169a3cd
+AUX lambdamoo.conf 185 SHA256 194961a596a12e76ade2fe83d4e7f3b2476b921da0c250ce2ba6ca5132e4de16 SHA512 fa96885e674b571c6eccb682cb4ab47d09a723a1dd82d6a11a42e5760c2b53ab24919627823ab9c4a2aeb5d3d2d41984df3eb9f3de382164b062e024639ba2b2 WHIRLPOOL 5c496df76586bea6a76b395113c68c110d20e0bd2f9f06c05d53927266f3c6eeed6b915ff49e65d4ddcff4cb37673e8df2fe98cf19e2ec0fe649b0ee4465f2de
+AUX lambdamoo.rc 1145 SHA256 4958b925c3e2446ee1e771fbf6785345ebf7f1fc213590b66cf7eb3df1f49e21 SHA512 ce0d41459aac2249b2982d5bc174810e2fd5a77ad5c5f102929c350306bb799cdd9582926dda42c062d7f60b77ae59dd26d7f32d249193d13e9b9feb888ebd96 WHIRLPOOL ed725d137ef328a49a78d7c45733158460e3be91c379243b908e45eecc05270a39974941c9cc7b3477d66e391c0cce79dd46b162e185532b65d5f1d5fde676a4
+DIST LambdaMOO-1.8.1.tar.gz 363803 SHA256 1c404855e5db85224e4fec0667bbbb9b2a3e98ac82d49e885ddb4ce8c24f3e5a SHA512 1629375d74c67851e20ac007411261bb24c642249e4ede0415580b5c87e0df77b23e8a70b249f734ad3b5bc3b8859b5f0162dc55f69b9756ce2afa6a9553b7fc WHIRLPOOL 3cb2fedfffe235c5529682b1345c1eaf00fba2d52296e173a4f5bbb4ad1873bce58804dab8ad00c6e589ab054ba5dcf5b895fece69028d5f09f2cafa6d9d0a82
+EBUILD lambdamoo-1.8.1-r3.ebuild 931 SHA256 b3f3930084860df1b8654db50a7bdfd20180ed69ab0c1abd874d5987baf76fd8 SHA512 16c1138b96b38ad023a463cbb2a7f6fdde8df29f29a416d2725b4ad5c5978784ed71e1c12840da2931e7f760050cf317d86171feba2c9b71f5c02e1cac218fb3 WHIRLPOOL 7dc8299c90079e2c3aa319f1166ca41539f02d27122ad5e67a363451b5a200332b24d45128513ea3484c49810f2b3700b97fc69db85bc1b8b89b4bb75d1ca742
+MISC ChangeLog 3149 SHA256 aa4a9f9600dcedca2aea97ae844e6d293594f220146542d6e727d2cdf9c92d75 SHA512 0b295c0785d7b5c9ee6bf913192033739920d802cecf609cd8b99e78089b7195797bb7618adc7d77baa56df073a721d58a348a9f1e1141df95a63a59737abecb WHIRLPOOL 72977d5aec1f84dbe057bfc2780642353cb03077e2d21ebeb4eeb945968ac0f3809adba5ade8fa404c887b13c4bc4d387b3684f0fb27fe4484c19f4fe4154cde
+MISC ChangeLog-2015 1610 SHA256 4c91ab40b4b3d721fe27beee2bed2af1037a02f8b5a83614caaab9e52d69142c SHA512 7122e5aa6ac273549020d01f016cd37e368266087cedb31610191bcdcb05151e350309188593cfde7d2196ae5f9c4d14ea5d0d00d4c76653554213c84b5af201 WHIRLPOOL 63c19332de2d9b2a413dfe8af152db0cb66d5050244b92ad5fe6c9c882185326e12a1e234ff88f3588a82f04285479ed0ba4bd81f75d56513969ea807fe3f458
+MISC metadata.xml 246 SHA256 40d5303bd24f4ba57c146aa2dbafc8ca3b4f9224be68ed2fa15bf790b9e813fa SHA512 2e061a29f6379f4379aec8e6ba1da5b4265f6594e0a414e7e5a04fa5b3ca8ec3c2487f86049d234c37221303050050a8a9264c8c08fe3992c0a0cb2ecfa74d6e WHIRLPOOL 5c32aba482877c868118b14f22562a747bd8064c12208635b8d1e80a3632926eeb4ee2cee959e2d51f849763a3d2fc4b2b6a62e02d3196d4a2c8f6c368d9ad61
diff --git a/net-misc/lambdamoo/files/1.8.1-enable-outbound.patch b/net-misc/lambdamoo/files/1.8.1-enable-outbound.patch
new file mode 100644
index 000000000000..b96e013683b8
--- /dev/null
+++ b/net-misc/lambdamoo/files/1.8.1-enable-outbound.patch
@@ -0,0 +1,13 @@
+diff -ur MOO-1.8.1.orig/options.h MOO-1.8.1/options.h
+--- MOO-1.8.1.orig/options.h	2003-04-17 15:25:25.000000000 -0500
++++ MOO-1.8.1/options.h	2003-04-17 15:27:33.000000000 -0500
+@@ -155,7 +155,7 @@
+  *	 NP_SINGLE or NP_LOCAL.
+  */
+ 
+-/* #define OUTBOUND_NETWORK */
++#define OUTBOUND_NETWORK
+ 
+ /******************************************************************************
+  * The following constants define certain aspects of the server's network
+
diff --git a/net-misc/lambdamoo/files/lambdamoo.conf b/net-misc/lambdamoo/files/lambdamoo.conf
new file mode 100644
index 000000000000..3f84faefe344
--- /dev/null
+++ b/net-misc/lambdamoo/files/lambdamoo.conf
@@ -0,0 +1,6 @@
+# The full path to your database, without the extention.
+# For example:
+DB_PREFIX=/usr/share/lambdamoo/Minimal
+
+# The port LambdaMOO should listen for incoming connections on
+PORT=7777
diff --git a/net-misc/lambdamoo/files/lambdamoo.rc b/net-misc/lambdamoo/files/lambdamoo.rc
new file mode 100644
index 000000000000..2a641acc4ba9
--- /dev/null
+++ b/net-misc/lambdamoo/files/lambdamoo.rc
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# adapted from Pavel Curtis' restart.sh
+
+depend() {
+	need net
+}
+
+check_setup() {
+	if [ ! -r ${DB_PREFIX}.db ] ; then
+		eerror "Unable to read ${DB_PREFIX}.db"
+		return 1
+	fi
+
+	if [ -r ${DB_PREFIX}.db.new ] ; then
+		mv ${DB_PREFIX}.db ${DB_PREFIX}.db.old
+		mv ${DB_PREFIX}.db.new ${DB_PREFIX}.db
+		#Pavel compressed the old db here, I have not to save start time.
+	fi
+
+	if [ -f /var/log/lambdamoo.log ] ; then
+		cat /var/log/lambdamoo.log >> /var/log/lambdamoo.log.old
+		rm /var/log/lambdamoo.log
+	fi
+
+	return 0
+}
+
+start() {
+	check_setup || return 1
+
+	ebegin "Starting LambdaMOO"
+	echo "`date`: RESTARTED" >> ${DB_PREFIX}.log
+	start-stop-daemon --start --startas /usr/sbin/moo \
+	                  --pidfile /var/run/LambdaMOO.pid --make-pidfile \
+			  -- -l /var/log/lambdamoo.log ${DB_PREFIX}.db ${DB_PREFIX}.db.new ${PORT} &
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping LambdaMOO"
+	start-stop-daemon -o --quiet --stop --pidfile /var/run/LambdaMOO.pid
+	eend $?
+	[ -f /var/run/LambdaMOO.pid ] && rm /var/run/LambdaMOO.pid
+}
diff --git a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
new file mode 100644
index 000000000000..296ae54cd94a
--- /dev/null
+++ b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="networked mud that can be used for different types of collaborative software"
+HOMEPAGE="https://sourceforge.net/projects/lambdamoo/"
+SRC_URI="mirror://sourceforge/lambdamoo/LambdaMOO-${PV}.tar.gz"
+
+LICENSE="LambdaMOO GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE=""
+
+DEPEND="sys-devel/bison"
+RDEPEND=""
+
+S=${WORKDIR}/MOO-${PV}
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/${PV}-enable-outbound.patch
+	sed -i Makefile.in \
+		-e '/ -o /s|$(CFLAGS)|& $(LDFLAGS)|g' \
+		|| die "sed Makefile.in"
+	eautoreconf
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS} \
+		-DHAVE_MKFIFO=1"
+}
+
+src_install() {
+	dosbin moo
+	insinto /usr/share/${PN}
+	doins Minimal.db
+	dodoc *.txt README*
+
+	newinitd "${FILESDIR}"/lambdamoo.rc ${PN}
+	newconfd "${FILESDIR}"/lambdamoo.conf ${PN}
+}
diff --git a/net-misc/lambdamoo/metadata.xml b/net-misc/lambdamoo/metadata.xml
new file mode 100644
index 000000000000..7748f1aed853
--- /dev/null
+++ b/net-misc/lambdamoo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">lambdamoo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/lanmap/Manifest b/net-misc/lanmap/Manifest
new file mode 100644
index 000000000000..356cc70f0ff7
--- /dev/null
+++ b/net-misc/lanmap/Manifest
@@ -0,0 +1,8 @@
+AUX lanmap-81-make.patch 1930 SHA256 8c34f20dd6fa573fc448d21cd60c5e6350b47f2acb9c7548f4cce653ae0085be SHA512 601a570e55ce987d41106cf1c79a2564e55d8756bf8ec1cd58c63df38ebdccfece6b60d29b24f36aa828289f0762c3c54ae58b30b61355c2479c27fa9322b86c WHIRLPOOL 4fb90424465b8765c2ea3873be39446fbe5c6bcf0a9cf831ad0b614d3a23e320cbc95ebec78a0598bc9a6a55419d76484a3b1b1888e580cd762b6533a697611d
+AUX lanmap-81-printf-format.patch 303 SHA256 7de8d02354acc67c26a83a2478c736c9d1eb28beed5341d1288d5755792407b7 SHA512 644e269b1c3b872f66707d452129033f9f2d67ad895244b5aeb34886f1cf572482a7ad82f97f4d23ac3e652ce64f56f9bdaa8c11aa76cb5d6cac42c170f30285 WHIRLPOOL 3a3c23e13426975239129b6179c6bf0649f580c0d4136c898fdf3bcb97c8ae7a828907ae9176573246250eca206e145f97ac5811cbe00291ec8c39a445b1a64b
+DIST lanmap-2006-03-07-rev81.zip 405933 SHA256 9a67645c5cde565e61c1a717a17a3491d027e72bfe6825d1d50262f6a6600fa3 SHA512 9216d753548fba48f4fcd18a55136a50c0dd01c87f1d5f7736319a7a71b28bd50f082a9aa94d8c426924e0fa4fb6537cd8c8cbd2a289736ede54fd4c6f4679f2 WHIRLPOOL e7d9d24dfafea9430d3a65da6d6cf7b8b12d176d6b99911f581a12074166c09099b56fcf50913e293c42ab962fc5f4bc41184184aaa41fbd453f7a3f667e86f3
+EBUILD lanmap-81-r1.ebuild 790 SHA256 d8e9fcb679854cf75365d17bef31eae0e2e920cb37df154a6425ea71623af617 SHA512 cba80ae3be83ade4018ea9bd7c8a45200c9d08fb4dc13dbc2fe2bdc13e834415be2b26a61614c06821965b9f753f641a07d438084412f952d1cc9937f720f7ae WHIRLPOOL f1419c805d2add77d394ef2cf15a07108ce1d18a635578e32fc9c99bcc7d0a99bd0019b2b6a2b181d9fa4de3f44eaa68f476e2c10974c4fdf7e962ed0ce9ead3
+EBUILD lanmap-81-r2.ebuild 837 SHA256 03b2ce519ffa0f84fdf9a35c175c51d75610f74034682d07d017071bf4318c27 SHA512 9e3406a98b0c49f7d256a19964d151f5a74fd808d53d4cc3faa16d66eb6de3656b555bd8ed4e815ebce504fc65ee5432eff682484b3bc4660a8118674418ddbd WHIRLPOOL 3ea03ec937447eb6fbea424badcecd8e4143ef9a44d469e65c3ce100dd38827430a8e54b775870731d47089de43ea06590004c332892675d7ea84c5b2e396091
+MISC ChangeLog 2936 SHA256 ece472273c2b626a89b6a2d64ba218136c3733eb7dc31b671d50173029bda6cc SHA512 b8c169b513625948f012db601e797a110de885aa07e744d9bc1ecbf41ee6be7d8d03e5463be3dddf915ff4664393c0bd674ea8a85f65b033a32c08f3bcabfd65 WHIRLPOOL 39267c6679b4e267bc2bcf74685b2720a73858fa03457a8486cf68b79cb1d7c67f08dc8c2a0cbdbbdec4c37c60bf60085e06686fc23a97e557ea6dd7af405f2f
+MISC ChangeLog-2015 1655 SHA256 d16a08590ab92f60f51a749fe1f28821b12728688b847a4ae3613fa66e483e3f SHA512 32ec3fcacd0f186631cfb091536c6f02d839aec8f207352d98bbfdf8c0ad8b294fea1576da64936c269e80d40d31bd00e5d4d5c07b1daae91e78435a6c473827 WHIRLPOOL 43faf85f979f5197a241408bb376eb1ffe7a73c934365ada0dd416a5c47bb1d1339b357b6fa4ad7702eb30e3e3578dabc1a2fd28088a1d7c16a7275034a518a4
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-misc/lanmap/files/lanmap-81-make.patch b/net-misc/lanmap/files/lanmap-81-make.patch
new file mode 100644
index 000000000000..e0c1988cc836
--- /dev/null
+++ b/net-misc/lanmap/files/lanmap-81-make.patch
@@ -0,0 +1,69 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -2,8 +2,8 @@
+ # $Id$
+ 
+ # complation
+-CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
+-LDFLAGS = -lpcap -lm
++CFLAGS += -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
++LDFLAGS += -lpcap -lm
+ CFLAGS_DEBUG = -D_DEBUG -ggdb
+ LDFLAGS_DEBUG = -pg
+ BINARY = lanmap
+@@ -14,12 +14,12 @@
+ 	$(CC) $(OBJS) -o $(BINARY) $(LDFLAGS)
+ 
+ static:
+-	make clean
+-	make LDFLAGS="$(LDFLAGS) -static" all
++	$(MAKE) clean
++	$(MAKE) LDFLAGS="$(LDFLAGS) -static" all
+ 
+ debug:
+-	make clean
+-	make CFLAGS="$(CFLAGS) $(CFLAGS_DEBUG)" LDFLAGS="$(LDFLAGS)"  all
++	$(MAKE) clean
++	$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_DEBUG)" LDFLAGS="$(LDFLAGS)"  all
+ 
+ # for testing the classify code by itself
+ os_classify: os_classify.c misc.c
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,18 +10,18 @@
+ DATADEST = ${prefix}/share/lanmap/
+ 
+ all:
+-	cd ./src && make LANMAP_DATADIR="$(DATADEST)"
++	cd ./src && $(MAKE) LANMAP_DATADIR="$(DATADEST)"
+ 
+ install:
+-	install -m 0755 ./src/$(BINARY) $(BINDEST)
++	install -m 0755 -D ./src/$(BINARY) $(BINDEST)/$(BINARY)
+ 	install -m 0755 -d $(DATADEST)
+ 	install -m 0755 -d $(DATADEST)data/
+ 	install -m 0755 -d $(DATADEST)data/graph/
+ 	install -m 0755 -d $(DATADEST)graph/img/
+ 	install -m 0644 ./data/mac_vendor $(DATADEST)data/
+-	install -m 0644 -d $(DATADEST)graph
++	install -m 0755 -d $(DATADEST)graph
+ 	install -m 0644 ./graph/lanmap.header $(DATADEST)graph/
+-	for f in ./graph/img/*.{png,gif,svg}; do install -m 0644 $$f $(DATADEST)graph/img/; done
++	for f in ./graph/img/*.gif ./graph/img/*.png ./graph/img/*.svg; do install -m 0644 $$f $(DATADEST)graph/img/; done
+ 	
+ uninstall:
+ 	rm $(BINDEST)$(BINARY)
+@@ -29,11 +29,11 @@
+ 
+ clean:
+ 	rm -f ./src/$(BINARY)
+-	cd ./src && make clean
++	cd ./src && $(MAKE) clean
+ 
+ distclean: clean
+ 	rm -f Makefile config.cache config.log config.status config.h
+ 
+ debug:
+-	cd ./src && make debug
++	cd ./src && $(MAKE) debug
+ 
diff --git a/net-misc/lanmap/files/lanmap-81-printf-format.patch b/net-misc/lanmap/files/lanmap-81-printf-format.patch
new file mode 100644
index 000000000000..cbe330434f20
--- /dev/null
+++ b/net-misc/lanmap/files/lanmap-81-printf-format.patch
@@ -0,0 +1,11 @@
+--- a/src/misc.c
++++ b/src/misc.c
+@@ -58,7 +58,7 @@
+ 	linebuf[64] = ' ';
+ 	linebuf[56 + j - 1 + (j - 1 > 7) + 1] = '\n';
+ 	linebuf[56 + j - 1 + (j - 1 > 7) + 2] = '\0';
+-	printf(linebuf);
++	printf("%s", linebuf);
+ #ifdef DEBUG
+ 	if (strlen(linebuf) > 73) {
+ 		fprintf(stderr, "line too long, wtf?!\n");
diff --git a/net-misc/lanmap/lanmap-81-r1.ebuild b/net-misc/lanmap/lanmap-81-r1.ebuild
new file mode 100644
index 000000000000..44739a58baf5
--- /dev/null
+++ b/net-misc/lanmap/lanmap-81-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="lanmap sits quietly on a network and builds a picture of what it sees"
+HOMEPAGE="http://www.parseerror.com/lanmap"
+SRC_URI="http://www.parseerror.com/${PN}/rev/${PN}-2006-03-07-rev${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+CDEPEND="net-libs/libpcap"
+RDEPEND="
+	${CDEPEND}
+	media-gfx/graphviz
+"
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+	rm configure || die
+	eautoreconf
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake prefix="${ED}"/usr install
+	dodoc README.txt TODO.txt
+}
diff --git a/net-misc/lanmap/lanmap-81-r2.ebuild b/net-misc/lanmap/lanmap-81-r2.ebuild
new file mode 100644
index 000000000000..6b5892520aaa
--- /dev/null
+++ b/net-misc/lanmap/lanmap-81-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="lanmap sits quietly on a network and builds a picture of what it sees"
+HOMEPAGE="http://www.parseerror.com/lanmap"
+SRC_URI="http://www.parseerror.com/${PN}/rev/${PN}-2006-03-07-rev${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+CDEPEND="net-libs/libpcap"
+RDEPEND="
+	${CDEPEND}
+	media-gfx/graphviz
+"
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-make.patch \
+		"${FILESDIR}"/${P}-printf-format.patch
+	rm configure || die
+	eautoreconf
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake prefix="${ED}"/usr install
+	dodoc README.txt TODO.txt
+}
diff --git a/net-misc/lanmap/metadata.xml b/net-misc/lanmap/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-misc/lanmap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/lcr/Manifest b/net-misc/lcr/Manifest
new file mode 100644
index 000000000000..f90c2252ebf3
--- /dev/null
+++ b/net-misc/lcr/Manifest
@@ -0,0 +1,4 @@
+EBUILD lcr-9999.ebuild 1235 SHA256 9f6f0bef72d7a7d541f64decadb06b778707add32333be130bae6ac8041bc869 SHA512 93b30ff22f463606800cfc165058975d189d8cd975814b9992a01edf8323c318ff64fa20fa2c4682fec99e8bbd7ade02ecc65571bc51e8d0369c0622750859a1 WHIRLPOOL c53feae34bea472037a8ce9b8902fde1346dc00428ee2c47288bab1fc10a590eb09f579aff35ddc0ad3d3f8bd4f2c5a8609de71de36a9f5ee7e4b725ec1e562f
+MISC ChangeLog 2945 SHA256 fb04c12db8a41e32493ad3a12a0ccb3ca37ec6e59c9da443a14c9162911e53ed SHA512 850e7022e494bbc50f8b047b86da4c4fe310ade2af7c4b12b2a66088d75f6bd3d70341b8d4f7fd1b125f1c7023772bed62e6aa54941d23cf9755bceabad9e8a8 WHIRLPOOL 55a9865adacec67d55230b7ba673b98467766bed7c9b1a777cb9f611a8e79818c056983ab1ca803c5dd90b609d4b7f1280bce1938aef130a1722d57a701d9f5e
+MISC ChangeLog-2015 518 SHA256 2b3871b7a6d2e753c33818df47b712c6a08717d25b758290d780b575155c7812 SHA512 596819a78e2634c72862320bc8bac032a787106d845f2bbf8a8ca06e75460f447c9c77183afc27fff256a9837fee5f925f07561614e606c8f398db82847f7a53 WHIRLPOOL 8137d1ca7f9e47ec0bfacc9c86fe0161bb2c17260c2447e376a3c934013bf774aa7fc98a8b3a6e8feed18258f123740c0412f0e8e8ae9e1f858a965f96edc85a
+MISC metadata.xml 650 SHA256 c0e4ce26d55dc5ba344a174de5a15bb6e9475b69c7b30d7d7daaae1b830eb039 SHA512 12497b4e4d2b11a3f2fe6aba4ee440419fb217a7df6a56da837384e7a4a16db7a2b62b2f88e5aef462305676081e94475fab15b43581e08136a63eb8439f7a70 WHIRLPOOL 2cd6ba6912d7b780a1b2fc250059103f747f2a25f6a89e0b28baab70db4db062a874e46c186471f152c47f52e03decd2075e67abdeb6a95b5e61f52e1f17115f
diff --git a/net-misc/lcr/lcr-9999.ebuild b/net-misc/lcr/lcr-9999.ebuild
new file mode 100644
index 000000000000..4e1cdce0dd5a
--- /dev/null
+++ b/net-misc/lcr/lcr-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit git-2 autotools
+
+DESCRIPTION="Linux Call Router"
+HOMEPAGE="http://isdn.eversberg.eu/"
+EGIT_REPO_URI="git://git.misdn.eu/lcr.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="asterisk +ssl +gsm-bs +gsm-ms ss5 +sip gsmhr misdn"
+
+DEPEND="
+	media-libs/opencore-amr
+	asterisk? ( net-misc/asterisk )
+	ssl? ( dev-libs/openssl )
+	gsm-bs? ( net-wireless/openbsc )
+	sip? ( net-libs/sofia-sip )
+	gsm-ms? ( net-wireless/osmocom-bb )
+"
+	#mdisn? ( net-misc/misdn )
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i 's:#!/usr/bin/env python:#!/usr/bin/env python2:' "${S}"/libgsmhr/fetch_sources.py
+	eautoreconf
+}
+
+src_configure() {
+	CXXFLAGS="$CXXFLAGS -I./include" CFLAGS="$CFLAGS -I./include" econf \
+		$(use_with asterisk) \
+		$(use_with ssl) \
+		$(use_with gsm-bs) \
+		$(use_with gsm-ms) \
+		$(use_with ss5) \
+		$(use_with sip) \
+		$(use_with misdn) \
+		$(use_enable gsmhr)
+}
+
+src_compile() {
+	emake -j1
+}
+
+pkg_postinst() {
+	use gsmhr || return
+	ewarn "You have enabled the gsmhr use flag, for the GSM half-rate"
+	ewarn "codec. This is strongly discouraged, except for testing,"
+	ewarn "because of extremely high CPU usage."
+}
diff --git a/net-misc/lcr/metadata.xml b/net-misc/lcr/metadata.xml
new file mode 100644
index 000000000000..b1d1e33aef3d
--- /dev/null
+++ b/net-misc/lcr/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<use>
+		<flag name="asterisk">net-misc/asterisk channel driver</flag>
+		<flag name="misdn">net-misc/misdn driver</flag>
+		<flag name="gsm-bs">net-wireless/openbsc driver</flag>
+		<flag name="gsm-ms">net-wireless/osmobb driver</flag>
+		<flag name="ss5">CCITT No. 5 support</flag>
+		<flag name="sip">SIP support</flag>
+		<flag name="gsmhr">Support for GSM HR codec using reference code (very slow)</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/libss7/Manifest b/net-misc/libss7/Manifest
new file mode 100644
index 000000000000..682570613e7c
--- /dev/null
+++ b/net-misc/libss7/Manifest
@@ -0,0 +1,8 @@
+AUX 1.0.2-ldflags.patch 481 SHA256 32174c9ff0f582a893d0a383ad44e460a3d69f3978f5f12814ff067a5f80d55c SHA512 9c376b64b992bc190986a3aaee8c81d36df6803e0eeb6257c893ab4673c61cfe129785b008bbf8a55f1686c53cc6278e6ac77b5d6947b4190ff37f4c2a558940 WHIRLPOOL 6ce521e54b703d480bfa1652aa40c19c51bf97f3ce99b5a9fb1db8390c73f15b020713f408630888aa85ddad59c29840f6f960a2cfe0d51485ff40105a44112b
+AUX 1.0.2-no-ldconfig.patch 558 SHA256 e379f63b1f7fe3ade12ffac05ff8666c96597230e9893dbe79038afc4cd1e937 SHA512 66891ae2939cb006fdb6b07e740c76ba493c7b5cd341aa31cf0f614095d074016fce03e275ad05ec2f79b7951e03b20e3c42bf01bd7942093da593ca36881a0f WHIRLPOOL 85807cadb73fe52828903bbd280d4b10ddd4cb1dc21c707f87aa209a8e87206935d1dad50d06bb88ed40afc752c0006cb66be1c46ea13c3ffdee9764bb781a92
+AUX 1.0.2-werror-idiocy.patch 532 SHA256 3cb475fd213baefee5fc6a95d9321ed370b65aa90da36f7ed31a70a37a641fe4 SHA512 3590fce6fa831b46dabd31dd4450a1a39029478cf0607cc523e7175cd9134e744bbff6a187c1cf35e34bf37e17650878d71671d5828485776bb467dfb8c166b5 WHIRLPOOL 0481d3821de5f920c18f40bd0d3a9ed50e41ecefa1dddf0b76e2491f21687ae11cecd879672863622727d18888b78d4dbaea9ba42cf84478dc2c542a729c4256
+DIST libss7-1.0.2.tar.gz 60834 SHA256 654188973371e61b4af511eae18756675dbf7c1e17e6f400f2860f3d32ac4b37 SHA512 ff2a7f37aa8186df6059e0069fb12174d9c32147354eeff742faab28923feaa0459e82037139273cb436211e2bf709047a4f88740791fb63543dfac1f4ce3d11 WHIRLPOOL 9c2400c710a62d31762402838b20617834842068779b9b6c7298cb2e5dc8e25b91f02614fe592768ba789cb1fa82ee1184420dc7ba83a11a623cfe77bfbd1a85
+EBUILD libss7-1.0.2.ebuild 737 SHA256 d508d737215b5b708cbf9d7aacaf8f01ee071847741baa5c337a703775da2832 SHA512 7a42a15bc2aea37713c2938e9750feaa75c40cd213017fe569476c34fe8e3fa13df0c33c401404b3a638fe3e35ddd28d14c47073fab63f299f1eadf781405fc8 WHIRLPOOL b8066c8e6390283d81acefe19f9a2f70aaa0654be57829736cb0b5d7219de5625c685f397924125dc441f44a500e6486da1bc91f4b0b479b8224a8a59ca6809d
+MISC ChangeLog 2269 SHA256 0bd8459fd7b21c9edb6d959b38f9c943c5b3fb1b9f020e81f02bb8db6a26ad87 SHA512 b76a253c828c7bf9ba5631975c71d8361bd6baae364344ea4729dbb5d01170869813c87efae5a5fd4e42b49828e2f5e35d8ed196aef68ac962e89d33b98dd72e WHIRLPOOL 577e2f08b453c7a03e9ee299fd983a16b874c585e17d502c1a186f6fe3f70fe858019625b4958dbe6eb86a8f4f11fa5102ad5327dc04b7378ca92e848b06652c
+MISC ChangeLog-2015 693 SHA256 65889b1325cd626ff108598c58298cae29f0e27fa453e06bb6c69703a9bd264c SHA512 9be22be667d37469da528d59fbda2aeb2df8c500f323c89af7355a68e535d1a21bc29634242bc0ec435d1d6938bcb12a0924e5430037e2305ad40b72a0bd7380 WHIRLPOOL 4906286705d9fb9fe498b79306e09833b3c73deaca2df25761a0ae38e6c57a6c394dc3a7b4a554d965de1dc5437026a6c410edeffa4a01f22fd857012acb4237
+MISC metadata.xml 251 SHA256 f6ff468128d9aa804b47d9a184c761b4123b908d302eec0953226acd00fc80df SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd WHIRLPOOL 1610f6ab9cfa21736bbc4643fec692b621f8889a5888b4189847af4aa6f5719829cfaba363c480483fe7e8fb2c40d417e986964b52cb21d564940c4b51f8554d
diff --git a/net-misc/libss7/files/1.0.2-ldflags.patch b/net-misc/libss7/files/1.0.2-ldflags.patch
new file mode 100644
index 000000000000..d88fe25237b7
--- /dev/null
+++ b/net-misc/libss7/files/1.0.2-ldflags.patch
@@ -0,0 +1,12 @@
+diff -uNr libss7-1.0.2.ORIG/Makefile libss7-1.0.2/Makefile
+--- libss7-1.0.2.ORIG/Makefile	2012-08-23 10:49:15.341155719 +0100
++++ libss7-1.0.2/Makefile	2012-08-23 10:50:35.403236983 +0100
+@@ -54,7 +54,7 @@
+ 	ranlib $(STATIC_LIBRARY)
+ 
+ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
+-	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
++	$(CC) -shared $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
+ 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
+ 	ln -sf libss7.so.1 libss7.so
+ 	ln -sf libss7.so.1.0 libss7.so.1
diff --git a/net-misc/libss7/files/1.0.2-no-ldconfig.patch b/net-misc/libss7/files/1.0.2-no-ldconfig.patch
new file mode 100644
index 000000000000..166fd01745cb
--- /dev/null
+++ b/net-misc/libss7/files/1.0.2-no-ldconfig.patch
@@ -0,0 +1,11 @@
+diff -uNr libss7-1.0.2.ORIG/Makefile libss7-1.0.2/Makefile
+--- libss7-1.0.2.ORIG/Makefile	2012-08-23 10:26:35.733775711 +0100
++++ libss7-1.0.2/Makefile	2012-08-23 10:27:06.826807271 +0100
+@@ -48,7 +48,6 @@
+ 	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+ 	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libss7.so.1 libss7.so ; ln -sf libss7.so.1.0 libss7.so.1 )
+ 	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+-	if test $$(id -u) = 0; then $(LDCONFIG); fi
+ 
+ $(STATIC_LIBRARY): $(STATIC_OBJS)
+ 	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
diff --git a/net-misc/libss7/files/1.0.2-werror-idiocy.patch b/net-misc/libss7/files/1.0.2-werror-idiocy.patch
new file mode 100644
index 000000000000..8eed3e5e2196
--- /dev/null
+++ b/net-misc/libss7/files/1.0.2-werror-idiocy.patch
@@ -0,0 +1,12 @@
+diff -uNr libss7-1.0.2.ORIG/Makefile libss7-1.0.2/Makefile
+--- libss7-1.0.2.ORIG/Makefile	2012-08-23 10:22:27.855524115 +0100
++++ libss7-1.0.2/Makefile	2012-08-23 10:22:46.156542689 +0100
+@@ -11,7 +11,7 @@
+ DYNAMIC_OBJS=mtp2.o ss7_sched.o ss7.o mtp3.o isup.o version.o
+ STATIC_LIBRARY=libss7.a
+ DYNAMIC_LIBRARY=libss7.so.1.0
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC
++CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC
+ LDCONFIG_FLAGS=-n
+ SOFLAGS=-Wl,-hlibss7.so.1
+ LDCONFIG=/sbin/ldconfig
diff --git a/net-misc/libss7/libss7-1.0.2.ebuild b/net-misc/libss7/libss7-1.0.2.ebuild
new file mode 100644
index 000000000000..036e6bea25c3
--- /dev/null
+++ b/net-misc/libss7/libss7-1.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit base toolchain-funcs
+
+DESCRIPTION="Signalling System 7 (SS7) protocol library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=net-misc/dahdi-2.0.0"
+PATCHES=(
+	"${FILESDIR}/${PV}-werror-idiocy.patch"
+	"${FILESDIR}/${PV}-no-ldconfig.patch"
+	"${FILESDIR}/${PV}-ldflags.patch"
+)
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getLD) DESTDIR="${D}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog README NEWS* || die "dodoc failed"
+}
diff --git a/net-misc/libss7/metadata.xml b/net-misc/libss7/metadata.xml
new file mode 100644
index 000000000000..5087760546f6
--- /dev/null
+++ b/net-misc/libss7/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
new file mode 100644
index 000000000000..9b36dcbbdcca
--- /dev/null
+++ b/net-misc/libteam/Manifest
@@ -0,0 +1,5 @@
+DIST libteam-1.22.tar.gz 544302 SHA256 9a028bf4e77ef21f2812c6d32cbd57a640e409f848fe81b74ecb231d75647ee3 SHA512 7f54b7e87c1d3a5150e598052126e1c2f5396096450a68a923c9cfb7bcc48b724cddc61f55e34d1b5df103f5473367eb268877100f10c58d53fc3eaf24749d5b WHIRLPOOL d86535a74814ce2fc7c41d56e94574a230e265c350ee5678a81d746a1548b548c7f841af4d2122e10d0d514d99585747c9b6612059f795494a14af5ee90d18b9
+EBUILD libteam-1.22.ebuild 1284 SHA256 8691ae1a0239d4e6fd3b64751db4a1c8e45e4aaf0a657500fef8a8e991c21f5b SHA512 04aab77a8d8da1eddd3d25a3683e6b93820aebada9f34d80081e28fb7e3517c6a0adfe58e16584853431a7d55e66e103907638bb0118dba2caa71db48ff8e013 WHIRLPOOL 34a7a6149f4fc36ecb1fdb983528b0c40fa93cbb487b54f881e6c4220164d47e97cbc88e7e8028c04bd79cadf49132a9961fe9198630e931d95043c3926a65c6
+MISC ChangeLog 4235 SHA256 f20cff17310050dcc221c2c2b50c232c094c1ba95a947552a58b299a31e620f6 SHA512 45bb0707d3d6bb978e36d53c67c25fcf54992b1f7aa5e0086bfb8d222bdaf91f42fd1021a54660a4d853eaa0e628892f1eaaadba14279844fced3ac3ac0515d7 WHIRLPOOL 1feac94f2b5f829372fcd33a5526b61022e807f79ab5b74579ea3abf446fd101dcf4b7c8e7a6c1944d8e44f73a5b86e1e53597b1c083c4606ff87b25e7d82b14
+MISC ChangeLog-2015 1473 SHA256 b10bf35264de4199ea0c1e7a4d76476a4a73812305b190f204325cf8c89c747f SHA512 b5a166ccc9214a00a55f958c4ca91b900c40be3fd527bc36a1c2553e493545934b8c0f8a31efb897d276b58dbdd7a3728899169bc0e971a0eb33a80825798ea6 WHIRLPOOL 11e2d11f8513a3aa6a327f038cbc014e5671330dc7babc393b4e05ed5e1dbd189f2130d638132828aa2cbd5d3ad32c6f28339115d4354745fc19cb7815a3ceef
+MISC metadata.xml 334 SHA256 c66184085a724be3c5ccf908b6f661914076ae7b8556f66712957f8e79de1398 SHA512 0cdfae73365dfd53d676ae7ab8e9a0689f0a117542d5fb99e1c5987ae41388f8f8c54b37829915035f417b7e9ac30b6f2abccf95b8a3202c7a6731530201d2d4 WHIRLPOOL 087dc8cf889652b88daa9eda9ffbe7bf3df0a4571cafee87654e907b82354730a32c39f8774f103682c5230096441333621fc2e300bdba5f5c301f0870c62afe
diff --git a/net-misc/libteam/libteam-1.22.ebuild b/net-misc/libteam/libteam-1.22.ebuild
new file mode 100644
index 000000000000..b6c9a923d13b
--- /dev/null
+++ b/net-misc/libteam/libteam-1.22.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils linux-info
+
+DESCRIPTION="Library and tools set for controlling team network device"
+HOMEPAGE="http://libteam.org"
+SRC_URI="http://libteam.org/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+IUSE="dbus debug examples static-libs +syslog zmq"
+
+DEPEND=">=dev-libs/jansson-2.4
+	dev-libs/libdaemon
+	>=dev-libs/libnl-3.2.19[utils]
+	dbus? ( sys-apps/dbus )
+	zmq? ( >=net-libs/zeromq-3.2.0 )
+	"
+
+RDEPEND="${DEPEND}
+	syslog? ( virtual/logger )"
+
+CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
+ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
+Only >=3.3.0 kernel version support in team mode"
+
+DOCS=( README )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable syslog logging)
+		$(use_enable dbus)
+		$(use_enable zmq)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	insinto /etc/dbus-1/system.d
+	doins teamd/dbus/teamd.conf
+
+	if use examples; then
+		docinto examples
+		dodoc teamd/example_configs/*
+	fi
+}
diff --git a/net-misc/libteam/metadata.xml b/net-misc/libteam/metadata.xml
new file mode 100644
index 000000000000..f2df868f0441
--- /dev/null
+++ b/net-misc/libteam/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-needed -->
+	<use>
+		<flag name="zmq">Build witch <pkg>net-libs/zeromq</pkg> support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">jpirko/libteam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/linux-eoip/Manifest b/net-misc/linux-eoip/Manifest
new file mode 100644
index 000000000000..4d8ab15be436
--- /dev/null
+++ b/net-misc/linux-eoip/Manifest
@@ -0,0 +1,5 @@
+DIST linux-eoip-0.5.tgz 657013 SHA256 97fa59518353fa91b032b651ace60e94c31f18613ea695dea3154d932bf1a8ff SHA512 a8ed24a0bc4bf6dc97b125ece4ec6b46d20ee1aa09a21f7127854394c085143d4cf1d973e544869bbe6da6de86df7ee6c6901ca1e0dcf9c1610d5d35fdeea7c0 WHIRLPOOL e07613523825ec7add49b4b73562ee01b33c3133e9f692eea7480258b50057cd2a2b9cbb988a4e058d650d60f6217a81c22d89909a3261c68a14791c487e3f8b
+EBUILD linux-eoip-0.5.ebuild 699 SHA256 8ae0b22e00d1f14327539122115f04db4e744fb2b147c79de40ea702fd934211 SHA512 2f9cda3cc804a7fe4e1227fb2d9941ed7fbd78e843bb4be461ad9ec3a44efea5f733dfd9b3d5ed87bf49b154844072170ef4d642f57cfb91524822f7bcfd84d5 WHIRLPOOL b371c8ffbeeae97431f877577ffdf4afd92e8145c09c0abd87ca621e4267ff97d1d8a7fb32a0a3ea02aeb631759b61c98aaab96b9c761a78119a6fdb35ee4a47
+MISC ChangeLog 2752 SHA256 3d0e302d9f12923f0bf8cbabf1f8d0a7b2b02f3ebb89123b0a5d70fa99488160 SHA512 56acd80479274cc2191f71a1d659950198f60453d42b0d61ace73cdbbbbc7c25010e99d403ea0e6209015bc5dd6316fc906bfb311396331235fc9c0c969e93db WHIRLPOOL 436e760f22cc21d537e559c2c576168f8353e2323dec8c14d7af1c1d752451c1875534587475313e1229d8ed14b10c5c1277af1e85b6b50e6b363b1066f98ce8
+MISC ChangeLog-2015 642 SHA256 fbe76d6da138e2262225b1b1faf6aecb9ad7ad071a209c2ca67f61562f02106f SHA512 92328629a15a6b69a624ab2f27c56979507ec910def2ae2c87ed0c4c9302e36249c32b6edf13b1cab6da8a75d9e0749e24f746eb10116afd909cfbd764a2eb7c WHIRLPOOL db52224f2806e95a63c89282ce02da23d5a354c1999d9b4bfef082399c7c347b7ee71e2656d56d378259874dec5a15e8cc7201e5053498b961fdd7aba5d5d12d
+MISC metadata.xml 374 SHA256 07cd5e4abc306a6a108c9e36a7dab4c1314a247005a0d1b2b51c18707477326f SHA512 04c13ccf8492060efa30661a15a80d93655aaf5dafc3135734b3f229912ea5dd52ab0b51fe370e05881a26d6c65514bf5edf9ee547a6ed1b0bf4763dd89fef42 WHIRLPOOL 60aad0115c260e256a9790e94c105668b6046c7458b6d12994bcba368d3ab0426744496345c1abfd27c0d985afc17fc6fccadeb03686cb49f0fd169c903a04cf
diff --git a/net-misc/linux-eoip/linux-eoip-0.5.ebuild b/net-misc/linux-eoip/linux-eoip-0.5.ebuild
new file mode 100644
index 000000000000..89b53995b2a9
--- /dev/null
+++ b/net-misc/linux-eoip/linux-eoip-0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils
+
+DESCRIPTION="Linux support for proprietary MIkrotik EoIP protocol"
+HOMEPAGE="https://code.google.com/p/linux-eoip/"
+SRC_URI="https://linux-eoip.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/lzo:2
+	"
+
+RDEPEND="${DEPEND}"
+DOCS=( README )
+
+src_prepare() {
+	esvn_clean
+	sed -e 's/bin_PROGRAMS/sbin_PROGRAMS/g' -i Makefile.am
+	autotools-utils_src_prepare
+}
+
+src_install() {
+	autotools-utils_src_install
+	insinto /etc
+	doins vip.cfg eoip.cfg
+}
diff --git a/net-misc/linux-eoip/metadata.xml b/net-misc/linux-eoip/metadata.xml
new file mode 100644
index 000000000000..b6637298422f
--- /dev/null
+++ b/net-misc/linux-eoip/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>pinkbyte@gentoo.org</email>
+	<name>Sergey Popov</name>
+</maintainer>
+<upstream>
+	<maintainer>
+		<email>nuclearcat@nuclearcat.com</email>
+		<name>Denys Fedoryshchenko</name>
+	</maintainer>
+</upstream>
+</pkgmetadata>
diff --git a/net-misc/linux-identd/Manifest b/net-misc/linux-identd/Manifest
new file mode 100644
index 000000000000..bd26ae04e9b1
--- /dev/null
+++ b/net-misc/linux-identd/Manifest
@@ -0,0 +1,7 @@
+AUX identd.init 379 SHA256 d8270e5a70c4b1528b0144d4c9d628b2fb3b1ecb82354c7613a442a6bd1a1b37 SHA512 0fa2e7a493d487d7c670c64d6ad8b029a8e04dcaed5c36f05be2a2a18f5b3e6a05ce332812ddfdfa31f98fb3e126b4a4f72d1a0307fd94c902496a6bba56a5ed WHIRLPOOL ef9c8c535ea81a3653c5213aa55da67176e60b4f3cabfdd81df8d31864240defc32b00f93d0a38a924ee428faa2efaf8961f6ca5a56f368235e4bbf602b25027
+AUX identd.xinetd 130 SHA256 45b3718a885a6c51a85ca1ab354cdc256ffb59ced15c544dae2394d992e4250a SHA512 31ef13ab9fed83a3bc6bc0038ba8a41ba6ef5c4876cb93a845faee0beaf7b8b369bdaf464eaf9e5fa8d01984919c8740fb2fcab5487f8f55186ece6854a3bd62 WHIRLPOOL d0e1dd43664e720328919d54299ad76ecc7dafb9f021404bb4d1fd14c500af45220f53991b16043df8c2dce3c6f07ef7bc2e120ee2f8de80a3e02424838840bd
+DIST linux-identd-1.3.tar.gz 16719 SHA256 3d82fcf7202f5cd8d92ddcb71c7098f9f76fc81679dcf3076dde82bed12a04fd SHA512 3f533933da0d3be42713ee3ab18a31c72c19434363635b3a996ad1a0b7516eb3a2127f181b4c584a19671ae4e270ab6248a2c975b6e8ae26817990bee3c3bab4 WHIRLPOOL b9745d555668f6b5bb088fd6cfd6595932b5b690349e82a94d5ca54f52572dd2e90610845838a743d17f3a22f55d477853b59867fb3a72d3eb75b0a642a89e0a
+EBUILD linux-identd-1.3-r2.ebuild 787 SHA256 61a3cf85b2fde61c8624616a8f733e84677e2697e0b17491325982e669427f90 SHA512 2f8789e9fad41cd063d4ebcb1af478f4e309d09458ad5531a9e5a5870d512e9a5fc133e3ce681f68fb09c8e5f7fa560baf0b7c978cff6bd30323ffd90beae872 WHIRLPOOL b897cc68b6dc0e078445c492d77d1c54d6ad0172a347dbc6b44075b3814925c7ef403642cf88e5cb986b33e0ddf586764a4b934f3c093f4d3e66fee56982db37
+MISC ChangeLog 2999 SHA256 7c8a7b0f487444f76d7539f91b62eecca2cd135a1bdda161da6b3bc335ae446e SHA512 81b60476ce84236464ffcc824e1f3687f454be4353ea7d415c6879db109b922455d1e9087a2c36a94b2ab65bcae3e917efc65c52c67d8c0e6b2c4e6a32ddd742 WHIRLPOOL f8c3cac2ba05ce6ce86bddf2909e027685bd33dedd2356aa4e05abac55c47c60aab915412c04becd4825bcde6b2cc62bea74ade7ab776b18e6b56792239d583b
+MISC ChangeLog-2015 3253 SHA256 4e60fe18db2a6cee292e99b0b0cc09135bfd952bb8ad7b4d2749d4088b85638e SHA512 6e69b404bfb07f081312e1f285545d166d12d61518a1eb65665e09be959e2f83569a84c66f512153eb09cbdc822076651c7ce8ce13ff8c74548134c29eec4ce1 WHIRLPOOL 37fdee5259560e07f06084e3dd53ffe58fd0f99dfb006dcd4c04430e965243beab27685de0de08f95402bc1edaf97fa8b6dddb1e8a049a7c3ad964fb491db91c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/linux-identd/files/identd.init b/net-misc/linux-identd/files/identd.init
new file mode 100644
index 000000000000..4210441c157b
--- /dev/null
+++ b/net-misc/linux-identd/files/identd.init
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting identd"
+	start-stop-daemon --start --quiet --name identd \
+		--startas /usr/sbin/identd -- -d
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping identd"
+	start-stop-daemon --stop --quiet --name identd
+	eend $?
+}
diff --git a/net-misc/linux-identd/files/identd.xinetd b/net-misc/linux-identd/files/identd.xinetd
new file mode 100644
index 000000000000..a51d49b2019a
--- /dev/null
+++ b/net-misc/linux-identd/files/identd.xinetd
@@ -0,0 +1,9 @@
+service ident
+{
+	disable		= no
+	socket_type = stream
+	wait		= no
+	user		= nobody
+	protocol	= tcp
+	server		= /usr/sbin/in.identd
+}
diff --git a/net-misc/linux-identd/linux-identd-1.3-r2.ebuild b/net-misc/linux-identd/linux-identd-1.3-r2.ebuild
new file mode 100644
index 000000000000..2938662642ff
--- /dev/null
+++ b/net-misc/linux-identd/linux-identd-1.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A real IDENT daemon for linux"
+HOMEPAGE="http://www.fukt.bsnet.se/~per/identd/"
+SRC_URI="http://www.fukt.bsnet.se/~per/identd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc sparc x86"
+IUSE="xinetd"
+
+DEPEND=""
+RDEPEND="xinetd? ( sys-apps/xinetd )"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CEXTRAS="${CFLAGS}"
+}
+
+src_install() {
+	dodir /etc/init.d /usr/sbin /usr/share/man/man8
+	dodoc README ChangeLog
+	emake install DESTDIR="${D}" MANDIR=/usr/share/man
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/identd.xinetd identd
+	else
+		newinitd "${FILESDIR}"/identd.init identd
+	fi
+}
diff --git a/net-misc/linux-identd/metadata.xml b/net-misc/linux-identd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/linux-identd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
new file mode 100644
index 000000000000..40a07c98885c
--- /dev/null
+++ b/net-misc/linuxptp/Manifest
@@ -0,0 +1,11 @@
+DIST linuxptp-1.5.tgz 139127 SHA256 ecebc8503a9fd2340299f8015e520527c32cf3760d34849fa0e855bbbf4b1090 SHA512 03ec0c3a283e08f9e62dfa7d059326887db541aa53b5c65e03534079083f39666a441a4303f428f3b972976483e683e603bdc2ec232495ccab46153531124974 WHIRLPOOL e5fb5398cf239221f08ec52830252aa4eeaabcef6341cc9c04a9ff3794d4d93f18247323b0a1fd26a088e00d6816087d7149e8625e7b25d91882be9dc034dec1
+DIST linuxptp-1.6.tgz 144842 SHA256 e7fd16a9f235b059be527bd512e86f0c1d9f2e7c36736e6d6d9727a4427ac14c SHA512 f7e237f2afc0a53254cd56c3121c44dd633947eadf3c76bd3cb1e9488281e582d7d80dd33a681f5b4aef336cb3cfefe274783cf3b4a6f6e4bf98488996d81883 WHIRLPOOL fbd9492330d5fe6cfb5732778c3d3384d41250c1a0709e64cd2b19c1c050a9d5c02daa0ec14d4e68ee5356a77bd088d8cb6cffe9fee464354c3e128b2d532892
+DIST linuxptp-1.7.tgz 145856 SHA256 cc52610c5e6ec81cbbd392dc434040e99cb7fc661215d32a9d30b8008c499c26 SHA512 65cd509d098b9a12af469cab76aea7a1aeeca7b3d1db04d1538ed0979025f65a832b27d46fef9e262cc77e3787830eb33535068740def61dfa0e99569bce714b WHIRLPOOL 62a8d2f1ee689288e127b151105ff9ee251df0d1449e463cfb80aab7d2cc807ec7a762f4b287d7b4dddc4e776623949e6edeee2d68c4df6cf405daf87bb61ef9
+DIST linuxptp-1.8.tgz 147764 SHA256 fa8e00f6ec73cefa7bb313dce7f60dfe5eb9e2bde3353594e9ac18edc93e5165 SHA512 8ac52428b7addf1c43769083e660ca0ceb2813994107b8b9c59338e480f1d2e45666ebcc3f59f7b8cf9a02301b55aa54b26cbbbf81622a525a704f2d08fd383e WHIRLPOOL e90643030aec33b63951f90fe23929816d258bc5c72170668161a1bd8b706ea77519e59bdf131bca996e8eb82030dfc2a903c13202620b946d0f35b7da4e030a
+EBUILD linuxptp-1.5.ebuild 722 SHA256 a897d35b255fe7b7342c28d86f0a15e7aa92560b14a88755119a257091a57af1 SHA512 acdc547f29ec8e618c836c65b21da9192290af4b001926f7720b1a35943e4967695ee16d839cf5f18b194ac8bbeca9346127e0c08806e66d079d349fe574f2d9 WHIRLPOOL 83f14d999fc57559b60fbab010c277249d2ce9e724fd7432f9c0eb971a3ec88c6cd8327d2bb9a788e333109c7ed81f2a43dfbca5ed8856fb06d2133fe3abf55e
+EBUILD linuxptp-1.6.ebuild 722 SHA256 a897d35b255fe7b7342c28d86f0a15e7aa92560b14a88755119a257091a57af1 SHA512 acdc547f29ec8e618c836c65b21da9192290af4b001926f7720b1a35943e4967695ee16d839cf5f18b194ac8bbeca9346127e0c08806e66d079d349fe574f2d9 WHIRLPOOL 83f14d999fc57559b60fbab010c277249d2ce9e724fd7432f9c0eb971a3ec88c6cd8327d2bb9a788e333109c7ed81f2a43dfbca5ed8856fb06d2133fe3abf55e
+EBUILD linuxptp-1.7.ebuild 722 SHA256 ef67b3f510fcffa5307288d79a4c66d28e219d5664d9453257d6bcc9c1cc08e9 SHA512 436e295ba2ce051d858cd45633a249e78da1e7a9463b2f58fa675d8303891544904f9fdfea6d44839d692695c071bd6547008ab9f5d12e319227b51551eed744 WHIRLPOOL 3e5a74c63f88fccee9fe721f6de2863b2c9df23428e8613fd557bcc7461e288bc907957fac4c2ac35f25e8d6f9aaebe5ca0472069bc81953baf4846f422a5c25
+EBUILD linuxptp-1.8.ebuild 722 SHA256 ef67b3f510fcffa5307288d79a4c66d28e219d5664d9453257d6bcc9c1cc08e9 SHA512 436e295ba2ce051d858cd45633a249e78da1e7a9463b2f58fa675d8303891544904f9fdfea6d44839d692695c071bd6547008ab9f5d12e319227b51551eed744 WHIRLPOOL 3e5a74c63f88fccee9fe721f6de2863b2c9df23428e8613fd557bcc7461e288bc907957fac4c2ac35f25e8d6f9aaebe5ca0472069bc81953baf4846f422a5c25
+MISC ChangeLog 2635 SHA256 e9f59a88a6e175a0d305655b27eec6a3c03009d387404679c781c930db4cf718 SHA512 f29c21bc29c23246071a76e4c63e1d35ecdfeaceeb253cd9bb13abd792f2b4b698842067b4ef88620ff26f5e86d3258f46289aee99d2a5c331d01e7340fd5c77 WHIRLPOOL 426b6ca573470af1122d6bbff0640dd773ce6b5f271200022789a1ba2ea61340898915a19ac0ca3b35cf29c301e7e8cb8efdb01ff7a66d2215d5cfae36bb63b8
+MISC ChangeLog-2015 436 SHA256 6bdcfb1f7bb1930364e4b418399f4b18d079da265beb1e10a1aaa2ec3cf09380 SHA512 dfc52c1aba243859ed527bfae57c4bd8f4f5389cd68e80670488243168494ffe6d1a85d84a35e082521bdca7e876d57ce1494f6f19c1c0222331ba7b72fca8a0 WHIRLPOOL 6e2eacc78d56221a9e3d30c55633691a9f714c068263b097c451d6bc27ae90333b4450c66f0ebc0bc206a1c50666eeb1a8cafbb2079c49b88ee97b686a8f4446
+MISC metadata.xml 445 SHA256 a0b71f391ffb6d8329bf49dea248e4d1d1eeaff06fe1e646d5615d835b96fc3f SHA512 6016bb962e61088156d9f2b78d8dfc0f4b07e6a22016d7d591459b8254ef42798c902a2cdfe183972703d3c1911ab48d7b3c95a0bc1b470a4dcc1a34ea66d232 WHIRLPOOL a0595b478378db38169c8ea996019411b65a4bc4c0c95a81ecd7a9bd2e9237c9f9100a9205cde3418cefcc80ab12a844cbed8700a6503205955af02b58b58711
diff --git a/net-misc/linuxptp/linuxptp-1.5.ebuild b/net-misc/linuxptp/linuxptp-1.5.ebuild
new file mode 100644
index 000000000000..558f1ca5c7aa
--- /dev/null
+++ b/net-misc/linuxptp/linuxptp-1.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info
+
+DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
+HOMEPAGE="http://linuxptp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="PPS NETWORK_PHY_TIMESTAMPING PTP_1588_CLOCK"
+
+src_compile() {
+	export EXTRA_CFLAGS=${CFLAGS}
+	emake prefix=/usr mandir=/usr/share/man
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		libdir="${D}"/usr/$(get_libdir) \
+		install
+
+	dodoc README.org
+}
diff --git a/net-misc/linuxptp/linuxptp-1.6.ebuild b/net-misc/linuxptp/linuxptp-1.6.ebuild
new file mode 100644
index 000000000000..558f1ca5c7aa
--- /dev/null
+++ b/net-misc/linuxptp/linuxptp-1.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info
+
+DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
+HOMEPAGE="http://linuxptp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="PPS NETWORK_PHY_TIMESTAMPING PTP_1588_CLOCK"
+
+src_compile() {
+	export EXTRA_CFLAGS=${CFLAGS}
+	emake prefix=/usr mandir=/usr/share/man
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		libdir="${D}"/usr/$(get_libdir) \
+		install
+
+	dodoc README.org
+}
diff --git a/net-misc/linuxptp/linuxptp-1.7.ebuild b/net-misc/linuxptp/linuxptp-1.7.ebuild
new file mode 100644
index 000000000000..4e1f587b8bbb
--- /dev/null
+++ b/net-misc/linuxptp/linuxptp-1.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info
+
+DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
+HOMEPAGE="http://linuxptp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="PPS NETWORK_PHY_TIMESTAMPING PTP_1588_CLOCK"
+
+src_compile() {
+	export EXTRA_CFLAGS=${CFLAGS}
+	emake prefix=/usr mandir=/usr/share/man
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		libdir="${D}"/usr/$(get_libdir) \
+		install
+
+	dodoc README.org
+}
diff --git a/net-misc/linuxptp/linuxptp-1.8.ebuild b/net-misc/linuxptp/linuxptp-1.8.ebuild
new file mode 100644
index 000000000000..4e1f587b8bbb
--- /dev/null
+++ b/net-misc/linuxptp/linuxptp-1.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info
+
+DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
+HOMEPAGE="http://linuxptp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="PPS NETWORK_PHY_TIMESTAMPING PTP_1588_CLOCK"
+
+src_compile() {
+	export EXTRA_CFLAGS=${CFLAGS}
+	emake prefix=/usr mandir=/usr/share/man
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		libdir="${D}"/usr/$(get_libdir) \
+		install
+
+	dodoc README.org
+}
diff --git a/net-misc/linuxptp/metadata.xml b/net-misc/linuxptp/metadata.xml
new file mode 100644
index 000000000000..0a0544e123f3
--- /dev/null
+++ b/net-misc/linuxptp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tomjbe@gentoo.org</email>
+		<name>Thomas Beierlein</name>
+	</maintainer>
+	<longdescription>The package implements the Linux version of the
+		Precision Time Protocol (PTP)
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">linuxptp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/liveice/Manifest b/net-misc/liveice/Manifest
new file mode 100644
index 000000000000..4f6683c9d248
--- /dev/null
+++ b/net-misc/liveice/Manifest
@@ -0,0 +1,5 @@
+DIST liveice.tar.gz 85171 SHA256 d295bc85b925f4e35569e5426968062cc8051ec62bd0528c34727667283eb11c SHA512 6b6b7ed7f4aa2b27e2b97db407554955e332002c059bbf3fbb5c5fe60c1d6aa5cd594d2698524a9b447fc3a81de96fb46945c2386467f1773ff0ba2b10da78e4 WHIRLPOOL 7c3b70be89882b5a8003eff977698bb63b65a75caf2264666573fa39b24b99293692e1f684f693904108badd31ad757577824a320b55367a94ce3b8cf6d143aa
+EBUILD liveice-2000530-r1.ebuild 805 SHA256 3be3608e3d3007104db24d7036004e6ed7e5f0631ba1c6fb8c04ea90a14b43a5 SHA512 9eeea18578b6d2b869df4620ea753b9d0d2877652bdd5841bebb3e8317ec69c2d291e7ce9c697d8158e411aeb3b61768fc56b53e05244fe7f413e41379116e52 WHIRLPOOL 521098f3b4a46de8c3453fcecfb8fd722ebdcd09377e2bc6d4df8cc10d66ffac8b3a62086d3f2ef99ad6972282a3ebdea27ade7fd55b50402c114d7f96495372
+MISC ChangeLog 2532 SHA256 96ae21b6c2fcf5040081a908bc7e286e8f67b956d744b7e8b0d0c01cd68f59ed SHA512 196890dbfe8f6095b3f4568650b9107d2677ce62f127c1470b5239180d97e7ba0749b284813a95444d4cb635130a9f0ef516b2cb39d9127401cabaf330eb0735 WHIRLPOOL 220075acebd83ff41d9476252ddef10e3664901e188e6e8f791bae9c69f5bee2818a6931d39fe23a10622faa4594fab6d0479a0cef35802491be9131fb58864f
+MISC ChangeLog-2015 1392 SHA256 fee3b732c4d5e8b26f3a9516a9bfa62226c3a3af8d7136dff934516b525bf649 SHA512 be82ba14395e9c776d1ba7544207427bd35f36bc698dddc28e76f1b01ae25ce7748454d7519fbb72c766b999231f20c562973c867ab0152d147e812d898006fe WHIRLPOOL fb034feabbabc6d86e020ce1531bf680649a1679faede58ce8cf6d7bafc0947c9dcb8925bff3b908077e015217e242317d4614a523a8187c1fc228a42d653ad6
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/liveice/liveice-2000530-r1.ebuild b/net-misc/liveice/liveice-2000530-r1.ebuild
new file mode 100644
index 000000000000..bfdc4567572c
--- /dev/null
+++ b/net-misc/liveice/liveice-2000530-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Live Source Client For IceCast"
+HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html"
+SRC_URI="http://star.arm.ac.uk/~spm/software/liveice.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND="media-sound/lame
+	media-sound/mpg123"
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# cannot use LDFLAGS directly as the Makefile uses it for LIBS
+	sed -i Makefile.in \
+		-e 's|-o liveice|$(LLFLAGS) &|' \
+		|| die "sed Makefile.in"
+	tc-export CC
+}
+
+src_compile() {
+	emake LLFLAGS="${LDFLAGS}" || die
+}
+src_install() {
+	dobin liveice || die
+	dodoc liveice.cfg README.liveice README.quickstart README_new_mixer.txt Changes.txt
+}
diff --git a/net-misc/liveice/metadata.xml b/net-misc/liveice/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/liveice/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
new file mode 100644
index 000000000000..7330fdf702b9
--- /dev/null
+++ b/net-misc/lksctp-tools/Manifest
@@ -0,0 +1,11 @@
+AUX lksctp-tools-1.0.13-build.patch 972 SHA256 76361b40420fe44775a620b6a65f49d63b07bdaaf1d6844c6d4b5ca18d8f6a2a SHA512 7db737b2e369e85f4e97c167bf8ca52d004fb19b3fbda7cc538cfcdbec19320ae94fb97e83451143eba91e1b44f11f11d4824511e203b85d2fa329d7aa66cba6 WHIRLPOOL 9b7e0408f91934807c6b1df8a05f3d9100ecb9d9f8844787660d1d32b04b066dded0346d8a11ae8b894ae4b856145ced90a432e1e739b7fbf6ae2b314306527b
+AUX lksctp-tools-1.0.8-prefix.patch 332 SHA256 0ba46873503b855e0ac2be948a9d5f2a43ae2298003cfe46fca60424ca483039 SHA512 f64962208c270fbf39ba73b71801c27f5c2e45e4382c53bf3728e14c1300970b0d2a86d34132a4e8d24f8eb694bd234b11cefb7cc31eb232557d090c34d830e5 WHIRLPOOL 64fa9a8da1ae199efc46fc6af677d7c0ec5e914255b409fbd49472f117a64d764809f0271c774ae6e3d3101d214aad6625db8aa0b63c431011be1ccc2c0a57be
+DIST lksctp-tools-1.0.13.tar.gz 564530 SHA256 7c681868a95afc420f941d2f7dc6bfe07658de109aba6969c407ddf213c2f2a5 SHA512 bdcf06223641ca062fd528ad87efbd3ac2a4e721b691bade528ae6d2ad8eaee5a6c0516eff42c83a3afed812c378f3ce782b93efe8ec830d91280b7419ce17b4 WHIRLPOOL a6d02d4ce9a05d40c28d34437f79da2158684d3cab7b9c2ea0ddac61d2c2464af0eb1931865a80bc889a17ea544a93e2125314d9b53c576cf719a09608ef37d4
+DIST lksctp-tools-1.0.16.tar.gz 565446 SHA256 0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae351f26 SHA512 ea771f3ffeef4630638ee9cbdf01723d01b1b0ca2e8f147a2b61b907339bd1a0c5d621a58638a3b700b6ffc41de06c7b9002645254a471e279663b64b313f467 WHIRLPOOL cebff8ede44ce9ca82da14b6d5a622876e0b86805672320364bab9ca5c8fc92197c806a88898fbd06598c9120ec5b044d2fd94e3f1814d2742c743217ef12cee
+DIST lksctp-tools-1.0.17.tar.gz 795762 SHA256 1aeb204cdb2befc94d9eb3037d1609c9d1d2cd5379d6dd2c0a8ca9b10533aa15 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4 WHIRLPOOL 0831eccf424b8a02ded67b4c822713bd45bd07e3026ca5812dd0ed57c0d9b9573eee6f191075aea7a6b8587cf7b0b82c1c9b368edb08473d4967cd42ea69536a
+EBUILD lksctp-tools-1.0.13.ebuild 1325 SHA256 0789f44efdef1f906a1badf70fb3ea4959048acbe46bf31204a09b4d0c6e2669 SHA512 056d22e86c97ebab6a4b782ac069a18df5f3f023188e064ed0c600859dcb4c2a5eda9dd87e1caa0b733da3f40887afd02ab8c3835a745ea03b83567154de5586 WHIRLPOOL 5d2bd239e1d22a47317e488ab786e46e7a7b8f6cd3d9f36b4c69c15e7ad203270843379ca8dee74ac76d192663fcc045ec6fab385d5d3fec3620e1c31350b8e9
+EBUILD lksctp-tools-1.0.16.ebuild 1262 SHA256 4d648d38e06e8e847a799a173bc6eb5dc360ab64b3c1e7230eab4521d3b7fddb SHA512 895d27b5a9250d835f9327ae66d45c05a0c714dc85c227c767bc255b7139f8beb46469c1201b293b482074722bee68a5f6d71648b9d91f85c1d5da67297edb5f WHIRLPOOL 24218cbfbe79ff6c28801de2d88bde2fdda1730b70daff1c9ee25c5c5c30987ccd836bf451dad7beb42bbf977f5f1daa9f63882985e67f8d9d6473d65282e25e
+EBUILD lksctp-tools-1.0.17.ebuild 1270 SHA256 991befcdaeadcbdda97ad1322adeba7951aee85e10b407f1cc0622cc6d4469f4 SHA512 d8bec192a0ca70d0e66af8da4027ad6f038c8b14b06009607f880e2fdd765293885e8a7c0fadc19585dfdfd56719b5ebe1f8ebb6487e77f91f8120574f84f2fa WHIRLPOOL 0fa7ee374d2c963c0d6d01cdf4bde3f17054828ba6d64778ec6814c434b3b2d2813eecbc1bd84f53d89a354c6030363b66a0c7634e5d0e3a97d593ec5261563a
+MISC ChangeLog 3435 SHA256 16d479b950a2864b379123c5be11f609387c0e6633003c8ee783522cd352ed26 SHA512 3ebf9dc298c45f572189cd9f3404786591d63ab0a0406f7312b362cd96dd85d6ea59a6cabc4fd0cd476cd7703392905aca13e2dd914d533c131eb965b0617bf3 WHIRLPOOL bd9bb720fa6ae7da7800bc63f121acf39a14bda81487c36b37afc8b9b810b7ae346dd17f142963b3f06505dd8b91c56484478b8d41bdee0bd3e8231f0d478209
+MISC ChangeLog-2015 7132 SHA256 c53b92a5ab8cc9b8607255e4af0110f6cae2caa660d698773627f4ad1332c23c SHA512 478db7db5e6af3846999811668d6e56d9fb3f54a37c737ccdbeb5cc0fdcf2efbd05288417c5dcf71617d62be659380b0f4ff67207d9bf97caea0ebd8a03c1e66 WHIRLPOOL c6975d2dbb897e7181847a4d1e25cbca082ceb68d8a16b6796d723cac8db53495c97e358c3f4420d1dda6486eb8d1d3c2f1e2f02e38e0aab5ca9d46148da6965
+MISC metadata.xml 550 SHA256 02eab31e40c2278d681e879703d41a06ec6bc72f50ce56c50233ae0e442766b7 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff WHIRLPOOL 4ed43dec6103c28d49de479829557f1221655e491ee4d350cacef2f8e2f3b9cc060ff5295a4a6f1afbb2fdde2b72bafbb2c54e8385895eb3ef6e9a30349fccf9
diff --git a/net-misc/lksctp-tools/files/lksctp-tools-1.0.13-build.patch b/net-misc/lksctp-tools/files/lksctp-tools-1.0.13-build.patch
new file mode 100644
index 000000000000..919bb1728aee
--- /dev/null
+++ b/net-misc/lksctp-tools/files/lksctp-tools-1.0.13-build.patch
@@ -0,0 +1,30 @@
+From 2f2ba4e271b91535860705ca5911a3a6e1f64121 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Sat, 23 Feb 2013 23:08:49 -0800
+Subject: [PATCH lksctp-tools] build: fix out-of-tree build of withsctp.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ src/withsctp/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/withsctp/Makefile.am b/src/withsctp/Makefile.am
+index e091049..cecf606 100644
+--- a/src/withsctp/Makefile.am
++++ b/src/withsctp/Makefile.am
+@@ -10,7 +10,7 @@ include $(top_srcdir)/Makefile.rules
+ bin_PROGRAMS = checksctp
+ bin_SCRIPTS = withsctp
+ 
+-AM_CPPFLAGS=-I../include
++AM_CPPFLAGS=-I$(top_srcdir)/src/include
+ pkglib_LTLIBRARIES = libwithsctp.la
+ libwithsctp_la_SOURCES = sctp_load_libs.c sctp_socket.c sctp_bind.c \
+ 	sctp_sockopt.c sctp_socket.h
+-- 
+1.8.1.2
+
diff --git a/net-misc/lksctp-tools/files/lksctp-tools-1.0.8-prefix.patch b/net-misc/lksctp-tools/files/lksctp-tools-1.0.8-prefix.patch
new file mode 100644
index 000000000000..6e5808468d50
--- /dev/null
+++ b/net-misc/lksctp-tools/files/lksctp-tools-1.0.8-prefix.patch
@@ -0,0 +1,13 @@
+default @bindir@ expands to ${exec_prefix}/bin and default @exec_prefix@
+expands to ${prefix}
+
+--- src/withsctp/withsctp.in
++++ src/withsctp/withsctp.in
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ # -*- sh -*-
++prefix=@prefix@
++exec_prefix=@exec_prefix@
+ LIBDIR=@libdir@/@PACKAGE@
+ BINDIR=@bindir@
+ export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.6
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild
new file mode 100644
index 000000000000..993649af9366
--- /dev/null
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.13.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib flag-o-matic autotools autotools-utils linux-info
+
+DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
+HOMEPAGE="http://lksctp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="kernel_linux static-libs"
+
+# This is only supposed to work with Linux to begin with.
+DEPEND=">=sys-kernel/linux-headers-2.6"
+RDEPEND=""
+
+REQUIRED_USE="kernel_linux"
+
+CONFIG_CHECK="~IP_SCTP"
+WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
+	epatch "${FILESDIR}"/${P}-build.patch
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	autotools-utils_src_configure
+}
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
+
+src_install() {
+	autotools-utils_src_install
+
+	dodoc doc/*txt
+	newdoc src/withsctp/README README.withsctp
+
+	# Don't install static library or libtool file, since this is used
+	# only as preloadable library.
+	use static-libs && rm "${D}"/usr/$(get_libdir)/${PN}/*.a
+}
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
new file mode 100644
index 000000000000..66c6d4a85974
--- /dev/null
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib flag-o-matic autotools autotools-utils linux-info
+
+DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
+HOMEPAGE="http://lksctp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="kernel_linux static-libs"
+
+# This is only supposed to work with Linux to begin with.
+DEPEND=">=sys-kernel/linux-headers-2.6"
+RDEPEND=""
+
+REQUIRED_USE="kernel_linux"
+
+CONFIG_CHECK="~IP_SCTP"
+WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	autotools-utils_src_configure
+}
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
+
+src_install() {
+	autotools-utils_src_install
+
+	dodoc doc/*txt
+	newdoc src/withsctp/README README.withsctp
+
+	# Don't install static library or libtool file, since this is used
+	# only as preloadable library.
+	use static-libs && rm "${D}"/usr/$(get_libdir)/${PN}/*.a
+}
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
new file mode 100644
index 000000000000..6dc0a490f3b6
--- /dev/null
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib flag-o-matic autotools autotools-utils linux-info
+
+DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
+HOMEPAGE="http://lksctp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="kernel_linux static-libs"
+
+# This is only supposed to work with Linux to begin with.
+DEPEND=">=sys-kernel/linux-headers-2.6"
+RDEPEND=""
+
+REQUIRED_USE="kernel_linux"
+
+CONFIG_CHECK="~IP_SCTP"
+WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	autotools-utils_src_configure
+}
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
+
+src_install() {
+	autotools-utils_src_install
+
+	dodoc doc/*txt
+	newdoc src/withsctp/README README.withsctp
+
+	# Don't install static library or libtool file, since this is used
+	# only as preloadable library.
+	use static-libs && rm "${D}"/usr/$(get_libdir)/${PN}/*.a
+}
diff --git a/net-misc/lksctp-tools/metadata.xml b/net-misc/lksctp-tools/metadata.xml
new file mode 100644
index 000000000000..c9eb9d45053a
--- /dev/null
+++ b/net-misc/lksctp-tools/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lu_zero@gentoo.org</email>
+    <description>
+      Luca and Diego are using SCTP for development, so they'll know
+      if it works
+    </description>
+  </maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">lksctp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
new file mode 100644
index 000000000000..286d2270d2a5
--- /dev/null
+++ b/net-misc/lldpd/Manifest
@@ -0,0 +1,19 @@
+AUX lldpd-0.7.11-zsh-completion-dir.patch 318 SHA256 a6b1cab53649d58d3332ae847bb0827c07f8c550e57812802ae88e9a009b6083 SHA512 cd4c069f9d637d6c9f0a687a7a415a6382bf5217390a94a269de19f5a35c1edd47d5c3455bc63d75aa7bc74a72d7f2c9de9210c0795a95bd0c78a10c1709fcb1 WHIRLPOOL 058512d0caf9ee539c91fbf2722cc1cb17322fceed62fa498c63773e10be2e461cf510650b0e680fe781954b05031ede70acd4912a270f853d2db61a03950538
+AUX lldpd-0.9-add-getpid-to-seccomp.patch 779 SHA256 e74b201a427f3adf66bb5bfd8f54a95fc1427c2031535b84b5963acad554161c SHA512 0094bf64e231eed45f33787c11f6f3c6332e32995b57673e41f1300c1eab606f4669ec4a60e9c4435929fc8c8f4b1831338fbdad786d9f13d6c4462a10b88741 WHIRLPOOL 7c9a080bd9c708521c20081de2a049dc979c76154d44e02f67ed4ff4f9ec00e4faa4b4d5981db9cd19d96ada202d50dd1abc5ce8340a25ae2f26dec09c24691e
+AUX lldpd-0.9-seccomp-missing-syscalls.patch 1192 SHA256 8127bbeb53c30669baf3a9745b8c4718f21024c76e45bcecb511ff2246df4fdd SHA512 360c53265171ba2effed935da762d66213a911da53832d2c5426e775d4e0d00d2ee74b0041bebe100a4aeb1ecd0292ac4bd2f95dcf0c79440e28f2ec47b01669 WHIRLPOOL a07e4a053d81f2418edd355860dc287c37a76ce3eaaa1ce5e20e6af23c57610569af9936ec85927d58ec661d10d3fb6cf490055081cc863b34b638d97565813d
+AUX lldpd-0.9.5-seccomp-add-mprotect.patch 748 SHA256 3757ce98e5b257c7593901914ed75a953ae039e1e072b88b2307fdd02eed599d SHA512 d419018d42a846b98ee06953af136e43853d5a3167b6137cf7ac34949b77e45b1f2625faf3d9980230965e7c5c2bff2b359f649e3ea3c41a26c31b8565ec9dac WHIRLPOOL 485c3f464e897f92a3b85253e9c71abd288e04b63f0fcb0d0898c8702a6f0fd484461a0f7232f9ebca1b73d7e2665bbdc59c241e434819639a02c8319413b4d6
+AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 SHA256 144494ebd3f753d9e9cfc542a69944564951b760ff2d21e53c38bed15571f11e SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc WHIRLPOOL d85776c7208731762d1adc8c823bf5b119b58edf8c5504537789c2a991d4e058f14490edf79871dff8cb3ebfcaf6aa3fb2dd4e0fb0e8c088d9c4e60ccccd7e66
+AUX lldpd-confd-1 142 SHA256 b1680fcf0395fc681bfb3283df7c86ac873aa105a9c92be37c41475b9ba9ee4c SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c WHIRLPOOL 0312f12cb5328dd9a3af675fbc142c726cb872b588e624c53b5e162cce191bf79d80ce039a61683d6c5c59c3263621ebd7e91deca1be40f6161865ccc257ad45
+AUX lldpd-initd-5 410 SHA256 a6bb408f2b924c30560dec814825529aea675bb8eb9fc33cc77e642ed623de35 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9 WHIRLPOOL ac59a8806c355bf0ea4735f1359ddb81d76ad3d6b1a20557f544acb55495c83e2c6a2c67beb183eb688122c006703f435c0abd0cf0d547c888dc8a924745b09b
+AUX lldpd.conf 49 SHA256 ff63df3f5400f3d002053e24f2254f3850ed9209d2726ead4810cff5e5cb61cc SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0 WHIRLPOOL 0445b22454bac2302215962dc0669816c86bc9d2b9560ea4a3a4c27582ce21a6539b4e5a6479b084d62abca56d537c6e0ac9416e2c25069e4f8af08977775371
+AUX lldpd.service 205 SHA256 a8434a8092ae95de991c4af83a96bbeacb0daae816cde127a3fbde6715605ef9 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054 WHIRLPOOL 20ffed164e88e7a84428df12bfd3a1475d41d121e0b1a129995327521f0ba908e417484d1acffb2819a0a55724181ea72264fdc31fb8f915dae1e59eb615b99a
+AUX tmpfilesd 32 SHA256 369398e9878566ee47e31c1dd895fb7b143e3ed3dab5dd6daffd1898fa45bedd SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde WHIRLPOOL c58b154100089e0a8c983fbc616e10e6e17e42c76239d845ddcef3f6d6b4a04eb4b882d6e82eabbe854df21b91626f4ba790d395b39ea95e116b4d3e72185a0f
+DIST lldpd-0.9.3.tar.gz 1601102 SHA256 cfa8a3245dd71efc1f5de064a72576a7c1afaaf0ccb5833238398b6dc612b127 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283 WHIRLPOOL c7be527cf48bd5623ad9b7b3ae684a5e223114d7ff57a71a33623e3e445f6bbb612a6db5353844644c6340f039bdf7caf435b7ae19cf231ae54acf1dad72b62a
+DIST lldpd-0.9.7.tar.gz 1619527 SHA256 b9360355c30a3c06fd5c0a6e658f2ad8bf77037d5a17c6fcabf20e62882e0db8 SHA512 6b087de11b54c3f731498081680c836a28b882b7e925150d8ca3a582538f6a9c294d1e94b8e906a7cbb40e9663eedb33699eddb870c186da4d88cf3a88238ae2 WHIRLPOOL 88d8a7d8cb937602a99a8f9c01f2309890546adb1d5dc6fc86ae76b90314e9e41b78b1051547f8d38220b36ba04b4bfadf08d47c03084431d7536a6c7bf50482
+DIST lldpd-0.9.8.tar.gz 1620806 SHA256 9ee494e91bc33938575b2c09b26188c486ef8eac6e2155d250c189cc4e988c4f SHA512 d3822d4dbb91cd10e678aacd176c83117d8682cfaf928eab8a0363ef40ca54a6f2d88759f219d0e524da88ad6e283d3c4f33a4e5d01761c5d23b02d7ee1083d6 WHIRLPOOL d1f140a63b5b0b1a62e415d5ec442c9a9f845148c15658136b0aa22e7e22aa1d4c72b8895e29614973b39e9244a6b927a8404e6fd97d50a23738f80835f89e0f
+EBUILD lldpd-0.9.3-r1.ebuild 2457 SHA256 26361085d4dbe67502c374be55095849c20f6db9cc1db39459101fe0b820426e SHA512 5426d7c8a2f73286a15b9901134692d77713d3cd4e20e31a4a30be64eb664b348cdd1c27196bc339af49a213e03bbc995bd4b30f8bab7c424b34f6595727b5bd WHIRLPOOL 124e376087b4dc84e35c132f034130d47a5c409b8f1068cefd21958db90c62173b919253bb21a5ef2b5bef5d673ee00cd36c5eb548116ce4afffb3d09196b8e3
+EBUILD lldpd-0.9.7.ebuild 2424 SHA256 1d06f5fb086dda3c81e772d81533823b32018769f9d6dffcd17c758ab7b6a7cd SHA512 5dad3866901c2393af61bbfc3caa827f5997f82cab3cd5286ea609e7ec2858c7229adbeca644f55a49877cbec967b43ca6f56cc067e1e0d8dc511d28aa23738b WHIRLPOOL 59fb290d1acbf693e0460c520a0c179929529c933b80de72b782446e06afcb021a8aa844781cd2f76024a5c0e5158766cf9b19824ec9b872556844c180de0985
+EBUILD lldpd-0.9.8.ebuild 2424 SHA256 afc30276630ce7335f9375ff26273b66cb856ac5717cf717b93a6acdd4b88306 SHA512 9ed97513aca887619ca40af24b512fc011238df180b3ad3ed046baca85abeeb40d82a86fdb1a7df43a1943fb464cbec0f8d1774be837b6e46530c769a34d7b2e WHIRLPOOL 9b51182463a0b4a8e3c3b75cd66b6645e4c14f153b149d9c4da687b9f487a061701ebf915484f997ea977545ebdd560ac00b537e6f7063a2f7a98dbeb2a4cab7
+MISC ChangeLog 5252 SHA256 bc2848db75d99fe286c05888364248cebedeb4c72b89577bbc5194b022248b19 SHA512 c2152d88aecab92226a117cbc2cd9163d94f7b542a9ae48f2a103199b28de4fff35f0f9cc5f3d079c54e9059b57362aa007c9e59d9c7d75e0caed9d78c4308c6 WHIRLPOOL 9377f60a98dbd5e6c520416f8716936f81b9b4d1427aa58834bd19868afc6f9438274a3f64f195233801dfefa2cbab256df6aa715792b5ce607ba6a3d910fafa
+MISC ChangeLog-2015 6147 SHA256 b88356ae256c87eaa34db27526e847e43f66f3df4c0d4f9d56114e15a1ff9c4d SHA512 c93df70cb5c658bca50fce9f6e2932cd1172cb846acde2471ece02edc644ff6afd87679b7a0bb722b1e963dce705720fc990561273c31fc0c7a727e5a4cda1b5 WHIRLPOOL 6b06183be1de3fb5a8f8ddac0813359ce34d2d28dc101a685d774bcf13ef7ea636ce91592e8a521d84db8c44db022e4de9fc18904b2fd84c49cdb330c4b2a54f
+MISC metadata.xml 2829 SHA256 eb84257c66c338cd8517476c0ead47d622e54f0438cf8736d6a722ca6905523d SHA512 a401329c2f122ba079995ce0c7810d32920a91dc94e8678378f3c0eb9f72e613710933df8508eb25ad1516bda1f406d6e459fe1049112dedd8c524a7d8432c01 WHIRLPOOL 631b4232e3232a5e7280af765f64199b8ca1c59045d38859b30dd4018eac61112af505f9b92a8ec4b377582c5196047d0da36850de280d76dbdd64381f685fa1
diff --git a/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch b/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch
new file mode 100644
index 000000000000..ff20d9aabc75
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch
@@ -0,0 +1,7 @@
+diff --git a/src/client/Makefile.am b/src/client/Makefile.am
+index 454bdeb..fd391fd 100644
+--- a/src/client/Makefile.am
++++ b/src/client/Makefile.am
+@@ -46 +46 @@ dist_bashcompletion_DATA = lldpcli.bash-completion
+-zshcompletiondir = $(datadir)/zsh/vendor-completions
++zshcompletiondir = $(datadir)/zsh/site-functions
diff --git a/net-misc/lldpd/files/lldpd-0.9-add-getpid-to-seccomp.patch b/net-misc/lldpd/files/lldpd-0.9-add-getpid-to-seccomp.patch
new file mode 100644
index 000000000000..55ed4b6f8e38
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.9-add-getpid-to-seccomp.patch
@@ -0,0 +1,12 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index 1905236..7d911bc 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -161,6 +161,7 @@ priv_seccomp_init(int remote, int child)
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(wait4), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendto), 0)) < 0 ||
diff --git a/net-misc/lldpd/files/lldpd-0.9-seccomp-missing-syscalls.patch b/net-misc/lldpd/files/lldpd-0.9-seccomp-missing-syscalls.patch
new file mode 100644
index 000000000000..183306a90482
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.9-seccomp-missing-syscalls.patch
@@ -0,0 +1,17 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index bccd378..4f9e6e6 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -148,10 +148,12 @@ priv_seccomp_init(int remote, int child)
+ 	if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(kill), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(bind), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockname), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(uname), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(unlink), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(ioctl), 0)) < 0 ||
diff --git a/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-mprotect.patch b/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-mprotect.patch
new file mode 100644
index 000000000000..dbb4c79ddf7c
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-mprotect.patch
@@ -0,0 +1,12 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index 4f9e6e6..97f4233 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -166,6 +166,7 @@ priv_seccomp_init(int remote, int child)
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(poll), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvmsg), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 ||
+ 	    /* The following are for resolving addresses */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||
diff --git a/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch b/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch
new file mode 100644
index 000000000000..987ef9a515c5
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch
@@ -0,0 +1,13 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index 97f4233..36184cd 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -167,6 +167,8 @@ priv_seccomp_init(int remote, int child)
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvmsg), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 ||
+ 	    /* The following are for resolving addresses */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||
diff --git a/net-misc/lldpd/files/lldpd-confd-1 b/net-misc/lldpd/files/lldpd-confd-1
new file mode 100644
index 000000000000..f719a1381d80
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/lldpd: config file for /etc/init.d/lldpd
+
+# see man page for lldpd or run `lldpd -h`
+# for valid cmdline options
+#LLDPD_OPTS=""
diff --git a/net-misc/lldpd/files/lldpd-initd-5 b/net-misc/lldpd/files/lldpd-initd-5
new file mode 100644
index 000000000000..ab0fc20c769c
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-initd-5
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+name=lldpd
+pidfile=/run/lldpd.pid
+command=/usr/sbin/lldpd
+retry="TERM/10/KILL/5"
+command_args="${LLDPD_OPTS}"
+start_stop_daemon_args="--wait 300"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath --directory /run/lldpd -o lldpd -m 0700
+}
+
+# vim:ft=gentoo-init-d:noet:ts=4:sts=4:sw=4:
diff --git a/net-misc/lldpd/files/lldpd.conf b/net-misc/lldpd/files/lldpd.conf
new file mode 100644
index 000000000000..09233b720826
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd.conf
@@ -0,0 +1 @@
+# empty placeholder configuration file for lldpd
diff --git a/net-misc/lldpd/files/lldpd.service b/net-misc/lldpd/files/lldpd.service
new file mode 100644
index 000000000000..c5be8a830021
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Link Layer Discovery Protocol daemon
+After=syslog.target
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/lldpd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/lldpd/files/tmpfilesd b/net-misc/lldpd/files/tmpfilesd
new file mode 100644
index 000000000000..5e3af548a581
--- /dev/null
+++ b/net-misc/lldpd/files/tmpfilesd
@@ -0,0 +1 @@
+d /run/lldpd 0700 lldpd lldpd -
diff --git a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild b/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..117ff3bf8973
--- /dev/null
+++ b/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user systemd bash-completion-r1 autotools
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph jansson +lldpmed old-kernel
+	sanitizers seccomp sonmp snmp static-libs readline xml zsh-completion"
+
+RDEPEND="dev-libs/libbsd
+	>=dev-libs/libevent-2.0.5
+	snmp? ( net-analyzer/net-snmp[extensible(+)] )
+	xml? ( dev-libs/libxml2 )
+	jansson? ( dev-libs/jansson )
+	seccomp? ( sys-libs/libseccomp )
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.11-zsh-completion-dir.patch"
+	"${FILESDIR}/${PN}-0.9-seccomp-missing-syscalls.patch"
+)
+
+pkg_setup() {
+	ebegin "Creating lldpd user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+	eend $?
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_with jansson json) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
diff --git a/net-misc/lldpd/lldpd-0.9.7.ebuild b/net-misc/lldpd/lldpd-0.9.7.ebuild
new file mode 100644
index 000000000000..d6f2a5e38803
--- /dev/null
+++ b/net-misc/lldpd/lldpd-0.9.7.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user systemd bash-completion-r1 autotools
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml zsh-completion"
+
+RDEPEND="dev-libs/libbsd
+	>=dev-libs/libevent-2.0.5:=
+	snmp? ( net-analyzer/net-snmp[extensible(+)] )
+	xml? ( dev-libs/libxml2 )
+	seccomp? ( sys-libs/libseccomp )
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)
+	test? ( dev-libs/check )"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.11-zsh-completion-dir.patch"
+	"${FILESDIR}/${PN}-0.9.5-seccomp-add-socket-ops.patch"
+)
+
+pkg_setup() {
+	ebegin "Creating lldpd user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+	eend $?
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
diff --git a/net-misc/lldpd/lldpd-0.9.8.ebuild b/net-misc/lldpd/lldpd-0.9.8.ebuild
new file mode 100644
index 000000000000..1d0988803acf
--- /dev/null
+++ b/net-misc/lldpd/lldpd-0.9.8.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user systemd bash-completion-r1 autotools
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml zsh-completion"
+
+RDEPEND="dev-libs/libbsd
+	>=dev-libs/libevent-2.0.5:=
+	snmp? ( net-analyzer/net-snmp[extensible(+)] )
+	xml? ( dev-libs/libxml2 )
+	seccomp? ( sys-libs/libseccomp )
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)
+	test? ( dev-libs/check )"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.5-seccomp-add-socket-ops.patch"
+	"${FILESDIR}/${PN}-0.9-add-getpid-to-seccomp.patch"
+)
+
+pkg_setup() {
+	ebegin "Creating lldpd user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+	eend $?
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml
new file mode 100644
index 000000000000..83adab8a47e0
--- /dev/null
+++ b/net-misc/lldpd/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+LLDP (Link Layer Discovery Protocol) (also known as 802.1ab) is an industry standard protocol designed to supplant proprietary Link-Layer protocols such as Extreme's EDP (Extreme Discovery Protocol) and CDP (Cisco Discovery Protocol). The goal of LLDP is to provide an inter-vendor compatible mechanism to deliver Link-Layer notifications to adjacent network devices.
+
+lldpd is a lldp daemon for GNU/Linux and implements both reception and sending. It supports both LLDP and LLDP-MED (contributed by Michael Hanig). It also implements an SNMP subagent for net-snmp to get local and remote LLDP information. The LLDP MIB is partially implemented but the most useful tables are here.
+
+lldpd supports bridge, vlan and bonding. bonding need to be done on real physical devices, not on bridges, vlans, etc. However, vlans can be mapped on the bonding device. You can bridge vlan but not add vlans on bridges. More complex setups may give false results.
+
+A small utility, lldpctl, allows to query information collected through the command line.
+
+lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Protocol), SONMP (Nortel Discovery Protocol) and EDP (Extreme Discovery Protocol). However, recent versions of IOS should support LLDP and most Extreme stuff support LLDP. When a EDP, CDP or SONMP frame is received on a given interface, lldpd starts sending EDP, CDP or SONMP frame on this interface. Informations collected through EDP/CDP/FDP/SONMP are integrated with other informations and can be queried with lldpctl or through SNMP.
+
+	With the help of lldpd, you can get a map of your network. You may also want to look at Wiremaps or NetDisco which are a web application that helps you to see what is connected to where.
+	</longdescription>
+	<use>
+		<flag name="cdp">Enable Cisco Discovery Protocol</flag>
+		<flag name="graph">Create dot graphs in documentations</flag>
+		<flag name="dot1">Enable Dot1 extension (VLAN stuff)</flag>
+		<flag name="dot3">Enable Dot3 extension (PHY stuff)</flag>
+		<flag name="edp">Enable Extreme Discovery Protocol</flag>
+		<flag name="fdp">Enable Foundry Discovery Protocol</flag>
+		<flag name="jansson">Enable JSON output via Jansson</flag>
+		<flag name="lldpmed">Enable LLDP-MED extension</flag>
+		<flag name="old-kernel">Enable compatibility with Linux kernel older than 2.6.39</flag>
+		<flag name="sanitizers">Enable code instrumentation with selected sanitizers</flag>
+		<flag name="sonmp">Enable SynOptics Network Management</flag>
+		<flag name="snmp">Enable the use of SNMP</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
new file mode 100644
index 000000000000..81ac542726b7
--- /dev/null
+++ b/net-misc/mediatomb/Manifest
@@ -0,0 +1,22 @@
+AUX mediatomb-0.12.0.confd 805 SHA256 21b1b9d31a6db76c5c1ccfbf00e5cd553eecfeb0e2bb161ccc024eab2243293c SHA512 74d2866c749272fe71e97e73ddf349070c51879967e7fd55716bb2dfc49f89d80d0655ac05e01fdb107fb057a62540116dcebdda87840b16c7bd11962c12065c WHIRLPOOL 3b545b860f61c5a91db2d9ba0ee8a30b572bb073ae7a82456488a2d8bacfa03e89218722d6e072ed7ab32f995bc5465f8da53c5bdaa4a049eb5d7caa8a71c5d8
+AUX mediatomb-0.12.0.config 6180 SHA256 cb43e92639e5e53908567c050c9a2fc0e5c349fd11a149414590c2c6a402b4d2 SHA512 310f408d6925ac7c2a4b5cbb0a8a854ba41c8aaa678b1e1805649e73be86d9e438da2fce7731df0e244b78271da98751e66624af15328633833603f7645be081 WHIRLPOOL abc2ad05aa92fa540ea4c69db24e205fa84babd308ff769eda68a7e4d68c004b96191c63566db71a308a2c309b10999ab9925af8e00cbf9caa90e16d90467871
+AUX mediatomb-0.12.1-flac-metadata.patch 17889 SHA256 ef5823f1987ed9f449f16030723258598ad192f2806a7e0404774ee0bad29e6c SHA512 e72e162576beb5f19518088f797b49ea81df52d32da2709bfd9f8841a3625d91ee0c7365d418d7469cf1162ca7840e3862b45ba3eb959549ec0d84e6428bc759 WHIRLPOOL 5bb571239fdacff5e86517b6757db69291e74a569e2a3671ad87c4dc91b27e2d121aca514776fa4b3bd8ddc767c46a692b29b15a4b0adb9635960b34e8f2d158
+AUX mediatomb-0.12.1-inotify-hard-links.patch 1483 SHA256 7a7475305d0d5376884e31c5220e9cad281a401a5ee6a4cf4243f084e9975832 SHA512 f9062fc0fa86045b325bbc38a9b31142c1d6e6227e2560f6429390917f675e5d9b3e4910b957b9bf3337b88f79cd2f66353fcd5460218a619303342670592206 WHIRLPOOL 4945f0bf2e21054764c8eeeebb398d3a8817b518f2ad1063ebc8464d73fb1a8dfae4d0d6d871726731fbb225c3d4a2d0155896e068dd9e444ac3d884b4b479d9
+AUX mediatomb-0.12.1-libextractor.patch 21074 SHA256 19f71fc190683056bb5f920a012bb06f10ea8c8680702fa1e5f166293aaf14bd SHA512 c71f872b98f8928baf5c53e5dad59efea622429f8b9e8b257afef53f263b7090fc986dc29e68a2d6164f60c1b74080804b4550b99f5613533001246a5336a77f WHIRLPOOL fb6c4331215d1cf13542627f0b961515e0c6aee4e7d10fb8228b06a4db71f75dd0a7276678b74a175c313d081a58e74734d11dd4620e3234da2054e450332be7
+AUX mediatomb-0.12.1-libmp4v2.patch 5893 SHA256 d39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84 SHA512 8e712c13de6e129a9a0b0805fc00c3af92bc3cedb583fa3e068c27d57ed52ad3b4c777bd92a6b073e2fee88376a28ce4d2467e97ab8ae2f9ea3ed7a64a0e45d3 WHIRLPOOL 6d8c1c06db3aed67f920f40176cd389ac84d7294b78ec5ca3f61920977fde8cbe49dac6bffe1050f97aca15af5fa4a743d947e3cba8f6a3ef9b0370bff7dac67
+AUX mediatomb-0.12.1-mozjs187.patch 8019 SHA256 4f502ead6b2620d188b2e8eeb01e353960d0527ffa46edb7dd73793d2e1343e2 SHA512 dc647eb34e508ac3ccdfc578b30e181da5aad60677a912e7a02967226a22e9f61f3123d84422c9ccd27cbba451b928b939cab3550286342bb662a319b097c66b WHIRLPOOL c09ccd53ca0d619e71e7a1fe3fb223896c8176f212b489012bdc6f5e894ac375622168448225b6cf0527ce527e426a26360ea22a520a4c66bc1a804ed0eb616a
+AUX mediatomb-0.12.1-system-ar.patch 1008 SHA256 473ebc6ba78fb21c21512c4e61be8e820f097150e28e2098a04a66a863293029 SHA512 7b07d96769b18f22b3d096ff949cd176fd5f1eb2305fc7dd0df7080326ba1c33ac17b18875453c24d585c4334834aac42d80faac511c11d08c9fc3185f4fc94d WHIRLPOOL 1ac74952948bdc8eee574848ee3febd68dba5dc5a6393adfc7e97ba69bf5a132133a7345677d9ad255a4273469e909535310101dc8c66b53ff7bd9b2d31e4397
+AUX mediatomb-0.12.1-system-uuid.patch 954 SHA256 ec6ad3d71a7ea9ed3adb284aaa6bf57f435f05738f4e20d1f49eefa7e8051780 SHA512 68ac4bca71ac5f2e52daffb58d54199ddc87a7cfd02b89e93bc0c1b4496b95f6c82c0d362d36f37d3a9076c3bfb5d018df809fb485ca687923e5e1b78e6bf4bf WHIRLPOOL 88adbe3f19493314609dea727c6b57b272095396358a14921e966cf3cfab86a3754fe5321d855b3980f7c22a38bf7c18d774b58a60f8a82abed945dc047b24f9
+AUX mediatomb-0.12.1-thumb-cache.patch 8347 SHA256 06620757320e7c04d278f4d0e020aed68c0741f21b15cc985356e8cfb5a00808 SHA512 8c919394f414dd029980916b082aeb567bda096b0e965cc95cfebc25bc7834af199eca4a0f46fc1b27131a48db349a227092ea20c5c5e1b64fbe93e2c13f2e44 WHIRLPOOL 39885a5ce5ef4025c72a2f7e0c0cfc7076c73de48edb27a74abaf491fa027cac265b4617bd69ae94de9b3e63a3c95aaeca124e16c19dce10d5996927559c6129
+AUX mediatomb-0.12.1-thumbnail-locking.patch 4992 SHA256 7c760d4f74dceda8298b44a970b738b375237011d688cea56c584269c96128f7 SHA512 ebe283cb5a56412b80d25a712323628bd40cf3cdde94420dd8e382f52280b8c06e0009ff6a6d0c8531e653cb37e58bbedbf6c61bbd7232d05695628718a55976 WHIRLPOOL 1819c41c3ab162478d2975889f980f52e73672d96cb496af89a8ee70699f2ff386ea4b9973ba60add41e08295958a358eb02be94968a2ea862a8a6e7cf35dfa2
+AUX mediatomb-0.12.1-time-t.patch 2999 SHA256 7fe3a1a73663e6a2d1a188a73c17902da6f7ce169fc8ac3c9e22505e5569e1a3 SHA512 db993ea515e334b85e79f70373ac367f4951fa71b0d648ed67b5e6b4e5a596603ae0352a28411edf730f9b6e7ffa83d9c2ba9f0b4dc7c0e291a17a79cfd50d94 WHIRLPOOL 8ac0e84d9fb13ecb36912e2fac5f6e2326fdf1faced97094dd2e9a5c3e4d91e20e312eb42a5ab80ebeb3d8ce3f3889384580f49f2e9f01e257ed253a06518a00
+AUX mediatomb-0.12.1-youtube-dl.patch 4704 SHA256 76342683dea21e8566f599723658d4e90fb97c8d4d6dcc5c988115a308642667 SHA512 658e580499c17fb5a8f78c41095c38a94043c4e472b1996507b97229ab1fadd3c8044f9c3d27c8f210052e1c96b5ad88cf9e70daef9e98d2e740b9376eb7f102 WHIRLPOOL 3c9055ce23dd87651fe41e354ffc78bb0d3215456f8c0d8268fa968e7bf0d923971615820101fcf60b527305a1a8f9d4413ce0a9d5367fd3dc195f4579dfa020
+AUX mediatomb-0.12.1.initd 833 SHA256 6e79329e8d703d1181e49f188f153a591a2611da5a09b03050022352287fce52 SHA512 a7fd0f7dee5ec657ac139fcfa2d81eeb914e7107df73afa70aa31f40f8cd60faa469ab582aabc235f3b3cd77859ba524da0d79a913479a79dadc7c0f41c90c34 WHIRLPOOL 195dd8121c63917081d2be987622abc2e7679482223b5fc4f673e5387d68b30d574798b46c00420a8824ee7fb9b492adf30264241b932cbe437361ac76a4eba2
+DIST mediatomb-0.12.1.tar.gz 1240612 SHA256 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd SHA512 36e7269a532a79c91b4ea7be36f92cbefa913a1f856e422e46fe2b97ee7a569dd20c38b0cbe651a8e7faacde892ea18f3cac66c3c0737480c44f9b9bc3a45438 WHIRLPOOL 6a9e294aa9f8f40850863a86bae4fd6a81d198d7f4cf34d67a6a0cd568c387ef0f0bd5a3524c7bc05cb304f4e86dd0c12dc773bd1034c1924af6919cc740177b
+DIST mediatomb-0.12.2_pre20160522.tar.gz 2415058 SHA256 30df1c8c57dcc2e90d5f0f9ed3c4613cc798aeae21e8541c6668be0066d7c4b9 SHA512 b45c81f548013b8fc0de84e02e47c8acbf21c359a6c41a5f13addfdd9d084ee58b23b776da4dce4da1f924a80a02835c622245165da09107c0b89786e5a69804 WHIRLPOOL cbdbccbe5a0e09a1fd8948382f96e696ab752a66a355eeb3a0eb49d0e75641567870e2979b375724d795362ad265786509a5bd53f6d74d27914ceaa714ec4dc8
+DIST mediatomb_0.12.1-5.debian.tar.gz 36001 SHA256 bfbc971eeaeb09791d4cf1b1102a19ca9ce69d67c97608bba7b8ce3b519a8625 SHA512 420cf0d4fc0aa82337f2893ef18f04f9d079d833f2540d6bee504d423e8acee5e5ae528d97f5cd4228d6648777c62d6186532f7a74d3d0cb04f9226a2de1dd95 WHIRLPOOL 3d826181f97873fc9acb67fa5a3171b9e0c60862066cc0dd29e05a4f793828fbcfb438dd1375d56144933d101824a4f498b5dbf1e269e3bb12e4ee53d9b13d59
+EBUILD mediatomb-0.12.1-r8.ebuild 4323 SHA256 6903d90f8ad5c3bd3d3720c1316ba8719921519e082dcbd4f7bab99672a361d4 SHA512 553a9a3acdfdc32d807b3f081e6322d8156f95951e7e0926f18994410548c341a3343acdb54a6e883c3e65229868fb2427221ac0a531d31673022c5d9beb2bd6 WHIRLPOOL 3e0d0339cf1de52dd2b3eb8dc3dcfacfc2db0241b535204110122b43b5deec32a8a33c04ed25d0797da93c1263316c14d5335edea06a00d4363ea41aae254872
+EBUILD mediatomb-0.12.2_pre20160522.ebuild 3247 SHA256 0507f1643f2556f3e4fbb8ba62fbc6be133ad73fae106bf615f8213385b579ed SHA512 bca0467f059b565e4fda74395c186e2d7373fbbf3bad50d485e314c932ddf67e45e3aaf7b9e728a11dbe169df93f386b164a9441b4301a52a67ea3fb0f2d2c63 WHIRLPOOL 9e9c88b5df9fc0bee63ee1a2a6054faaff9c6395857cb6cdd5606b043dc04daf26c7abd8a66b2f8975772045b0508aa4029db57d6ff158237e174cb89f6c903f
+MISC ChangeLog 4659 SHA256 f7f1fee2349c7e0e870931682bd2cc61c7cf9213973f1a3e3970d7229f76a9b8 SHA512 25a1b667ae9898b2ba4fee91855660d86056eb96f62977a377bf13b829cbf4db563ecdc5f0b0584c4c3a2c5092b000f9d39a9a7cde126ec8f6ca914611c2a9af WHIRLPOOL 5cf4470914a22c55e2aa73b0d637c058baea88487a455c27c007633928f989971f22e5d3b4ed56474c58fa4892403be9fc3b878b71b6fde2478e0f16df9237b2
+MISC ChangeLog-2015 11779 SHA256 540c4932f91dfc02cc15169cca1d0850b7a34c32334a3cb6eb6feea8dc74a7fd SHA512 3ad48e5ee61f984263320f8b7f42dcb6878953d97ef21e4d789bea4fd63597a6edf37227be94e442db89158ca93bc17c7eb07d78fa5ae44f2d5e2b7c259cbbc7 WHIRLPOOL 9f053d26641438c1c909da2ea8001192eef1a03f0b0f474bab59bc19b01b6ec873e98d5704b850421504c2f00ab19cfdfd74bd51f47ea4d0f572282533eeb944
+MISC metadata.xml 1407 SHA256 b46441247428bfb76509f1cc0dd257ee744f0206c166135b5ace588ffef6c6f0 SHA512 667d62c12d0e8d9726a16fe683ed55998541f40c00fe26a9d4a5aebd5b717274167b7f22517592802b30535d085cde79b76472976ee77560cce4ba5a7ff38541 WHIRLPOOL 139975ac6eb5278618a9539025a15ac9778f97fa8b567d28ff369fa7871425155ec29a99de8cfac0fe81f69e2d599ec22d0741b5f9312266b9f35e08459b7903
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.0.confd b/net-misc/mediatomb/files/mediatomb-0.12.0.confd
new file mode 100644
index 000000000000..7f5c00830251
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.0.confd
@@ -0,0 +1,28 @@
+# /etc/conf.d/mediatomb: config file for /etc/init.d/mediatomb
+
+# See the mediatomb(1) manpage for more info.
+
+# MediaTomb Web UI port.
+# NOTE: The minimum value allowed is 49152
+MEDIATOMB_PORT=49152
+
+# Run MediaTomb as this user.
+# NOTE: For security reasons do not run MediaTomb as root.
+MEDIATOMB_USER="mediatomb"
+
+# Run MediaTomb as this group.
+# NOTE: For security reasons do not run MediaTomb as root.
+MEDIATOMB_GROUP="mediatomb"
+
+# Path to MediaTomb config file.
+MEDIATOMB_CONFIG="/etc/mediatomb/config.xml"
+
+# Path to MediaTomb log file.
+MEDIATOMB_LOGFILE="/var/log/mediatomb.log"
+
+# Path to MediaTomb pid file.
+MEDIATOMB_PIDFILE="/var/run/mediatomb.pid"
+
+# Other options you want to pass to MediaTomb.
+# Add "--interface ${MEDIATOMB_INTERFACE}" to bind to a named interface.
+MEDIATOMB_OPTIONS=""
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.0.config b/net-misc/mediatomb/files/mediatomb-0.12.0.config
new file mode 100644
index 000000000000..0cd03b15d8e8
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.0.config
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
+  <server>
+    <ui enabled="yes" show-tooltips="yes">
+      <accounts enabled="no" session-timeout="30">
+        <account user="mediatomb" password="mediatomb"/>
+      </accounts>
+    </ui>
+    <name>MediaTomb</name>
+    <udn></udn>
+    <home>/var/lib/mediatomb</home>
+    <webroot>/usr/share/mediatomb/web</webroot>
+    <storage>
+      <sqlite3 enabled="yes">
+        <database-file>mediatomb.db</database-file>
+      </sqlite3>
+      <mysql enabled="no">
+        <host>host</host>
+        <database>database</database>
+        <username>username</username>
+        <password>password</password>
+      </mysql>
+    </storage>
+    <protocolInfo extend="yes"/>
+    <pc-directory upnp-hide="no"/>
+    <extended-runtime-options>
+      <ffmpegthumbnailer enabled="no">
+        <thumbnail-size>160</thumbnail-size>
+        <seek-percentage>10</seek-percentage>
+        <filmstrip-overlay>no</filmstrip-overlay>
+        <workaround-bugs>no</workaround-bugs>
+        <image-quality>8</image-quality>
+      </ffmpegthumbnailer>
+      <mark-played-items enabled="no" suppress-cds-updates="yes">
+        <string mode="prepend">*</string>
+        <mark>
+          <content>video</content>
+        </mark>
+      </mark-played-items>
+      <lastfm enabled="no">
+        <username>username</username>
+        <password>password</password>
+      </lastfm>
+    </extended-runtime-options>
+  </server>
+  <import hidden-files="no">
+    <scripting script-charset="UTF-8">
+      <common-script>/usr/share/mediatomb/js/common.js</common-script>
+      <playlist-script>/usr/share/mediatomb/js/playlists.js</playlist-script>
+      <virtual-layout type="builtin">
+        <import-script>/usr/share/mediatomb/js/import.js</import-script>
+      </virtual-layout>
+    </scripting>
+    <mappings>
+      <extension-mimetype ignore-unknown="no">
+        <map from="mp3" to="audio/mpeg"/>
+        <map from="ogx" to="application/ogg"/>
+        <map from="ogv" to="video/ogg"/>
+        <map from="oga" to="audio/ogg"/>
+        <map from="ogg" to="audio/ogg"/>
+        <map from="ogm" to="video/ogg"/>
+        <map from="asf" to="video/x-ms-asf"/>
+        <map from="asx" to="video/x-ms-asf"/>
+        <map from="wma" to="audio/x-ms-wma"/>
+        <map from="wax" to="audio/x-ms-wax"/>
+        <map from="wmv" to="video/x-ms-wmv"/>
+        <map from="wvx" to="video/x-ms-wvx"/>
+        <map from="wm" to="video/x-ms-wm"/>
+        <map from="wmx" to="video/x-ms-wmx"/>
+        <map from="m3u" to="audio/x-mpegurl"/>
+        <map from="pls" to="audio/x-scpls"/>
+        <map from="flv" to="video/x-flv"/>
+        <map from="mkv" to="video/x-matroska"/>
+        <map from="mka" to="audio/x-matroska"/>
+        <map from="avi" to="video/divx"/>
+        <map from="m2ts" to="video/avc"/>
+        <map from="cr2" to="image/raw"/>
+        <map from="nef" to="image/raw"/>
+      </extension-mimetype>
+      <mimetype-upnpclass>
+        <map from="audio/*" to="object.item.audioItem.musicTrack"/>
+        <map from="video/*" to="object.item.videoItem"/>
+        <map from="image/*" to="object.item.imageItem"/>
+      </mimetype-upnpclass>
+      <mimetype-contenttype>
+        <treat mimetype="audio/mpeg" as="mp3"/>
+        <treat mimetype="application/ogg" as="ogg"/>
+        <treat mimetype="video/ogg" as="ogg"/>
+        <treat mimetype="audio/ogg" as="ogg"/>
+        <treat mimetype="audio/x-flac" as="flac"/>
+        <treat mimetype="image/jpeg" as="jpg"/>
+        <treat mimetype="audio/x-mpegurl" as="playlist"/>
+        <treat mimetype="audio/x-scpls" as="playlist"/>
+        <treat mimetype="audio/x-wav" as="pcm"/>
+        <treat mimetype="audio/L16" as="pcm"/>
+        <treat mimetype="video/x-msvideo" as="avi"/>
+        <treat mimetype="video/mp4" as="mp4"/>
+        <treat mimetype="audio/mp4" as="mp4"/>
+        <treat mimetype="video/divx" as="avi"/>
+      </mimetype-contenttype>
+    </mappings>
+    <online-content>
+      <YouTube enabled="no" refresh="28800" update-at-start="yes" purge-after="604800" racy-content="exclude" format="mp4" hd="no">
+        <favorites user="NationalGeographic"/>
+        <playlists user="PlayStation"/>
+        <uploads user="Google"/>
+        <standardfeed feed="most_viewed" time-range="today"/>
+        <standardfeed feed="recently_featured" time-range="today"/>
+      </YouTube>
+    </online-content>
+  </import>
+  <transcoding enabled="no">
+    <mimetype-profile-mappings>
+      <transcode mimetype="audio/ogg" using="audio2pcm"/>
+      <transcode mimetype="audio/x-flac" using="audio2pcm"/>
+      <transcode mimetype="video/ogg" using="video2mpeg"/>
+      <transcode mimetype="video/x-flv" using="video2mpeg"/>
+    </mimetype-profile-mappings>
+    <profiles>
+      <profile name="audio2pcm" enabled="yes" type="external">
+        <mimetype>audio/L16</mimetype>
+        <accept-url>no</accept-url>
+        <first-resource>yes</first-resource>
+        <hide-original-resource>yes</hide-original-resource>
+        <accept-ogg-theora>no</accept-ogg-theora>
+        <sample-frequency>44100</sample-frequency>
+        <audio-channels>2</audio-channels>
+        <agent command="ffmpeg" arguments="-i %in -acodec pcm_s16be -ab 192k -ar 44100 -ac 2 -f s16be -y %out"/>
+        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
+      </profile>
+      <profile name="video2mpeg" enabled="yes" type="external">
+        <mimetype>video/mpeg</mimetype>
+        <accept-url>no</accept-url>
+        <first-resource>yes</first-resource>
+        <hide-original-resource>yes</hide-original-resource>
+        <accept-ogg-theora>yes</accept-ogg-theora>
+        <sample-frequency>48000</sample-frequency>
+        <audio-channels>2</audio-channels>
+        <agent command="ffmpeg" arguments="-i %in -vcodec mpeg2video -b 4096k -r 25 -acodec mp2 -ab 192k -ar 48000 -ac 2 -async 1 -f dvd -threads 2 -y %out"/>
+        <buffer size="10485760" chunk-size="262144" fill-size="524288"/>
+      </profile>
+    </profiles>
+  </transcoding>
+</config>
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-flac-metadata.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-flac-metadata.patch
new file mode 100644
index 000000000000..0228dffd08d8
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-flac-metadata.patch
@@ -0,0 +1,446 @@
+diff -urpN a/build/Makefile.am b/build/Makefile.am
+--- a/build/Makefile.am	2010-03-22 21:39:46.000000000 +1100
++++ b/build/Makefile.am	2013-12-16 10:16:32.426878578 +1100
+@@ -18,6 +18,7 @@ libmediatomb_a_CXXFLAGS = \
+                      $(ICONV_CXXFLAGS) \
+ 					 $(LIBMAGIC_CFLAGS) \
+                      $(ID3LIB_CFLAGS) \
++                     $(FLAC_CFLAGS) \
+                      $(LIBEXIF_CFLAGS) \
+                      $(ZLIB_CFLAGS) \
+                      $(PTHREAD_CFLAGS) \
+@@ -44,6 +45,7 @@ mediatomb_CXXFLAGS = -I$(top_srcdir)/src
+                      $(ICONV_CXXFLAGS) \
+ 					 $(LIBMAGIC_CFLAGS) \
+                      $(ID3LIB_CFLAGS) \
++                     $(FLAC_CFLAGS) \
+                      $(LIBEXIF_CFLAGS) \
+                      $(ZLIB_CFLAGS) \
+                      $(PTHREAD_CFLAGS) \
+@@ -78,6 +80,7 @@ mediatomb_LDADD = \
+     $(JS_LIBS) \
+ 	$(LIBMAGIC_LIBS) \
+     $(ID3LIB_LIBS) \
++    $(FLAC_LIBS) \
+     $(LIBEXIF_LIBS) \
+     $(ZLIB_LIBS) \
+     $(RT_LIBS) \
+diff -urpN a/build/libmediatomb_src b/build/libmediatomb_src
+--- a/build/libmediatomb_src	2010-03-23 04:09:53.000000000 +1100
++++ b/build/libmediatomb_src	2013-12-16 10:14:49.730356868 +1100
+@@ -98,6 +98,8 @@ libmediatomb_a_SOURCES = \
+ ../src/metadata/libmp4v2_handler.h \
+ ../src/metadata/taglib_handler.cc \
+ ../src/metadata/taglib_handler.h \
++../src/metadata/flac_handler.cc \
++../src/metadata/flac_handler.h \
+ ../src/mpegdemux/buffer.c \
+ ../src/mpegdemux/buffer.h \
+ ../src/mpegdemux/mpegdemux.c \
+diff -urpN a/configure.ac b/configure.ac
+--- a/configure.ac	2010-04-08 08:38:51.000000000 +1000
++++ b/configure.ac	2013-12-16 10:24:16.547793225 +1100
+@@ -1314,6 +1314,35 @@ LDFLAGS="$LDFLAGS_SAVE"
+ LIBS="$LIBS_SAVE"
+ CXXFLAGS="$CXXFLAGS_SAVE"
+ CPPFLAGS="$CPPFLAGS_SAVE"
++
++######### FLAC
++
++FLAC_STATUS=
++
++MT_OPTION([FLAC], [enable],
++          [FLAC metadata extraction with the help of FLAC],[],[])
++
++if test "x$FLAC_OPTION_ENABLED" = xyes; then
++    MT_CHECK_PACKAGE([FLAC],
++                     [FLAC/metadata],
++                     [FLAC], [main])
++else
++    FLAC_STATUS=disabled
++fi
++
++if test "x$FLAC_STATUS" != xyes; then
++    if (test "x$FLAC_OPTION_REQUESTED" = xyes) &&
++       (test "x$FLAC_OPTION_ENABLED" = xyes); then
++        AC_MSG_ERROR([unable to configure FLAC support])
++    fi
++else
++    CFLAGS="$CFLAGS $FLAC_CFLAGS"
++    CXXFLAGS="$CXXFLAGS $FLAC_CFLAGS"
++    LDFLAGS="$LDFLAGS $FLAC_LDFLAGS $FLAC_LIBS"
++    AC_LANG_SAVE
++    AC_LANG_CPLUSPLUS
++fi
++
+ ######## curl
+ 
+ CURL_PROG_FOUND=0
+@@ -1914,7 +1943,7 @@ if (test "x$SOPCAST_OPTION_ENABLED" = xy
+     AC_DEFINE([SOPCAST], [1], [Enable support for the SopCast service])
+ fi
+ 
+-AC_DEFINE_UNQUOTED([COMPILE_INFO], "\thost:\t\t\t$host\n\tsqlite3:\t\t$SQLITE3_STATUS\n\tmysql:\t\t\t$MYSQL_STATUS\n\tlibjs:\t\t\t$JS_OK\n\tlibmagic:\t\t$LIBMAGIC_STATUS\n\tinotify:\t\t$INOTIFY_STATUS\n\tlibexif:\t\t$LIBEXIF_STATUS\n\tid3lib:\t\t\t$ID3LIB_STATUS\n\ttaglib:\t\t\t$TAGLIB_STATUS\n\tffmpeg\t\t\t$FFMPEG_STATUS\n\tlibmp4v2:\t\t$LIBMP4V2_STATUS\n\texternal transcoding:\t$EXTERNAL_TRANSCODING_OPTION_ENABLED\n\tcurl:\t\t\t$CURL_OK\n\tYouTube:\t\t$YOUTUBE_OPTION_ENABLED\n\tlibextractor\t\t$LIBEXTRACTOR_STATUS\n\tdb-autocreate:\t\t$DB_AUTOCREATE_OPTION_ENABLED\n\tdebug log:\t\t$DEBUG_LOG_OPTION_ENABLED\n\tprotocol info extension:$PROTOCOLINFO_EXTENSION_OPTION_ENABLED\n\tffmpegthumbnailer:\t$FFMPEGTHUMBNAILER_STATUS\n\tlastfmlib:\t\t$LASTFMLIB_STATUS\n\tdata directory:\t\t$PACKAGE_DATADIR", [compile option summary])
++AC_DEFINE_UNQUOTED([COMPILE_INFO], "\thost:\t\t\t$host\n\tsqlite3:\t\t$SQLITE3_STATUS\n\tmysql:\t\t\t$MYSQL_STATUS\n\tlibjs:\t\t\t$JS_OK\n\tlibmagic:\t\t$LIBMAGIC_STATUS\n\tinotify:\t\t$INOTIFY_STATUS\n\tlibexif:\t\t$LIBEXIF_STATUS\n\tid3lib:\t\t\t$ID3LIB_STATUS\n\ttaglib:\t\t\t$TAGLIB_STATUS\n\tFLAC:\t\t\t$FLAC_STATUS\n\tffmpeg\t\t\t$FFMPEG_STATUS\n\tlibmp4v2:\t\t$LIBMP4V2_STATUS\n\texternal transcoding:\t$EXTERNAL_TRANSCODING_OPTION_ENABLED\n\tcurl:\t\t\t$CURL_OK\n\tYouTube:\t\t$YOUTUBE_OPTION_ENABLED\n\tlibextractor\t\t$LIBEXTRACTOR_STATUS\n\tdb-autocreate:\t\t$DB_AUTOCREATE_OPTION_ENABLED\n\tdebug log:\t\t$DEBUG_LOG_OPTION_ENABLED\n\tprotocol info extension:$PROTOCOLINFO_EXTENSION_OPTION_ENABLED\n\tffmpegthumbnailer:\t$FFMPEGTHUMBNAILER_STATUS\n\tlastfmlib:\t\t$LASTFMLIB_STATUS\n\tdata directory:\t\t$PACKAGE_DATADIR", [compile option summary])
+ 
+ ###############
+ AC_CONFIG_FILES([
+@@ -1946,6 +1975,7 @@ echo "inotify               : $INOTIFY_S
+ echo "libexif               : $LIBEXIF_STATUS"
+ echo "id3lib                : $ID3LIB_STATUS"
+ echo "taglib                : $TAGLIB_STATUS"
++echo "FLAC                  : $FLAC_STATUS"
+ echo "libmp4v2              : $LIBMP4V2_STATUS"
+ echo "ffmpeg                : $FFMPEG_STATUS"
+ echo "ffmpegthumbnailer     : $FFMPEGTHUMBNAILER_STATUS"
+diff -urpN a/src/cds_resource_manager.cc b/src/cds_resource_manager.cc
+--- a/src/cds_resource_manager.cc	2010-03-26 01:58:11.000000000 +1100
++++ b/src/cds_resource_manager.cc	2013-12-16 10:25:15.277987292 +1100
+@@ -372,6 +372,7 @@ void CdsResourceManager::addResources(Re
+         // only add upnp:AlbumArtURI if we have an AA, skip the resource
+         if ((i > 0) && ((item->getResource(i)->getHandlerType() == CH_ID3) ||
+                         (item->getResource(i)->getHandlerType() == CH_MP4) ||
++                        (item->getResource(i)->getHandlerType() == CH_FLAC) ||
+                         (item->getResource(i)->getHandlerType() == CH_EXTURL)))
+         {
+             String rct;
+diff -urpN a/src/config_manager.cc b/src/config_manager.cc
+--- a/src/config_manager.cc	2010-03-26 01:58:11.000000000 +1100
++++ b/src/config_manager.cc	2013-12-16 10:26:57.220886235 +1100
+@@ -624,6 +624,10 @@ String ConfigManager::createDefaultConfi
+                                            _(CONTENT_TYPE_OGG)));
+     mtcontent->appendElementChild(treat_as(_("audio/x-flac"), 
+                                            _(CONTENT_TYPE_FLAC)));
++    mtcontent->appendElementChild(treat_as(_("audio/x-ms-wma"), 
++                                           _(CONTENT_TYPE_WMA)));
++    mtcontent->appendElementChild(treat_as(_("audio/x-wavpack"), 
++                                           _(CONTENT_TYPE_WAVPACK)));
+     mtcontent->appendElementChild(treat_as(_("image/jpeg"), 
+                                            _(CONTENT_TYPE_JPG)));
+     mtcontent->appendElementChild(treat_as(_("audio/x-mpegurl"),
+diff -urpN a/src/metadata/flac_handler.cc b/src/metadata/flac_handler.cc
+--- a/src/metadata/flac_handler.cc	1970-01-01 10:00:00.000000000 +1000
++++ b/src/metadata/flac_handler.cc	2013-12-16 10:30:19.955604387 +1100
+@@ -0,0 +1,204 @@
++/*MT*
++    
++    MediaTomb - http://www.mediatomb.cc/
++    
++    flac_handler.cc - this file is part of MediaTomb.
++    
++    Copyright (C) 2005 Gena Batyan <bgeradz@mediatomb.cc>,
++                       Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
++    
++    Copyright (C) 2006-2009 Gena Batyan <bgeradz@mediatomb.cc>,
++                            Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>,
++                            Leonhard Wimmer <leo@mediatomb.cc>
++    
++    MediaTomb is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License version 2
++    as published by the Free Software Foundation.
++    
++    MediaTomb is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++    
++    You should have received a copy of the GNU General Public License
++    version 2 along with MediaTomb; if not, write to the Free Software
++    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
++    
++    # $Id$
++*/
++
++/// \file flac_handler.cc
++/// \brief Implementeation of the FlacHandler class.
++
++#ifdef HAVE_CONFIG_H
++    #include "autoconfig.h"
++#endif
++
++#ifdef HAVE_FLAC
++
++#include <FLAC/all.h>
++
++#include "flac_handler.h"
++#include "string_converter.h"
++#include "config_manager.h"
++#include "common.h"
++#include "tools.h"
++#include "mem_io_handler.h"
++
++#include "content_manager.h"
++
++using namespace zmm;
++
++FlacHandler::FlacHandler() : MetadataHandler()
++{
++}
++
++static void addField(metadata_fields_t field, const FLAC__StreamMetadata* tags, Ref<CdsItem> item)
++{
++    String value;
++    int i;
++
++	Ref<StringConverter> sc = StringConverter::i2i(); // sure is sure 
++	
++    switch (field)
++    {
++        case M_TITLE:
++			i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "TITLE");
++            break;
++        case M_ARTIST:
++            i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "ARTIST");
++            break;
++        case M_ALBUM:
++            i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "ALBUM");
++            break;
++        case M_DATE:
++            i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "DATE");
++            break;
++        case M_GENRE:
++            i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "GENRE");
++            break;
++        case M_DESCRIPTION:
++            i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "DESCRIPTION");
++            break;
++        case M_TRACKNUMBER:
++            i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "TRACKNUMBER");
++            break;
++        default:
++            return;
++    }
++
++	if( 0 <= i )
++		value = strchr((const char *)tags->data.vorbis_comment.comments[i].entry, '=') + 1;
++	else
++		return;
++
++    value = trim_string(value);
++
++    if (string_ok(value))
++    {
++        item->setMetadata(MT_KEYS[field].upnp, sc->convert(value));
++        log_debug("Setting metadata on item: %d, %s\n", field, sc->convert(value).c_str());
++    }
++}
++
++void FlacHandler::fillMetadata(Ref<CdsItem> item)
++{
++	FLAC__StreamMetadata* tags = NULL;
++	FLAC__StreamMetadata streaminfo;
++	Ref<StringConverter> sc = StringConverter::i2i(); // sure is sure 
++	
++	if( !FLAC__metadata_get_tags(item->getLocation().c_str(), &tags) )
++		return;
++		
++	if( FLAC__METADATA_TYPE_VORBIS_COMMENT == tags->type )
++	{
++		for (int i = 0; i < M_MAX; i++)
++			addField((metadata_fields_t) i, tags, item);
++	}
++		
++	FLAC__metadata_object_delete(tags);
++	tags = NULL;
++	
++	if( !FLAC__metadata_get_streaminfo(item->getLocation().c_str(), &streaminfo) )
++		return;
++	
++	if( FLAC__METADATA_TYPE_STREAMINFO == streaminfo.type )
++	{
++		// note: UPnP requires bytes/second
++		item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_BITRATE), String::from((unsigned)((streaminfo.data.stream_info.bits_per_sample * streaminfo.data.stream_info.sample_rate) / 8)));
++		// note: UPnP requires HMS
++		item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_DURATION), secondsToHMS((unsigned)(streaminfo.data.stream_info.total_samples / streaminfo.data.stream_info.sample_rate)));
++		item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY), String::from(streaminfo.data.stream_info.sample_rate));
++		item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS), String::from(streaminfo.data.stream_info.channels));
++	}
++	
++	if( !FLAC__metadata_get_picture(item->getLocation().c_str(), 
++									&tags, 
++									FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER,
++									NULL,
++									NULL,
++									(unsigned)-1,
++									(unsigned)-1,
++									(unsigned)-1,
++									(unsigned)-1 ) )
++		return;
++	
++	if( FLAC__METADATA_TYPE_PICTURE == tags->type )
++	{
++		String art_mimetype = tags->data.picture.mime_type;
++		log_debug("Mime type : %s\n", sc->convert(art_mimetype).c_str());
++		
++		// saw that simply "PNG" was used with some mp3's, so mimetype setting
++        // was probably invalid
++        if (!string_ok(art_mimetype) || (art_mimetype.index('/') == -1))
++        {
++#ifdef HAVE_MAGIC
++            art_mimetype =  ContentManager::getInstance()->getMimeTypeFromBuffer((void *)tags->data.picture.data, tags->data.picture.data_length);
++            if (!string_ok(art_mimetype))
++#endif
++				art_mimetype = _(MIMETYPE_DEFAULT);
++			
++			log_debug("Mime type via magic: %s\n", sc->convert(art_mimetype).c_str());
++        }
++		
++		// if we could not determine the mimetype, then there is no
++        // point to add the resource - it's probably garbage
++        if (art_mimetype != _(MIMETYPE_DEFAULT))
++        {
++            Ref<CdsResource> resource(new CdsResource(CH_FLAC));
++            resource->addAttribute(MetadataHandler::getResAttrName(R_PROTOCOLINFO), renderProtocolInfo(art_mimetype));
++            resource->addParameter(_(RESOURCE_CONTENT_TYPE), _(ID3_ALBUM_ART));
++            item->addResource(resource);
++        }
++	}
++
++	FLAC__metadata_object_delete(tags);
++}
++
++Ref<IOHandler> FlacHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size)
++{
++	FLAC__StreamMetadata* picture = NULL;
++	
++	if( !FLAC__metadata_get_picture(item->getLocation().c_str(), 
++									&picture, 
++									FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER,
++									NULL,
++									NULL,
++									(unsigned)-1,
++									(unsigned)-1,
++									(unsigned)-1,
++									(unsigned)-1 ) )
++		throw _Exception(_("FlacHandler: could not exctract cover from: ") + item->getLocation());
++	
++	if( FLAC__METADATA_TYPE_PICTURE != picture->type )
++		throw _Exception(_("TagHandler: resource has no album information"));
++	
++	Ref<IOHandler> h(new MemIOHandler((void *)picture->data.picture.data, picture->data.picture.data_length));
++	*data_size = picture->data.picture.data_length;
++	
++	FLAC__metadata_object_delete(picture);
++		
++    return h;
++}
++
++#endif // HAVE_FLAC
+diff -urpN a/src/metadata/flac_handler.h b/src/metadata/flac_handler.h
+--- a/src/metadata/flac_handler.h	1970-01-01 10:00:00.000000000 +1000
++++ b/src/metadata/flac_handler.h	2013-12-16 10:31:24.061822827 +1100
+@@ -0,0 +1,47 @@
++/*MT*
++    
++    MediaTomb - http://www.mediatomb.cc/
++    
++    flac_handler.h - this file is part of MediaTomb.
++    
++    Copyright (C) 2005 Gena Batyan <bgeradz@mediatomb.cc>,
++                       Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
++    
++    Copyright (C) 2006-2009 Gena Batyan <bgeradz@mediatomb.cc>,
++                            Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>,
++                            Leonhard Wimmer <leo@mediatomb.cc>
++    
++    MediaTomb is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License version 2
++    as published by the Free Software Foundation.
++    
++    MediaTomb is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++    
++    You should have received a copy of the GNU General Public License
++    version 2 along with MediaTomb; if not, write to the Free Software
++    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
++    
++    # $Id$
++*/
++
++/// \file flac_handler.h
++/// \brief Definition of the FlacHandler class.
++
++#ifndef __METADATA_FLAC_H__
++#define __METADATA_FLAC_H__
++
++#include "metadata_handler.h"
++
++/// \brief This class is responsible for reading FLAC metadata
++class FlacHandler : public MetadataHandler
++{
++public:
++    FlacHandler();
++    virtual void fillMetadata(zmm::Ref<CdsItem> item);
++    virtual zmm::Ref<IOHandler> serveContent(zmm::Ref<CdsItem> item, int resNum, off_t *data_size);
++};
++
++#endif // __METADATA_FLAC_H__
+diff -urpN a/src/metadata_handler.cc b/src/metadata_handler.cc
+--- a/src/metadata_handler.cc	2010-03-26 01:58:11.000000000 +1100
++++ b/src/metadata_handler.cc	2013-12-16 10:35:48.783540865 +1100
+@@ -51,6 +51,10 @@
+ #endif // HAVE_ID3LIB
+ #endif // HAVE_TAGLIB
+ 
++#ifdef HAVE_FLAC
++#include "metadata/flac_handler.h"
++#endif
++
+ #ifdef HAVE_LIBMP4V2
+ #include "metadata/libmp4v2_handler.h"
+ #endif
+@@ -140,7 +144,8 @@ void MetadataHandler::setMetadata(Ref<Cd
+         if ((content_type == CONTENT_TYPE_MP3) || 
+            ((content_type == CONTENT_TYPE_OGG) && 
+             (!item->getFlag(OBJECT_FLAG_OGG_THEORA))) ||
+-            (content_type == CONTENT_TYPE_FLAC))
++            (content_type == CONTENT_TYPE_WMA) ||
++            (content_type == CONTENT_TYPE_WAVPACK))
+         {
+             handler = Ref<MetadataHandler>(new TagHandler());
+             break;
+@@ -155,7 +160,13 @@ void MetadataHandler::setMetadata(Ref<Cd
+ #endif // HAVE_ID3LIB
+ #endif // HAVE_TAGLIB
+ 
+-
++#ifdef HAVE_FLAC
++        if (content_type == CONTENT_TYPE_FLAC)
++        {
++            handler = Ref<MetadataHandler>(new FlacHandler());
++            break;
++        }
++#endif
+ 
+ #ifdef HAVE_EXIV2
+ /*        
+@@ -277,6 +288,10 @@ Ref<MetadataHandler> MetadataHandler::cr
+         case CH_FFTH:
+             return Ref<MetadataHandler>(new FfmpegHandler());
+ #endif
++#ifdef HAVE_FLAC
++        case CH_FLAC:
++            return Ref<MetadataHandler>(new FlacHandler());
++#endif
+         default:
+             throw _Exception(_("unknown content handler ID: ") + handlerType);
+     }
+diff -urpN a/src/metadata_handler.h b/src/metadata_handler.h
+--- a/src/metadata_handler.h	2010-03-26 01:58:11.000000000 +1100
++++ b/src/metadata_handler.h	2013-12-16 10:52:23.234353526 +1100
+@@ -45,10 +45,13 @@
+ #define CH_EXTURL    4
+ #define CH_MP4       5
+ #define CH_FFTH      6
++#define CH_FLAC      7
+ 
+ #define CONTENT_TYPE_MP3        "mp3"
+ #define CONTENT_TYPE_OGG        "ogg"
+ #define CONTENT_TYPE_FLAC       "flac"
++#define CONTENT_TYPE_WMA        "wma"
++#define CONTENT_TYPE_WAVPACK    "wv"
+ #define CONTENT_TYPE_JPG        "jpg"
+ #define CONTENT_TYPE_PLAYLIST   "playlist"
+ #define CONTENT_TYPE_MP4        "mp4"
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-inotify-hard-links.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-inotify-hard-links.patch
new file mode 100644
index 000000000000..af9a887befe0
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-inotify-hard-links.patch
@@ -0,0 +1,34 @@
+make sure new hard links get processed like new files by handling
+the IN_CREATE flag properly
+
+patch by Mike Frysinger
+
+--- a/src/autoscan_inotify.cc
++++ b/src/autoscan_inotify.cc
+@@ -281,7 +284,7 @@
+                     }
+                 }
+                 
+-                if (adir != nil && mask & (IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_CLOSE_WRITE | IN_MOVED_FROM | IN_MOVED_TO | IN_UNMOUNT))
++                if (adir != nil && mask & (IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_CLOSE_WRITE | IN_MOVED_FROM | IN_MOVED_TO | IN_UNMOUNT | IN_CREATE))
+                 {
+                     String fullPath;
+                     if (mask & IN_ISDIR)
+@@ -289,7 +292,7 @@
+                     else
+                         fullPath = path;
+                     
+-                    if (! (mask & IN_MOVED_TO))
++                    if (! (mask & (IN_MOVED_TO | IN_CREATE)))
+                     {
+                         log_debug("deleting %s\n", fullPath.c_str());
+                         
+@@ -312,7 +315,7 @@
+                         if (objectID != INVALID_OBJECT_ID)
+                             cm->removeObject(objectID);
+                     }
+-                    if (mask & (IN_CLOSE_WRITE | IN_MOVED_TO))
++                    if (mask & (IN_CLOSE_WRITE | IN_MOVED_TO | IN_CREATE))
+                     {
+                         log_debug("adding %s\n", path.c_str());
+                         // path, recursive, async, hidden, low priority, cancellable
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-libextractor.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-libextractor.patch
new file mode 100644
index 000000000000..e46aca9c487f
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-libextractor.patch
@@ -0,0 +1,675 @@
+http://bugs.gentoo.org/435394
+
+port to libextractor-0.6.x
+
+patch by Mike Frysinger <vapier@gentoo.org>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1631,7 +1631,7 @@ MT_CHECK_OPTIONAL_PACKAGE([lastfmlib], [disable],
+ ######## extractor
+ 
+ if test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes; then
+-    MT_CHECK_PACKAGE([libextractor], [extractor], [extractor], [EXTRACTOR_getKeywords])
++    MT_CHECK_PACKAGE([libextractor], [extractor], [extractor], [EXTRACTOR_extract])
+ fi
+ 
+ if test "x$LIBEXTRACTOR_STATUS" = xyes; then
+--- a/src/metadata/extractor_handler.cc
++++ b/src/metadata/extractor_handler.cc
+@@ -55,322 +55,344 @@ ExtractorHandler::ExtractorHandler() : MetadataHandler()
+ {
+ }
+ 
+-static EXTRACTOR_KeywordType getTagFromString(String tag)
++static EXTRACTOR_MetaType getTagFromString(String tag)
+ {
+-    if (tag == "EXTRACTOR_UNKNOWN")
+-        return EXTRACTOR_UNKNOWN;
+-    if (tag == "EXTRACTOR_FILENAME")
+-        return EXTRACTOR_FILENAME;
+-    if (tag == "EXTRACTOR_MIMETYPE")
+-        return EXTRACTOR_MIMETYPE;
+-    if (tag == "EXTRACTOR_TITLE")
+-        return EXTRACTOR_TITLE;
+-    if (tag == "EXTRACTOR_AUTHOR")
+-        return EXTRACTOR_AUTHOR;
+-    if (tag == "EXTRACTOR_ARTIST")
+-        return EXTRACTOR_ARTIST;
+-    if (tag == "EXTRACTOR_DESCRIPTION")
+-        return EXTRACTOR_DESCRIPTION;
+-    if (tag == "EXTRACTOR_COMMENT")
+-        return EXTRACTOR_COMMENT;
+-    if (tag == "EXTRACTOR_DATE")
+-        return EXTRACTOR_DATE;
+-    if (tag == "EXTRACTOR_PUBLISHER")
+-        return EXTRACTOR_PUBLISHER;
+-    if (tag == "EXTRACTOR_LANGUAGE")
+-        return EXTRACTOR_LANGUAGE;
+-    if (tag == "EXTRACTOR_ALBUM")
+-        return EXTRACTOR_ALBUM;
+-    if (tag == "EXTRACTOR_GENRE")
+-        return EXTRACTOR_GENRE;
+-    if (tag == "EXTRACTOR_LOCATION")
+-        return EXTRACTOR_LOCATION;
+-    if (tag == "EXTRACTOR_VERSIONNUMBER")
+-        return EXTRACTOR_VERSIONNUMBER;
+-    if (tag == "EXTRACTOR_ORGANIZATION")
+-        return EXTRACTOR_ORGANIZATION;
+-    if (tag == "EXTRACTOR_COPYRIGHT")
+-        return EXTRACTOR_COPYRIGHT;
+-    if (tag == "EXTRACTOR_SUBJECT")
+-        return EXTRACTOR_SUBJECT;
+-    if (tag == "EXTRACTOR_KEYWORDS")
+-        return EXTRACTOR_KEYWORDS;
+-    if (tag == "EXTRACTOR_CONTRIBUTOR")
+-        return EXTRACTOR_CONTRIBUTOR;
+-    if (tag == "EXTRACTOR_RESOURCE_TYPE")
+-        return EXTRACTOR_RESOURCE_TYPE;
+-    if (tag == "EXTRACTOR_FORMAT")
+-        return EXTRACTOR_FORMAT;
+-    if (tag == "EXTRACTOR_RESOURCE_IDENTIFIER")
+-        return EXTRACTOR_RESOURCE_IDENTIFIER;
+-    if (tag == "EXTRACTOR_SOURCE")
+-        return EXTRACTOR_SOURCE;
+-    if (tag == "EXTRACTOR_RELATION")
+-        return EXTRACTOR_RELATION;
+-    if (tag == "EXTRACTOR_COVERAGE")
+-        return EXTRACTOR_COVERAGE;
+-    if (tag == "EXTRACTOR_SOFTWARE")
+-        return EXTRACTOR_SOFTWARE;
+-    if (tag == "EXTRACTOR_DISCLAIMER")
+-        return EXTRACTOR_DISCLAIMER;
+-    if (tag == "EXTRACTOR_WARNING")
+-        return EXTRACTOR_WARNING;
+-    if (tag == "EXTRACTOR_TRANSLATED")
+-        return EXTRACTOR_TRANSLATED;
+-    if (tag == "EXTRACTOR_CREATION_DATE")
+-        return EXTRACTOR_CREATION_DATE;
+-    if (tag == "EXTRACTOR_MODIFICATION_DATE")
+-        return EXTRACTOR_MODIFICATION_DATE;
+-    if (tag == "EXTRACTOR_CREATOR")
+-        return EXTRACTOR_CREATOR;
+-    if (tag == "EXTRACTOR_PRODUCER")
+-        return EXTRACTOR_PRODUCER;
+-    if (tag == "EXTRACTOR_PAGE_COUNT")
+-        return EXTRACTOR_PAGE_COUNT;
+-    if (tag == "EXTRACTOR_PAGE_ORIENTATION")
+-        return EXTRACTOR_PAGE_ORIENTATION;
+-    if (tag == "EXTRACTOR_PAPER_SIZE")
+-        return EXTRACTOR_PAPER_SIZE;
+-    if (tag == "EXTRACTOR_USED_FONTS")
+-        return EXTRACTOR_USED_FONTS;
+-    if (tag == "EXTRACTOR_PAGE_ORDER")
+-        return EXTRACTOR_PAGE_ORDER;
+-    if (tag == "EXTRACTOR_CREATED_FOR")
+-        return EXTRACTOR_CREATED_FOR;
+-    if (tag == "EXTRACTOR_MAGNIFICATION")
+-        return EXTRACTOR_MAGNIFICATION;
+-    if (tag == "EXTRACTOR_RELEASE")
+-        return EXTRACTOR_RELEASE;
+-    if (tag == "EXTRACTOR_GROUP")
+-        return EXTRACTOR_GROUP;
+-    if (tag == "EXTRACTOR_SIZE")
+-        return EXTRACTOR_SIZE;
+-    if (tag == "EXTRACTOR_SUMMARY")
+-        return EXTRACTOR_SUMMARY;
+-    if (tag == "EXTRACTOR_PACKAGER")
+-        return EXTRACTOR_PACKAGER;
+-    if (tag == "EXTRACTOR_VENDOR")
+-        return EXTRACTOR_VENDOR;
+-    if (tag == "EXTRACTOR_LICENSE")
+-        return EXTRACTOR_LICENSE;
+-    if (tag == "EXTRACTOR_DISTRIBUTION")
+-        return EXTRACTOR_DISTRIBUTION;
+-    if (tag == "EXTRACTOR_BUILDHOST")
+-        return EXTRACTOR_BUILDHOST;
+-    if (tag == "EXTRACTOR_OS")
+-        return EXTRACTOR_OS;
+-    if (tag == "EXTRACTOR_DEPENDENCY")
+-        return EXTRACTOR_DEPENDENCY;
+-    if (tag == "EXTRACTOR_HASH_MD4")
+-        return EXTRACTOR_HASH_MD4;
+-    if (tag == "EXTRACTOR_HASH_MD5")
+-        return EXTRACTOR_HASH_MD5;
+-    if (tag == "EXTRACTOR_HASH_SHA0")
+-        return EXTRACTOR_HASH_SHA0;
+-    if (tag == "EXTRACTOR_HASH_SHA1")
+-        return EXTRACTOR_HASH_SHA1;
+-    if (tag == "EXTRACTOR_HASH_RMD160")
+-        return EXTRACTOR_HASH_RMD160;
+-    if (tag == "EXTRACTOR_RESOLUTION")
+-        return EXTRACTOR_RESOLUTION;
+-    if (tag == "EXTRACTOR_CATEGORY")
+-        return EXTRACTOR_CATEGORY;
+-    if (tag == "EXTRACTOR_BOOKTITLE")
+-        return EXTRACTOR_BOOKTITLE;
+-    if (tag == "EXTRACTOR_PRIORITY")
+-        return EXTRACTOR_PRIORITY;
+-    if (tag == "EXTRACTOR_CONFLICTS")
+-        return EXTRACTOR_CONFLICTS;
+-    if (tag == "EXTRACTOR_REPLACES")
+-        return EXTRACTOR_REPLACES;
+-    if (tag == "EXTRACTOR_PROVIDES")
+-        return EXTRACTOR_PROVIDES;
+-    if (tag == "EXTRACTOR_CONDUCTOR")
+-        return EXTRACTOR_CONDUCTOR;
+-    if (tag == "EXTRACTOR_INTERPRET")
+-        return EXTRACTOR_INTERPRET;
+-    if (tag == "EXTRACTOR_OWNER")
+-        return EXTRACTOR_OWNER;
+-    if (tag == "EXTRACTOR_LYRICS")
+-        return EXTRACTOR_LYRICS;
+-    if (tag == "EXTRACTOR_MEDIA_TYPE")
+-        return EXTRACTOR_MEDIA_TYPE;
+-    if (tag == "EXTRACTOR_CONTACT")
+-        return EXTRACTOR_CONTACT;
+-    if (tag == "EXTRACTOR_THUMBNAIL_DATA")
+-        return EXTRACTOR_THUMBNAIL_DATA;
+-
+-#ifdef EXTRACTOR_GE_0_5_2
+-    if (tag == "EXTRACTOR_PUBLICATION_DATE")
+-        return EXTRACTOR_PUBLICATION_DATE;
+-    if (tag == "EXTRACTOR_CAMERA_MAKE")
+-        return EXTRACTOR_CAMERA_MAKE;
+-    if (tag == "EXTRACTOR_CAMERA_MODEL")
+-        return EXTRACTOR_CAMERA_MODEL;
+-    if (tag == "EXTRACTOR_EXPOSURE")
+-        return EXTRACTOR_EXPOSURE;
+-    if (tag == "EXTRACTOR_APERTURE")
+-        return EXTRACTOR_APERTURE;
+-    if (tag == "EXTRACTOR_EXPOSURE_BIAS")
+-        return EXTRACTOR_EXPOSURE_BIAS;
+-    if (tag == "EXTRACTOR_FLASH")
+-        return EXTRACTOR_FLASH;
+-    if (tag == "EXTRACTOR_FLASH_BIAS")
+-        return EXTRACTOR_FLASH_BIAS;
+-    if (tag == "EXTRACTOR_FOCAL_LENGTH")
+-        return EXTRACTOR_FOCAL_LENGTH;
+-    if (tag == "EXTRACTOR_FOCAL_LENGTH_35MM")
+-        return EXTRACTOR_FOCAL_LENGTH_35MM;
+-    if (tag == "EXTRACTOR_ISO_SPEED")
+-        return EXTRACTOR_ISO_SPEED;
+-    if (tag == "EXTRACTOR_EXPOSURE_MODE")
+-        return EXTRACTOR_EXPOSURE_MODE;
+-    if (tag == "EXTRACTOR_METERING_MODE")
+-        return EXTRACTOR_METERING_MODE;
+-    if (tag == "EXTRACTOR_MACRO_MODE")
+-        return EXTRACTOR_MACRO_MODE;
+-    if (tag == "EXTRACTOR_IMAGE_QUALITY")
+-        return EXTRACTOR_IMAGE_QUALITY;
+-    if (tag == "EXTRACTOR_WHITE_BALANCE")
+-        return EXTRACTOR_WHITE_BALANCE;
+-    if (tag == "EXTRACTOR_ORIENTATION")
+-        return EXTRACTOR_ORIENTATION;
+-#endif // EXTRACTOR_GE_0_5_2
++#define T(x) [EXTRACTOR_METATYPE_##x] = "EXTRACTOR_METATYPE_"#x,
++    /* XXX: should convert to EXTRACTOR_metatype_to_string() somehow */
++    const char *types[] =
++    {
++        T(RESERVED)
++        T(MIMETYPE)
++        T(FILENAME)
++        T(COMMENT)
++
++        T(TITLE)
++        T(BOOK_TITLE)
++        T(BOOK_EDITION)
++        T(BOOK_CHAPTER_NUMBER)
++        T(JOURNAL_NAME)
++        T(JOURNAL_VOLUME)
++        T(JOURNAL_NUMBER)
++        T(PAGE_COUNT)
++        T(PAGE_RANGE)
++        T(AUTHOR_NAME)
++        T(AUTHOR_EMAIL)
++        T(AUTHOR_INSTITUTION)
++        T(PUBLISHER)
++        T(PUBLISHER_ADDRESS)
++        T(PUBLISHER_INSTITUTION)
++        T(PUBLISHER_SERIES)
++        T(PUBLICATION_TYPE)
++        T(PUBLICATION_YEAR)
++        T(PUBLICATION_MONTH)
++        T(PUBLICATION_DAY)
++        T(PUBLICATION_DATE)
++        T(BIBTEX_EPRINT)
++        T(BIBTEX_ENTRY_TYPE)
++        T(LANGUAGE)
++        T(CREATION_TIME)
++        T(URL)
++
++        T(URI)
++        T(ISRC)
++        T(HASH_MD4)
++        T(HASH_MD5)
++        T(HASH_SHA0)
++        T(HASH_SHA1)
++        T(HASH_RMD160)
++
++        T(GPS_LATITUDE_REF)
++        T(GPS_LATITUDE)
++        T(GPS_LONGITUDE_REF)
++        T(GPS_LONGITUDE)
++        T(LOCATION_CITY)
++        T(LOCATION_SUBLOCATION)
++        T(LOCATION_COUNTRY)
++        T(LOCATION_COUNTRY_CODE)
++
++        T(UNKNOWN)
++        T(DESCRIPTION)
++        T(COPYRIGHT)
++        T(RIGHTS)
++        T(KEYWORDS)
++        T(ABSTRACT)
++        T(SUMMARY)
++        T(SUBJECT)
++        T(CREATOR)
++        T(FORMAT)
++        T(FORMAT_VERSION)
++
++        T(CREATED_BY_SOFTWARE)
++        T(UNKNOWN_DATE)
++        T(CREATION_DATE)
++        T(MODIFICATION_DATE)
++        T(LAST_PRINTED)
++        T(LAST_SAVED_BY)
++        T(TOTAL_EDITING_TIME)
++        T(EDITING_CYCLES)
++        T(MODIFIED_BY_SOFTWARE)
++        T(REVISION_HISTORY)
++
++        T(EMBEDDED_FILE_SIZE)
++        T(FINDER_FILE_TYPE)
++        T(FINDER_FILE_CREATOR)
++
++        T(PACKAGE_NAME)
++        T(PACKAGE_VERSION)
++        T(SECTION)
++        T(UPLOAD_PRIORITY)
++        T(PACKAGE_DEPENDENCY)
++        T(PACKAGE_CONFLICTS)
++        T(PACKAGE_REPLACES)
++        T(PACKAGE_PROVIDES)
++        T(PACKAGE_RECOMMENDS)
++        T(PACKAGE_SUGGESTS)
++        T(PACKAGE_MAINTAINER)
++        T(PACKAGE_INSTALLED_SIZE)
++        T(PACKAGE_SOURCE)
++        T(PACKAGE_ESSENTIAL)
++        T(TARGET_ARCHITECTURE)
++        T(PACKAGE_PRE_DEPENDENCY)
++        T(LICENSE)
++        T(PACKAGE_DISTRIBUTION)
++        T(BUILDHOST)
++        T(VENDOR)
++        T(TARGET_OS)
++        T(SOFTWARE_VERSION)
++        T(TARGET_PLATFORM)
++        T(RESOURCE_TYPE)
++        T(LIBRARY_SEARCH_PATH)
++        T(LIBRARY_DEPENDENCY)
++
++        T(CAMERA_MAKE)
++        T(CAMERA_MODEL)
++        T(EXPOSURE)
++        T(APERTURE)
++        T(EXPOSURE_BIAS)
++        T(FLASH)
++        T(FLASH_BIAS)
++        T(FOCAL_LENGTH)
++        T(FOCAL_LENGTH_35MM)
++        T(ISO_SPEED)
++        T(EXPOSURE_MODE)
++        T(METERING_MODE)
++        T(MACRO_MODE)
++        T(IMAGE_QUALITY)
++        T(WHITE_BALANCE)
++        T(ORIENTATION)
++        T(MAGNIFICATION)
++
++        T(IMAGE_DIMENSIONS)
++        T(PRODUCED_BY_SOFTWARE)
++        T(THUMBNAIL)
++        T(IMAGE_RESOLUTION)
++        T(SOURCE)
++
++        T(CHARACTER_SET)
++        T(LINE_COUNT)
++        T(PARAGRAPH_COUNT)
++        T(WORD_COUNT)
++        T(CHARACTER_COUNT)
++        T(PAGE_ORIENTATION)
++        T(PAPER_SIZE)
++        T(TEMPLATE)
++        T(COMPANY)
++        T(MANAGER)
++        T(REVISION_NUMBER)
++
++        T(DURATION)
++        T(ALBUM)
++        T(ARTIST)
++        T(GENRE)
++        T(TRACK_NUMBER)
++        T(DISC_NUMBER)
++        T(PERFORMER)
++        T(CONTACT_INFORMATION)
++        T(SONG_VERSION)
++        T(PICTURE)
++        T(COVER_PICTURE)
++        T(CONTRIBUTOR_PICTURE)
++        T(EVENT_PICTURE)
++        T(LOGO)
++        T(BROADCAST_TELEVISION_SYSTEM)
++        T(SOURCE_DEVICE)
++        T(DISCLAIMER)
++        T(WARNING)
++        T(PAGE_ORDER)
++        T(WRITER)
++        T(PRODUCT_VERSION)
++        T(CONTRIBUTOR_NAME)
++        T(MOVIE_DIRECTOR)
++        T(NETWORK_NAME)
++        T(SHOW_NAME)
++        T(CHAPTER_NAME)
++        T(SONG_COUNT)
++        T(STARTING_SONG)
++        T(PLAY_COUNTER)
++        T(CONDUCTOR)
++        T(INTERPRETATION)
++        T(COMPOSER)
++        T(BEATS_PER_MINUTE)
++        T(ENCODED_BY)
++        T(ORIGINAL_TITLE)
++        T(ORIGINAL_ARTIST)
++        T(ORIGINAL_WRITER)
++        T(ORIGINAL_RELEASE_YEAR)
++        T(ORIGINAL_PERFORMER)
++        T(LYRICS)
++        T(POPULARITY_METER)
++        T(LICENSEE)
++        T(MUSICIAN_CREDITS_LIST)
++        T(MOOD)
++        T(SUBTITLE)
++
++        T(GNUNET_DISPLAY_TYPE)
++        T(GNUNET_FULL_DATA)
++        T(RATING)
++        T(ORGANIZATION)
++        T(RIPPER)
++        T(PRODUCER)
++        T(GROUP)
++        T(GNUNET_ORIGINAL_FILENAME)
++    };
++#undef T
++    size_t i;
++
++    for (i = 0; i < sizeof(types) / sizeof(types[0]); ++i)
++        if (!strcmp(types[i], tag.c_str()))
++            return (EXTRACTOR_MetaType) i;
+ 
+     log_warning("Ignoring unknown libextractor tag: %s\n", tag.c_str());
+-    return EXTRACTOR_UNKNOWN;
++    return EXTRACTOR_METATYPE_UNKNOWN;
+ }
+ 
+-static void addMetaField(metadata_fields_t field, EXTRACTOR_KeywordList *keywords, Ref<CdsItem> item, Ref<StringConverter> sc)
++struct field_state {
++    Ref<CdsItem> item;
++    Ref<StringConverter> sc;
++    Ref<Array<StringBase> > aux;
++};
++
++static int addField(void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
++                    enum EXTRACTOR_MetaFormat format, const char *data_mime_type,
++                    const char *data, size_t data_len)
+ {
+-    String value;
+-    const char *temp = NULL;
+- 
++    metadata_fields_t field = M_MAX;
++    resource_attributes_t attr = R_MAX;
++
++    if (!data)
++        return 0;
++
++    log_debug("metadata %zu [%s] -> %s\n", (size_t)type, EXTRACTOR_metatype_to_string(type), data);
++
+     /// \todo check if UTF-8 conversion is needed, may already be in UTF-8
+-    
+-    switch (field)
++
++    switch (type)
+     {
+-        case M_TITLE:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_TITLE, keywords);
++        case EXTRACTOR_METATYPE_TITLE:
++            field = M_TITLE;
+             break;
+-        case M_ARTIST:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_ARTIST, keywords);
++        case EXTRACTOR_METATYPE_ARTIST:
++            field = M_ARTIST;
+             break;
+-        case M_ALBUM:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_ALBUM, keywords);
++        case EXTRACTOR_METATYPE_ALBUM:
++            field = M_ALBUM;
+             break;
+-        case M_DATE:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_DATE, keywords);
++        case EXTRACTOR_METATYPE_PUBLICATION_YEAR:
++            field = M_DATE;
+             break;
+-        case M_GENRE:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_GENRE, keywords);
++        case EXTRACTOR_METATYPE_GENRE:
++            field = M_GENRE;
+             break;
+-        case M_DESCRIPTION:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_DESCRIPTION, keywords);
+-
+-            if (temp == NULL)
+-                temp = EXTRACTOR_extractLast(EXTRACTOR_COMMENT, keywords);
++        case EXTRACTOR_METATYPE_DESCRIPTION:
++            field = M_DESCRIPTION;
++            break;
++        case EXTRACTOR_METATYPE_COMMENT:
++            field = M_DESCRIPTION;
++            break;
++        case EXTRACTOR_METATYPE_IMAGE_DIMENSIONS:
++            attr = R_RESOLUTION;
+             break;
+-        default:
+-            return;
+     }
+ 
+-    if (temp != NULL)
+-        value = temp;
++    String value;
++    struct field_state *field_state = (struct field_state *)cls;
++    Ref<CdsItem> item = field_state->item;
++    Ref<StringConverter> sc = field_state->sc;
++    Ref<Array<StringBase> > aux = field_state->aux;
++
++    if (field == M_MAX && attr == R_MAX && aux == nil)
++    {
++        log_debug("no match\n");
++        return 0;
++    }
+ 
++    value = data;
+     value = trim_string(value);
+-    
+-    if (string_ok(value))
++    if (!string_ok(value))
++        return 0;
++
++    if (field != M_MAX)
+     {
+         item->setMetadata(MT_KEYS[field].upnp, sc->convert(value));
+-//        log_debug("Setting metadata on item: %d, %s\n", field, sc->convert(value).c_str());
++        log_debug("Setting metadata on item: %d, %s\n", field, sc->convert(value).c_str());
+     }
+-}
+ 
+-static void addResourceField(resource_attributes_t attr, EXTRACTOR_KeywordList *keywords, Ref<CdsItem> item, Ref<StringConverter> sc)
+-{
+-    String value;
+-    const char *temp = NULL;
+-    
+-    switch (attr)
++    if (attr != R_MAX)
+     {
+-        case R_RESOLUTION:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_SIZE, keywords);
+-            break;
+-/*        case R_SIZE:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_SIZE, keywords);
+-            break;
+-*/
+-        default:
+-            return;
++        item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(attr), value);
++        log_debug("Setting attribute on item: %d, %s\n", attr, value.c_str());
+     }
+ 
+-    if (temp != NULL)
+-        value = temp;
+-
+-    if (string_ok(value))
++    if (aux != nil)
+     {
+-          item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(attr), value);
++        String tmp;
++        for (int j = 0; j < aux->size(); j++)
++        {
++            tmp = aux->get(j);
++            if (string_ok(tmp))
++            {
++                if (type == getTagFromString(tmp))
++                {
++                    value = sc->convert(value);
++                    item->setAuxData(tmp, value);
++                    log_debug(("Adding tag: %s with value %s\n", tmp.c_str(), value.c_str()));
++                }
++            }
++        }
+     }
++
++    return 0;
+ }
+ 
+ 
+ 
+-Ref<RExp> ReAudioFormat;
+-EXTRACTOR_ExtractorList *extractors = NULL;
+-bool load_libraries_failed = false;
++static Ref<RExp> ReAudioFormat;
++static EXTRACTOR_PluginList *plugins = NULL;
++static bool load_libraries_failed = false;
+ 
+ void ExtractorHandler::fillMetadata(Ref<CdsItem> item)
+ {
+     if (load_libraries_failed)
+         return;
+-    Ref<Array<StringBase> > aux;
+-    Ref<StringConverter> sc = StringConverter::i2i();
+-        
+-    if (! extractors)
++    if (! plugins)
+     {
+-        extractors = EXTRACTOR_loadDefaultLibraries();
+-        if (! extractors)
++        plugins = EXTRACTOR_plugin_add_defaults(EXTRACTOR_OPTION_DEFAULT_POLICY);
++        if (! plugins)
++        {
+             load_libraries_failed = true;
++            return;
++        }
+     }
+-    EXTRACTOR_KeywordList *keywords = EXTRACTOR_getKeywords(extractors, item->getLocation().c_str());
+-
+-    //EXTRACTOR_printKeywords(stdout, keywords);
+ 
+-    for (int i = 0; i < M_MAX; i++)
+-        addMetaField((metadata_fields_t)i, keywords, item, sc);
+-    
+-    for (int i = 0; i < R_MAX; i++)
+-        addResourceField((resource_attributes_t)i, keywords, item, sc);
++    log_debug("processing %s\n", item->getLocation().c_str());
+ 
+     Ref<ConfigManager> cm = ConfigManager::getInstance();
+-    aux = cm->getStringArrayOption(CFG_IMPORT_LIBOPTS_EXTRACTOR_AUXDATA_TAGS_LIST);
+-    if (aux != nil)
+-    {
+-        String value;
+-        String tmp;
+-        const char *temp = NULL;
+-        
+-        for (int j = 0; j < aux->size(); j++)
+-        {
+-
+-            tmp = aux->get(j);
+-            if (string_ok(tmp))
+-            {
+-                temp = EXTRACTOR_extractLast(getTagFromString(tmp), keywords);
+-                if (temp != NULL)
+-                {
+-                    value = temp; 
+-                    if (string_ok(value))
+-                    {
+-                        value = sc->convert(value);
+-                        item->setAuxData(tmp, value);
+-//                      log_debug(("Adding tag: %s with value %s\n", tmp.c_str(), value.c_str()));
+-                    }
+-                }
+-            }
+-        }
+-    }
++    struct field_state field_state = {
++        .item = item,
++        .sc = StringConverter::i2i(),
++        .aux = cm->getStringArrayOption(CFG_IMPORT_LIBOPTS_EXTRACTOR_AUXDATA_TAGS_LIST),
++    };
++    EXTRACTOR_extract(plugins, item->getLocation().c_str(), NULL, 0, addField, &field_state);
+ 
+     if (ReAudioFormat == nil)
+     {
+@@ -379,35 +401,9 @@ void ExtractorHandler::fillMetadata(Ref<CdsItem> item)
+         ReAudioFormat->compile(_("([0-9]+)\\s+kbps,\\s*([0-9]+)\\s+hz,\\s*"
+                                  "(([0-9]+)h)?([0-9]+)m([0-9]+)\\s(\\S+)"), "i");
+     }
+-   
+-    /*
+-    temp = EXTRACTOR_extractLast(EXTRACTOR_FORMAT, keywords);
+-    log_debug("EXTRACTOR_FORMAT: %s\n", temp);
+-
+-    if (temp)
+-    {
+-        Ref<Matcher> matcher = ReAudioFormat->match((char *)temp);
+-        if (matcher != nil)
+-        {
+-            log_debug(("BR:%s FR:%s H:%s M:%s S:%s TYPE:%s\n",
+-                       matcher->group(1).c_str(),
+-                       matcher->group(2).c_str(),
+-                       matcher->group(4).c_str(),
+-                       matcher->group(5).c_str(),
+-                       matcher->group(6).c_str(),
+-                       matcher->group(7).c_str()));
+-        }
+-        else
+-        {
+-            log_debug(("format pattern unmatched!"));
+-        }
+-    }
+-
+-    */
+-    EXTRACTOR_freeKeywords(keywords);
+ 
+     // commented out for the sake of efficiency
+-    // EXTRACTOR_removeAll(extractors);
++    // EXTRACTOR_plugin_remove_all(plugins);
+ }
+ 
+ Ref<IOHandler> ExtractorHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size)
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-libmp4v2.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-libmp4v2.patch
new file mode 100644
index 000000000000..6a6b51e1e05a
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-libmp4v2.patch
@@ -0,0 +1,187 @@
+diff -urN old/src/metadata/libmp4v2_handler.cc new/src/metadata/libmp4v2_handler.cc
+--- old/src/metadata/libmp4v2_handler.cc	2012-04-05 01:46:26.000000000 +0200
++++ new/src/metadata/libmp4v2_handler.cc	2012-04-05 02:01:24.000000000 +0200
+@@ -65,29 +65,28 @@
+ static void addMetaField(metadata_fields_t field, MP4FileHandle mp4, Ref<CdsItem> item)
+ {
+     String value;
+-    char*  mp4_retval = NULL;
+-    u_int16_t track;
+-    u_int16_t total_tracks;
+- 
+     Ref<StringConverter> sc = StringConverter::i2i();
+     
++    const MP4Tags* new_tags = MP4TagsAlloc();
++
++    if (!MP4TagsFetch(new_tags, mp4))
++        return;
++
+     switch (field)
+     {
+         case M_TITLE:
+-            MP4GetMetadataName(mp4, &mp4_retval);
++            value = new_tags->name;
+             break;
+         case M_ARTIST:
+-            MP4GetMetadataArtist(mp4, &mp4_retval);
++            value = new_tags->artist;
+             break;
+         case M_ALBUM:
+-            MP4GetMetadataAlbum(mp4, &mp4_retval);
++            value = new_tags->album;
+             break;
+         case M_DATE:
+-            MP4GetMetadataYear(mp4, &mp4_retval);
+-            if (mp4_retval)
++            value = new_tags->releaseDate;
++            if (value.length() > 0)
+             {
+-                value = mp4_retval;
+-                free(mp4_retval);
+                 if (string_ok(value))
+                     value = value + "-01-01";
+                 else
+@@ -95,34 +94,31 @@
+             }
+             break;
+         case M_GENRE:
+-            MP4GetMetadataGenre(mp4, &mp4_retval);
++            value = new_tags->genre;
+             break;
+         case M_DESCRIPTION:
+-            MP4GetMetadataComment(mp4, &mp4_retval);
++            value = new_tags->comments;
+             break;
+         case M_TRACKNUMBER:
+-            MP4GetMetadataTrack(mp4, &track, &total_tracks);
+-            if (track > 0)
++            if (new_tags->track)
+             {
+-                value = String::from(track);
+-                item->setTrackNumber((int)track);
++                value = String::from(new_tags->track->index);
++                item->setTrackNumber((int)new_tags->track->index);
+             }
+             else
++			{
++			    MP4TagsFree( new_tags );
+                 return;
++            }
+             break;
+         default:
++			MP4TagsFree( new_tags );
+             return;
+     }
+ 
+-    if ((field != M_DATE) && (field != M_TRACKNUMBER) && 
+-        (mp4_retval))
+-    {
+-        value = mp4_retval;
+-        free(mp4_retval);
+-    }
+-    
++	MP4TagsFree( new_tags );
+     value = trim_string(value);
+-    
++
+     if (string_ok(value))
+     {
+         item->setMetadata(MT_KEYS[field].upnp, sc->convert(value));
+@@ -190,14 +186,19 @@
+         }
+ 
+ #if defined(HAVE_MAGIC)
+-        u_int8_t *art_data;
+-        u_int32_t art_data_len;
++        void *art_data = 0;
++        u_int32_t art_data_len = 0;
+         String art_mimetype;
++
++        const MP4Tags* new_tags = MP4TagsAlloc();
++        MP4TagsFetch(new_tags, mp4);
++        if (new_tags->artworkCount)
++        {
++            art_data = new_tags->artwork->data;
++            art_data_len = new_tags->artwork->size;
++        }
+ #ifdef HAVE_MP4_GET_METADATA_COVER_ART_COUNT
+-        if (MP4GetMetadataCoverArtCount(mp4) && 
+-            MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len))
+-#else
+-            MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len);
++        if (new_tags->artworkCount && art_data_len > 0) 
+ #endif
+         {
+             if (art_data)
+@@ -211,11 +212,10 @@
+                 }
+                 catch (Exception ex)
+                 {
+-                    free(art_data);
++                    MP4TagsFree(new_tags);
+                     throw ex;
+                 }
+ 
+-                free(art_data);
+                 if (art_mimetype != _(MIMETYPE_DEFAULT))
+                 {
+                     Ref<CdsResource> resource(new CdsResource(CH_MP4));
+@@ -225,6 +225,7 @@
+                 }
+             }
+         }
++        MP4TagsFree(new_tags);
+ #endif
+         MP4Close(mp4);
+     }
+@@ -249,26 +250,35 @@
+ 
+     if (ctype != ID3_ALBUM_ART)
+         throw _Exception(_("LibMP4V2Handler: got unknown content type: ") + ctype);
++
++    const MP4Tags* new_tags = MP4TagsAlloc();
++    if (MP4TagsFetch(new_tags, mp4))
++    {
+ #ifdef HAVE_MP4_GET_METADATA_COVER_ART_COUNT
+-    if (!MP4GetMetadataCoverArtCount(mp4))
+-        throw _Exception(_("LibMP4V2Handler: resource has no album art information"));
++        if (!new_tags->artworkCount)
++            throw _Exception(_("LibMP4V2Handler: resource has no album art information"));
+ #endif
+-    u_int8_t *art_data;
+-    u_int32_t art_data_len;
+-    if (MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len))
+-    {
+-        if (art_data)
++        void *art_data = 0;
++        u_int32_t art_data_len;
++
++        const MP4TagArtwork* art = new_tags->artwork;
++        art_data = art->data;
++        art_data_len = art->size;
++        if (art)
+         {
+-            *data_size = (off_t)art_data_len;
+-            Ref<IOHandler> h(new MemIOHandler((void *)art_data, art_data_len));
+-            free(art_data);
+-            return h;
++            if (art_data)
++            {
++                *data_size = (off_t)art_data_len;
++                Ref<IOHandler> h(new MemIOHandler(art_data, art_data_len));
++                MP4TagsFree(new_tags);
++                return h;
++            }
+         }
++        MP4TagsFree(new_tags);
+     }
+-        
+     throw _Exception(_("LibMP4V2Handler: could not serve album art "
+-                           "for file") + item->getLocation() + 
+-                           " - embedded image not found");
++            "for file") + item->getLocation() + 
++        " - embedded image not found");
+ }
+ 
+ #endif // HAVE_LIBMP4V2
+De binära filerna old/src/metadata/.libmp4v2_handler.cc.swp och new/src/metadata/.libmp4v2_handler.cc.swp skiljer
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-mozjs187.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-mozjs187.patch
new file mode 100644
index 000000000000..c4b080a3656b
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-mozjs187.patch
@@ -0,0 +1,260 @@
+maybe this is correct, maybe it's not.  spidermonkey's documentation blows, so
+who is to say!
+
+https://bugs.gentoo.org/423991
+
+--- a/src/scripting/dvd_image_import_script.cc
++++ b/src/scripting/dvd_image_import_script.cc
+@@ -232,8 +232,6 @@ DVDImportScript::DVDImportScript(Ref<Runtime> runtime) : Script(runtime)
+ 
+         String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_DVD_SCRIPT); 
+         load(scriptPath);
+-        root = JS_NewScriptObject(cx, script);
+-        JS_AddNamedRoot(cx, &root, "DVDImportScript");
+         log_info("Loaded %s\n", scriptPath.c_str());
+ 
+          Ref<Dictionary> mappings =
+@@ -296,21 +294,4 @@ void DVDImportScript::processDVDObject(Ref<CdsObject> obj)
+ #endif
+ }
+ 
+-DVDImportScript::~DVDImportScript()
+-{
+-#ifdef JS_THREADSAFE
+-    JS_SetContextThread(cx);
+-    JS_BeginRequest(cx);
+-#endif
+-    
+-    if (root)
+-        JS_RemoveRoot(cx, &root);
+-
+-#ifdef JS_THREADSAFE
+-    JS_EndRequest(cx);
+-    JS_ClearContextThread(cx);
+-#endif
+-
+-}
+-
+ #endif // HAVE_JS
+--- a/src/scripting/dvd_image_import_script.h
++++ b/src/scripting/dvd_image_import_script.h
+@@ -41,7 +41,6 @@ class DVDImportScript : public Script
+ {
+ public:
+     DVDImportScript(zmm::Ref<Runtime> runtime);
+-    ~DVDImportScript();
+     /// \brief Adds a DVD object to the database
+     /// 
+     /// \param title DVD title number
+--- a/src/scripting/import_script.cc
++++ b/src/scripting/import_script.cc
+@@ -53,8 +53,6 @@ ImportScript::ImportScript(Ref<Runtime> runtime) : Script(runtime)
+     try 
+     {
+         load(scriptPath);
+-        root = JS_NewObject(cx, NULL, script, NULL);
+-        JS_AddNamedObjectRoot(cx, &root, "ImportScript");
+     }
+     catch (Exception ex)
+     {
+@@ -109,21 +107,4 @@ void ImportScript::processCdsObject(Ref<CdsObject> obj, String rootpath)
+ #endif
+ }
+ 
+-ImportScript::~ImportScript()
+-{
+-#ifdef JS_THREADSAFE
+-    JS_SetContextThread(cx);
+-    JS_BeginRequest(cx);
+-#endif
+-    
+-    if (root)
+-        JS_RemoveObjectRoot(cx, &root);
+-
+-#ifdef JS_THREADSAFE
+-    JS_EndRequest(cx);
+-    JS_ClearContextThread(cx);
+-#endif
+-
+-}
+-
+ #endif // HAVE_JS
+--- a/src/scripting/import_script.h
++++ b/src/scripting/import_script.h
+@@ -41,11 +41,8 @@ class ImportScript : public Script
+ {
+ public:
+     ImportScript(zmm::Ref<Runtime> runtime);
+-    ~ImportScript();
+     void processCdsObject(zmm::Ref<CdsObject> obj, zmm::String rootpath);
+     virtual script_class_t whoami() { return S_IMPORT; }
+-private:
+-    JSObject *root;
+ };
+ 
+ #endif // __SCRIPTING_IMPORT_SCRIPT_H__
+--- a/src/scripting/playlist_parser_script.cc
++++ b/src/scripting/playlist_parser_script.cc
+@@ -93,8 +93,6 @@ PlaylistParserScript::PlaylistParserScript(Ref<Runtime> runtime) : Script(runtim
+ 
+         String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); 
+         load(scriptPath);
+-        root = JS_NewObject(cx, NULL, script, NULL);
+-        JS_AddNamedObjectRoot(cx, &root, "PlaylistScript");
+     }
+     catch (Exception ex)
+     {
+@@ -236,21 +234,4 @@ void PlaylistParserScript::processPlaylistObject(zmm::Ref<CdsObject> obj, Ref<Ge
+ 
+ }
+ 
+-
+-PlaylistParserScript::~PlaylistParserScript()
+-{
+-#ifdef JS_THREADSAFE
+-    JS_SetContextThread(cx);
+-    JS_BeginRequest(cx);
+-#endif
+-
+-    if (root)
+-        JS_RemoveObjectRoot(cx, &root);
+-
+-#ifdef JS_THREADSAFE
+-    JS_EndRequest(cx);
+-    JS_ClearContextThread(cx);
+-#endif
+-
+-}
+ #endif // HAVE_JS
+--- a/src/scripting/playlist_parser_script.h
++++ b/src/scripting/playlist_parser_script.h
+@@ -42,7 +42,6 @@ class PlaylistParserScript : public Script
+ {
+ public:
+     PlaylistParserScript(zmm::Ref<Runtime> runtime);
+-    ~PlaylistParserScript();
+     zmm::String readln();
+     void processPlaylistObject(zmm::Ref<CdsObject> obj, zmm::Ref<GenericTask> task);
+     virtual script_class_t whoami() { return S_PLAYLIST; }
+@@ -52,7 +51,6 @@ private:
+     int currentObjectID;
+     char *currentLine;
+     zmm::Ref<GenericTask> currentTask;
+-    JSObject *root;
+ };
+ 
+ #endif // __SCRIPTING_PLAYLIST_PARSER_SCRIPT_H__
+--- a/src/scripting/script.cc
++++ b/src/scripting/script.cc
+@@ -427,15 +427,10 @@ static JSFunctionSpec js_global_functions[] = {
+         try
+         {
+             common_script = _load(common_scr_path);
+-            common_root = JS_NewObject(cx, NULL, common_script, NULL);
+-            JS_AddNamedObjectRoot(cx, &common_root, "common-script");
+             _execute(common_script);
+         }
+         catch (Exception e)
+         {
+-            if (common_root)
+-                JS_RemoveObjectRoot(cx, &common_root);
+-
+             log_js("Unable to load %s: %s\n", common_scr_path.c_str(), 
+                     e.getMessage().c_str());
+         }
+@@ -459,8 +454,6 @@ Script::~Script()
+     JS_SetContextThread(cx);
+     JS_BeginRequest(cx);
+ #endif
+-    if (common_root)
+-        JS_RemoveObjectRoot(cx, &common_root);
+ 
+ /*
+  * scripts are unrooted and will be cleaned up by GC
+@@ -532,12 +532,12 @@ void Script::defineFunctions(JSFunctionSpec *functions)
+         throw _Exception(_("Scripting: JS_DefineFunctions failed"));
+ }
+ 
+-JSObject *Script::_load(zmm::String scriptPath)
++JSScript *Script::_load(zmm::String scriptPath)
+ {
+     if (glob == NULL)
+         initGlobalObject();
+ 
+-    JSObject *scr;
++    JSScript *scr;
+ 
+     String scriptText = read_text_file(scriptPath);
+ 
+@@ -568,7 +568,7 @@ void Script::load(zmm::String scriptPath)
+ }
+ 
+ 
+-void Script::_execute(JSObject *scr)
++void Script::_execute(JSScript *scr)
+ {
+     jsval ret_val;
+ 
+--- a/src/scripting/script.h
++++ b/src/scripting/script.h
+@@ -66,8 +66,8 @@ public:
+     JSRuntime *rt;
+     JSContext *cx;
+     JSObject  *glob;
+-    JSObject  *script;
+-    JSObject  *common_script;
++    JSScript  *script;
++    JSScript  *common_script;
+     
+ public:
+     Script(zmm::Ref<Runtime> runtime);
+@@ -112,11 +112,9 @@ protected:
+     zmm::Ref<CdsObject> processed;
+     
+ private:
+-    JSObject *common_root;
+-
+     void initGlobalObject();
+-    JSObject *_load(zmm::String scriptPath);
+-    void _execute(JSObject *scr);
++    JSScript *_load(zmm::String scriptPath);
++    void _execute(JSScript *scr);
+     zmm::Ref<StringConverter> _p2i;
+     zmm::Ref<StringConverter> _j2i;
+     zmm::Ref<StringConverter> _f2i;
+--- a/configure.ac
++++ b/configure.ac
+@@ -1036,13 +1036,13 @@
+                 ],
+                 [
+                     unset ac_cv_lib_smjs_JS_NewObject
+-                    AC_CHECK_LIB(mozjs185, JS_NewObject,
++                    AC_CHECK_LIB(mozjs187, JS_NewObject,
+                         [
+-                            MOZLIB=mozjs185
+-                            JS_LIBS="-lmozjs185"
++                            MOZLIB=mozjs187
++                            JS_LIBS="-lmozjs187"
+                         ],
+                         [
+-                    unset ac_cv_lib_mozjs185_JS_NewObject
++                    unset ac_cv_lib_mozjs187_JS_NewObject
+                     AC_CHECK_LIB(mozjs, JS_NewObject,
+                         [
+                             MOZLIB=mozjs
+@@ -1064,11 +1064,11 @@
+                                             MOZLIB=smjs
+                                         ],
+                                         [
+-                                    unset ac_cv_lib_mozjs185_JS_NewObject
+-                                    AC_CHECK_LIB(mozjs185, JS_NewObject,
++                                    unset ac_cv_lib_mozjs187_JS_NewObject
++                                    AC_CHECK_LIB(mozjs187, JS_NewObject,
+                                         [
+-                                            JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
+-                                            MOZLIB=mozjs185
++                                            JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs187"
++                                            MOZLIB=mozjs187
+                                         ],
+                                         [
+                                             LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-system-ar.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-system-ar.patch
new file mode 100644
index 000000000000..349bf7d8da74
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-system-ar.patch
@@ -0,0 +1,35 @@
+--- configure.ac	2010-04-08 00:38:51.000000000 +0200
++++ configure.ac	2013-05-30 12:27:55.620514386 +0200
+@@ -318,6 +318,10 @@
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_GCC_TRADITIONAL
++AN_MAKEVAR([AR], [AC_PROG_AR])
++AN_PROGRAM([ar], [AC_PROG_AR])
++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
++AC_PROG_AR
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+--- build/Makefile.in	2010-04-08 00:40:15.000000000 +0200
++++ build/Makefile.in	2013-05-30 12:25:55.310337928 +0200
+@@ -50,7 +50,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ libmediatomb_a_AR = $(AR) $(ARFLAGS)
+ libmediatomb_a_LIBADD =
+--- tombupnp/build/Makefile.in	2010-04-08 00:40:16.000000000 +0200
++++ tombupnp/build/Makefile.in	2013-05-30 12:26:18.420371823 +0200
+@@ -48,7 +48,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ libtombupnp_a_AR = $(AR) $(ARFLAGS)
+ libtombupnp_a_LIBADD =
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-system-uuid.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-system-uuid.patch
new file mode 100644
index 000000000000..053f18cea879
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-system-uuid.patch
@@ -0,0 +1,36 @@
+use libuuid from the system rather than local bundled code
+
+http://bugs.gentoo.org/270830
+
+--- a/build/Makefile.am
++++ b/build/Makefile.am
+@@ -58,6 +58,7 @@ mediatomb_CXXFLAGS = -I$(top_srcdir)/src \
+ mediatomb_LDADD = \
+     libmediatomb.a \
+     $(top_srcdir)/tombupnp/build/libtombupnp.a \
++    -luuid \
+     $(LIBEXIF_LDFLAGS) \
+     $(ZLIB_LDFLAGS) \
+     $(EXPAT_LDFLAGS) \
+--- a/build/libmediatomb_src
++++ b/build/libmediatomb_src
+@@ -231,19 +231,6 @@ libmediatomb_a_SOURCES = \
+ ../src/url.h \
+ ../src/url_request_handler.cc \
+ ../src/url_request_handler.h \
+-../src/uuid/clear.c \
+-../src/uuid/compare.c \
+-../src/uuid/copy.c \
+-../src/uuid/gen_uuid.c \
+-../src/uuid/isnull.c \
+-../src/uuid/pack.c \
+-../src/uuid/parse.c \
+-../src/uuid/unpack.c \
+-../src/uuid/unparse.c \
+-../src/uuid/uuid.h \
+-../src/uuid/uuidP.h \
+-../src/uuid/uuid_time.c \
+-../src/uuid/uuid_types.h \
+ ../src/web/action.cc \
+ ../src/web/add.cc \
+ ../src/web/add_object.cc \
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch
new file mode 100644
index 000000000000..7de291a552b9
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch
@@ -0,0 +1,237 @@
+https://sourceforge.net/tracker/?func=detail&aid=3291468&group_id=129766&atid=715782
+
+[PATCH] Add the cache feature of ffmpegthumbnailer.
+
+I want the cache feature of ffmpegthumbnailer because my machine
+is not powerful :-(
+So I created this patch for the cache feature.
+
+This patch adds a new option "cache-dir" in config.xml.
+If not specifying any string, the cache feature is disable. 
+And specifying some directory, the cache feature is enable
+and the cache files will be created under the directory.
+
+Signed-off-by: Ken'ichi Ohmichi <ken1ohmichi@gmail.com>
+---
+diff --git a/src/common.h b/src/common.h
+index d1998b3..358f4d1 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -367,6 +367,8 @@
+     #define DEFAULT_FFMPEGTHUMBNAILER_FILMSTRIP_OVERLAY YES
+     #define DEFAULT_FFMPEGTHUMBNAILER_WORKAROUND_BUGS   NO
+     #define DEFAULT_FFMPEGTHUMBNAILER_IMAGE_QUALITY     8
++    #define DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED YES
++    #define DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR         ""
+ #endif
+ 
+ #if defined(HAVE_LASTFMLIB)
+diff --git a/src/config_manager.cc b/src/config_manager.cc
+index 8c975f8..2902090 100644
+--- a/src/config_manager.cc
++++ b/src/config_manager.cc
+@@ -1873,6 +1873,24 @@ void ConfigManager::validate(String serverhome)
+ 
+         NEW_INT_OPTION(temp_int);
+         SET_INT_OPTION(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_IMAGE_QUALITY);
++
++        temp = getOption("/server/extended-runtime-options/ffmpegthumbnailer/"
++                         "cache-dir", DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR);
++
++        NEW_OPTION(temp);
++        SET_OPTION(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR);
++
++        temp = getOption("/server/extended-runtime-options/ffmpegthumbnailer/"
++                         "cache-dir/attribute::enabled",
++                         DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED);
++
++        if (!validateYesNo(temp))
++            throw _Exception(_("Error in config file: "
++                              "invalid \"enabled\" attribute value in "
++                              "ffmpegthumbnailer <cache-dir> tag"));
++
++        NEW_BOOL_OPTION(temp == YES ? true : false);
++        SET_BOOL_OPTION(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED);
+     }
+ #endif
+ 
+diff --git a/src/config_manager.h b/src/config_manager.h
+index 52b9842..a447a60 100644
+--- a/src/config_manager.h
++++ b/src/config_manager.h
+@@ -110,6 +110,8 @@ typedef enum
+     CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_FILMSTRIP_OVERLAY,
+     CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_WORKAROUND_BUGS,
+     CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_IMAGE_QUALITY,
++    CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED,
++    CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR,
+ #endif
+     CFG_SERVER_EXTOPTS_MARK_PLAYED_ITEMS_ENABLED,
+     CFG_SERVER_EXTOPTS_MARK_PLAYED_ITEMS_STRING_MODE_PREPEND,
+diff --git a/src/metadata/ffmpeg_handler.cc b/src/metadata/ffmpeg_handler.cc
+index a637d9c..8e7ef23 100644
+--- a/src/metadata/ffmpeg_handler.cc
++++ b/src/metadata/ffmpeg_handler.cc
+@@ -50,6 +50,9 @@
+ // INT64_C is not defined in ffmpeg/avformat.h but is needed
+ // macro defines included via autoconfig.h
+ #include <stdint.h>
++#include <sys/stat.h>
++#include <errno.h>
++#include <string.h>
+ 
+ //#ifdef FFMPEG_NEEDS_EXTERN_C
+ extern "C" 
+@@ -279,6 +282,122 @@ void FfmpegHandler::fillMetadata(Ref<CdsItem> item)
+     av_close_input_file(pFormatCtx);
+ }
+ 
++#ifdef HAVE_FFMPEGTHUMBNAILER
++
++static int _mkdir(const char *path)
++{
++    int ret = mkdir(path, 0777);
++
++    if (ret == 0) {
++        // Make sure we are +x in case of restrictive umask that strips +x.
++        struct stat st;
++        if (stat(path, &st)) {
++            log_warning("could not stat(%s): %s\n", path, strerror(errno));
++            return -1;
++        }
++        mode_t xbits = S_IXUSR | S_IXGRP | S_IXOTH;
++        if (!(st.st_mode & xbits)) {
++            if (chmod(path, st.st_mode | xbits)) {
++                log_warning("could not chmod(%s, +x): %s\n", path, strerror(errno));
++                return -1;
++            }
++        }
++    }
++
++    return ret;
++}
++
++static bool makeThumbnailCacheDir(String& path)
++{
++    char *path_temp = strdup(path.c_str());
++    char *last_slash = strrchr(path_temp, '/');
++    char *slash = last_slash;
++    bool ret = false;
++
++    if (!last_slash)
++        return ret;
++
++    // Assume most dirs exist, so scan backwards first.
++    // Avoid stat/access checks due to TOCTOU races.
++    errno = 0;
++    for (slash = last_slash; slash > path_temp; --slash) {
++        if (*slash != '/')
++            continue;
++        *slash = '\0';
++        if (_mkdir(path_temp) == 0) {
++            // Now we can forward scan.
++            while (slash < last_slash) {
++                *slash = DIR_SEPARATOR;
++                if (_mkdir(path_temp) < 0)
++                    // Allow EEXIST in case of someone else doing `mkdir`.
++                    if (errno != EEXIST)
++                        goto done;
++                slash += strlen(slash);
++            }
++            if (slash == last_slash)
++                ret = true;
++            break;
++        } else if (errno == EEXIST) {
++            ret = true;
++            break;
++        } else if (errno != ENOENT) {
++            break;
++        }
++    }
++
++ done:
++    free(path_temp);
++    return ret;
++}
++
++static String getThumbnailCacheFilePath(String& movie_filename, bool create)
++{
++    Ref<ConfigManager> cfg = ConfigManager::getInstance();
++    String cache_dir = cfg->getOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR);
++
++    if (cache_dir.length() == 0) {
++        String home_dir = cfg->getOption(CFG_SERVER_HOME);
++        cache_dir = home_dir + "/cache-dir";
++    }
++
++    cache_dir = cache_dir + movie_filename + "-thumb.jpg";
++    if (create && !makeThumbnailCacheDir(cache_dir))
++        cache_dir = "";
++    return cache_dir;
++}
++
++static bool readThumbnailCacheFile(String movie_filename, uint8_t **ptr_img, size_t *size_img)
++{
++    String path = getThumbnailCacheFilePath(movie_filename, false);
++    FILE *fp = fopen(path.c_str(), "rb");
++    if (!fp)
++        return false;
++
++    size_t bytesRead;
++    uint8_t buffer[1024];
++    *ptr_img = NULL;
++    *size_img = 0;
++    while ((bytesRead = fread(buffer, 1, sizeof(buffer), fp)) > 0) {
++        *ptr_img = (uint8_t *)realloc(*ptr_img, *size_img + bytesRead);
++        memcpy(*ptr_img + *size_img, buffer, bytesRead);
++        *size_img += bytesRead;
++    }
++    fclose(fp);
++    return true;
++}
++
++static void writeThumbnailCacheFile(String movie_filename, uint8_t *ptr_img, int size_img)
++{
++    String path = getThumbnailCacheFilePath(movie_filename, true);
++    FILE *fp = fopen(path.c_str(), "wb");
++    if (!fp)
++        return;
++    fwrite(ptr_img, sizeof(uint8_t), size_img, fp);
++    fclose(fp);
++}
++
++#endif
++
+ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size)
+ {
+     *data_size = -1;
+@@ -288,6 +407,18 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
+     if (!cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_ENABLED))
+         return nil;
+ 
++    if (cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED)) {
++        uint8_t *ptr_image;
++        size_t size_image;
++        if (readThumbnailCacheFile(item->getLocation(),
++                                   &ptr_image, &size_image)) {
++            *data_size = (off_t)size_image;
++            Ref<IOHandler> h(new MemIOHandler(ptr_image, size_image));
++            free(ptr_image);
++            log_debug("Returning cached thumbnail for file: %s\n", item->getLocation().c_str());
++            return h;
++        }
++    }
+ #ifdef FFMPEGTHUMBNAILER_OLD_API
+     video_thumbnailer *th = create_thumbnailer();
+     image_data *img = create_image_data();
+@@ -318,6 +449,10 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
+ #endif // old api
+         throw _Exception(_("Could not generate thumbnail for ") + 
+                 item->getLocation());
++    if (cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED)) {
++        writeThumbnailCacheFile(item->getLocation(),
++                                img->image_data_ptr, img->image_data_size);
++    }
+ 
+     *data_size = (off_t)img->image_data_size;
+     Ref<IOHandler> h(new MemIOHandler((void *)img->image_data_ptr, 
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-thumbnail-locking.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-thumbnail-locking.patch
new file mode 100644
index 000000000000..70658c495d25
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-thumbnail-locking.patch
@@ -0,0 +1,71 @@
+if you try to generate a bunch of thumbnails at once, it can crash:
+
+Program received signal SIGABRT, Aborted.
+[Switching to Thread 0x7fdb7a6cb700 (LWP 17295)]
+0x00007fdb8031c899 in __GI_raise (sig=sig@entry=0x6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56
+56      ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
+(gdb) bt
+#0  0x00007fdb8031c899 in __GI_raise (sig=sig@entry=0x6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56
+#1  0x00007fdb8031de27 in __GI_abort () at abort.c:89
+#2  0x00007fdb7f6b9222 in ff_unlock_avcodec () at /var/tmp/portage/media-video/ffmpeg-1.2.6/work/ffmpeg-1.2.6/libavcodec/utils.c:2767
+#3  0x00007fdb7f6b9662 in avcodec_open2 (avctx=0x7fdb64032080, codec=<optimized out>, options=0x0) at /var/tmp/portage/media-video/ffmpeg-1.2.6/work/ffmpeg-1.2.6/libavcodec/utils.c:1132
+#4  0x00007fdb81be57bb in ffmpegthumbnailer::MovieDecoder::initializeVideo (this=this@entry=0x7fdb7a6ca000) at libffmpegthumbnailer/moviedecoder.cpp:176
+#5  0x00007fdb81be599c in ffmpegthumbnailer::MovieDecoder::initialize (this=0x7fdb7a6ca000, filename=...) at libffmpegthumbnailer/moviedecoder.cpp:86
+#6  0x00007fdb81be92cc in ffmpegthumbnailer::VideoThumbnailer::generateThumbnail (this=this@entry=0x7fdb6402af90, videoFile=..., imageWriter=..., pAvContext=pAvContext@entry=0x0) at libffmpegthumbnailer/videothumbnailer.cpp:118
+#7  0x00007fdb81be97b4 in ffmpegthumbnailer::VideoThumbnailer::generateThumbnail (this=this@entry=0x7fdb6402af90, videoFile=..., type=<optimized out>, type@entry=Jpeg, buffer=..., pAvContext=pAvContext@entry=0x0) at libffmpegthumbnailer/videothumbnailer.cpp:191
+#8  0x00007fdb81bea23e in video_thumbnailer_generate_thumbnail_to_buffer (thumbnailer=<optimized out>, movie_filename=0x7fdb7003abc0 "........mp4", generated_image_data=0x7fdb64022680) at libffmpegthumbnailer/videothumbnailerc.cpp:113
+#9  0x00000000004ebfed in FfmpegHandler::serveContent (this=this@entry=0x7fdb64020ff0, item=..., resNum=resNum@entry=0x1, data_size=data_size@entry=0x7fdb7a6caaf0) at ../src/metadata/ffmpeg_handler.cc:475
+#10 0x00000000004e48d7 in FileRequestHandler::open (this=<optimized out>, filename=<optimized out>, info=0x7fdb7a6caaf0, mode=<optimized out>) at ../src/file_request_handler.cc:575
+#11 0x00000000004bba74 in web_open (filename=0x7fdb640175f0 "/content/media/object_id/16634/res_id/1/rh/6/ext/file.jpg", info=0x7fdb7a6caaf0, mode=UPNP_READ) at ../src/web_callbacks.cc:198
+#12 0x000000000052674b in process_request (Fp=<synthetic pointer>, RespInstr=0x7fdb7a6cab70, alias=0x7fdb7a6cab20, filename=0x7fdb7a6caad0, headers=0x7fdb7a6caab0, rtype=<synthetic pointer>, req=0x7fdb7a6cacd0) at ../upnp/src/genlib/net/http/webserver.c:1343
+#13 web_server_callback (parser=0x7fdb7a6cacd0, req=0x7fdb7a6cacd0, info=0x7fdb7a6cacc0) at ../upnp/src/genlib/net/http/webserver.c:1803
+#14 0x000000000051f29a in dispatch_request (hparser=0x7fdb7a6cacd0, info=0x7fdb7a6cacc0) at ../upnp/src/genlib/miniserver/miniserver.c:236
+#15 handle_request (args=0x7fdb6c000c40) at ../upnp/src/genlib/miniserver/miniserver.c:339
+#16 0x000000000052cc66 in WorkerThread (arg=0x7a80e0 <gRecvThreadPool>) at ../threadutil/src/ThreadPool.c:594
+#17 0x00007fdb80697333 in start_thread (arg=0x7fdb7a6cb700) at pthread_create.c:309
+#18 0x00007fdb803d226d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:111
+(gdb)
+
+--- a/src/metadata/ffmpeg_handler.cc
++++ b/src/metadata/ffmpeg_handler.cc
+@@ -311,6 +311,10 @@ void FfmpegHandler::fillMetadata(Ref<CdsItem> item)
+ 
+ #ifdef HAVE_FFMPEGTHUMBNAILER
+ 
++// The ffmpegthumbnailer code (ffmpeg?) is not threading safe.
++// Add a lock around the usage to avoid crashing randomly.
++static pthread_mutex_t thumb_lock;
++
+ static int _mkdir(const char *path)
+ {
+     int ret = mkdir(path, 0777);
+@@ -446,6 +450,9 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
+             return h;
+         }
+     }
++
++    pthread_mutex_lock(&thumb_lock);
++
+ #ifdef FFMPEGTHUMBNAILER_OLD_API
+     video_thumbnailer *th = create_thumbnailer();
+     image_data *img = create_image_data();
+@@ -474,8 +481,11 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
+     if (video_thumbnailer_generate_thumbnail_to_buffer(th, 
+                                          item->getLocation().c_str(), img) != 0)
+ #endif // old api
++    {
++        pthread_mutex_unlock(&thumb_lock);
+         throw _Exception(_("Could not generate thumbnail for ") + 
+                 item->getLocation());
++    }
+     if (cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED)) {
+         writeThumbnailCacheFile(item->getLocation(),
+                                 img->image_data_ptr, img->image_data_size);
+@@ -491,6 +501,7 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t
+     video_thumbnailer_destroy_image_data(img);
+     video_thumbnailer_destroy(th);
+ #endif// old api
++    pthread_mutex_unlock(&thumb_lock);
+     return h;
+ #else
+     return nil;
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-time-t.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-time-t.patch
new file mode 100644
index 000000000000..9961b5fede1f
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-time-t.patch
@@ -0,0 +1,56 @@
+From 73d12ad230a4ef4694f8d58b249ec6c2804ee324 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 5 Apr 2016 22:56:27 -0400
+Subject: [PATCH] fix storage quoting with long long values
+
+On 32-bit systems w/64-bit time_t's (like the x32 ABI) we fail to build:
+../src/storage/sql_storage.cc: In member function 'virtual void SQLStorage::autoscanUpdateLM(zmm::Ref<AutoscanDirectory>)':
+../src/storage/sql_storage.cc:2139:81: error: call of overloaded 'quote(time_t)' is ambiguous
+         << " SET " << TQ("last_modified") << '=' << quote(adir->getPreviousLMT())
+
+Handle long long types explicitly to fix that.
+---
+ src/storage/mysql/mysql_storage.h     | 1 +
+ src/storage/sql_storage.h             | 1 +
+ src/storage/sqlite3/sqlite3_storage.h | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/storage/mysql/mysql_storage.h b/src/storage/mysql/mysql_storage.h
+index c377d76..eaec12c 100644
+--- a/src/storage/mysql/mysql_storage.h
++++ b/src/storage/mysql/mysql_storage.h
+@@ -55,6 +55,7 @@ private:
+     virtual inline zmm::String quote(unsigned long val) { return zmm::String::from(val); }
+     virtual inline zmm::String quote(bool val) { return zmm::String(val ? '1' : '0'); }
+     virtual inline zmm::String quote(char val) { return quote(zmm::String(val)); }
++    virtual inline zmm::String quote(long long val) { return zmm::String::from(val); }
+     virtual zmm::Ref<SQLResult> select(const char *query, int length);
+     virtual int exec(const char *query, int length, bool getLastInsertId = false);
+     virtual void storeInternalSetting(zmm::String key, zmm::String value);
+diff --git a/src/storage/sql_storage.h b/src/storage/sql_storage.h
+index 833693a..bd1afc3 100644
+--- a/src/storage/sql_storage.h
++++ b/src/storage/sql_storage.h
+@@ -81,6 +81,7 @@ public:
+     virtual zmm::String quote(unsigned long val) = 0;
+     virtual zmm::String quote(bool val) = 0;
+     virtual zmm::String quote(char val) = 0;
++    virtual zmm::String quote(long long val) = 0;
+     virtual zmm::Ref<SQLResult> select(const char *query, int length) = 0;
+     virtual int exec(const char *query, int length, bool getLastInsertId = false) = 0;
+     
+diff --git a/src/storage/sqlite3/sqlite3_storage.h b/src/storage/sqlite3/sqlite3_storage.h
+index d825bd4..be6294d 100644
+--- a/src/storage/sqlite3/sqlite3_storage.h
++++ b/src/storage/sqlite3/sqlite3_storage.h
+@@ -160,6 +160,7 @@ private:
+     virtual inline zmm::String quote(unsigned long val) { return zmm::String::from(val); }
+     virtual inline zmm::String quote(bool val) { return zmm::String(val ? '1' : '0'); }
+     virtual inline zmm::String quote(char val) { return quote(zmm::String(val)); }
++    virtual inline zmm::String quote(long long val) { return zmm::String::from(val); }
+     virtual zmm::Ref<SQLResult> select(const char *query, int length);
+     virtual int exec(const char *query, int length, bool getLastInsertId = false);
+     virtual void storeInternalSetting(zmm::String key, zmm::String value);
+-- 
+2.7.4
+
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-youtube-dl.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-youtube-dl.patch
new file mode 100644
index 000000000000..6001d2fc5661
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-youtube-dl.patch
@@ -0,0 +1,141 @@
+--- mediatomb-0.12.1.orig/src/youtube_video_url.cc	2013-12-17 22:46:24.272442249 +0000
++++ mediatomb-0.12.1/src/youtube_video_url.cc	2013-12-17 22:57:25.968039083 +0000
+@@ -117,89 +117,68 @@ String YouTubeVideoURL::getVideoURL(Stri
+ 
+     watch = _(YOUTUBE_URL_WATCH) + video_id;
+ 
+-    Ref<URL> url(new URL(YOUTUBE_PAGESIZE));
++    /*
++     * NOTE ON PATCH:
++     *
++     * The original code does not seem to work anymore.
++     *
++     * I have commented-out all the original code, and instead
++     * replaced it with a call/exec to youtube-dl (this is a separate/stand-alone python script).
++     *
++     * Available at http://rg3.github.io/youtube-dl/
++     *
++     *
++     * The current code works on a/my samsung TV. I have not tested it further on other devices.
++     * (I needed a quick fix, because I wanted to watch some video's.  :) )
++     *
++     * I thought I would share the results.
++     *
++     * Suggestions / feedback  -> bas-patch@tcfaa.nl
++     *
++     * Regards, Bas Nedermeijer
++     */ 
++
++    int pipefd[2];
++    pipe(pipefd);
++
++    if (fork() == 0)
++    {
++        // close reading end in the child
++        close(pipefd[0]);
++
++        // send stdout to the pipe
++        dup2(pipefd[1], 1); 
++        // send stderr to the pipe
++        dup2(pipefd[1], 2); 
+ 
+-    Ref<StringBuffer> buffer = url->download(watch, &retcode, curl_handle,
+-                                             false, verbose, true);
+-    if (retcode != 200)
+-    {
+-        throw _Exception(_("Failed to get URL for video with id ")
+-                         + watch + _("HTTP response code: ") + 
+-                         String::from(retcode));
+-    }
++        // this descriptor is no longer needed
++        close(pipefd[1]); 
+ 
+-    log_debug("------> GOT BUFFER %s\n", buffer->toString().c_str());
+-
+-    Ref<Matcher> matcher =  reVideoURLParams->matcher(buffer->toString());
+-    String params;
+-    if (matcher->next())
+-    {
+-//        params = trim_string(matcher->group(1));
+-        params = trim_string( matcher->group( 0 ) );
+-      /*
+-        int brace = params.index( '{' );
+-        if ( brace > 0 )
+-            params = params.substring( brace );
+-        brace = params.index( '}' );
+-        if ( brace > 0 )
+-            params = params.substring( 0, brace + 1 );
+-            */
+-        Ref<Matcher> m2 = param_t->matcher(params);
+-        if (m2->next())
+-        {
+-            String hmm = m2->group(1);
+-            if (string_ok(hmm))
+-                params = hmm; 
+-            else 
+-            {
+-                throw _Exception(_("Could not retrieve \"t\" parameter."));
+-            }
+-        }
++        // This code assumes youtube-dl is available for usage.
++        execl("/usr/bin/youtube-dl", "/usr/bin/youtube-dl","-g",watch.c_str(),NULL);
+     }
+     else
+     {
+-        throw _Exception(_("Failed to get URL for video with id (step 1)") + video_id);
+-    }
++        // parent
++        char buffery[8192];
++        memset(&buffery[0], 0, sizeof(buffery));
+ 
+-    params = _(YOUTUBE_URL_GET) + YOUTUBE_URL_PARAM_VIDEO_ID + '=' + 
+-             video_id + '&' + YOUTUBE_URL_PARAM_T + '=' + params;
++        close(pipefd[1]);  // close the write end of the pipe in the parent
+ 
+-    if (mp4)
+-    {
+-        String format = _("&fmt=18");
+-        
+-        if (hd)
++        // Hopefully the read is never called twice, otherwise the buffer will become corrupt.
++        while (read(pipefd[0], buffery, sizeof(buffery)) != 0)
+         {
+-            matcher = HD->matcher(buffer->toString());
+-            if (matcher->next())
+-            {
+-                if (trim_string(matcher->group(1)) == "true")
+-                    format = _("&fmt=22");
+-            }
+         }
+-                    
+-        params = params + format;
+-    }
+ 
+-    buffer = url->download(params, &retcode, curl_handle, true, verbose, true);
++       log_debug("------> GOT BUFFER %s\n", buffery);
++       String result = _(buffery);
+ 
+-    matcher = redirectLocation->matcher(buffer->toString());
+-    if (matcher->next())
+-    {
+-        if (string_ok(trim_string(matcher->group(1))))
+-            return trim_string(matcher->group(1));
+-        else
+-            throw _Exception(_("Failed to get URL for video with id (step 2)")+ 
+-                             video_id);
+-    }
++       result = trim_string(result);
+ 
+-    if (retcode != 303)
+-    {
+-        throw _Exception(_("Unexpected reply from YouTube: ") + 
+-                         String::from(retcode));
+-    }
++       log_debug("------> GOT BUFFER (after trimming) %s\n", result.c_str());
+ 
+-    throw _Exception(_("Could not retrieve YouTube video URL"));
++       return result;
++    }
+ }
+ 
+ #endif//YOUTUBE
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1.initd b/net-misc/mediatomb/files/mediatomb-0.12.1.initd
new file mode 100644
index 000000000000..6c7989d89d66
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1.initd
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	# In order to properly support this (need vs use), we would have to
+	# parse ${MEDIATOMB_CONFIG} and see if mysql is enabled and if it is
+	# pointing to the local system.  #368409
+	use mysql
+}
+
+start() {
+	ebegin "Starting MediaTomb"
+	start-stop-daemon --start --quiet --exec /usr/bin/mediatomb \
+		--pidfile ${MEDIATOMB_PIDFILE} -- --daemon \
+		--pidfile ${MEDIATOMB_PIDFILE} --user ${MEDIATOMB_USER} \
+		--group ${MEDIATOMB_GROUP} --logfile ${MEDIATOMB_LOGFILE} \
+		--config ${MEDIATOMB_CONFIG} --port ${MEDIATOMB_PORT} \
+		${MEDIATOMB_OPTIONS}
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping MediaTomb"
+	start-stop-daemon --stop --retry 10 --quiet --pidfile ${MEDIATOMB_PIDFILE}
+	eend $?
+}
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild
new file mode 100644
index 000000000000..dbd677893117
--- /dev/null
+++ b/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils linux-info user
+
+DEB_VER="5"
+DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
+HOMEPAGE="http://www.mediatomb.cc/"
+
+SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+
+IUSE="curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm
+		libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib"
+REQUIRED_USE="
+	|| ( mysql sqlite )
+	taglib? ( !id3tag )
+	id3tag? ( !taglib )
+	thumbnail? ( ffmpeg !libextractor )
+	ffmpeg? ( !libextractor )
+	libextractor? ( !ffmpeg !thumbnail )
+"
+
+DEPEND="mysql? ( virtual/mysql )
+	dev-libs/expat
+	id3tag? ( media-libs/id3lib )
+	javascript? ( >=dev-lang/spidermonkey-1.8.5:0 )
+	taglib? ( media-libs/taglib )
+	sqlite? ( >=dev-db/sqlite-3 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	libextractor? ( media-libs/libextractor )
+	mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? ( media-libs/flac )
+	thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
+	curl? ( net-misc/curl net-misc/youtube-dl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	enewgroup mediatomb
+	enewuser mediatomb -1 -1 /dev/null mediatomb
+}
+
+src_prepare() {
+	# Apply Debians patchset
+	local p dd="${WORKDIR}"/debian/patches
+	sed -i -r '/^[-+]{3} /s:[.][.]/::' "${dd}"/* || die
+	# We use our version as it seems to be more complete.
+	sed -i '/^0010_fix_libmp4v2_build.patch/d' "${dd}"/series || die
+	for p in $(<"${dd}"/series) ; do
+		epatch "${dd}"/${p}
+	done
+
+	# libmp4v2 API breakage #410235
+	epatch "${FILESDIR}"/${P}-libmp4v2.patch
+
+	# Use system libuuid #270830
+	epatch "${FILESDIR}"/${P}-system-uuid.patch
+
+	# Support spidermonkey-187 #423991 #482392
+	if has_version "~dev-lang/spidermonkey-1.8.7" ; then
+		epatch "${FILESDIR}"/${P}-mozjs187.patch
+	fi
+
+	# Support libextractor-0.6.0 #435394
+	epatch "${FILESDIR}"/${P}-libextractor.patch
+
+	# Fix inotify and hard links
+	epatch "${FILESDIR}"/${P}-inotify-hard-links.patch
+
+	# Add support for caching thumbnails
+	epatch "${FILESDIR}"/${P}-thumb-cache.patch
+	epatch "${FILESDIR}"/${P}-thumbnail-locking.patch
+
+	# Respect AR #464710
+	epatch "${FILESDIR}"/${P}-system-ar.patch
+
+	# Add flac metadata support #494398
+	epatch "${FILESDIR}"/${P}-flac-metadata.patch
+
+	# Work around broken youtube support by using youtube-dl #467110
+	epatch "${FILESDIR}"/${P}-youtube-dl.patch
+
+	epatch "${FILESDIR}"/${P}-time-t.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable curl) \
+		$(use_enable curl youtube) \
+		$(use_enable debug tombdebug) \
+		$(use_enable exif libexif) \
+		$(use_enable ffmpeg) \
+		$(use_enable flac FLAC) \
+		$(use_enable id3tag id3lib) \
+		$(use_enable inotify) \
+		$(use_enable javascript libjs) \
+		$(use_enable lastfm lastfmlib) \
+		$(use_enable libextractor) \
+		$(use_enable magic libmagic) \
+		$(use_enable mp4 libmp4v2) \
+		$(use_enable mysql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable taglib) \
+		$(use_enable thumbnail ffmpegthumbnailer) \
+		$(use_enable zlib) \
+		--enable-external-transcoding \
+		--enable-protocolinfo-extension
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}-0.12.1.initd ${PN}
+	use mysql || sed -i -e "/use mysql/d" "${ED}"/etc/init.d/${PN}
+	newconfd "${FILESDIR}"/${PN}-0.12.0.confd ${PN}
+
+	insinto /etc/mediatomb
+	newins "${FILESDIR}/${PN}-0.12.0.config" config.xml
+	fperms 0600 /etc/mediatomb/config.xml
+	fowners mediatomb:mediatomb /etc/mediatomb/config.xml
+
+	keepdir /var/lib/mediatomb
+	fowners mediatomb:mediatomb /var/lib/mediatomb
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "MediaTomb has been built with MySQL support and needs"
+		elog "to be configured before being started."
+		elog "For more information, please consult the MediaTomb"
+		elog "documentation: http://mediatomb.cc/pages/documentation"
+		elog
+	fi
+
+	elog "To configure MediaTomb edit:"
+	elog "/etc/mediatomb/config.xml"
+	elog
+	elog "The MediaTomb web interface can be reached at (after the service is started):"
+	elog "http://localhost:49152/"
+}
diff --git a/net-misc/mediatomb/mediatomb-0.12.2_pre20160522.ebuild b/net-misc/mediatomb/mediatomb-0.12.2_pre20160522.ebuild
new file mode 100644
index 000000000000..3640a7bd24bc
--- /dev/null
+++ b/net-misc/mediatomb/mediatomb-0.12.2_pre20160522.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils linux-info systemd user vcs-snapshot
+
+DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
+HOMEPAGE="http://www.mediatomb.cc/"
+SRC_URI="https://github.com/v00d00/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm
+	libav +magic +mp4 mysql +sqlite +taglib thumbnail +zlib"
+REQUIRED_USE="
+	|| ( mysql sqlite )
+	taglib? ( !id3tag )
+	id3tag? ( !taglib )
+	thumbnail? ( ffmpeg )
+"
+
+DEPEND="mysql? ( virtual/mysql )
+	dev-libs/expat
+	id3tag? ( media-libs/id3lib )
+	javascript? ( >=dev-lang/spidermonkey-1.8.5:0 )
+	taglib? ( media-libs/taglib )
+	sqlite? ( >=dev-db/sqlite-3 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 )
+	ffmpeg? (
+		libav? ( >=media-video/libav-10:0= )
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+	)
+	flac? ( media-libs/flac )
+	thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
+	curl? ( net-misc/curl net-misc/youtube-dl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	use inotify && linux-info_pkg_setup
+
+	enewgroup mediatomb
+	enewuser mediatomb -1 -1 /dev/null mediatomb
+}
+
+src_prepare() {
+	# Support spidermonkey-187 #423991 #482392
+	if has_version "~dev-lang/spidermonkey-1.8.7" ; then
+		epatch "${FILESDIR}"/${PN}-0.12.1-mozjs187.patch
+	fi
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable curl) \
+		$(use_enable curl youtube) \
+		$(use_enable debug tombdebug) \
+		$(use_enable exif libexif) \
+		$(use_enable ffmpeg) \
+		$(use_enable flac) \
+		$(use_enable id3tag id3lib) \
+		$(use_enable inotify) \
+		$(use_enable javascript libjs) \
+		$(use_enable lastfm lastfm) \
+		$(use_enable magic libmagic) \
+		$(use_enable mp4 libmp4v2) \
+		$(use_enable mysql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable taglib) \
+		$(use_enable thumbnail ffmpegthumbnailer) \
+		--enable-external-transcoding \
+		--enable-protocolinfo-extension
+}
+
+src_install() {
+	default
+
+	systemd_dounit "${S}"/scripts/systemd/"${PN}".service
+	use mysql && systemd_dounit "${S}"/scripts/systemd/"${PN}"-mysql.service
+
+	newinitd "${FILESDIR}"/${PN}-0.12.1.initd ${PN}
+	use mysql || sed -i -e "/use mysql/d" "${ED}"/etc/init.d/${PN}
+	newconfd "${FILESDIR}"/${PN}-0.12.0.confd ${PN}
+
+	insinto /etc/mediatomb
+	newins "${FILESDIR}/${PN}-0.12.0.config" config.xml
+	fperms 0600 /etc/mediatomb/config.xml
+	fowners mediatomb:mediatomb /etc/mediatomb/config.xml
+
+	keepdir /var/lib/mediatomb
+	fowners mediatomb:mediatomb /var/lib/mediatomb
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "MediaTomb has been built with MySQL support and needs"
+		elog "to be configured before being started."
+		elog "For more information, please consult the MediaTomb"
+		elog "documentation: http://mediatomb.cc/pages/documentation"
+		elog
+	fi
+
+	elog "To configure MediaTomb edit:"
+	elog "/etc/mediatomb/config.xml"
+	elog
+	elog "The MediaTomb web interface can be reached at (after the service is started):"
+	elog "http://localhost:49152/"
+}
diff --git a/net-misc/mediatomb/metadata.xml b/net-misc/mediatomb/metadata.xml
new file mode 100644
index 000000000000..f49135825709
--- /dev/null
+++ b/net-misc/mediatomb/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>thev00d00@gentoo.org</email>
+    <name>Ian Whyman</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <use>
+    <flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
+    <flag name="flac">Enable FLAC metadata/artwork support</flag>
+    <flag name="id3tag">Use <pkg>media-libs/libid3tag</pkg> for reading files' metadata rather than taglib</flag>
+    <flag name="inotify">Enable inotify filesystem monitoring support</flag>
+    <flag name="lastfm">Enable last.fm support</flag>
+    <flag name="libextractor">Use libextractor to gather files' metadata</flag>
+    <flag name="magic">Use libmagic to determine file types</flag>
+    <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
+    <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag>
+    <flag name="thumbnail">Enables video thumbnails generation through <pkg>media-video/ffmpegthumbnailer</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">v00d00/mediatomb</remote-id>
+    <remote-id type="sourceforge">mediatomb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest
new file mode 100644
index 000000000000..5ace8543f9c8
--- /dev/null
+++ b/net-misc/megatools/Manifest
@@ -0,0 +1,7 @@
+DIST megatools-1.9.97.tar.gz 105211 SHA256 5868b911a916848b9d4f7e12c84837ea11418e42f6ffd0fdab9d0618d9358480 SHA512 bdc28b0d5abed23ef2b36c19d9b3572e776c293ff9e1b8cfc5966ae4a1107d554509bf136b4ceeb351cdfb3b0e094406d1ba5432c9a4572691b6ea16f6680552 WHIRLPOOL a3e19d18a7869040d6d3cc05064238536aaab805608edd79830d563efdf2fec4d7beeb35e7b1e24a9c8eb786c4b01e642641ce45e72962938de9e2235842beed
+DIST megatools-1.9.98.tar.gz 83684 SHA256 8e8614d7c29dc00fc47999d2a47372ae115635df9f30779fe32032f1a7289cec SHA512 0610809e16d135fd7cc3be45517a342f9800b098ed306b4341205bf0359832b4cb2a64220c84d5879cea6c4074229920dffd461824c93e08b492080ce87e012b WHIRLPOOL d4f6f6513e323507a4f8f036c4a38ba63a896255b1f063cb774701331cd213637a2bae01118001548dfe2e23809c6c24e89130d7fa1cc6d19ce09bc8a1cc3120
+EBUILD megatools-1.9.97.ebuild 974 SHA256 a593aac8daff57470f98c72559f91fe02d7032a92ed7fc991709eca5699d83fe SHA512 41b24a0ae3b125e92406bed4ba40e75a3481f50cb748143289fcd2cd6f5068f530bad1c60bf962c05a607c8b4b23216a0bada21565038362a04274f1dfc1fce9 WHIRLPOOL c3584233f2fc8d0ec3a90d11d9c37840084cee0459be8774ceefab79ae3e9b26bd9bd5bfe2814cd0abcfc08307a9ed3a1033ffa6595966d02fa317e3d5a657ac
+EBUILD megatools-1.9.98.ebuild 974 SHA256 a593aac8daff57470f98c72559f91fe02d7032a92ed7fc991709eca5699d83fe SHA512 41b24a0ae3b125e92406bed4ba40e75a3481f50cb748143289fcd2cd6f5068f530bad1c60bf962c05a607c8b4b23216a0bada21565038362a04274f1dfc1fce9 WHIRLPOOL c3584233f2fc8d0ec3a90d11d9c37840084cee0459be8774ceefab79ae3e9b26bd9bd5bfe2814cd0abcfc08307a9ed3a1033ffa6595966d02fa317e3d5a657ac
+MISC ChangeLog 3148 SHA256 c20738c7866d4644ee3401ef8bdbf45e6ed88c57f4750cc1ccbe81899d717391 SHA512 cf0dac5916ac7f3557368edaac17392642b5b170c5f47b0e153a91e4a2fe292c21aa4b0aba6753550f87712c2d9bd140651f35f04b4d8ffa0657c1c486284afc WHIRLPOOL 6793f0b05c13d0fe0ddb2c0ff7785ec15db304536c839252af189a034f73224fc9167f9a5225821ae9a35a228dcbbdf47a0314f74d4c037e5692c1b2f4644037
+MISC ChangeLog-2015 1377 SHA256 15a0a58e018c2134cef10d17cdf4299fa28c9fa94448bed8a6c00977b0c9e518 SHA512 8139af10ac544b630c86663814afbbedf53b68a74afa7a677f16379a05028fcc5e807c3dfde1ff7326f591d3ef88fd5b3b2a9671932865574ea0f4347ed82918 WHIRLPOOL 4f489cd491559242941bf821ea50f7cc468c3aae8576b7b62db1d2ef02da01ceadbd2092961571eff3b446f2f83edef474dc76b9314be0406eb2f6da76bbc28a
+MISC metadata.xml 666 SHA256 842b33026b9d4cdbf10afef9aee1d9a6ccc9afea7983d506e91f2143d6254887 SHA512 321d7e5b4918744e25067abd15fdd0d1fc1a4f627915ad9f38ed059b0a69cada014c8bb28bddc584c0c405a308818b597ce37bdf8603aa3d7d21a995d3eafe18 WHIRLPOOL d6474daf2d2564d04cd7cea891c4efb8052bdf32cfe9f492e643c9fbc720229899014ae8dc069db84d6b6adbd64c58e608c5bb5a06c95a2f5b44f9ec815f2e8c
diff --git a/net-misc/megatools/megatools-1.9.97.ebuild b/net-misc/megatools/megatools-1.9.97.ebuild
new file mode 100644
index 000000000000..42d283b633f9
--- /dev/null
+++ b/net-misc/megatools/megatools-1.9.97.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils
+
+DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
+HOMEPAGE="https://github.com/megous/megatools"
+SRC_URI="https://github.com/megous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="fuse introspection static-libs"
+
+COMMON_DEPEND="dev-libs/glib:2
+	dev-libs/openssl:0
+	net-misc/curl
+	fuse? ( sys-fs/fuse )
+"
+RDEPEND="${COMMON_DEPEND}
+	net-libs/glib-networking[ssl]
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	app-text/asciidoc"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--enable-docs-build
+		--disable-maintainer-mode
+		--disable-warnings
+		--disable-glibtest
+		$(use_enable static-libs static)
+		$(use_enable introspection)
+		$(use_with fuse)
+	)
+	autotools-utils_src_configure
+}
diff --git a/net-misc/megatools/megatools-1.9.98.ebuild b/net-misc/megatools/megatools-1.9.98.ebuild
new file mode 100644
index 000000000000..42d283b633f9
--- /dev/null
+++ b/net-misc/megatools/megatools-1.9.98.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils
+
+DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
+HOMEPAGE="https://github.com/megous/megatools"
+SRC_URI="https://github.com/megous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="fuse introspection static-libs"
+
+COMMON_DEPEND="dev-libs/glib:2
+	dev-libs/openssl:0
+	net-misc/curl
+	fuse? ( sys-fs/fuse )
+"
+RDEPEND="${COMMON_DEPEND}
+	net-libs/glib-networking[ssl]
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	app-text/asciidoc"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--enable-docs-build
+		--disable-maintainer-mode
+		--disable-warnings
+		--disable-glibtest
+		$(use_enable static-libs static)
+		$(use_enable introspection)
+		$(use_with fuse)
+	)
+	autotools-utils_src_configure
+}
diff --git a/net-misc/megatools/metadata.xml b/net-misc/megatools/metadata.xml
new file mode 100644
index 000000000000..bab792ed6d53
--- /dev/null
+++ b/net-misc/megatools/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<longdescription lang="en">
+Megatools is a collection of programs for accessing Mega service from 
+a command line of your desktop or server.
+
+Mega website can be found at http://mega.co.nz.
+</longdescription>
+	<use>
+		<flag name="fuse">
+		Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">megous/megatools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
new file mode 100644
index 000000000000..ce9457a349dc
--- /dev/null
+++ b/net-misc/memcached/Manifest
@@ -0,0 +1,18 @@
+AUX memcached-1.2.2-fbsd.patch 328 SHA256 a0e91bd63a01a1a3361b0465fb9c63d091627d8714f3f64c853723b31da54b2f SHA512 efbafa228cc969c49b303e1d746f1699acd3c627ba65f57a8cd9fe63b87c3ce3aa01daa6a767d09c4edb8fdd9159254a0d14e8b6b05263e82041d5d5dcf251a2 WHIRLPOOL eefb5240bd848446f90f68f5b46bfdd9e1559bb3ade827a20082ba3ac72b77e28bf6fa1d7a3d9b7fd6f8cdfe84e2624cdcc14a9ef98ad9d0b73106107ec01a08
+AUX memcached-1.4.0-fix-as-needed-linking.patch 1557 SHA256 bfedf767ee68f83e1e31d78d551d16f644cbfc8d385c991968d6cfdd22946cb8 SHA512 a177f82d13b25a1ee13b02852040289a46b08fba750467026ecd8932d12008c7a276ea4b9b166de3d3371f5e7f9a6e0ef8d15315ab1ec9d10928dd7f40090253 WHIRLPOOL 68a54588b33543083ecb853bd80282dd54c1b8f3a20101bfad5ae95344d8edef297bcd7c8ef94216fdbc112c938b72465f3f34766dedc4323551bd19ba7f69b9
+AUX memcached-1.4.17-EWOULDBLOCK.patch 506 SHA256 c0f2be207fd5a6185c70d16482d1d24931e966fde028ad82f7aaf94023778663 SHA512 6ddd823154a384e7502e138528b8d391b9fe203366c56f14ae38ddb6d8b6394fd0297e5fad90cf94f7bc1e7d90e04e0aab17b545fe3f1d2a55f0e2158e9a98dc WHIRLPOOL bcdb64364d56d1f1d69e2d555e9332f1ae2ab356906e5e46715d864504bbf0b5af73471b11d46aa1839930eb67802e2ba4a97ff1abb036c7c0d5b840a3faebe4
+AUX memcached-1.4.4-as-needed.patch 1135 SHA256 4b08e69c7a3f97e6add4fb337b095b7b0aba55c3d62ed793858cbf1dad036421 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e WHIRLPOOL baf83fc9213b04f35e6c503606f6b6b386ce0b5c50ba173a0cb48e8b7aa5576361b541d9a2af0da34795b64d5d58cbcee62bcb8d50e5695d8fb4ccd0b23137e3
+AUX memcached.confd 872 SHA256 700e2d718cb9d15de92a334cd8fe5f966bc3a34bba32878c1b95b5ce7696963b SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63 WHIRLPOOL 07465aef2fdc867a2e2c4dbad801715f65030ee5d83bc73a38ff887c2cc022ea7b299564b560a315db9ee2bc441cab3d732453c591ca32e82042edcc6ebe4032
+AUX memcached.init2 2205 SHA256 e70d28c64acbd322618e3774f570d285c667a16985896978bc62b9cf2e0eec26 SHA512 b7b68362a4e4b24e9db893b85c3959184d17ea0bf8346a38561235461cfc8c94cf6d546f1c31bbe34bb7ca3409db2209171dd08214d5f057d00c65885663992a WHIRLPOOL 95663d8656d7ba4f2ca47d14abddc08b9d5613b62c155efd569541faf2a71e1778276905a4d56c64ab11421156ef4bb07d9cc9072db118cebab004fa71c2e761
+AUX memcached.service 273 SHA256 ac7b65867203f195ed1aa2064072869a75f2a7c652de5a404f9b936a78a4180f SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 WHIRLPOOL cca378cb72a08b6b5177434ec1add5edd3d6a744b0999226fe22628b29edf31e7aadedfa6721a706bf7d4122bdf2a3953cdfeb3f0c2c8dfccb97372d9fb8737f
+DIST memcached-1.4.33.tar.gz 389813 SHA256 83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d SHA512 00af5a2f46702fb8e606b1035cdaad125445d8eb701927a3ccccd7cd6c12e0811efb3ad917e3118043fd993b5c313f1aa0c4b2a471218e971a21fed7c896e136 WHIRLPOOL 05ee1d4ea931a1f1792283b1d947ffa48752cb6ad1417d06221f967b00e638f5fa21448080efc1de1adf7457bd202b6102ae1495ba1e01368fcba04565c95299
+DIST memcached-1.4.39.tar.gz 403751 SHA256 23c4bf7c787e4fd9a7b0a7b61b3ffcb374ee86f9cc00ba892ce53eec40afd735 SHA512 055d39d9d681adebb9a6a255bce5d550b61df0a1981f0105f8ffcc936e2053bca60360d755b65d79af836ba1ca71d4c739c67e20a2e0e7110ada183a7b0b63d6 WHIRLPOOL 186e180edc8998b8e6006d6fe22538c3a90ab13785643fb7577cf3ece399350a9d64e684863cd762fd92a67775f56022a88cbc07a177e60b2153565673fbeec0
+DIST memcached-1.5.1.tar.gz 407282 SHA256 a87908936b51d1bd3ef10a2347eef5647f003b63407a5d8161fa7928b1cd6b5c SHA512 686ad82f1fd73f683fa09930d4e14aa85bd8237106e39752c9676d31aa397db1687378c4ddfadf4591f7c623837cadf90e6643263aea78a80eb294683ed0dfbb WHIRLPOOL ec71a78124942f42750a81803f08a35caf710a973a715fb00323143b2c9862b49a36da282ce688f7594aa6a53af7060c27976f51eb0eff2586bd072367c25aa2
+DIST memcached-1.5.2.tar.gz 407715 SHA256 9ac93113bdb5d037e79c61277386564ac2e5e31d49e594f11e554e4c149b7245 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d WHIRLPOOL 31eaaf3006ce6211413347723f862ea4199acd2564d71c652e3800f876af2ba3d215ac8450d7c13a19747011ef733c25022406506b42d991affe85e0ce31db35
+EBUILD memcached-1.4.33.ebuild 2624 SHA256 5e8fa07f214704a05ef63385ae8a2b78920ca7aa22b994db7f370ce25876b43d SHA512 95106208e83a37e1d1f94c04cb2942194f4ed9e7f8470b831529849c3ca62b48477fc0937e87ec7cd44204d87df7672ff72e20199068d21f63b8320335e074a2 WHIRLPOOL d68b507ad7976b8b3b19de82fb4a9d13b5d35c02e0057f1ffcbbb7e616d5cbc2e8ba566ec2494c9add5e9bd44d10679c4c1850427a1bdc4bd199853495273965
+EBUILD memcached-1.4.39.ebuild 2887 SHA256 0557ddb98d86c07429a5a5b01af5eba2ea3330b5fe779917ee641157235cdaf2 SHA512 0726d795ffbaa17ed04b3b307146742bd647ab6c2084a1e0f22b333b293ac6e15a7488d69fd166f2480c49c87b236f14e7d7d7642c40fe853097347e9199e706 WHIRLPOOL 2062c9871526025fdb86633dc211f25901aefa72f9d806e58ce667274e13464bf9145cf7c172a4a4f112241363bc824586be16419d946f51411869081c5908c9
+EBUILD memcached-1.5.1.ebuild 2903 SHA256 90149ac9457d7b15126a8ddd6295977c0f68ac387094fe06eaec9d0e520d1b91 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6 WHIRLPOOL 2f346ce0fbbc02230fc854eee1d92cfc53cded2d5c3ce3aa14aeaff7c528b96583b7a3c7c69e84f7646a4db68d1c8ef21604738d2f4fa765eb2e7e213593d5d9
+EBUILD memcached-1.5.2.ebuild 2903 SHA256 90149ac9457d7b15126a8ddd6295977c0f68ac387094fe06eaec9d0e520d1b91 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6 WHIRLPOOL 2f346ce0fbbc02230fc854eee1d92cfc53cded2d5c3ce3aa14aeaff7c528b96583b7a3c7c69e84f7646a4db68d1c8ef21604738d2f4fa765eb2e7e213593d5d9
+MISC ChangeLog 9513 SHA256 2f72df675f6c2041cda3cdb32f7a4f1314fda9417e8873fc24ab60950767e527 SHA512 9962bb124817964f19dceee258da39a00d1f95ab6929efc27d012920f1e2bdc290e5619603cceeb53d080ecf79c22ab9bc3628c923895002220e17cec357e22b WHIRLPOOL 828f0916052f66539e8b37f6c46e14064a2bab23d5066205dfed3049f695ac712d1029d401c85b68954a24f3a971369d05751d17c50564f97c71d7153966f692
+MISC ChangeLog-2015 29003 SHA256 a8e02533be3dc8071b69388e8c927edc33d54ce26b596a775f99a30698847eb4 SHA512 55fa88fdce9ff266070e8b5eab890a2418165bc6ab5c093f071acd0c3d218059d47a255281fc789c98869ac67b81aae4ae81111131d2dc5feb0457b54b6301a6 WHIRLPOOL e5fda7152db66bb75db44574d2c68f1272a4323498d25755b5a8f4b01cc684e6fd362c68c143df09b29dcbbdfb3f6fcf4b4291ac252fe28da60ebc705f194e82
+MISC metadata.xml 1134 SHA256 e189a8b1f9310663b1921d6279b993ea689153406a9058fbc977927c65e05068 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 WHIRLPOOL 9e1b630893ccee95aedb117e40d03de15605fb5085eea1bf687ca445b9972e8fc900dbed7bcf0d45bb351e3801e1849210d6517e8891bae7bf2fd004a207dc53
diff --git a/net-misc/memcached/files/memcached-1.2.2-fbsd.patch b/net-misc/memcached/files/memcached-1.2.2-fbsd.patch
new file mode 100644
index 000000000000..76f237698cf7
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.2.2-fbsd.patch
@@ -0,0 +1,12 @@
+Index: memcached-1.2.2/memcached.h
+===================================================================
+--- memcached-1.2.2.orig/memcached.h
++++ memcached-1.2.2/memcached.h
+@@ -4,6 +4,7 @@
+ #include "config.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
++#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <event.h>
+ 
diff --git a/net-misc/memcached/files/memcached-1.4.0-fix-as-needed-linking.patch b/net-misc/memcached/files/memcached-1.4.0-fix-as-needed-linking.patch
new file mode 100644
index 000000000000..d8a8ff295fc3
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.4.0-fix-as-needed-linking.patch
@@ -0,0 +1,47 @@
+Users that try to second-guess us and specify -DNDEBUG are just asking to cause
+problems. They cause breakage with the testapp and -debug versions.
+
+So let's ensure that testapp and -debug use per-object compile flags, and thus
+preventing flags leaking between stuff. The #undef at the top of testapp.c is
+redundant now, but not removed.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+X-Gentoo-Bug: 278780
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=278780
+
+diff -Nuar memcached-1.4.0/testapp.c memcached-1.4.0/testapp.c
+--- memcached-1.4.0/testapp.c	2009-07-09 09:43:42.000000000 -0700
++++ memcached-1.4.0/testapp.c	2009-07-27 16:41:14.468907751 -0700
+@@ -115,12 +115,16 @@
+     char old = *(p - 1);
+     *(p - 1) = 0;
+     cache_free(cache, p);
++#ifndef NDEBUG
+     assert(cache_error == -1);
++#endif
+     *(p - 1) = old;
+ 
+     p[sizeof(uint32_t)] = 0;
+     cache_free(cache, p);
++#ifndef NDEBUG
+     assert(cache_error == 1);
++#endif
+ 
+     /* restore signal handler */
+     sigaction(SIGABRT, &old_action, NULL);
+diff -Nuar memcached-1.4.0.orig/Makefile.am memcached-1.4.0/Makefile.am
+--- memcached-1.4.0.orig/Makefile.am	2009-07-09 09:43:42.000000000 -0700
++++ memcached-1.4.0/Makefile.am	2009-07-27 17:45:20.973106097 -0700
+@@ -27,8 +27,12 @@
+ 
+ memcached_debug_SOURCES = $(memcached_SOURCES)
+ memcached_CPPFLAGS = -DNDEBUG
++
+ memcached_debug_LDADD = @PROFILER_LDFLAGS@
+ memcached_debug_CFLAGS = @PROFILER_FLAGS@
++memcached_debug_CPPFLAGS = -UNDEBUG
++
++testapp_CPPFLAGS = -UNDEBUG
+ 
+ memcached_LDADD = 
+ memcached_DEPENDENCIES =
diff --git a/net-misc/memcached/files/memcached-1.4.17-EWOULDBLOCK.patch b/net-misc/memcached/files/memcached-1.4.17-EWOULDBLOCK.patch
new file mode 100644
index 000000000000..115c6bbc8633
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.4.17-EWOULDBLOCK.patch
@@ -0,0 +1,21 @@
+errno.h(0P):
+    EAGAIN Resource unavailable, try again (may be the same value as [EWOULDBLOCK]).
+
+    [...]
+
+    EWOULDBLOCK
+        Operation would block (may be the same value as [EAGAIN]).
+
+
+--- a/testapp.c
++++ b/testapp.c
+@@ -1840,6 +1840,9 @@
+                 switch (errno) {
+                 case EINTR:
+                     break;
++#if (EAGAIN != EWOULDBLOCK)
++                case EAGAIN:
++#endif
+                 case ENOMEM:
+                 case EWOULDBLOCK:
+                     more = false;
\ No newline at end of file
diff --git a/net-misc/memcached/files/memcached-1.4.4-as-needed.patch b/net-misc/memcached/files/memcached-1.4.4-as-needed.patch
new file mode 100644
index 000000000000..f6e5cde11057
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.4.4-as-needed.patch
@@ -0,0 +1,31 @@
+diff -Nuar memcached-1.4.4.orig/configure.ac memcached-1.4.4/configure.ac
+--- memcached-1.4.4.orig/configure.ac	2009-11-24 16:40:29.000000000 -0800
++++ memcached-1.4.4/configure.ac	2009-11-27 15:20:38.000000000 -0800
+@@ -115,6 +115,14 @@
+ AC_SUBST(ENABLE_SASL)
+ AC_SUBST(PROFILER_LDFLAGS)
+ 
++dnl Check whether the user's system supports pthread before adding -pthread to CFLAGS
++dnl otherwise we won't get -l{threads} in LIBS
++dnl AFAIK -pthread should be added to LDFLAGS on BSD systems
++AC_SEARCH_LIBS(pthread_create, [pthread pthreads thread threads] )
++if test "x$ac_cv_search_pthread_create" == "xno"; then
++  AC_MSG_ERROR([Can't enable threads without the POSIX thread library.])
++fi
++
+ AC_ARG_ENABLE(coverage,
+   [AS_HELP_STRING([--disable-coverage],[Disable code coverage])])
+ 
+@@ -376,12 +384,6 @@
+ 
+ AC_C_HTONLL
+ 
+-dnl Check whether the user's system supports pthread
+-AC_SEARCH_LIBS(pthread_create, pthread)
+-if test "x$ac_cv_search_pthread_create" = "xno"; then
+-  AC_MSG_ERROR([Can't enable threads without the POSIX thread library.])
+-fi
+-
+ AC_CHECK_FUNCS(mlockall)
+ AC_CHECK_FUNCS(getpagesizes)
+ AC_CHECK_FUNCS(memcntl)
diff --git a/net-misc/memcached/files/memcached.confd b/net-misc/memcached/files/memcached.confd
new file mode 100644
index 000000000000..aad80780e759
--- /dev/null
+++ b/net-misc/memcached/files/memcached.confd
@@ -0,0 +1,40 @@
+# memcached config file
+
+MEMCACHED_BINARY="/usr/bin/memcached"
+
+# Specify memory usage in megabytes (do not use letters)
+# 64MB is default
+MEMUSAGE="64"
+
+# User to run as
+MEMCACHED_RUNAS="memcached"
+
+# Specify maximum number of concurrent connections
+# 1024 is default
+MAXCONN="1024"
+
+# Listen for connections on what address?
+# If this is empty, memcached will listen on 0.0.0.0
+# be sure you have a firewall in place!
+LISTENON=""
+
+# Listen for connections on what port?
+PORT="11211"
+
+# Listen for UDP connecitons on what port? 0 means turn off UDP
+UDPPORT="${PORT}"
+
+# PID file location
+# '-${PORT}.${CONF}.pid' will be appended to this!
+# You do not normally need to change this.
+PIDBASE="/var/run/memcached/memcached"
+
+# Socket to listen on
+#SOCKET="/var/run/memcached/memcached.sock"
+
+# Socket mask
+# 0700 is default
+#SOCKET_MASK="0700"
+
+# Other Options
+MISC_OPTS=""
diff --git a/net-misc/memcached/files/memcached.init2 b/net-misc/memcached/files/memcached.init2
new file mode 100644
index 000000000000..4bdfec6b945c
--- /dev/null
+++ b/net-misc/memcached/files/memcached.init2
@@ -0,0 +1,90 @@
+#!/sbin/openrc-run
+
+CONF="${SVCNAME#*.}"
+CONFBASE="/etc/conf.d/memcached"
+
+[ -z "${PIDBASE}" ] && PIDBASE="/run/memcached/memcached"
+[ "${CONF}" = "memcached" ] && CONF=''
+
+if [ -n "${CONF}" ]; then
+    PIDFILE="${PIDBASE}.${CONF}.pid"
+    CONFSRC="${CONFBASE}.${CONF}"
+    if [ -f "${CONFSRC}" ]; then
+        source "${CONFSRC}"
+    else
+        eerror "The configuration file $CONFSRC was not found!"
+    fi
+else
+    PIDFILE="${PIDBASE}.pid"
+    CONFSRC="${CONFBASE}"
+fi
+
+depend() {
+    # per bug #269022, accurate time is important for memcached!
+    # We include the full list of ways it might be set on boot.
+    after ntp-client ntpd rdate openrdate adjtimex hwclock
+}
+
+checkconfig() {
+    if [ -z "${LISTENON}" ] && [ -z "${SOCKET}" ]; then
+        ewarn "You should edit $CONFSRC and specify an address or socket to listen on."
+        ewarn "Listening on any address (check your firewall!)"
+    fi
+}
+
+start() {
+    if [ -n "${CONF}" ]; then
+        ebegin "Starting memcached (${CONF})"
+    else
+        ebegin "Starting memcached"
+    fi
+    checkconfig
+    local dir="$(dirname ${PIDFILE})"
+    if [ ! -d "${dir}" ]; then
+        einfo " Creating ${dir}"
+        mkdir -p "${dir}"
+    fi
+
+    chown ${MEMCACHED_RUNAS} "${dir}"
+    if [ -f "${PIDFILE}" ]; then
+        einfo "  Removing stale pidfile ${PIDFILE}"
+        rm -f "${PIDFILE}" 1>/dev/null
+    fi
+
+        
+    if [ -n "${SOCKET}" ]; then
+        CONNECTION="-s ${SOCKET}"
+
+        if [ -n "${SOCKET_MASK}" ]; then
+            CONNECTION="${CONNECTION} -a ${SOCKET_MASK}"
+        fi
+    else
+        CONNECTION="-p ${PORT} -U ${UDPPORT}"
+
+        if [ -n "${LISTENON}" ]; then
+            CONNECTION="${CONNECTION} -l ${LISTENON}"
+        fi
+    fi
+
+    /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
+        --exec "${MEMCACHED_BINARY}" -- \
+        -d ${CONNECTION} -m ${MEMUSAGE}  \
+        -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
+        ${MISC_OPTS}
+
+    eend $?
+}
+
+stop() {
+    if [ -n "${CONF}" ]; then
+        ebegin "Stopping memcached (${CONF})"
+    else
+        ebegin "Stopping memcached"
+    fi
+
+    start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+
+    rm -f "${PIDFILE}"
+
+    eend $?
+}
diff --git a/net-misc/memcached/files/memcached.service b/net-misc/memcached/files/memcached.service
new file mode 100644
index 000000000000..f51fd1f35730
--- /dev/null
+++ b/net-misc/memcached/files/memcached.service
@@ -0,0 +1,12 @@
+[Unit]
+After=network.target
+Description=High-performance, distributed memory object caching system
+Documentation=man:memcached(1)
+Documentation=http://code.google.com/p/memcached/
+
+[Service]
+ExecStart=/usr/bin/memcached
+User=memcached
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/memcached/memcached-1.4.33.ebuild b/net-misc/memcached/memcached-1.4.33.ebuild
new file mode 100644
index 000000000000..48ebbfb8d2ec
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.33.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )
+		 selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	# Handled different upstream
+	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${FILESDIR}/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/memcached/memcached-1.4.39.ebuild b/net-misc/memcached/memcached-1.4.39.ebuild
new file mode 100644
index 000000000000..ad41318d90c0
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.39.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )
+		 selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/memcached/memcached-1.5.1.ebuild b/net-misc/memcached/memcached-1.5.1.ebuild
new file mode 100644
index 000000000000..9e386070af56
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )
+		 selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/memcached/memcached-1.5.2.ebuild b/net-misc/memcached/memcached-1.5.2.ebuild
new file mode 100644
index 000000000000..9e386070af56
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )
+		 selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/memcached/metadata.xml b/net-misc/memcached/metadata.xml
new file mode 100644
index 000000000000..a03b9969a2df
--- /dev/null
+++ b/net-misc/memcached/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<longdescription>High-performance, distributed memory object caching system, generic in nature,
+but intended for use in speeding up dynamic web applications by alleviating
+database load.
+Danga Interactive developed memcached to enhance the speed of LiveJournal.com, a
+site which was already doing 20 million+ dynamic page views per day for 1
+million users with a bunch of webservers and a bunch of database servers.
+memcached dropped the database load to almost nothing, yielding faster page load
+times for users, better resource utilization, and faster access to the databases
+on a memcache miss.</longdescription>
+	<use>
+		<flag name="slabs-reassign">Allow manual reassignment of memory slabs at the cost of slab optimizations.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">memcached/memcached</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/metadata.xml b/net-misc/metadata.xml
new file mode 100644
index 000000000000..0848d7ad90c9
--- /dev/null
+++ b/net-misc/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The net-misc category contains various miscellaneous networking tools
+		and utilities.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-misc enthält verschiedenste Programme und Werkzeuge
+		rund um Netzwerke.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-misc contiene varias herramientas y utilidades
+		relacionadas con las redes.
+	</longdescription>
+	<longdescription lang="ja">
+		net-miscカテゴリーには多種多様なネットワーキング・ツールと
+		ユーティリティが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-misc categorie bevat verschillende netwerkapplicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-misc chứa các công cụ mạng khác nhau.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-misc contiene vari strumenti ed utilità per la gestione delle reti.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria net-misc contém várias ferramentas e utilitários
+		de rede.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria net-misc zawiera różne dodatkowe narzędzia i programy sieciowe.
+	</longdescription>
+</catmetadata>
+
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
new file mode 100644
index 000000000000..6a15d062e3ef
--- /dev/null
+++ b/net-misc/mico/Manifest
@@ -0,0 +1,10 @@
+DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 SHA256 9d616c90f1ef4db44709e393fd2ab74d1e17f7e65541900c3735c312376de681 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf WHIRLPOOL 52494f75a92cfd3e06baf5074b17ce8776f120bb38c63ffea09be78ba95735d629098c2bc34a2289ff5c2ed383d697f450530b76b9f73919dcdacf8072765773
+DIST mico-2.3.13.tar.gz 3269814 SHA256 a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69 SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895 WHIRLPOOL e8f5b92502a012e4f316ae341a25a0c24def7718f7a85fed7e24de5298d593b1a2af2fcb21e89d857e6da65d6b0765108eb3f77e820874d98047127d07734389
+DIST mico-9999-gentoo-patches-20170529.tar.xz 16716 SHA256 e5271dd2c8742b19fd89abb014bd02fa1a1a1acd17d1cf740f61127f0aafd367 SHA512 33361ab7a40fe897a48bf69fb33ffc3afa3da224a1589cfd7c4660deb00dcb9dd76dd2bc84ed968db6dd8a9e22aa493bb4b78713606675b6021f081eb56deb10 WHIRLPOOL 72b5777543e5d7f48cf0b64d4134fd33d6f29c3889281ccdecb9306d846af2f965138dd8093459c7bdb8b26a335c0bce3fab2d10282e59f6f441a45ac79742cf
+EBUILD mico-2.3.13-r10.ebuild 4590 SHA256 57541107af7237351f81feda3c346a346d6ab6bcaecf987407fe1c43c1bec034 SHA512 0ecfb9573f3970b755aa4aca9030e1837abd3661cc71add09fd7b8bf5430a5453adf857b83ce15637e0d5a1101e3f74f653f75833f8e8110140c09a55229ac60 WHIRLPOOL 09acdf59801a72a7ca8680c20f0e8ebfac3e3e418e179fb71c2879dd44b8b80956db48b40e1eef5cd2da25fbbcdbb1185657031325227ed6cc9597096027f62a
+EBUILD mico-2.3.13-r8.ebuild 3970 SHA256 69871e978e84e3a3ab2309567dc92f7f4c38e519e60ab184e0f8cdf8ec0b9359 SHA512 86f9edc2281fdeb190fc71ee315acd569364d18ff4b64647e552f400f030086e27262e13013403caf49c14dd410d0f5137b4b832177c49b29a25ff082a9022e0 WHIRLPOOL ab94240f7c890f004c05f13814f9a4dddfa88cfb57985bfa79499e6b40d82dd8f4a6e4d8c318dab119a8c58f756f900e43b028ef325b89af8fa03c4833d4bc9c
+EBUILD mico-2.3.13-r9.ebuild 4304 SHA256 1e482abc374bdf44c31efd88f73105751caaa76438f165f161e700cd25d92cd5 SHA512 2c7de23f01b8789b55e7df548c351cb48bf8b04675b192828ad442df8fc13fe22dc72500947001df695d2f302c347a3d6bf7b83c1c9fbd0ee95c95c7525a5100 WHIRLPOOL 0f0aa32811fc2d0a7ed7d24f3774db7140daabe1e0f413de26ad66d227993890d2dd6def46671284129532d57ea0dcd004e111826b904d1a0ef393494de00119
+EBUILD mico-9999.ebuild 4440 SHA256 7f313869a2f56059150fc08e2e116ab948d01797f6cbabd17bb58f7948ee111c SHA512 ee384e476d508d2b1f8d15288dc8a18f15aa532ac84c603533f643741b9de11a6b516f051d4b1c127b40b5b24fff46b8cb977a78b4b667ba7a6f3f4ed2d5b2ef WHIRLPOOL 721c3a70ce888503e66485d1e6ccaac78ad6396f08c22a782657672fe3ce55574ce339dbf08d8d89593ff707ee61a054f9da096dde3be9605bbe48089beb6522
+MISC ChangeLog 2655 SHA256 22b56ade34a8a211f348166f003e860e612eebe1f9957589f6a87712b2d1db34 SHA512 806046e5469715922b0a98099a4a043d2c7eb35221ea7708cdd58cc3e0a722283abe522aee5512cf727aea18647aaa4bf81e64f5d8d91a8e5d1b1e5c535179a9 WHIRLPOOL 9764c9a58a649deff84c021ba687b3b873780d0dce79d8e069b4b0179eb1d0a3827a0fe539661273ca416ca82f124a2e9207e8017494dc2b1d50694e8e877898
+MISC ChangeLog-2015 6259 SHA256 a14960416f823d85b1ab305f0fce57dbaddda2473eb36cfe15058bcd4e45f8b6 SHA512 b6a11f887bc048107598dbf776653234817037234550269b41405a4d9ca6fe6f3e5d1f33cbce870ced89ab5e54f8167e85068071af05fccc5a51620d5b453845 WHIRLPOOL 4aa53b0b7b8309538be8ba5254739dc9aee15c0ae1acaf90a2f73fb8d0a320644ce51b54fd43ec426fd009b91387e31193d1045edd1ebfb21485f21a06e7598b
+MISC metadata.xml 631 SHA256 d1e3469a91eee03d7ff53d20acd8bb1cede6aff7094d7ddcf59f1916b62a7faf SHA512 111d8d30478b2647475b075f3c16f49b14be2bbde9e55b0b9efde42c0eaa8da128dd6801a914a898a8500d705d034d50ad05f7b41da5ec644f3c1bad12f21840 WHIRLPOOL 81987038c272f3358ab5fff40f008d853f916ece31342435a32fcf5f237af9cbc811a9c4ad33e998e70a583b91e62b19a9ccb8f0b502bd63edd11fbbd0920f4e
diff --git a/net-misc/mico/metadata.xml b/net-misc/mico/metadata.xml
new file mode 100644
index 000000000000..89b3f821e9ce
--- /dev/null
+++ b/net-misc/mico/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>haubi@gentoo.org</email>
+		<name>Michael Haubenwallner</name>
+	</maintainer>
+	<longdescription lang="en">
+		MICO is a mature, secure, robust, fully standards-compliant
+		implementation of the CORBA standard. It is available as GNU open source
+		software and is widely used for robust application integration. MICO is
+		renowned for its market-leading security features, its great
+		user-friendliness, and its full standard-compliance.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/mico/mico-2.3.13-r10.ebuild b/net-misc/mico/mico-2.3.13-r10.ebuild
new file mode 100644
index 000000000000..024721e397f7
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r10.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs autotools
+
+PATCH_VER=20170529
+
+if [[ ${PV} == 9999 ]]; then
+	EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
+	inherit darcs
+	SRC_URI=
+else
+	SRC_URI="http://www.mico.org/${P}.tar.gz"
+fi
+
+if [[ -n ${PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
+	PATCHES=${WORKDIR}/patches
+else
+	PATCHES=
+fi
+
+DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
+HOMEPAGE="http://www.mico.org/"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
+IUSE="gtk postgres qt4 ssl tcl threads X"
+RESTRICT="test" #298101
+
+# doesn't compile:
+#   bluetooth? ( net-wireless/bluez )
+
+RDEPEND="
+	gtk?       ( x11-libs/gtk+:2 )
+	postgres?  ( dev-db/postgresql:* )
+	qt4?       ( dev-qt/qtgui:4[qt3support] )
+	ssl?       ( dev-libs/openssl:* )
+	tcl?       ( dev-lang/tcl:0 )
+	X?         ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.2
+	>=sys-devel/bison-1.22
+"
+
+if [[ ${PV} == 9999 ]]; then
+	src_unpack() {
+		darcs_src_unpack
+		default
+	}
+else
+	S=${WORKDIR}/${PN}
+fi
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# cannot use big TOC (AIX only), gdb doesn't like it.
+	# This assumes that the compiler (or -wrapper) uses
+	# gcc flag '-mminimal-toc' for compilation.
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
+
+	if use qt4; then
+		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
+			die "cannot update to use Qt3Support of qt4"
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	if use gtk && [[ -n ${PATCH_VER} ]]; then
+		# need gtk-1 wrapper for gtk-2
+		export PATH="${WORKDIR}"/helpers:${PATH}
+	fi
+
+	# Don't know which version of JavaCUP would suffice, but there is no
+	# configure argument to disable checking for JavaCUP.
+	# So we override the configure check to not find 'javac'.
+	export ac_cv_path_JAVAC=no
+
+	# '--without-ssl' just does not add another search path - the only way
+	# to disable openssl utilization seems to override the configure check.
+	use ssl || export ac_cv_lib_ssl_open=no
+
+	# CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
+	use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
+
+	local myconf=
+	myconf() {
+		myconf="${myconf} $*"
+	}
+
+	myconf --disable-mini-stl
+	myconf $(use_enable threads)
+
+	# '--without-*' or '--with-*=no' does not disable some features,
+	# the value needs to be empty instead.
+	# This applies to: gtk, pgsql, qt, tcl, bluetooth.
+	myconf --with-gtk=$(  use gtk      && echo "${EPREFIX}"/usr)
+	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
+	myconf --with-qt=$(   use qt4      && echo "${EPREFIX}"/usr)
+	myconf --with-tcl=$(  use tcl      && echo "${EPREFIX}"/usr)
+	# bluetooth and wireless both don't compile cleanly
+	myconf --with-bluetooth=''
+	myconf --disable-wireless
+	# But --without-x works.
+	myconf $(use_with X x "${EPREFIX}"/usr)
+
+	# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
+	[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
+
+	if [[ ${CHOST} == *-winnt* ]]; then
+		# disabling static libs, since ar on interix takes nearly
+		# one hour per library, thanks to mico's monster objects.
+		use threads &&
+		ewarn "disabling USE='threads', does not work on ${CHOST}"
+		myconf --disable-threads --disable-static --enable-final
+		append-flags -D__STDC__
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
+	if [[ $(get_libdir) != lib ]]; then #500744
+		mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
+	fi
+
+	# avoid conflict with net-dns/nsd, bug#544488
+	mv "${ED}"usr/bin/{,mico-}nsd || die
+	mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die
+
+	# avoid conflict with net-misc/eventd, bug#632170
+	mv "${ED}"usr/bin/{,mico-}eventd || die
+
+	dodir /usr/share
+	mv "${ED}"usr/man "${ED}"usr/share || die
+	dodir /usr/share/doc/${PF}
+	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
+
+	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO
+}
+
+pkg_postinst() {
+	einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'"
+	einfo "due to a name conflict with net-dns/nsd. For details"
+	einfo "please refer to https://bugs.gentoo.org/544488."
+	einfo
+	einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'"
+	einfo "due to a name conflict with net-misc/eventd. For details"
+	einfo "please refer to https://bugs.gentoo.org/632170."
+}
diff --git a/net-misc/mico/mico-2.3.13-r8.ebuild b/net-misc/mico/mico-2.3.13-r8.ebuild
new file mode 100644
index 000000000000..ec8a7b7a5d77
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r8.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs autotools
+
+PATCH_VER=20170529
+
+if [[ ${PV} == 9999 ]]; then
+	EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
+	inherit darcs
+	SRC_URI=
+else
+	SRC_URI="http://www.mico.org/${P}.tar.gz"
+fi
+
+if [[ -n ${PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
+	PATCHES=${WORKDIR}/patches
+else
+	PATCHES=
+fi
+
+DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
+HOMEPAGE="http://www.mico.org/"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
+IUSE="gtk postgres qt4 ssl tcl threads X"
+RESTRICT="test" #298101
+
+# doesn't compile:
+#   bluetooth? ( net-wireless/bluez )
+
+RDEPEND="
+	gtk?       ( x11-libs/gtk+:2 )
+	postgres?  ( dev-db/postgresql:* )
+	qt4?       ( dev-qt/qtgui:4[qt3support] )
+	ssl?       ( dev-libs/openssl:* )
+	tcl?       ( dev-lang/tcl:0 )
+	X?         ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.2
+	>=sys-devel/bison-1.22
+"
+
+if [[ ${PV} == 9999 ]]; then
+	src_unpack() {
+		darcs_src_unpack
+		default
+	}
+else
+	S=${WORKDIR}/${PN}
+fi
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# cannot use big TOC (AIX only), gdb doesn't like it.
+	# This assumes that the compiler (or -wrapper) uses
+	# gcc flag '-mminimal-toc' for compilation.
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
+
+	if use qt4; then
+		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
+			die "cannot update to use Qt3Support of qt4"
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	if use gtk && [[ -n ${PATCH_VER} ]]; then
+		# need gtk-1 wrapper for gtk-2
+		export PATH="${WORKDIR}"/helpers:${PATH}
+	fi
+
+	# Don't know which version of JavaCUP would suffice, but there is no
+	# configure argument to disable checking for JavaCUP.
+	# So we override the configure check to not find 'javac'.
+	export ac_cv_path_JAVAC=no
+
+	# '--without-ssl' just does not add another search path - the only way
+	# to disable openssl utilization seems to override the configure check.
+	use ssl || export ac_cv_lib_ssl_open=no
+
+	# CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
+	use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
+
+	local myconf=
+	myconf() {
+		myconf="${myconf} $*"
+	}
+
+	myconf --disable-mini-stl
+	myconf $(use_enable threads)
+
+	# '--without-*' or '--with-*=no' does not disable some features,
+	# the value needs to be empty instead.
+	# This applies to: gtk, pgsql, qt, tcl, bluetooth.
+	myconf --with-gtk=$(  use gtk      && echo "${EPREFIX}"/usr)
+	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
+	myconf --with-qt=$(   use qt4      && echo "${EPREFIX}"/usr)
+	myconf --with-tcl=$(  use tcl      && echo "${EPREFIX}"/usr)
+	# bluetooth and wireless both don't compile cleanly
+	myconf --with-bluetooth=''
+	myconf --disable-wireless
+	# But --without-x works.
+	myconf $(use_with X x "${EPREFIX}"/usr)
+
+	# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
+	[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
+
+	if [[ ${CHOST} == *-winnt* ]]; then
+		# disabling static libs, since ar on interix takes nearly
+		# one hour per library, thanks to mico's monster objects.
+		use threads &&
+		ewarn "disabling USE='threads', does not work on ${CHOST}"
+		myconf --disable-threads --disable-static --enable-final
+		append-flags -D__STDC__
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
+	if [[ $(get_libdir) != lib ]]; then #500744
+		mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
+	fi
+
+	dodir /usr/share
+	mv "${ED}"usr/man "${ED}"usr/share || die
+	dodir /usr/share/doc/${PF}
+	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
+
+	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO
+}
diff --git a/net-misc/mico/mico-2.3.13-r9.ebuild b/net-misc/mico/mico-2.3.13-r9.ebuild
new file mode 100644
index 000000000000..08b8567e5dd8
--- /dev/null
+++ b/net-misc/mico/mico-2.3.13-r9.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs autotools
+
+PATCH_VER=20170529
+
+if [[ ${PV} == 9999 ]]; then
+	EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
+	inherit darcs
+	SRC_URI=
+else
+	SRC_URI="http://www.mico.org/${P}.tar.gz"
+fi
+
+if [[ -n ${PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
+	PATCHES=${WORKDIR}/patches
+else
+	PATCHES=
+fi
+
+DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
+HOMEPAGE="http://www.mico.org/"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
+IUSE="gtk postgres qt4 ssl tcl threads X"
+RESTRICT="test" #298101
+
+# doesn't compile:
+#   bluetooth? ( net-wireless/bluez )
+
+RDEPEND="
+	gtk?       ( x11-libs/gtk+:2 )
+	postgres?  ( dev-db/postgresql:* )
+	qt4?       ( dev-qt/qtgui:4[qt3support] )
+	ssl?       ( dev-libs/openssl:* )
+	tcl?       ( dev-lang/tcl:0 )
+	X?         ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.2
+	>=sys-devel/bison-1.22
+"
+
+if [[ ${PV} == 9999 ]]; then
+	src_unpack() {
+		darcs_src_unpack
+		default
+	}
+else
+	S=${WORKDIR}/${PN}
+fi
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# cannot use big TOC (AIX only), gdb doesn't like it.
+	# This assumes that the compiler (or -wrapper) uses
+	# gcc flag '-mminimal-toc' for compilation.
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
+
+	if use qt4; then
+		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
+			die "cannot update to use Qt3Support of qt4"
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	if use gtk && [[ -n ${PATCH_VER} ]]; then
+		# need gtk-1 wrapper for gtk-2
+		export PATH="${WORKDIR}"/helpers:${PATH}
+	fi
+
+	# Don't know which version of JavaCUP would suffice, but there is no
+	# configure argument to disable checking for JavaCUP.
+	# So we override the configure check to not find 'javac'.
+	export ac_cv_path_JAVAC=no
+
+	# '--without-ssl' just does not add another search path - the only way
+	# to disable openssl utilization seems to override the configure check.
+	use ssl || export ac_cv_lib_ssl_open=no
+
+	# CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
+	use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
+
+	local myconf=
+	myconf() {
+		myconf="${myconf} $*"
+	}
+
+	myconf --disable-mini-stl
+	myconf $(use_enable threads)
+
+	# '--without-*' or '--with-*=no' does not disable some features,
+	# the value needs to be empty instead.
+	# This applies to: gtk, pgsql, qt, tcl, bluetooth.
+	myconf --with-gtk=$(  use gtk      && echo "${EPREFIX}"/usr)
+	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
+	myconf --with-qt=$(   use qt4      && echo "${EPREFIX}"/usr)
+	myconf --with-tcl=$(  use tcl      && echo "${EPREFIX}"/usr)
+	# bluetooth and wireless both don't compile cleanly
+	myconf --with-bluetooth=''
+	myconf --disable-wireless
+	# But --without-x works.
+	myconf $(use_with X x "${EPREFIX}"/usr)
+
+	# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
+	[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
+
+	if [[ ${CHOST} == *-winnt* ]]; then
+		# disabling static libs, since ar on interix takes nearly
+		# one hour per library, thanks to mico's monster objects.
+		use threads &&
+		ewarn "disabling USE='threads', does not work on ${CHOST}"
+		myconf --disable-threads --disable-static --enable-final
+		append-flags -D__STDC__
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
+	if [[ $(get_libdir) != lib ]]; then #500744
+		mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
+	fi
+
+	# avoid conflict with net-dns/nsd, bug#544488
+	mv "${ED}"usr/bin/{,mico-}nsd || die
+	mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die
+
+	dodir /usr/share
+	mv "${ED}"usr/man "${ED}"usr/share || die
+	dodir /usr/share/doc/${PF}
+	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
+
+	dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO
+}
+
+pkg_postinst() {
+	einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'"
+	einfo "due to a name conflict with net-dns/nsd. For details"
+	einfo "please refer to https://bugs.gentoo.org/544488."
+}
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
new file mode 100644
index 000000000000..7012727c9d66
--- /dev/null
+++ b/net-misc/mico/mico-9999.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs autotools
+
+PATCH_VER=20170529
+
+if [[ ${PV} == 9999 ]]; then
+	EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
+	inherit darcs
+	SRC_URI=
+else
+	SRC_URI="http://www.mico.org/${P}.tar.gz"
+fi
+
+if [[ -n ${PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
+	PATCHES=${WORKDIR}/patches
+else
+	PATCHES=
+fi
+
+DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
+HOMEPAGE="http://www.mico.org/"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gtk postgres qt4 ssl tcl threads X"
+RESTRICT="test" #298101
+
+# doesn't compile:
+#   bluetooth? ( net-wireless/bluez )
+
+RDEPEND="
+	gtk?       ( x11-libs/gtk+:2 )
+	postgres?  ( dev-db/postgresql:* )
+	qt4?       ( dev-qt/qtgui:4[qt3support] )
+	ssl?       ( dev-libs/openssl:* )
+	tcl?       ( dev-lang/tcl:0 )
+	X?         ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.2
+	>=sys-devel/bison-1.22
+"
+
+if [[ ${PV} == 9999 ]]; then
+	src_unpack() {
+		darcs_src_unpack
+		default
+	}
+else
+	S=${WORKDIR}/${PN}
+fi
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die #426262
+	eautoreconf
+
+	# cannot use big TOC (AIX only), gdb doesn't like it.
+	# This assumes that the compiler (or -wrapper) uses
+	# gcc flag '-mminimal-toc' for compilation.
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
+
+	if use qt4; then
+		sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
+			die "cannot update to use Qt3Support of qt4"
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# Don't know which version of JavaCUP would suffice, but there is no
+	# configure argument to disable checking for JavaCUP.
+	# So we override the configure check to not find 'javac'.
+	export ac_cv_path_JAVAC=no
+
+	# '--without-ssl' just does not add another search path - the only way
+	# to disable openssl utilization seems to override the configure check.
+	use ssl || export ac_cv_lib_ssl_open=no
+
+	# CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
+	use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
+
+	local myconf=
+	myconf() {
+		myconf="${myconf} $*"
+	}
+
+	myconf --disable-mini-stl
+	myconf $(use_enable threads)
+
+	# '--without-*' or '--with-*=no' does not disable some features,
+	# the value needs to be empty instead.
+	# This applies to: pgsql, qt, tcl, bluetooth.
+	myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
+	myconf --with-qt=$(   use qt4      && echo "${EPREFIX}"/usr)
+	myconf --with-tcl=$(  use tcl      && echo "${EPREFIX}"/usr)
+	# bluetooth and wireless both don't compile cleanly
+	myconf --with-bluetooth=''
+	myconf --disable-wireless
+	# But --without-x works.
+	myconf $(use_with X x "${EPREFIX}"/usr)
+	# Same for gtk after patch 013, searches for gtk release.
+	myconf $(use_with gtk gtk 2)
+
+	# http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
+	[[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
+
+	if [[ ${CHOST} == *-winnt* ]]; then
+		# disabling static libs, since ar on interix takes nearly
+		# one hour per library, thanks to mico's monster objects.
+		use threads &&
+		ewarn "disabling USE='threads', does not work on ${CHOST}"
+		myconf --disable-threads --disable-static --enable-final
+		append-flags -D__STDC__
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
+	if [[ $(get_libdir) != lib ]]; then #500744
+		mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
+	fi
+
+	# avoid conflict with net-dns/nsd, bug#544488
+	mv "${ED}"usr/bin/{,mico-}nsd || die
+	mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die
+
+	# avoid conflict with net-misc/eventd, bug#632170
+	mv "${ED}"usr/bin/{,mico-}eventd || die
+
+	dodir /usr/share
+	mv "${ED}"usr/man "${ED}"usr/share || die
+	dodir /usr/share/doc/${PF}
+	mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
+
+	dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
+}
+
+pkg_postinst() {
+	einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'"
+	einfo "due to a name conflict with net-dns/nsd. For details"
+	einfo "please refer to https://bugs.gentoo.org/544488."
+	einfo
+	einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'"
+	einfo "due to a name conflict with net-misc/eventd. For details"
+	einfo "please refer to https://bugs.gentoo.org/632170."
+}
diff --git a/net-misc/midentd/Manifest b/net-misc/midentd/Manifest
new file mode 100644
index 000000000000..2912b25acffd
--- /dev/null
+++ b/net-misc/midentd/Manifest
@@ -0,0 +1,8 @@
+AUX 2.3.1-pidfile.patch 602 SHA256 221116d95882e469c7eb0bd1b8d5d050995f999b8f1b9534595ada016507ec3e SHA512 b788e8a0f0ad4d1a2cd9bee3b3155648aad5332ee373220fb472d30b2c56b659cce45285aa71a2ed811b50a1f68ad7239613608de7f46a146d540946de839fff WHIRLPOOL 7ff69955904d89a0212c7bf58cfd382cffaaa8c73306536de2807c64970ce92363086797097c4ff42044962ce20c3453f2edd69cd4da78cd8918a7099401afaa
+AUX midentd.conf.d 162 SHA256 8dd3c4667e7bae12119013bce6aa3ab39eafdbd0e205f9d3efd4279fe145c0cc SHA512 a28cb5f1c6b9df6f70d673b2d6dd88b5e3dfe1305a112004d6e090d6349aef6d824495cbd351f9fc324d4c8a8703a3997af53f189a82e88b0e9e264ed3669cd5 WHIRLPOOL 5fb0e6325ef85a02db35f568b0fd1e59bb6f1c7cad2b2fcfb8fab29c9f13a422e35beb1a25eaa3ffa2ad7b847e17a16d5ff2073f7e999f7c390df1df1d8db90b
+AUX midentd.rc 369 SHA256 2bc3ea90b0ede040073c05d12363dc0eb4eb6549f021c277f3f6206c327a6eaf SHA512 141bb4e848da82f935e5fd7717e9e888615c06bfd312424974b2d4140b403d7ac0f416bb92f9ef043fd8b013705933cf73c3849b13e6defd21b5e71e3a7d7440 WHIRLPOOL 62cc05d2be77b0e329ec2326cb97ad1f05e59ca426f19cbe4ac77749db66199554644b20c1e13cc9f7460fef9d7be503893621bfc3ed436e57451584c4ef81b8
+DIST midentd-2.3.1.tar.gz 14298 SHA256 ad720d07e59203370e05611e3007a6295eddbf6131c974a21574415bc89309d4 SHA512 e5bed5c8850317fc6fc30b96b62b91fd8c53965a00c317d33bc8df0f3b06043d65793d8bd7cb1413f52465227c54dd430a2f945627d99c630866d2b025d9a3ab WHIRLPOOL 69e3ac6ea6b6ff73dce7d467e2ce35e0cd3bbd823093bcc544ec3e5e8bcdba27e252959e5bc3cbc05e4110246d86274c4f0f09e65c99429f24d4a8c7b8057b9a
+EBUILD midentd-2.3.1-r2.ebuild 906 SHA256 f9c033c6e1f2e415b8083acc88910dd69d3b62e607ac317c65810f185bf76300 SHA512 d7207e7df54ac9b14b771c391c4334c6aedc41cfb1855c83c005966598c7afa4c9ac47a4eac26cc137e36c3faa35418a0709efeac51442fd7359782587a09dc0 WHIRLPOOL 76b58ee1fd3b32d02a4a8cb60e140430c8919357257d6092e841c1a03d0401ba17e8eb4043cd0006bd5b3e15bb3d55157ab089acdd6a7de58adf7300016eac78
+MISC ChangeLog 3216 SHA256 79be415212c3a3964e9d0b48c84df520874dd3409528ef7b3658d11f01498071 SHA512 a02bbe46613c1a91d7f803dfe540b6947d7e4951796b1d03fa65d5872e72244907d35821b518090c0dbbf0362c621fd41b032f2632d2a07b6f2324e12392541d WHIRLPOOL 4d5eaa7bd1b0a262183b76691c02196c7a656e574ad81ab18cbb956bb4a31924437b4adcad07d2700e64f16209d546a36f69c1e16ee168f7004dd2f62a244a8b
+MISC ChangeLog-2015 1292 SHA256 75009a978f18f55a61acf7885dfba792d55d993125424faa0bf44b5d9071ec95 SHA512 02687d962d5b2402aa7d28fa4e6de4ab42779d4552eae9f4a56ae0be030b9c6a9e5fd3ba7ff83e01618ac78725b53dffc5712c4eb2c1ad547ba566011ffc3362 WHIRLPOOL 4b9c1a5af6c1f276644889492af6521d63357cf14ea9157fc8ebd6a701766b41ae4bbe9976dfb11923fcca4fd98bc52293e47917f786c8874951cb3bee9df209
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/midentd/files/2.3.1-pidfile.patch b/net-misc/midentd/files/2.3.1-pidfile.patch
new file mode 100644
index 000000000000..248fcc08f203
--- /dev/null
+++ b/net-misc/midentd/files/2.3.1-pidfile.patch
@@ -0,0 +1,19 @@
+--- midentd.orig	2004-05-13 21:57:43.642441512 -0400
++++ midentd	2004-05-13 22:01:10.165045304 -0400
+@@ -74,6 +75,7 @@
+ 	close STDIN; open STDIN, "/dev/null";
+ 	close STDOUT; open STDOUT, ">/dev/null";
+ 	close STDERR; open STDERR, ">/dev/null";
++	open PIDFILE, ">/var/run/midentd.pid";
+ 	umask 0466;
+ 	&logger ("Daemon started, listening.");
+ 	# FIXME, maximum number of connections should be limited
+@@ -87,6 +89,8 @@
+ 	if ($< != $uid || $> != $uid) {
+ 		die "Can't change UID\n";
+ 	}
++    print PIDFILE $$;
++    close PIDFILE;
+ 	while (accept (SOCKET, SERVER)) {
+ 		$in = *SOCKET;
+ 		$out = *SOCKET;
diff --git a/net-misc/midentd/files/midentd.conf.d b/net-misc/midentd/files/midentd.conf.d
new file mode 100644
index 000000000000..ab0dd4598144
--- /dev/null
+++ b/net-misc/midentd/files/midentd.conf.d
@@ -0,0 +1,5 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Options to pass to midentd
+MIDENTD_OPTS="-u nobody"
diff --git a/net-misc/midentd/files/midentd.rc b/net-misc/midentd/files/midentd.rc
new file mode 100644
index 000000000000..555dd1a8a3e7
--- /dev/null
+++ b/net-misc/midentd/files/midentd.rc
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	ebegin "Starting midentd"
+	/usr/sbin/midentd ${MIDENTD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping midentd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/midentd.pid
+	local ret=$?
+	rm -f /var/run/midentd.pid
+	eend ${ret}
+}
diff --git a/net-misc/midentd/metadata.xml b/net-misc/midentd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/midentd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/midentd/midentd-2.3.1-r2.ebuild b/net-misc/midentd/midentd-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..c48d07205eae
--- /dev/null
+++ b/net-misc/midentd/midentd-2.3.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="ident daemon with masquerading and fake replies support"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+	default
+
+	eapply -p0 "${FILESDIR}"/${PV}-pidfile.patch
+	sed -i \
+		-e 's:/usr/local:/usr:' \
+		-e 's:service ident:service auth:' \
+		-e 's:disable = no:disable = yes:' \
+		midentd.xinetd || die
+}
+
+src_install() {
+	dosbin midentd midentd.logcycle
+
+	insinto /etc/xinetd.d
+	newins midentd.xinetd midentd
+	newinitd "${FILESDIR}"/midentd.rc midentd
+	newconfd "${FILESDIR}"/midentd.conf.d midentd
+
+	dodoc CHANGELOG README
+
+	dodir /var/log
+	touch "${D}"/var/log/midentd.log
+	fowners nobody:nobody /var/log/midentd.log
+}
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
new file mode 100644
index 000000000000..454df0f5d733
--- /dev/null
+++ b/net-misc/mikutter/Manifest
@@ -0,0 +1,9 @@
+AUX mikutter 136 SHA256 7f855010d33bdeb64ca07a6be1a719fdbd4ae73e1cb5b753dd0cba804969a981 SHA512 bae3b58b6983c7ad6e0c10f006f4338eb0923b1056b6f74f518a1b3caeeef7c414f8de8dd927420611ae8542dde8507f1c25ca0529e7cd3a17f6ac8fc25e16b0 WHIRLPOOL 6dc07eba773ac02709458d6be35e7123d64284185a73f7952931f156b46713339983bf36fabc041cf8b21eb19ba408a8de8d6095071b370101621b732626ebf8
+DIST mikutter.3.4.2.tar.gz 3684733 SHA256 4531a284946763ca7c57dbfec1e26e029415519977414e381496bbb3ac84ea8f SHA512 bbdde61324825e9c7d4ffa6b6dc004f74c512391c1b1a538d7c72672f6aa68c3b68c579d1a2a3db13d25b909dc497195fcd7f0d66c88c8d1b2856508e965418d WHIRLPOOL 67a4fb086d1d50e3177f6ae31f5b2503bd10fac9ce9cd5cb264b1e5f2772a917ac054ce7fed050a167b5f604f969d5a4fce7db66369c93dd74d35b9a970e6425
+DIST mikutter.3.5.4.tar.gz 3743674 SHA256 04c048666539f0098c715ce820ff76a3cf82b2eb5632d3b038ec735f9f4dd4ca SHA512 adb7a1902026ee01737840d0b7f9004ab363e874e01f7c497bd9252fccb3cc16f86f1959bb2eff3d309cb7ba1fa93376d9a1e46d5226859a1279069de7f2ba8e WHIRLPOOL cf62e54c4b35b91bf6e5d43fbafdd2dc56c7bf40a6c631098547846342df7215d44842ac0abb662e042cbb2db1eeaed938761396a4cfb97c6fa0cf45a5d71733
+EBUILD mikutter-3.4.2-r1.ebuild 1629 SHA256 9b92b85b3fc8693e4a52ba69f6924f12ce235bfa1655e857e4cdfee7745c22d7 SHA512 cba1d3745f5408eaab08b5a0f326b18c2fbe9cd878dc8db6e1f59cba4adc50e4870de6e3b3690cdcdc6b26baa986f04bfd2bf0d12623c30c0a6ac64726713f83 WHIRLPOOL 1c78f19f52fd77724f74c7a6d9d853fa219085517105b892d25a753a81d42bc66374751d52d968363f2c7abf5f1e4eafa989fbe4133cc730b10d42feae36b8b7
+EBUILD mikutter-3.5.4-r1.ebuild 1629 SHA256 77f1203a496657500d1b146620f61b043adecb92b0ab88dcd5339497cedde62d SHA512 02c66c4ca66fe2626adccf2d87c7b8f6722f21f8f63e3ba1bcddf9c66390dabade1fd3f45a141e7d03136ee896dfd84bfe726e9973c54023725f6239364cfe33 WHIRLPOOL 7641358688c8d5f3e80443bdc4c2bd98bff6b8effd1444dd55955bfd802a68e4ff21d00cf9cea7dac43d0955741a1ff9c0cd76308d0719e369c9655416043956
+EBUILD mikutter-9999.ebuild 1623 SHA256 59f0daa5a92e45f96253c525c2df47ac525761ec3449fd3eded405673cb4e4e5 SHA512 b4ec47efe60835b32b0cdfab08089b6bc3f4311e1a4212d050d653e96edd132e057f12f68c28c4a7f3edc1f7bb04204b764018dfad1a4ed11e229d8186faf8aa WHIRLPOOL 072ddc95ef7c01874c3b79a32149412e4753b96f0c3f719c0bc1a52668ee1ced062148b5f0cf100ca4b97f09510182e4841076357a921482856c709d511ea6ce
+MISC ChangeLog 3148 SHA256 d6d565471b8a370cc83c8b6fbec95abeacd7ec61a6b2238ba44213fab49170d7 SHA512 91fdad3964bd19d5dcbf0487b13a25fc8cf0034e46397493803614666b924b0b44701d0ff8b6074478101f786acad4a67a49362e9497eb212a4184459c73bf29 WHIRLPOOL 75f0f0b30554f5449ee877462591c311bf1b255f6757779df4cf6681cfe4dacdf7aadfb8465eb1992179ef891787e54d38b9a8d38ab9d30297b822c191b75f3b
+MISC ChangeLog-2015 8119 SHA256 3a4eed34558a1c09781ea2353814034d285b8456c05958da76e6af1ddca51191 SHA512 3d60c76b8559336d50d22bc803b4c0a75f4a991920ba9d91f5093947a3697d49523c850cd39e2c6e76b88bf0607d4cfde4146abae98d6d734ea15f8e9fca863d WHIRLPOOL 98ef2437fabc29dcba30516b319d2d1252a4b48d74ce4db15e938efb1b8294cb14b208a1f6539cd30a75b2a43fad9fd3d690967a55c83c12c9af246b83f72c52
+MISC metadata.xml 214 SHA256 f924c02fb6f286359b938dfff58d616a4ffc55bd6fe014331e86c0f90bdec719 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3 WHIRLPOOL b44b6a4248106706dc2e9737922117d3f1b7cf01e8b6682cbb48afc152aa42f99888e8fdaf7bc7061e94cb47f51e7232fd381134495c0131eceb06533d59d868
diff --git a/net-misc/mikutter/files/mikutter b/net-misc/mikutter/files/mikutter
new file mode 100644
index 000000000000..129b8cd6f106
--- /dev/null
+++ b/net-misc/mikutter/files/mikutter
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+EPREFIX=${0%/usr/bin/mikutter}
+
+DISABLE_BUNDLER_SETUP= $EPREFIX/usr/bin/ruby19 $EPREFIX/usr/share/mikutter/mikutter.rb $*
+
diff --git a/net-misc/mikutter/metadata.xml b/net-misc/mikutter/metadata.xml
new file mode 100644
index 000000000000..74eccf1850fc
--- /dev/null
+++ b/net-misc/mikutter/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 type="person">
+  <email>naota@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/mikutter/mikutter-3.4.2-r1.ebuild b/net-misc/mikutter/mikutter-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..d594c11b4eda
--- /dev/null
+++ b/net-misc/mikutter/mikutter-3.4.2-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22"
+
+inherit eutils ruby-ng
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git"
+	inherit git-2
+	KEYWORDS=""
+	EGIT_SOURCEDIR="${WORKDIR}/all"
+else
+	MY_P="${PN}.${PV}"
+	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
+	KEYWORDS="~amd64"
+	RUBY_S="${PN}"
+fi
+
+DESCRIPTION="Simple, powerful and moeful twitter client"
+HOMEPAGE="http://mikutter.hachune.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+libnotify"
+
+DEPEND=""
+RDEPEND="
+	libnotify? ( x11-libs/libnotify )
+	media-sound/alsa-utils"
+
+ruby_add_rdepend "dev-ruby/addressable
+	dev-ruby/delayer
+	dev-ruby/delayer-deferred
+	dev-ruby/httpclient
+	dev-ruby/json:0
+	dev-ruby/instance_storage
+	<dev-ruby/memoist-0.16
+	>=dev-ruby/moneta-0.7
+	dev-ruby/nokogiri
+	>=dev-ruby/oauth-0.4.7
+	dev-ruby/pluggaloid
+	dev-ruby/rcairo
+	>=dev-ruby/ruby-gettext-3.0.1
+	>=dev-ruby/ruby-gtk2-2.2.0
+	dev-ruby/ruby-hmac
+	dev-ruby/totoridipjp
+	dev-ruby/twitter-text
+	dev-ruby/typed-array
+	virtual/ruby-ssl"
+
+all_ruby_unpack() {
+	if [ "${PV}" = "9999" ];then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+each_ruby_install() {
+	local rubyversion
+
+	if use ruby_targets_ruby22; then
+		rubyversion=ruby22
+	elif use ruby_targets_ruby21; then
+		rubyversion=ruby21
+	fi
+
+	exeinto /usr/share/mikutter
+	doexe mikutter.rb
+	insinto /usr/share/mikutter
+	doins -r core plugin
+	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
+		| newbin - mikutter
+	dodoc README
+	make_desktop_entry mikutter Mikutter \
+		/usr/share/mikutter/core/skin/data/icon.png
+}
diff --git a/net-misc/mikutter/mikutter-3.5.4-r1.ebuild b/net-misc/mikutter/mikutter-3.5.4-r1.ebuild
new file mode 100644
index 000000000000..141beca0bbbd
--- /dev/null
+++ b/net-misc/mikutter/mikutter-3.5.4-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23"
+
+inherit eutils ruby-ng
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git"
+	inherit git-2
+	KEYWORDS=""
+	EGIT_SOURCEDIR="${WORKDIR}/all"
+else
+	MY_P="${PN}.${PV}"
+	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
+	KEYWORDS="~amd64"
+	RUBY_S="${PN}"
+fi
+
+DESCRIPTION="Simple, powerful and moeful twitter client"
+HOMEPAGE="http://mikutter.hachune.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+libnotify"
+
+DEPEND=""
+RDEPEND="
+	libnotify? ( x11-libs/libnotify )
+	media-sound/alsa-utils"
+
+ruby_add_rdepend "dev-ruby/addressable
+	dev-ruby/delayer
+	dev-ruby/delayer-deferred
+	dev-ruby/httpclient
+	dev-ruby/json:0
+	dev-ruby/instance_storage
+	<dev-ruby/memoist-0.16
+	>=dev-ruby/moneta-0.7
+	dev-ruby/nokogiri
+	>=dev-ruby/oauth-0.5.1
+	dev-ruby/pluggaloid
+	dev-ruby/rcairo
+	>=dev-ruby/ruby-gettext-3.0.1
+	>=dev-ruby/ruby-gtk2-3.1.1
+	dev-ruby/ruby-hmac
+	dev-ruby/totoridipjp
+	dev-ruby/twitter-text
+	dev-ruby/typed-array
+	virtual/ruby-ssl"
+
+all_ruby_unpack() {
+	if [ "${PV}" = "9999" ];then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+each_ruby_install() {
+	local rubyversion
+
+	if use ruby_targets_ruby23; then
+		rubyversion=ruby23
+	elif use ruby_targets_ruby22; then
+		rubyversion=ruby22
+	fi
+
+	exeinto /usr/share/mikutter
+	doexe mikutter.rb
+	insinto /usr/share/mikutter
+	doins -r core plugin
+	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
+		| newbin - mikutter
+	dodoc README
+	make_desktop_entry mikutter Mikutter \
+		/usr/share/mikutter/core/skin/data/icon.png
+}
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
new file mode 100644
index 000000000000..3cb00cde69e7
--- /dev/null
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22"
+
+inherit eutils ruby-ng
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git"
+	inherit git-2
+	KEYWORDS=""
+	EGIT_SOURCEDIR="${WORKDIR}/all"
+else
+	MY_P="${PN}.${PV}"
+	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
+	KEYWORDS="~amd64"
+	RUBY_S="${PN}"
+fi
+
+DESCRIPTION="Simple, powerful and moeful twitter client"
+HOMEPAGE="http://mikutter.hachune.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+libnotify"
+
+DEPEND=""
+RDEPEND="
+	libnotify? ( x11-libs/libnotify )
+	media-sound/alsa-utils"
+
+ruby_add_rdepend "dev-ruby/addressable
+	dev-ruby/delayer
+	dev-ruby/delayer-deferred
+	dev-ruby/httpclient
+	dev-ruby/json:0
+	dev-ruby/instance_storage
+	dev-ruby/memoist
+	>=dev-ruby/moneta-0.7
+	dev-ruby/nokogiri
+	>=dev-ruby/oauth-0.4.7
+	dev-ruby/pluggaloid
+	dev-ruby/rcairo
+	>=dev-ruby/ruby-gettext-3.0.1
+	>=dev-ruby/ruby-gtk2-2.2.0
+	dev-ruby/ruby-hmac
+	dev-ruby/totoridipjp
+	dev-ruby/twitter-text
+	dev-ruby/typed-array
+	virtual/ruby-ssl"
+
+all_ruby_unpack() {
+	if [ "${PV}" = "9999" ];then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+each_ruby_install() {
+	local rubyversion
+
+	if use ruby_targets_ruby22; then
+		rubyversion=ruby22
+	elif use ruby_targets_ruby21; then
+		rubyversion=ruby21
+	fi
+
+	exeinto /usr/share/mikutter
+	doexe mikutter.rb
+	insinto /usr/share/mikutter
+	doins -r core plugin
+	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
+		| newbin - mikutter
+	dodoc README
+	make_desktop_entry mikutter Mikutter \
+		/usr/share/mikutter/core/skin/data/icon.png
+}
diff --git a/net-misc/mindterm/Manifest b/net-misc/mindterm/Manifest
new file mode 100644
index 000000000000..ed31f1d1aa84
--- /dev/null
+++ b/net-misc/mindterm/Manifest
@@ -0,0 +1,5 @@
+DIST mindterm_3.4-src.zip 1224973 SHA256 46d19b5037db3aa687f33bcda36590385b555a3abae98deb32be0ffd2ec70183 SHA512 6c274aea32622517f07010d496f97010a0a7e17fd769a85e928ea0794b20daddb785a5cf4fc954dd2f6e863bc3f90422714392f995d040f4cf3f1230fb14cb07 WHIRLPOOL bb05d7508780daecdec10877e22fefaccc24153df51c94dc9d48d78e278602ef4876270b78e8fa9ad73a1d64c5e179b8d79f2d9bbcd5f29a58163eb720d30001
+EBUILD mindterm-3.4.ebuild 1320 SHA256 54858fbcd9400d0068c154b665eb7c2f6f1d02f1b14b95713440579c7d82023a SHA512 c7c501c626ca2d169588f4b251d10991e4eef1c3e5c79f346ae5f3b43e442aa905eb5532379d0d0b1837f5cb59a30a1d3bb0370b4a76fb83445fef495d59c40d WHIRLPOOL 493b349ef424cc71f1ed1e36d3205e7d7da9b42a5fc08542acf0c0021cbe1a76feee409a286c087fcb206851b7c13c67875a5912c3d03eb54a6b4a7c251dc062
+MISC ChangeLog 2607 SHA256 7ed067bc240aeca647032cf9faafb20f9897f804ca10a67543eda11dc7430487 SHA512 5bfe68a48a7b7e0eaded1e0bb54797c46bbf805e4277c5bec9fdd85e097abf0e9fb72a129f11047b63cdf41c83688d54523bcdc46a2ce9b2ae8bb2acda720881 WHIRLPOOL 356fb7a07b6f3e8ab8f688acb264967c067fcf0d72e2543b2935da2cf205b7fa526ed58d7a795cb23f7346b45691e5b5c8446b3549dee0ab5521a746c967d46c
+MISC ChangeLog-2015 3897 SHA256 7c0e8474c1312624ceccb3d28da5147bc65e297382461d00761efda0d35a2801 SHA512 e45d9ed16f9216221d7fd1fe35d556f578cc39d8999f801c8b832925d8ddaeafa7a892c43fa30d5d88e56d9e4c323fdac00166216a80faa5df5c06412bdf5dca WHIRLPOOL 08e92ba68e1f66b7ee9587a456786746c1e07e31640007aa4ac24f376589484d86936824db899485c3461aeef4269e7aad8eab937cba6bfdbb23eccea054fe34
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/net-misc/mindterm/metadata.xml b/net-misc/mindterm/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/net-misc/mindterm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/mindterm/mindterm-3.4.ebuild b/net-misc/mindterm/mindterm-3.4.ebuild
new file mode 100644
index 000000000000..456655a8cd16
--- /dev/null
+++ b/net-misc/mindterm/mindterm-3.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc test examples"
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P=${P/-/_}
+
+DESCRIPTION="A Java SSH Client"
+HOMEPAGE="http://www.appgate.com/products/80_MindTerm/"
+SRC_URI="http://www.appgate.com/downloads/MindTerm-${PV}/${MY_P}-src.zip"
+
+LICENSE="mindterm"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+COMMON_DEP="dev-java/jzlib:0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_P}
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+EANT_BUILD_TARGET="mindterm.jar lite"
+EANT_DOC_TARGET="doc"
+EANT_GENTOO_CLASSPATH="jzlib"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-ant_rewrite-classpath
+	rm -vr com/jcraft || die "Failed to remove bundled jcraft"
+}
+
+# Don't even compile
+RESTRICT="test"
+src_test() {
+	ANT_TASKS="ant-junit ant-nodeps" eant test \
+		-Dgentoo.classpath="$(java-pkg_getjars jzlib,junit):mindterm.jar"
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+
+	java-pkg_dolauncher ${PN} --main com.mindbright.application.MindTerm
+
+	dodoc README.txt RELEASE_NOTES.txt CHANGES || die
+	use doc && java-pkg_dojavadoc javadoc
+	use examples && java-pkg_doexamples "${S}/examples/"
+}
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
new file mode 100644
index 000000000000..9c9f7aead4ea
--- /dev/null
+++ b/net-misc/minidlna/Manifest
@@ -0,0 +1,12 @@
+AUX minidlna-1.0.25.confd 313 SHA256 67603d65c6bd3918255f050cb5cfd6fc1373b024bca1ce728f03491a90d79e19 SHA512 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8 WHIRLPOOL f749a75ee70cc63eb5221770a17b5df6deadc87f4258b8cb418478f09e92084fce0c3d815be83ec2205a88ac4c43e9a88df28f92fd7e9b093f42f2a858e2812e
+AUX minidlna-1.1.2.service 230 SHA256 a7d236773cf39bffa46fa611e5f4144e1d5b52f6a4009d96a17037a9b2685c9b SHA512 0cfa770c43097007dce2c440512e4ca27e02678a08299c8343c91d2e9f70d4756bfd9527c6747a484c639e0e8467cad3d5f2f5a216684ce75495be084e6ac5df WHIRLPOOL e2c3417dd680d5c7214f1f7c6a2b80b77cf291c4926a6f683767d8462e280e81581141808b6f5f5e4c709bf7bd5986c7292c08d2a120d1892e853ac50e639a59
+AUX minidlna-1.1.5.initd 682 SHA256 222f15395586422c0aaa153b6b160e0be53004fb1b071bb9541bb604d4d38abc SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2 WHIRLPOOL 4c5ae7760d59a744b5e7c748fe93ae9246093afa49f508ca038281745315e3148d1673cbaa11de09eb36cee58297f78b67b207d50dd18b06dcac2a7bfbec9d66
+AUX minidlna-1.2.1-buildsystem.patch 758 SHA256 45c4f33be12cb35e7815d42abe40dba0cdaf6c0c3a7d1ab6a9b4e8d2305d5ebc SHA512 63b625ca9bb163ed8b7532e5af03c3b3ca45c519c72bd4b6c4d1421de5e115cec4d3b510d03ea44ad050eada0b275fcb3da3d0e622dd3a2e53531222f229006b WHIRLPOOL 19350fcb364c125a1d4cac4792f04a6c4e1feeec876566f46d666e37d7d5d339f5b6b5362b456726305fdcbd1ce9a37260eb6f3ccab0d17f0e4fe888626f9b11
+DIST minidlna-1.1.5.tar.gz 488191 SHA256 8477ad0416bb2af5cd8da6dde6c07ffe1a413492b7fe40a362bc8587be15ab9b SHA512 2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa WHIRLPOOL 8ed8fd62fb063b042a234c8647fa05c65e4f1e331a66efae8f361002f5cedcd2706d777348332075e3263e0d8bbde7794dd84fc400dfe3a656e5d70952427669
+DIST minidlna-1.2.1.tar.gz 459549 SHA256 67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b WHIRLPOOL 9ecbe04b367af7b670a1e2be3effcb6666aae5fa9edabe340c05ddb55d894cdee137a783aec98dd8dadfcae4924a24ea408abb0409b4abedec1f6e53e3a998e3
+DIST minidlna-gentoo-artwork.patch.xz 49372 SHA256 37ae7228b07b7c81c8962c5dc88a41ed1691bdf1b019b654a9fc93ac1da0c7ce SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e WHIRLPOOL e243b9b6a002af5e3ee1bb196239790ff86724624ebccb34c84ac072426341db6b5f44e455d13657d5284220fe2688ddf3a2ec0212a7b86525eb02a6c080af80
+EBUILD minidlna-1.1.5-r1.ebuild 2428 SHA256 924483e6f7c74de2e212f692ea95cdbdf230769e9fd2e962da2ef60cb8ece03c SHA512 a8feb71af3593a8840ad3071e3f789089030a9378ec7ee8d8c5a178fab99a93da82beda7c0f73f126dd550205e66652db1b861f2ac63315bd83db6540960281c WHIRLPOOL bb36c93f13d7733103f8879cd825a1020c2daaa1d67f095eb0677f054892a7968b960597eb828aa1526c948bb7b0a840bf513708df5f64419e4954220502df09
+EBUILD minidlna-1.2.1.ebuild 2550 SHA256 e3e6f080ac33caf7a8badfd7674ab98bb2700fe285bc5063aedeebefe2dd0e8d SHA512 b3991371eafd355d1e8a8ef739a3aae978384517a123d0b8a812c01c8972384310e37213909e137d64f10026686d9b6e8f7631a46585fd30f407d752525a9f63 WHIRLPOOL a69e5877663f527dc8b3afc43c89cfe17ffd074591912074f4fbf63b3865374b9e3c0077da18e8cf35f7baf72057b8907d2690e14d879e041191862644671425
+MISC ChangeLog 4250 SHA256 b252be4c3450cef634ff1839f8e2c448266ac05b4c0eb083bcec75ed7207191d SHA512 f5f0c980da46343c5bb76737edc0c63559c7140123e4d57570b9bf35b7f2f1a38709f60765171b55142410c2cf751a0f3b7be90cd247bc78c184c22db73721f7 WHIRLPOOL 1c2493a1d6b6be1ca2677eeffb29c6b081b8cf4cc6319282d4ad020f22224b270d465a28f3c57d41a44686d9563bdd1c9cc5f050a4d8fccee65125e89cac80ec
+MISC ChangeLog-2015 8832 SHA256 f55630bf20e69087caf28c4436de271d452ac5fc87c726a277ecd7d7ad46da42 SHA512 fd457c9181e5d8141745d4e25224eda461d80d89184b7f0132f0bb553a8699270ed8381ff8e019974ec045bfe0ba9aed083e3854d21e4c9e2133386fc325a39c WHIRLPOOL d4187067269b2f54c593d7ea40aa80d147bed4be9335d8d5ee7e3831146b03613825bbe93c0e61415ccf5de1397a07ae53b8b80742420665f3fb1743a88be355
+MISC metadata.xml 504 SHA256 34df0fd3b2bce617ae5809530141e0b74d5ba81ff5981e573652f30beea59b00 SHA512 bc4d1779433e175233fd4034c0a5a055464424c214b657c34047a98d8f4a37547cf50e2a2307fa98ccab053ac3b69ea05a7e8b8a0ade03ea6ebf5c5a530c23ae WHIRLPOOL fe58d737b4bc693e8873e668eaafa046e89089c0abd0d80dccb776ba088fb9220d9e0ea2d77a5635fb406f22b93f9a2fcf7bf41f58bf02997fb0e71a4a096e64
diff --git a/net-misc/minidlna/files/minidlna-1.0.25.confd b/net-misc/minidlna/files/minidlna-1.0.25.confd
new file mode 100644
index 000000000000..97d15b00c391
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.0.25.confd
@@ -0,0 +1,14 @@
+# /etc/conf.d/minidlna
+
+# Should minidlna rescan the entire collection on startup?
+# Warning: This may take a long time!
+RESCAN="false"
+
+# The location of the config file
+#CONFIG="/etc/minidlna.conf"
+
+# Specify the user/group minidlna should run as
+#M_USER="minidlna"
+#M_GROUP="minidlna"
+
+# vim: ft=gentoo-conf-d
diff --git a/net-misc/minidlna/files/minidlna-1.1.2.service b/net-misc/minidlna/files/minidlna-1.1.2.service
new file mode 100644
index 000000000000..0d9571787d95
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.1.2.service
@@ -0,0 +1,11 @@
+[Unit]

+Description=MiniDLNA server

+After=network.target

+

+[Service]

+User=minidlna

+Group=minidlna

+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf -P /run/minidlna/minidlna.pid -S

+

+[Install]

+WantedBy=multi-user.target

diff --git a/net-misc/minidlna/files/minidlna-1.1.5.initd b/net-misc/minidlna/files/minidlna-1.1.5.initd
new file mode 100644
index 000000000000..416f122fa904
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.1.5.initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${CONFIG:=/etc/minidlna.conf}
+: ${M_USER:=minidlna}
+: ${M_GROUP:=minidlna}
+
+name="MiniDLNA"
+
+pidfile="/run/minidlna/minidlna.pid"
+command="/usr/sbin/minidlnad"
+command_args="-P $pidfile -f $CONFIG"
+start_stop_daemon_args="--user ${M_USER}:${M_GROUP}"
+
+required_files="$CONFIG"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ "$M_USER" = "root" ]; then
+		eerror "It's not a good idea to run minidlna as root!"
+	fi
+
+	if yesno "$RESCAN"; then
+		command_args="$command_args -R"
+	fi
+
+	checkpath -q -d -m 0750 -o "${M_USER}:${M_GROUP}" "$(dirname "$pidfile")"
+}
diff --git a/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch b/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch
new file mode 100644
index 000000000000..10154dd5165e
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch
@@ -0,0 +1,20 @@
+--- minidlna-1.2.1/configure.ac
++++ minidlna-1.2.1/configure.ac
+@@ -477,6 +477,9 @@
+         AM_CONDITIONAL(NEED_VORBIS, true),
+         -logg)
+ 
++AC_ARG_ENABLE([avahi], AS_HELP_STRING([--enable-avahi], [Enable search for avahi]))
++
++AS_IF([test "x$enable_avahi" = "xyes"], [
+ AC_CHECK_LIB(avahi-client, avahi_threaded_poll_new,
+         [AC_CHECK_HEADERS([avahi-common/thread-watch.h],
+          AM_CONDITIONAL(HAVE_AVAHI, true)
+@@ -484,6 +487,7 @@
+          AM_CONDITIONAL(HAVE_AVAHI, false))],
+          AM_CONDITIONAL(HAVE_AVAHI, false),
+         -lavahi-client -lavahi-common)
++], [AM_CONDITIONAL(HAVE_AVAHI, false)])
+ 
+ ################################################################################################################
+ ### Header checks
diff --git a/net-misc/minidlna/metadata.xml b/net-misc/minidlna/metadata.xml
new file mode 100644
index 000000000000..ed29d3cd8fd4
--- /dev/null
+++ b/net-misc/minidlna/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+</maintainer>
+<upstream>
+	<bugs-to>https://sourceforge.net/tracker/?group_id=243163</bugs-to>
+	<remote-id type="sourceforge">minidlna</remote-id>
+</upstream>
+<use>
+	<flag name="netgear">Enable netgear branding</flag>
+	<flag name="readynas">Enable readynas branding</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..a0ca7b231fc6
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="netgear readynas"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/flac
+	media-libs/libexif
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/ffmpeg
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	local my_is_new="yes"
+	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
+		# created by above enewuser command w/ wrong group and permissions
+		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
+		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
+		# if user already exists, but /var/lib/minidlna is missing
+		# rely on ${D}/var/lib/minidlna created in src_install
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+		-e "/db_dir/s:/var/cache/:/var/lib/:" \
+		-i ${PN}.conf || die
+
+	epatch "${WORKDIR}"/${PN}-gentoo-artwork.patch
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--with-db-path=/var/lib/${PN} \
+		--with-log-path=/var/log/${PN} \
+		--enable-tivo \
+		$(use_enable netgear) \
+		$(use_enable readynas)
+}
+
+src_install() {
+	default
+
+	#bug 536532
+	dosym /usr/sbin/${PN}d /usr/bin/${PN}
+
+	insinto /etc
+	doins ${PN}.conf
+
+	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-1.1.5.initd ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
+	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
+	systemd_dotmpfilesd "${T}"/${PN}.conf
+
+	dodir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+
+	dodoc AUTHORS NEWS README TODO
+	doman ${PN}d.8 ${PN}.conf.5
+}
+
+pkg_postinst() {
+	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+	elog "cache is moved to /var/lib/minidlna."
+	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}
diff --git a/net-misc/minidlna/minidlna-1.2.1.ebuild b/net-misc/minidlna/minidlna-1.2.1.ebuild
new file mode 100644
index 000000000000..6b5a1be8ebe8
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.2.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils linux-info systemd toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="avahi netgear readynas"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/flac
+	media-libs/libexif
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/ffmpeg
+	virtual/jpeg:0
+	avahi? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+PATCHES=( "${WORKDIR}"/${PN}-gentoo-artwork.patch
+	"${FILESDIR}"/${P}-buildsystem.patch )
+
+pkg_setup() {
+	local my_is_new="yes"
+	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
+		# created by above enewuser command w/ wrong group and permissions
+		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
+		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
+		# if user already exists, but /var/lib/minidlna is missing
+		# rely on ${D}/var/lib/minidlna created in src_install
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+		-e "/db_dir/s:/var/cache/:/var/lib/:" \
+		-i ${PN}.conf || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--with-db-path=/var/lib/${PN} \
+		--with-log-path=/var/log/${PN} \
+		--enable-tivo \
+		$(use_enable avahi ) \
+		$(use_enable netgear) \
+		$(use_enable readynas)
+}
+
+src_install() {
+	default
+
+	#bug 536532
+	dosym /usr/sbin/${PN}d /usr/bin/${PN}
+
+	insinto /etc
+	doins ${PN}.conf
+
+	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-1.1.5.initd ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
+	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
+	systemd_dotmpfilesd "${T}"/${PN}.conf
+
+	dodir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+
+	dodoc AUTHORS NEWS README TODO
+	doman ${PN}d.8 ${PN}.conf.5
+}
+
+pkg_postinst() {
+	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+	elog "cache is moved to /var/lib/minidlna."
+	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
new file mode 100644
index 000000000000..2dc19e5aa791
--- /dev/null
+++ b/net-misc/minissdpd/Manifest
@@ -0,0 +1,10 @@
+AUX minissdpd-1.2-remove-initd.patch 595 SHA256 c64c8a62d4c8ccab7e6bd8016ff458698d257d7227c902b9c75dcf27a12364ac SHA512 20306ae9870659c9d5c07643f3d95ce56961a57a119d3f15b6aa6ef4ad6ab4c8f32bff9d11af3445f1c94fc9b628faf0a9c9b7e1fb1924f5bd20697bc39d438f WHIRLPOOL 183affb96f28a58a32efec63f8aea2299699a76a62844c3a14de115ff0b229a7a6c26e74bab26c926d0f7b1020b2ca931170bc6ce95a394dbe60e2419367755f
+AUX minissdpd.confd 487 SHA256 5a31743b20198ce596a09c73abd45b747e2d087de688cd4f954626bdd1574fc6 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296 WHIRLPOOL d92909f50a2ee3b9481180f5e0c3aebe00281d597d3f4341ffab7e9c523d219ffd5d7305479923df15659edc60ea7d808f4d0853a032f22234f9d652aff63b69
+AUX minissdpd.initd-r2 1522 SHA256 a1b2d5073363554b9d9fd0aaf8cb9f92a4cc1fa85f00fc0ae715263e0311ca64 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade WHIRLPOOL 745c1c92ca2ba4d83a9f2368879d69d46be35d60d566ddb59c64a47a58269c76a03b254ad65a5bb59ac9a46e9324ef8c5ebb970ce96d7f2bf61ab7c3c5db4065
+DIST minissdpd-1.5.20160301.tar.gz 34827 SHA256 9ba6f87264898b9953f0e808a6ba6c6bdd38f4b47fe6d8e5dee2c92296657114 SHA512 b8dbfa7ce05fc006c09378fe53fb3345cd8d4aad486ba0bd4adb4d7f5d662e34ba04d82ad48bdc721eca1a7d1d083a9f42be69c5d1086223a0e8803068c15426 WHIRLPOOL e2f430ee76582e3d4652994d6c10ed3b07face490e2d040f2929602143b6aa2e53dddab720418189be01564c656a899ac6853608e09ffe521e061b60f79f9c99
+DIST minissdpd-1.5.20161216.tar.gz 35078 SHA256 b04f8f9d6f0ec9e9a99c23dfaeb14d33cb2e8e6c48f2928f1235f38df6a9d228 SHA512 4fe1dbc14a39a18bcc834c73cc0150cda656b2be7ffcc0a72dc2854dbd698f3528bfdcd80af741124546f916d914921ffc428bb4f19b34e7493f0cbf9ff54928 WHIRLPOOL 13f9c46d8bd2688463180f1dac519b2bc1a9b0d0c769740dd2a208c493e4e6964e500d1e34919a4522c25fcc559a45725723e343433f53fc043ac82fd7095ed1
+EBUILD minissdpd-1.5.20160301.ebuild 710 SHA256 2a175ecc4efe4926825bcf2c6228a601fdb6951ad265512db0ef8ad34a7db9d2 SHA512 5ffaf520ae16275f29245211dc505e4c99185f2afd10525921095ada1f58154c588dd82de33a5409821f5b0b1e43b5c1eacf5c36b9b8f1eb80975f887e33598e WHIRLPOOL 90b79d774b25b525f37b0061a7c8fda507e844a4535038fb005ff2e35ea973301dec742c716c0eb67480570d6ef2c6c4eb634471da5738c40681b6c084485446
+EBUILD minissdpd-1.5.20161216.ebuild 694 SHA256 ad640636e08e54950671982f0f2a9351ece6b0c603f7f663b32591e1fd75be90 SHA512 7d5738d4fec110c526ea32aa830b2dda2f0c4a8dfecbb77e5e5fd1201be01063ff32cec1206e4b635f35592d51b800e006fe096abd4e8d65aad56d3526f5933d WHIRLPOOL 364502d434336f2fde528d4c00781ffffebf64b1f8080a4d2a85bc7f44b9bc829a03a4e4d6e5d1593931ecfa242a3990fb400672bfd22a1db7258aab9b7255a9
+MISC ChangeLog 3954 SHA256 29db6fdf37aded41fd0a8593ea50f739596065a4d170b9ca9f642d7de78aec1b SHA512 7ed00201bafd386ae65e6e41ff7ec3c399138779762f7a5c39260e850e2e354aa6477e25624af218c73d17d707b6b9f87c4d8b8352eacb8ef54dff6836c7f4f6 WHIRLPOOL 966b8432eb8c7ad24db72622cca8459442b57a86bb1960cafca8f7e623a0a92d7932710aa094353f8be67f04ffd1098bcaad208f196acac9b5f18af9c5473460
+MISC ChangeLog-2015 4179 SHA256 5a6f98999f2fa6ff5654ee308ccdaf82d8654db9ecd370b1750a66eb65cf7286 SHA512 0f49bdae9a8a9601dde65e8c7100f47201ad1a94d1fafc7666e18e8ce2a4db2c000cae7bb16c27c3c601df45e98de5773012f58b133bb97798beaebe6b5f9ea5 WHIRLPOOL a30be88a3d22f47c6be26b4b647d7d5dc5bc282aa5faf1fa3d9c1672af020a244356210fd8a7f3992221065a26d6ac3a14549923e9eb82b29f38b62f1a59c16c
+MISC metadata.xml 360 SHA256 65bbd2a3b3c4b183edfb58712acdf48a4363461a387fe0a67a076d1ff73e46bb SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855 WHIRLPOOL 387407a6ad0497c1f098b85b49ac1281c377cd5a0c46c75fc0bc2619c04e603b62c03157e224b3b99abb7beb7a648a040f496bf5ed38ec749eed3795eeb3fe4c
diff --git a/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch b/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch
new file mode 100644
index 000000000000..9a5f5966e90f
--- /dev/null
+++ b/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch
@@ -0,0 +1,14 @@
+diff -Naur minissdpd-1.1.20120121.orig//Makefile minissdpd-1.1.20120121/Makefile
+--- minissdpd-1.1.20120121.orig//Makefile	2012-01-02 05:46:24.000000000 -0500
++++ minissdpd-1.1.20120121/Makefile	2012-01-22 07:01:54.000000000 -0500
+@@ -42,10 +42,6 @@
+ 	$(INSTALL) minissdpd $(SBININSTALLDIR)
+ 	$(INSTALL) -d $(MANINSTALLDIR)/man1
+ 	$(INSTALL) minissdpd.1 $(MANINSTALLDIR)/man1/minissdpd.1
+-ifneq ($(OS), Darwin)
+-	$(INSTALL) -d $(PREFIX)/etc/init.d
+-	$(INSTALL) minissdpd.init.d.script $(PREFIX)/etc/init.d/minissdpd
+-endif
+ 
+ minissdpd: $(MINISSDPDOBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(MINISSDPDOBJS)
diff --git a/net-misc/minissdpd/files/minissdpd.confd b/net-misc/minissdpd/files/minissdpd.confd
new file mode 100644
index 000000000000..43b662eca182
--- /dev/null
+++ b/net-misc/minissdpd/files/minissdpd.confd
@@ -0,0 +1,10 @@
+# /etc/conf.d/minissdpd: config file for /etc/init.d/minissdpd
+
+# Configure on which interface or interfaces minissdpd will listen.
+# List all interfaces space separated. If this is not specified then
+# minissdpd will listen on just the interface for the default route.
+# You probably want that when running minissdpd with miniupnpc on the
+# client, but you most likely want to specify the internal interface
+# when running with miniupnpd on the gateway.
+#
+# MINISSDPD_IFACE="eth0 eth1"
diff --git a/net-misc/minissdpd/files/minissdpd.initd-r2 b/net-misc/minissdpd/files/minissdpd.initd-r2
new file mode 100644
index 000000000000..c8da58753360
--- /dev/null
+++ b/net-misc/minissdpd/files/minissdpd.initd-r2
@@ -0,0 +1,61 @@
+#!/sbin/openrc-run
+
+MINISSDPD="/usr/sbin/minissdpd"
+PIDFILE="/var/run/minissdpd.pid"
+
+depend() {
+	need net
+	before miniupnpd
+}
+
+interfaceup() {
+	# interface exists?
+	if [ ! -f /sys/class/net/$1/flags ]; then return 1; fi
+	let "IFUP = `cat /sys/class/net/$1/flags` & 1"
+	# interface has UP flag?
+	if [ $IFUP -eq 0 ]; then return 1; fi
+	return 0
+}
+
+# awk script: scans the /proc routing table for local subnets
+# 1. filter list for entries with a gateway (column 3) of 0.0.0.0 (ie interface-local)
+# 2. read column 2 for network-order hex encoded subnet address
+# 3. match against a 10.x.x.x, 172.(16-31).x.x, or 192.168.x.x address
+# 4. print out any interface (column 1) that matches
+privateinterfaces() {
+	awk -f - /proc/net/route <<'FindPrivateNetworks'
+function p(m,n) { return(and(IP,m) == n); }
+$3=="00000000" { IP=strtonum("0x"$2); if (p(0xff,0x0a) || p(0x1fff,0x10ac) || p(0xffff,0xa8c0)) print $1; }
+FindPrivateNetworks
+}
+
+start() {
+	ebegin "Starting minissdpd"
+
+	ARGS=""
+	if [ "x$MINISSDPD_IFACE" = "x" ]; then
+		ewarn "No interfaces provided, using interfaces on private networks"
+		IFLIST=$(privateinterfaces)
+	else
+		IFLIST="$MINISSDPD_IFACE"
+	fi
+
+	eindent
+	for IF in $IFLIST; do
+		if interfaceup $IF; then
+			einfo Adding interface $IF
+			ARGS+="-i $IF "
+		else
+			ewarn "Interface $IF is not up"
+		fi
+	done
+	eoutdent
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $MINISSDPD -- $ARGS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping minissdpd"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/net-misc/minissdpd/metadata.xml b/net-misc/minissdpd/metadata.xml
new file mode 100644
index 000000000000..41a639ee419d
--- /dev/null
+++ b/net-misc/minissdpd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/minissdpd/minissdpd-1.5.20160301.ebuild b/net-misc/minissdpd/minissdpd-1.5.20160301.ebuild
new file mode 100644
index 000000000000..aed15e6c5e32
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20160301.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils toolchain-funcs
+
+DESCRIPTION="MiniSSDP Daemon"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+HOMEPAGE="http://miniupnp.free.fr/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libnfnetlink"
+
+RDEPEND="$DEPEND
+	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2-remove-initd.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	einstall PREFIX="${D}"
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	dodoc Changelog.txt README
+	doman minissdpd.1
+}
diff --git a/net-misc/minissdpd/minissdpd-1.5.20161216.ebuild b/net-misc/minissdpd/minissdpd-1.5.20161216.ebuild
new file mode 100644
index 000000000000..3feef3241d18
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20161216.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit toolchain-funcs
+
+DESCRIPTION="MiniSSDP Daemon"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+HOMEPAGE="http://miniupnp.free.fr/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libnfnetlink"
+
+RDEPEND="$DEPEND
+	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2-remove-initd.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	emake PREFIX="${D}" install
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	dodoc Changelog.txt README
+	doman minissdpd.1
+}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
new file mode 100644
index 000000000000..cb25632d8ed2
--- /dev/null
+++ b/net-misc/miniupnpd/Manifest
@@ -0,0 +1,11 @@
+AUX miniupnpd-conf.d 41 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3 SHA512 81aa2dac0643bbd1331549427c438900319adce91928b6bad6f7d470492f6f48e04e4d1af89f961db53fc132a7ff89ea52625441f051afd5a1b48680917f4ff7 WHIRLPOOL 1e7a01c6d9ae398f418fafd9d1fb23842d999635d34ed567b4b21b23e1119e43aba3fae40ea8834e179372fbb94bc74371dd37eb0e99420fa0503810ecfb9088
+AUX miniupnpd-conf.d-r1 301 SHA256 0466660546e6d271a52db2e86f8380b4145b2c3ea2ab206a1ad5dcf067326fe8 SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b WHIRLPOOL 81a7da536963be9d7a9a12b2ac1fdba18c3ed251705b2ac0406442980248386231d09cd11412dde6e225b8a018879348ab5c05253aece50ca68e94516e343349
+AUX miniupnpd-init.d 510 SHA256 8963a70d2b5d49119eaab7a4828bd7b2acfc1f9c8223ee9c85818cd1b4411a07 SHA512 976304d4036a43335e893d4e30c23853834f810585c10dc93e9e8900c9057d31bfe2ecdeb1e48a5762521b8223bbdf56c3230285c9b5ab5fb1d75f4be4ddfea2 WHIRLPOOL f07dc96d07628a11e608560f371b33091e5712d0aa67184a5b12296c474e656752f2970ee1e59d7bdae6da7996b8cf3c4b16a061b40eebe1e58ef4a7ff281612
+AUX miniupnpd-init.d-r1 659 SHA256 e20d45106353a4b470cbe62dbd71f7fbba373494015f3f1826e35ed55d8925b9 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771 WHIRLPOOL 460f01a0fd582ee69fabd17e7c07ec3104ac82f38aebe975bc8c98512239915434042205fb48a1489583ea3d7f54550f8fd7944ba02273801fe49171466bc6fd
+DIST miniupnpd-2.0.20161216.tar.gz 218119 SHA256 9e73d50ac830b5e08b6eb1df4e4c917833a5ab54351809f615d15d0f30cdeef3 SHA512 af82f060d28033dd670fcc96c8e2895f92d249a8a79d991e0215159eeb57715d7a9152d7d751b836091f7a623ce8a194ea243d1a2fb639349e320c02ce187c27 WHIRLPOOL 478a56b137b86ba1dca70e15c7dbdef2969a2d089e1ae0bac7ff01c18e753c8c3cca8b89ef415d54c3a009b89156eb507e97ba1949223bdd37914042c5124be1
+DIST miniupnpd-2.0.tar.gz 217802 SHA256 d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7 SHA512 c88036d3f4b065fc855572db8945d921641a71a23ffe8b52cb4ccb1a7cf3e7396841c436d54d7ff5968d034d8c4bfc91630719959000436230bb8c37e5bdc8d4 WHIRLPOOL d6aec880c9ef3c70002fdf9a98a0e8f4de95d8b3c9c6a18e328bc94d7dc3b8c130829c8ea6117e27e5b0aac1cd4526bbc9d9de21bd13e7b5527db54a656a1fff
+EBUILD miniupnpd-2.0.20161216.ebuild 1468 SHA256 c9e6c485580737e48fd19e39e0e834756c35b63c42f72a285a8b58567e43da15 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e WHIRLPOOL 05f728133588741a5f5bcd7039334db9b11b98f5e85ee911602bea428cc9d1b08b2b3db48c86b113fa18aed7b4f0bca89e5d010d00ec83e6fd51800f2841d82b
+EBUILD miniupnpd-2.0.ebuild 1488 SHA256 2ba7672836c59c312e4e10d4206d74ca5e4c7cfb8360a08d79d816a56b3d45d0 SHA512 35824d68869b52670b2bc69d598d1fc8724cf041e3effa796944c006eb9f94635afa37756617c88dc396a14a94b0bf78d68df169879eb6107692dc339100532a WHIRLPOOL aea034de205cd1a9e5c79fac35e32b15a0297577a1f1470ae1313f12f2be8cbbca6a4ad825cfbfae72259dae6a1af725e7512ff00e381005f8fddc1faa5cdb26
+MISC ChangeLog 3865 SHA256 922c601a075a75759351cab586d30f5a46ed2b7e81186484adb7e903790a84bc SHA512 2509f4e3a97b1345fceb510296aa6c839a4c4f622535c0034875aca011902e4f14ecfbec33bdf524e38d0f18fdc5995bca21d293c19a4d5036a257d0b8f92a8a WHIRLPOOL 45e18145ead0ecf9f19456f5495b3815c0fdbcfeac345c2657e3903561046bad85f9b3c390715d0ded75d7344973f56ac9a534be805d35ad40b5cff769b7abfe
+MISC ChangeLog-2015 8740 SHA256 bf95830c3179813e7192e8e60e8b685b89b9a6a7f216d8571652e1c9777dcea8 SHA512 4759a856a36cd4d42803c6b4ad66b1cb9fe4d5b41be88648a65f0875d4aa003b74341b904dd7fddbdeb6b9cc5221950c619e85dea34e3a79dd3ecf9cb8700298 WHIRLPOOL 4725d0b3495b5421eca6f687987f8f2d2337d582409b513d0976851c13daedcb93b835c0f0529ff08eba078cd99ac19f839e990c6f20e9004370fd0808169875
+MISC metadata.xml 1055 SHA256 d2519ba819f9a1e2121dc4d389dc277fd0fbe5eeea3f97952919630062311ee7 SHA512 38a62c904cfc7c8e4c0bf16a0426ee8cd2338933f85fc1a7d9fa3e0cb1b74525df1a6bf2bc8dea83bf41003e683f76804bcb1b69bd17b855290a5f37792328b2 WHIRLPOOL 2067d540de3934c4003919fec13e3de3f202c180899bb4bc450ce730e1ed4806571f7f510f66b1e52e37097e39ef4c94d1f1c10b153d9a453cb54f800c6e91e8
diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d b/net-misc/miniupnpd/files/miniupnpd-conf.d
new file mode 100644
index 000000000000..8482ef2d185b
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-conf.d
@@ -0,0 +1,2 @@
+ARGS='-f /etc/miniupnpd/miniupnpd.conf'
+
diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r1 b/net-misc/miniupnpd/files/miniupnpd-conf.d-r1
new file mode 100644
index 000000000000..1464bf04bd18
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-conf.d-r1
@@ -0,0 +1,10 @@
+# /etc/conf.d/miniupnpd: Configuration for miniupnpd init script
+
+# extra arguments to be passed to the command
+#extra_args=""
+
+# the location of the configuration file
+#config_file="/etc/miniupnpd/miniupnpd.conf"
+
+# uncomment to not use included scripts to manipulate iptables
+#no_iptables_scripts=1
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d b/net-misc/miniupnpd/files/miniupnpd-init.d
new file mode 100644
index 000000000000..6d1ee24e3d31
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-init.d
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net iptables
+	use minissdpd
+}
+
+start() {
+	ebegin "Starting miniupnpd"
+	/etc/miniupnpd/iptables_init.sh
+	start-stop-daemon --start --pidfile /var/run/miniupnpd.pid --exec /usr/sbin/miniupnpd -- ${ARGS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping miniupnpd"
+        start-stop-daemon --stop --pidfile /var/run/miniupnpd.pid
+	eend $?
+	/etc/miniupnpd/iptables_removeall.sh
+}
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r1 b/net-misc/miniupnpd/files/miniupnpd-init.d-r1
new file mode 100644
index 000000000000..99406106a86d
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-init.d-r1
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/miniupnpd"
+: "${config_file:=/etc/miniupnpd/miniupnpd.conf}"
+command_args="-f ${config_file:-/etc/miniupnpd/miniupnpd.conf} ${extra_args}"
+: "${pidfile:=/var/run/miniupnpd.pid}"
+
+depend() {
+	need net iptables
+	use minissdpd
+}
+
+start_pre() {
+	local retval=0
+
+	if [[ -z ${no_iptables_scripts} ]]; then
+		/etc/miniupnpd/iptables_init.sh || retval=${?}
+	fi
+	
+	return ${retval}
+}
+
+stop_post() {
+	local retval=0
+
+	if [[ -z ${no_iptables_scripts} ]]; then
+		/etc/miniupnpd/iptables_removeall.sh
+	fi
+
+	return ${retval}
+}
diff --git a/net-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml
new file mode 100644
index 000000000000..c4e9cf4a54d8
--- /dev/null
+++ b/net-misc/miniupnpd/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gurligebis@gentoo.org</email>
+		<name>Bjarke Istrup Pedersen</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<longdescription>
+		MiniUPnP Internet Gateway Device Deamon, used to allow UPnP enabled clients to forward ports.
+	</longdescription>
+  <use>
+    <flag name="leasefile">Enable lease file.</flag>
+    <flag name="igd2">Build for IGDv2 instead of an IGDv1</flag>
+    <flag name="pcp-peer">Enable support for PCP-PEER to allow NAT-PMP clients to mangle their packets.</flag>
+    <flag name="portinuse">Check if a port is in use before allowing a NAT-PMP client to map it.</flag>
+    <flag name="strict">Be more strict regarding compliance with UPnP specifications.</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20161216.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20161216.ebuild
new file mode 100644
index 000000000000..cbdc231611f5
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.0.20161216.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
+
+RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
+	net-libs/libnfnetlink:=
+	net-libs/libmnl:=
+	dev-libs/gmp:0=
+	sys-apps/util-linux
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+	mv Makefile.linux Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(use igd2 && printf -- '--igd2\n')
+		$(use ipv6 && printf -- '--ipv6\n')
+		$(use leasefile && printf -- '--leasefile\n')
+		$(use portinuse && printf -- '--portinuse\n')
+		$(use pcp-peer && printf -- '--pcp-peer\n')
+		$(use strict && printf -- '--strict\n')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.ebuild
new file mode 100644
index 000000000000..1347a12fbd0e
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
+
+RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
+	net-libs/libnfnetlink:=
+	net-libs/libmnl:=
+	dev-libs/gmp:0=
+	sys-apps/util-linux
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+	mv Makefile.linux Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(use igd2 && printf -- '--igd2\n')
+		$(use ipv6 && printf -- '--ipv6\n')
+		$(use leasefile && printf -- '--leasefile\n')
+		$(use portinuse && printf -- '--portinuse\n')
+		$(use pcp-peer && printf -- '--pcp-peer\n')
+		$(use strict && printf -- '--strict\n')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
new file mode 100644
index 000000000000..e0145fb74624
--- /dev/null
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -0,0 +1,5 @@
+DIST mobile-broadband-provider-info-20170310.tar.xz 85016 SHA256 144f03c95e03a82c53425bae38bc9adcca5a5da3cac642d1931da6897a08b53b SHA512 24d8d8bb202f0893bea105420d38156ff8de311eac71e969524961e723ed3d1f9994ec98efbace62dc0ac3859c7a4b316a0728038539b82ca5cf8f8c460a6c6e WHIRLPOOL 660b3603125db04eeb7b8c4d42ce53221a175a8320c7d22083f8d75ef104e43951790233bc1a62fba079dc72c14b1e40327657e29501bf12fdd33f9219c59309
+EBUILD mobile-broadband-provider-info-20170310.ebuild 462 SHA256 9a18c82e7eee5dfb2e8d4b1bc0089c0a219752d8c748ced697fa3b44ee330719 SHA512 ecec2bcf1de8a1fe7a1cde63cb3905555c6611ce55ef3a78f4c2d2e62a8761dcd9599cf486567859b2eb3b46fa095597df9d42055361dedd362fce9ac16f1da4 WHIRLPOOL d4f063f16a0aa6911e977b7d1b991589fd52cd86c36a1b42e3819620bedbd71d8d20c0e6e0d2a41d099c1f8fcf9a34372b1178d9b871e470516dd74009584d0f
+MISC ChangeLog 3941 SHA256 93d9999316ce997e1991ba5ef031e57330d1a037cb9e8374a831cb094168f5de SHA512 b54e7506d86e45c4590a38520350cc2e002b6090f9a8ccf9b8c04ac59caa62c966955277d35a385c09eded1e6aec1c02aa60c6326081530f8a6e767d5ca5c5cd WHIRLPOOL 5e74e8c904ffafd10ba54946cc9f432b87f514db2f1c621d753f516da11b991fad4ca0cb4a6d2b6dba19d0e9c58273e209b4adbf53c8a6c5db5e224397fce799
+MISC ChangeLog-2015 4995 SHA256 5f7c3c9cfd823ebd24d2f4eb3dbb172f5591f956d5bd8c0010a535708b55871c SHA512 fc72df3338f1a1b40162c27de36202a73a86572222266d56baed27743a7eb28853dfc43f1acfd71af18301e276299780cf2d598da3962f8b28b99f5e8db7d3b8 WHIRLPOOL b3c863092fbdbde2a54970ef4df3c67429e42d636506bed5c30df7f3d5c5a3b207887de674d3e25d0906f37647df86f042f3e2493e1a61fa494c157a680ba7f3
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/net-misc/mobile-broadband-provider-info/metadata.xml b/net-misc/mobile-broadband-provider-info/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/net-misc/mobile-broadband-provider-info/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20170310.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20170310.ebuild
new file mode 100644
index 000000000000..863313224713
--- /dev/null
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20170310.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org
+
+DESCRIPTION="Database of mobile broadband service providers"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
+
+LICENSE="CC-PD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="test"
+
+DEPEND="
+	test? ( dev-libs/libxml2 )
+"
+
+DOCS="README" # ChangeLog and NEWS are both dead
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
new file mode 100644
index 000000000000..9a314cfcb1f7
--- /dev/null
+++ b/net-misc/modemmanager/Manifest
@@ -0,0 +1,8 @@
+AUX 01-org.freedesktop.ModemManager1.rules 293 SHA256 f97f132097feefc39608acf10b6cdc4b161ec6beaba5a0582e54fc1f09721e6d SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460 WHIRLPOOL ac1abd043698ff194869926ae2fa33646fde755ad3c30e8a5642aa4a0117b6809152508ba8cc0dd247d18c4f61e021e80407a1bebb0202ade43647d3d7d80fd1
+DIST ModemManager-1.4.14.tar.xz 1417092 SHA256 abe6cdd515a774bcba3afdcdb1e504569801e79282ccdf26099f33cbb8731ba2 SHA512 2fb5517cd3fbd98cf4048cec326fabf18fb26d88b75e56208d1ed64d70d72d6e826ef30391c86fbcfe4d69661194bcfbb55d545db10ebe8baf8ef16a3c580446 WHIRLPOOL 30c9e1e388c91f8aab73044634e3d122636f526cb9b437a597dc2f35cfd85e61917a568cfa572404f734eb19eb90c2e21bc85e16d6cc9b53518f590981f6efa4
+DIST ModemManager-1.6.4.tar.xz 1464276 SHA256 cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668 SHA512 6b31ce186adce445cec8964df751b6146a86271e6c14d860740ae66cfe296ac2ac4df21079357775ac5f7a5837c80a7f8db21a2680bc6b45802f9928565f1c73 WHIRLPOOL 3e3b16299ed5d9179e7d7bd38040d061df21fdde558032c8362110d098d3931f106988a0992a64936d969e008c83d699b85e71211bc0684d9bafb2dbc6b4baa9
+EBUILD modemmanager-1.4.14.ebuild 3051 SHA256 7d79b51e22234608c65c15774169bd29ce67e761c1c9677c5d382b87bc9ac6b3 SHA512 ec62991fdb60a0ca6b6bb3750a509da3fa909bd1b3c8647f7647fe414448eaec5577c0a13a3f58985a8f673004c59b944c5bafc827e29f8b728e2dbbb125919a WHIRLPOOL e3d6a1a0c2414298f10aab07a121cc0f387debc5c61cb29f75bc79b2eda3d6a7b8ee83659fe29755f0c3119d8bae5e4688f0daa5f7bd91a08706ca410145341e
+EBUILD modemmanager-1.6.4.ebuild 3143 SHA256 8bedc8d7a9878d8290d84a4bc99e0a68e3dfcb0e2a100d76c51ef600bade4d83 SHA512 edbe21effd6e22319d1f859d0f8c868725d6574633f2b311c191fd57d33ad6930547b84fbab8cc7a39303748b61dbc990fff63181e1710ca17b02ac72352376d WHIRLPOOL 111d5a46df52a675cffa50594b1ca22f255bdbf844b255832d6f4ebbded82e85f9b4f9e98ee63366bc75db7aa4cf39fb1adb58ffca1830f23e12c838157d3391
+MISC ChangeLog 7083 SHA256 cd1fc50937af9f0f255524437f6d6c3e54259659451ccfd1a8aa294417aaf6f4 SHA512 88e4a9efeb6de5437ae1a773a16de3ce1137c7035feff84d925f2c1a2816d4cb06c314f5539d4c655eb01622bd4fac9b6afd76102a8b0fd52e53e0cfa319fc00 WHIRLPOOL 9381ff17d989a9614e522834c6525b4736b6336f95899477fd1e6f9a1671bcc59edf3a733ae6a6a292466439bf45dc1c828f238181563547c18f75071dcdbff1
+MISC ChangeLog-2015 16358 SHA256 524df33ab8e46a303c95cda7eabc878be919012966e32f6c7c25949f0d109ff2 SHA512 80d112612565b72a5ba242cb66bc6421d3aeb7d2e08ee0e172b4d745d22d3e6825b6bb555b6209d829a7092741e551a690ce328cb261c795e5b2862739d9547f WHIRLPOOL 51f8addd67fd6706007a537c0ffb7e5556aa83db7a3a7228bc8d9cda0beedb2f12e86de9f542195eb522320465ff5a83e4c7261a6ee113e28a034d47974e6ead
+MISC metadata.xml 553 SHA256 1adf832aa4cc1217e02c3d12a96ae2a7207e57f0e128b8e35f43eeb738702e4a SHA512 14c8333f81e15f63452b1eaba2c17ad469bbd00132dcdeb4aeb9dcf25f8ec69d543685a8cd4bca3b2cb4d2e8b2ff9dd0d94e0add4fe7413316d76b2443e231c5 WHIRLPOOL d8f711d81c5b4457271d18d8800c29f8240304e0e1b02a24c9f3e9155710136ca1374a0fae1df20ae21ca9749e19edf66ef3955fd88ab285ce5c93d5ac04a4ef
diff --git a/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules b/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules
new file mode 100644
index 000000000000..7fca6472611e
--- /dev/null
+++ b/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules
@@ -0,0 +1,7 @@
+// Let users in plugdev group modify ModemManager
+polkit.addRule(function(action, subject) {
+    if (/^org\.freedesktop\.ModemManager1\.(Device\.Control|Contacts|Messaging|Location)$/.test(action.id) &&
+        subject.isInGroup("plugdev") && subject.active) {
+        return "yes";
+    }
+});
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
new file mode 100644
index 000000000000..2e8801cb40a8
--- /dev/null
+++ b/net-misc/modemmanager/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="mbim">Enable MBIM modem protocol</flag>
+		<flag name="qmi">Enable support for the QMI modem protocol used by
+			devices with Qualcomm chipsets</flag>
+		<flag name="qmi-newest">Avoid deprecated QMI commands. Warning: may
+			cause incompatibility with older devices.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/modemmanager/modemmanager-1.4.14.ebuild b/net-misc/modemmanager/modemmanager-1.4.14.ebuild
new file mode 100644
index 000000000000..905986820896
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.4.14.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 user readme.gentoo-r1 systemd udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://cgit.freedesktop.org/ModemManager/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
+
+IUSE="+introspection mbim policykit +qmi qmi-newest vala"
+REQUIRED_USE="
+	qmi-newest? ( qmi )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	virtual/libgudev:=
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.10 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.12.4:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
+		You should install sys-apps/usb_modeswitch which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--with-udev-base-dir="$(get_udevdir)" \
+		--disable-static \
+		--with-dist-version=${PVR} \
+		$(use_enable introspection) \
+		$(use_with mbim) \
+		$(use_with policykit polkit) \
+		$(use_with qmi) \
+		$(use_with qmi-newest newest-qmi-commands) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	use policykit && enewgroup plugdev
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/modemmanager/modemmanager-1.6.4.ebuild b/net-misc/modemmanager/modemmanager-1.6.4.ebuild
new file mode 100644
index 000000000000..9c85e2cec413
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.6.4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 user readme.gentoo-r1 systemd udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://cgit.freedesktop.org/ModemManager/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+
+IUSE="+introspection mbim policykit +qmi systemd vala"
+REQUIRED_USE="
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
+	>=virtual/libgudev-230:=
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.14.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.16.0:= )
+	systemd? ( >=sys-apps/systemd-183 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.19.3
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
+		You should install sys-apps/usb_modeswitch which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--with-udev-base-dir="$(get_udevdir)" \
+		--disable-static \
+		--with-dist-version=${PVR} \
+		$(use_enable introspection) \
+		$(use_with mbim) \
+		$(use_with policykit polkit) \
+		$(usex systemd --with-suspend-resume=systemd --with-suspend-resume=no) \
+		$(use_with qmi) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	use policykit && enewgroup plugdev
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/monmotha/Manifest b/net-misc/monmotha/Manifest
new file mode 100644
index 000000000000..2cdce310481a
--- /dev/null
+++ b/net-misc/monmotha/Manifest
@@ -0,0 +1,6 @@
+AUX monmotha.rc6 825 SHA256 62f2fe153f57d35d153962b070e4bb38e208185a1fbc1085ad13193c3571fc58 SHA512 4d11a2c00d1829664a39ac1338b8dc803d4e32c8703a929b9ce93fdeed42e1ccdb11fa5ab7e837d883dae0a7534b1fe40cba281f4d88a3d291ebd2911e34bd10 WHIRLPOOL 938cda0eb27e1ef3248811007863aedd2653349400f2110bdc7b9198da0bfa3355c6710eb4278a22887c999940dd0b4c5220b94ddaa1dd0e59fd2b7a1c9f49c1
+DIST rc.firewall-2.3.8 56204 SHA256 4d273d377baebfa5404cbaf87a40227b0000133ecb56c0c7539f548f516929f0 SHA512 ccdd3427a274204c697a64a8936d4311cb34fbb66738c6afc4c242baad01407d1a36adac7a73b24b432943cd7cec05c9c1d9b2d4845b8b132bd61378c0c2e098 WHIRLPOOL 51527b521ac2ce7b4ce782afd7d98af30c6faf997598bf1d10bb31e6484a2b37f3e93ca9a3cf2401becff73387479f9b5b24812bec88d860b50c48671c292d3d
+EBUILD monmotha-2.3.8-r1.ebuild 1231 SHA256 d498bcd02a68e7cbd5cd15b35581d560e633f57fefb5d347c8135c5eb8a2def3 SHA512 a3ffd4a1adc3129e645d96c0ed82413f8944f5109577447587e8fb3a17e72f6714b1983d922913aed39f6e1a49e403cad032e1882bb10f0876f2dd8d550b020e WHIRLPOOL 865fd99c925c0fc0d027322be30036f162245255a739edd3910853b09ff4840e524a19995403525846c75086705f893157ccd2458eb8c3cfa7e4f63856ea9292
+MISC ChangeLog 2954 SHA256 23ab289f0d1cfa42b70f08b8caaeb9f77c69199554b3116c6a81b95d94976ba6 SHA512 167bee089cafda34e3d868ac42153956a287a7eaca2201b344b60b46b699943d5682b84a4e0d61ce5b5a807db2af21e6eb4d559a8964c3c917b63f336f0eb07e WHIRLPOOL 1ba04345d332d03948c470efc87e40888c070cb4d211430afa454bf4d778412612e8dd1e5e524ab1cb32a8ff4f6cfd982aeabd63e45b1b2d796d7d9ec188e39c
+MISC ChangeLog-2015 1570 SHA256 6a4f3a89b1aef247aebb36d7da2572f3b5f16f44704c750f1dc6905280983e15 SHA512 e044ccde95af7200f57f233035dadbeb7d27188d26a6aa87690ca0b28d64f976c8c2a834044dcbcdc4cb3073c0021270b30e674278f4f3c206fa57a8f7fb8f37 WHIRLPOOL 1aa580f8e56b7596e12baab377f5bfa103e8ef8f9cbc2da897d701690466a72e5a1a5028276155e67d974fd2576a67ac64e6907a96007515eba6d4f9a30fdaa9
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/monmotha/files/monmotha.rc6 b/net-misc/monmotha/files/monmotha.rc6
new file mode 100644
index 000000000000..9bd0eeb8e2b1
--- /dev/null
+++ b/net-misc/monmotha/files/monmotha.rc6
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting the MonMotha Firewall"
+	/etc/monmotha/monmotha > /var/log/monmotha.log
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping the MonMotha Firewall"
+
+	# RESET ALL IPTABLES STUFF
+
+	/sbin/iptables -P INPUT ACCEPT
+	/sbin/iptables -P FORWARD ACCEPT
+	/sbin/iptables -P OUTPUT ACCEPT
+
+	/sbin/iptables -t nat -P PREROUTING ACCEPT
+	/sbin/iptables -t nat -P POSTROUTING ACCEPT
+	/sbin/iptables -t nat -P OUTPUT ACCEPT
+
+	/sbin/iptables -t mangle -P PREROUTING ACCEPT
+	/sbin/iptables -t mangle -P OUTPUT ACCEPT
+
+	/sbin/iptables -F
+	/sbin/iptables -t nat -F
+	/sbin/iptables -t mangle -F
+
+	/sbin/iptables -X
+	/sbin/iptables -t nat -X
+	/sbin/iptables -t mangle -X
+	
+	eend $?
+}
diff --git a/net-misc/monmotha/metadata.xml b/net-misc/monmotha/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/monmotha/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/monmotha/monmotha-2.3.8-r1.ebuild b/net-misc/monmotha/monmotha-2.3.8-r1.ebuild
new file mode 100644
index 000000000000..99f20cae77ef
--- /dev/null
+++ b/net-misc/monmotha/monmotha-2.3.8-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="MonMotha IPTables-based firewall script"
+HOMEPAGE="http://monmotha.mplug.org/firewall/"
+LICENSE="GPL-2"
+
+KEYWORDS="x86 ~amd64"
+IUSE=""
+SLOT="0"
+RDEPEND=">=net-firewall/iptables-1.2.5"
+
+MY_PVP=(${PV//[-\._]/ })
+
+S=${WORKDIR}
+
+SRC_URI="http://monmotha.mplug.org/~monmotha/firewall/firewall/${MY_PVP[0]}.${MY_PVP[1]}/rc.firewall-${PV}"
+
+src_unpack() {
+	cp "${DISTDIR}"/${A} "${S}"/
+}
+
+src_install() {
+	newinitd "${FILESDIR}/monmotha.rc6" monmotha
+	exeinto /etc/monmotha
+	newexe "${S}/rc.firewall-${PV}" monmotha
+}
+
+pkg_postinst () {
+	einfo "Don't forget to add the 'monmotha' startup script  to your default"
+	einfo "runlevel by typing the following command:"
+	einfo ""
+	einfo "	 rc-update add monmotha default"
+	einfo ""
+	einfo "You need to edit /etc/monmotha/monmotha before using"
+	einfo "it.  Enter the right vars in the file, start the script"
+	einfo "by typing: '/etc/init.d/monmotha start' and it should work."
+	einfo ""
+	einfo "Don't forget to change the path to iptables!!!"
+	einfo ""
+	einfo "Note: If You are stopping the firewall, all iptables rulesets"
+	einfo "will be flushed!!!"
+	einfo ""
+}
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
new file mode 100644
index 000000000000..a5e31394fcf2
--- /dev/null
+++ b/net-misc/mosh/Manifest
@@ -0,0 +1,11 @@
+AUX mosh-1.2.5-git-version.patch 547 SHA256 aad595bbb3382957257bb91335a414bd9c44e079560c7d7c2a6a13ac0c6e86d9 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d WHIRLPOOL 66f72f92b66b4e6bb9b55b653fe2b2866768f2b9e50659e52a98127285cdf2b2d80713b82031e00f2540685845a28eb40e3702071f0f18af64abc3c7603b5124
+DIST mosh-1.2.6.tar.gz 347185 SHA256 7e82b7fbfcc698c70f5843bb960dadb8e7bd7ac1d4d2151c9d979372ea850e85 SHA512 fe53ba3ba79fb393f9fd5d3c48b2864838a1b51a8e08f0160bcfb98fc8c2363d2bb77456e1bc79b765d6489a2af54237c5423ebb88a13196a82420be0cbc7403 WHIRLPOOL b8e4f8ecce2a5bf2b7e8238ec12181aeeacabf3a1be8f153d922bda0747894e7c23ab9735824a8c163ab4d6ca7942a4aa064559b9474243b82eee3561dbbc031
+DIST mosh-1.3.0.tar.gz 356220 SHA256 320e12f461e55d71566597976bd9440ba6c5265fa68fbf614c6f1c8401f93376 SHA512 2b43e3e3fb2ccf6c29a889f10dfc0d5504dbca6fabaf10419f4e355e4b73d64cc1e632324e447b25ac24ee18bb88d8a9a23f9c4824b267343fb86e26e7d5c54b WHIRLPOOL 9898ec43201e48c125a4d30d04c4045d91e66afe80e0371fdbf06d6bb775eeb3ece444cb61742e374ef29358bc75d49ae324cb7c6b89ef1bd7e440374e6a2e8f
+DIST mosh-1.3.2.tar.gz 359574 SHA256 da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769 WHIRLPOOL 3d0b8ed5790103c2e12793574c19a5b4de1e8c00c9a6e81e71dfae26100743256f7fca0b9b3ef680862ffa6d4eecedc76475ab594302723cd41933698f631eeb
+EBUILD mosh-1.2.6.ebuild 1420 SHA256 f5120c86a1101c536d40d4920711ca0b29d2356b04a764c3d45e50e3172c924c SHA512 77c21588af814452bc10942acefd9f8ece30a26afc751ec2499d86f61c960897152d6b7bbc5a647c9d63723ccc73e6b6776c855a375ebdcd2a9fb8878737914e WHIRLPOOL 12a34ade1415d4c2181278ecb309ffe2c68c5927ffbc365e13725081f574687662fd488762d7b93169148dbc0cf1efbeefe3969a5f43c3caae5b2826125fab71
+EBUILD mosh-1.3.0.ebuild 1416 SHA256 ac570340ec793b5851283c135e0cbca928ba10ba123907f9457a86f7b5c4ffeb SHA512 7b59e94aa6a096d34c7544017f2de6662f91b4ef2b569a2438fe4739d17d83d98db3df07bb2e95d2e88b7b5b86fdd9ab964c4968873567a0893d016de4a74a6b WHIRLPOOL 53ff3103fefe3f070f9e01532789816c6c16ef37c2940b0a2c2e661d6469b6537116f7e3e622ad8dd9c66f8a478a93096fae9263a077a1aa8dbef71b8ea3f7bd
+EBUILD mosh-1.3.2.ebuild 1416 SHA256 ac570340ec793b5851283c135e0cbca928ba10ba123907f9457a86f7b5c4ffeb SHA512 7b59e94aa6a096d34c7544017f2de6662f91b4ef2b569a2438fe4739d17d83d98db3df07bb2e95d2e88b7b5b86fdd9ab964c4968873567a0893d016de4a74a6b WHIRLPOOL 53ff3103fefe3f070f9e01532789816c6c16ef37c2940b0a2c2e661d6469b6537116f7e3e622ad8dd9c66f8a478a93096fae9263a077a1aa8dbef71b8ea3f7bd
+EBUILD mosh-9999.ebuild 1372 SHA256 c0d988d1ff1f3a49b423a78808f242ec756cabe30fee47559d95a60671942c5a SHA512 c94fe52a539a0ab2bf622a24968ab91e6d625513e299036f5c2e452bbc4dff506e61301ad53b13a6fba45f893c1238fa0ca959cd4e61eaf5bd42c43385ff0f8b WHIRLPOOL 0b10c13fb3280c7736b4aa10bb1c98686dc6967bb729f3f19e7ac2f5817d6114fc30d4ac76c0235e62f90d5bc75e34be9186ea928f9cfe4363a08f03b27cb34e
+MISC ChangeLog 3549 SHA256 4200428a2150f62891fde94875254b7d23e3109fdf93a58b3c8dd1c937c1f8b5 SHA512 8b314a943986b7fa4feda5f132722c73cebc4997bd20d738de8cb341e7bb14b2b7962d05f74d2ec53929d62c6310b2fb07247573df566315f831e4b51b094fde WHIRLPOOL c2b61486b137ef13c5f7cdccc78d9244b4b9f6b6acabc8d1f8df71f03a050835ccc552ea6a8f16464b168a18a952abbbdcf8c604def206881f16595e2439d2d2
+MISC ChangeLog-2015 7021 SHA256 78bc78fd25e1c1dcdf061060c7de6de0e60266037b380a5484eeeb0db44bc4e7 SHA512 9015e9c0b17fb947a15b5a29558a51010bbe62650da21414b4a3f23c1c7f27e12d39c9d1cd2d3f613b63c355c2c49c5d3a57e4c35c0100697a3dca1e87321b8c WHIRLPOOL 0a3deecec87dfd3839383d7643b5fad4ca4280833b7b05de45aad63dace8c13610ceb2a69eb7e6bd14b65a7a374b6bb29944d853351e6a5cd0ca846762248c21
+MISC metadata.xml 1159 SHA256 3548a17a47e700e9920e8daaf40e59e607dd9b5b398110ecce5b013845f0acd6 SHA512 6b85b61c6f28de63e397c7f24f0f79bd2d9bbbdc57de87b2d27b7cb4736e7e217bfdbd81a90cddf97bdbde376016413b0cb1fffc060838024376a332ff733272 WHIRLPOOL f55644ca0f7c4fb744c0c554629acf45092e09af078175dc9003d6c88f7ba76f79cde3b0a00819b0cc9b35dfd687004137875833d50396b7b231d39d990ce116
diff --git a/net-misc/mosh/files/mosh-1.2.5-git-version.patch b/net-misc/mosh/files/mosh-1.2.5-git-version.patch
new file mode 100644
index 000000000000..d97d98377b89
--- /dev/null
+++ b/net-misc/mosh/files/mosh-1.2.5-git-version.patch
@@ -0,0 +1,16 @@
+--- mosh-1.2.5/Makefile.am
++++ mosh-1.2.5/Makefile.am
+@@ -8,12 +8,7 @@
+ 
+ VERSION:
+ 	@echo @PACKAGE_STRING@ > VERSION.dist
+-	@set -e; if git describe --dirty --always > VERSION.git 2>&1 && \
+-		[ -z `git rev-parse --show-prefix` ]; then \
+-		if ! diff -q VERSION.git VERSION > /dev/null 2>&1; then \
+-			mv -f VERSION.git VERSION; \
+-		fi; \
+-	elif ! diff -q VERSION.dist VERSION > /dev/null 2>&1; then \
++	@set -e; if ! diff -q VERSION.dist VERSION > /dev/null 2>&1; then \
+ 		mv -f VERSION.dist VERSION; \
+ 	fi
+ 	@rm -f VERSION.dist VERSION.git
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
new file mode 100644
index 000000000000..5aa0beb6000a
--- /dev/null
+++ b/net-misc/mosh/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<use>
+		<flag name="client">Build network client</flag>
+		<flag name="examples">Include example scripts</flag>
+		<flag name="mosh-hardening">Enable compiler and linker options to frustrate memory corruption exploits</flag>
+		<flag name="server">Build network server</flag>
+		<flag name="ufw">Install net-firewall/ufw rule set</flag>
+		<flag name="utempter">Include libutempter support</flag>
+	</use>
+	<longdescription>
+Mosh is a remote terminal application that supports:
+  - intermittent network connectivity,
+  - roaming to different IP address without dropping the connection, and
+  - intelligent local echo and line editing to reduce the effects
+    of "network lag" on high-latency connections.
+</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/keithw/mosh/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/mosh/mosh-1.2.6.ebuild b/net-misc/mosh/mosh-1.2.6.ebuild
new file mode 100644
index 000000000000..830ca87da39b
--- /dev/null
+++ b/net-misc/mosh/mosh-1.2.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1 eutils vcs-snapshot
+
+DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+HOMEPAGE="http://mosh.mit.edu"
+SRC_URI="http://mosh.mit.edu/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ppc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+IUSE="+client examples +mosh-hardening +server ufw +utempter"
+
+REQUIRED_USE="
+	|| ( client server )
+	examples? ( client )"
+
+RDEPEND="
+	dev-libs/protobuf:0=
+	sys-libs/ncurses:0=
+	virtual/ssh
+	client? (
+		dev-lang/perl
+		dev-perl/IO-Tty
+	)
+	utempter? (
+		sys-libs/libutempter
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# [0] - avoid sandbox-violation calling git describe in Makefile
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
+)
+
+src_prepare() {
+	MAKEOPTS+=" V=1"
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-completion \
+		$(use_enable client) \
+		$(use_enable server) \
+		$(use_enable examples) \
+		$(use_enable ufw) \
+		$(use_enable mosh-hardening hardening) \
+		$(use_with utempter)
+}
+
+src_install() {
+	default
+
+	for myprog in $(find src/examples -type f -perm /0111) ; do
+		newbin ${myprog} ${PN}-$(basename ${myprog})
+		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
+	done
+
+	# bug 477384
+	dobashcomp conf/bash-completion/completions/mosh
+}
diff --git a/net-misc/mosh/mosh-1.3.0.ebuild b/net-misc/mosh/mosh-1.3.0.ebuild
new file mode 100644
index 000000000000..a1dac38e24f0
--- /dev/null
+++ b/net-misc/mosh/mosh-1.3.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1 eutils vcs-snapshot
+
+DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+HOMEPAGE="http://mosh.org"
+SRC_URI="http://mosh.org/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+IUSE="+client examples +mosh-hardening +server ufw +utempter"
+
+REQUIRED_USE="
+	|| ( client server )
+	examples? ( client )"
+
+RDEPEND="
+	dev-libs/protobuf:0=
+	sys-libs/ncurses:0=
+	virtual/ssh
+	client? (
+		dev-lang/perl
+		dev-perl/IO-Tty
+	)
+	utempter? (
+		sys-libs/libutempter
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# [0] - avoid sandbox-violation calling git describe in Makefile.
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
+)
+
+src_prepare() {
+	MAKEOPTS+=" V=1"
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-completion \
+		$(use_enable client) \
+		$(use_enable server) \
+		$(use_enable examples) \
+		$(use_enable ufw) \
+		$(use_enable mosh-hardening hardening) \
+		$(use_with utempter)
+}
+
+src_install() {
+	default
+
+	for myprog in $(find src/examples -type f -perm /0111) ; do
+		newbin ${myprog} ${PN}-$(basename ${myprog})
+		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
+	done
+
+	# bug 477384
+	dobashcomp conf/bash-completion/completions/mosh
+}
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
new file mode 100644
index 000000000000..a1dac38e24f0
--- /dev/null
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1 eutils vcs-snapshot
+
+DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+HOMEPAGE="http://mosh.org"
+SRC_URI="http://mosh.org/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+IUSE="+client examples +mosh-hardening +server ufw +utempter"
+
+REQUIRED_USE="
+	|| ( client server )
+	examples? ( client )"
+
+RDEPEND="
+	dev-libs/protobuf:0=
+	sys-libs/ncurses:0=
+	virtual/ssh
+	client? (
+		dev-lang/perl
+		dev-perl/IO-Tty
+	)
+	utempter? (
+		sys-libs/libutempter
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# [0] - avoid sandbox-violation calling git describe in Makefile.
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
+)
+
+src_prepare() {
+	MAKEOPTS+=" V=1"
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-completion \
+		$(use_enable client) \
+		$(use_enable server) \
+		$(use_enable examples) \
+		$(use_enable ufw) \
+		$(use_enable mosh-hardening hardening) \
+		$(use_with utempter)
+}
+
+src_install() {
+	default
+
+	for myprog in $(find src/examples -type f -perm /0111) ; do
+		newbin ${myprog} ${PN}-$(basename ${myprog})
+		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
+	done
+
+	# bug 477384
+	dobashcomp conf/bash-completion/completions/mosh
+}
diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild
new file mode 100644
index 000000000000..1c43e468a2db
--- /dev/null
+++ b/net-misc/mosh/mosh-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1 eutils git-r3
+
+DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+HOMEPAGE="http://mosh.mit.edu"
+EGIT_REPO_URI="https://github.com/keithw/mosh.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="+client examples +mosh-hardening +server ufw +utempter"
+
+REQUIRED_USE="
+	|| ( client server )
+	examples? ( client )"
+
+RDEPEND="
+	dev-libs/protobuf:0=
+	sys-libs/ncurses:0=
+	virtual/ssh
+	client? (
+		dev-lang/perl
+		dev-perl/IO-Tty
+	)
+	utempter? (
+		sys-libs/libutempter
+	)"
+
+DEPEND="${RDEPEND}
+	dev-vcs/git[curl]
+	virtual/pkgconfig"
+
+# [0] - avoid sandbox-violation calling git describe in Makefile
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
+)
+
+src_prepare() {
+	MAKEOPTS+=" V=1"
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-completion \
+		$(use_enable client) \
+		$(use_enable server) \
+		$(use_enable examples) \
+		$(use_enable ufw) \
+		$(use_enable mosh-hardening hardening) \
+		$(use_with utempter)
+}
+
+src_install() {
+	default
+
+	for myprog in $(find src/examples -type f -perm /0111) ; do
+		newbin ${myprog} ${PN}-$(basename ${myprog})
+		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
+	done
+
+	# bug 477384
+	dobashcomp conf/bash-completion/completions/mosh
+}
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
new file mode 100644
index 000000000000..246815eee0e9
--- /dev/null
+++ b/net-misc/mrouted/Manifest
@@ -0,0 +1,6 @@
+AUX mrouted.rc 603 SHA256 bd16a37814fdc234a2a96f881042aa74f9974abf9ab555d94854f7aee4fd098b SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3 WHIRLPOOL b52ee01119bfe4fbfaf9a761ce3747f84ad7b6aadbec4e10851fea22e2389b41fdaa0915cf2eecc3729a825eed124423749fa364e5938243b00f36fc9e131951
+DIST mrouted-3.9.5.tar.bz2 112746 SHA256 10f0204f3a420033df7b5dfe4cac96dfba58649cbd813d7c6e2253367601b147 SHA512 6ab7335fd18bcb971eb0f9af26e8fd566b1bf2e53abdfcdea847c4bd719d282496c443914678c6fcbcf754e276663ed48ac9f0ae9e940e60eff71ceb1f4622fd WHIRLPOOL a452871a4ab57e294d54378ec7604f7fda517656759ebceb7f8dfe802cb96f2c71f496bea54e6d49f8f573a4199d43f717685b3886165220a214fb3f829fe28d
+EBUILD mrouted-3.9.5-r1.ebuild 841 SHA256 17a2a90248ec2ca1c378dde9e93c071986a2574e518595c89ac00af5e9d69fb5 SHA512 e45dd94d7e7ea511e7798c0a9f75b5fdff669d98b9cc00f272c153d2ce2ab37296c5605390bb9df115928de99f654b3ed17242619e8b5c1ce4f8c25d790ec725 WHIRLPOOL c9b07c3a922e61bd24c49a2bf025374a78aa81414edd7dc9ff059f3f931264571035db318320361534ba8cab88f0ed01d32de46833974b00865e9c7f495d5308
+MISC ChangeLog 2944 SHA256 ab3b9b0a08aa031d04508e5a7558ee2c28affc821a12495d620c8f58b1791b5e SHA512 f666893706103baac3f489199256c94c5e7b77836ed961660dc92f2fa449363a2fa13042c624da8b2f0b0f1a7c1f668ce3fe89a456295d43446bb0c77ea7e107 WHIRLPOOL 1e5a9e524062e1a087dbd9a278f0bc5b93046f151e3e07d355aa3093e80414c7144689f04173ef8966af4cced36d755f82a5fe65ed375de0e8d32ea8772fe70c
+MISC ChangeLog-2015 2052 SHA256 72d5d97fbc2a7768324e0278ee81786b06d78e754b9a9319644d16d323b0ee9d SHA512 b4a316397681b3bba5310de1c069e565a487de0070d013fe2c91d29e3461934200bf8f4bba2bf2b6ebbed3fc3e39795f893729ff18da477be41a47fbd8f97d90 WHIRLPOOL 87d82b80bad37990f1b86eb8e644d8adc096ac7232f251ace2d166a0a1b79e11edce0bbb4b638a008baa886d7f6c576ec6a74ecdc0b998ceea20442abe422beb
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/mrouted/files/mrouted.rc b/net-misc/mrouted/files/mrouted.rc
new file mode 100644
index 000000000000..2be6b393d472
--- /dev/null
+++ b/net-misc/mrouted/files/mrouted.rc
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use logger
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/mrouted.conf ] ; then
+		eerror "You need an /etc/mrouted.conf file to run mrouted"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting mrouted"
+	start-stop-daemon --start --quiet --pidfile /var/run/mrouted.pid \
+		--startas /usr/bin/mrouted -- -c /etc/mrouted.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping mrouted"
+	start-stop-daemon --stop --quiet --pidfile /var/run/mrouted.pid
+	eend $?
+}
diff --git a/net-misc/mrouted/metadata.xml b/net-misc/mrouted/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/mrouted/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/mrouted/mrouted-3.9.5-r1.ebuild b/net-misc/mrouted/mrouted-3.9.5-r1.ebuild
new file mode 100644
index 000000000000..68ce93661989
--- /dev/null
+++ b/net-misc/mrouted/mrouted-3.9.5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="IP multicast routing daemon"
+HOMEPAGE="http://troglobit.com/mrouted.shtml"
+SRC_URI="ftp://ftp.vmlinux.org/pub/People/jocke/${PN}/${P}.tar.bz2"
+LICENSE="Stanford GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="|| ( dev-util/yacc sys-devel/bison )"
+RDEPEND=""
+
+src_prepare() {
+	# Respect user CFLAGS, remove upstream optimisation and -Werror
+	sed -i Makefile \
+		-e '/^CFLAGS/{s|[[:space:]]=| +=|g;s|-O2||g;s|-Werror||g}' \
+		|| die
+	default
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin mrouted
+	dosbin mtrace mrinfo map-mbone
+	doman mrouted.8 mtrace.8 mrinfo.8 map-mbone.8
+
+	insinto /etc
+	doins mrouted.conf
+	newinitd "${FILESDIR}"/mrouted.rc mrouted
+}
diff --git a/net-misc/mulk/Manifest b/net-misc/mulk/Manifest
new file mode 100644
index 000000000000..c6cc19203bea
--- /dev/null
+++ b/net-misc/mulk/Manifest
@@ -0,0 +1,8 @@
+AUX mulk-0.6.0-large-file.patch 867 SHA256 974b166c0ecbdd82f18d8200d09776e9a1fdd141dea004e0e5af0bcfce38eb40 SHA512 8018cacc3713474c5033aaafbae314136a448a10c13e4b49630a1808c2f1a14d3b22c79229a54e661cebfb59051cdbf29ccede72f2dc3265614d635d1ada16ae WHIRLPOOL 70b24fe69cb11f36c7f25b540f05c5e265ee874cd6905cdca6a9eec6f06724fdcf1048776855c8d8d45042f1f4bce61737db58dab69a2da12fde108d54deecf6
+DIST mulk-0.6.0.tar.gz 459141 SHA256 c2afee9c510cf9e56a92d911879f0c7f55fca1f9e5fe9615a39e5a71fca64312 SHA512 9e42add34305b071ac5132c645be75d3666e2a47b6b3a7c7eb46b1fbc130db85bccdd31dd54586b20c4d3629f000219c630511d6f2a59d241d60afce2cfeee37 WHIRLPOOL 50917be333c770c839dfc85a08a91f16eefb57bfa99ae3e951c0541d13c55df6b238d7b433c5ff26ef6c473f5c39762d8481548b53367fdff0d960ce9d4413ce
+DIST mulk-0.7.0.tar.gz 487995 SHA256 aca61867fc0b93ebcd8a564c57394b97dabed2f9973835933f88c137defcdd1e SHA512 e1c6cf14b0ee2e42d83c8ad33d011feec9eb192ea4f8495cc67926db934d7ac132dfea66e40c47844965321573bd5b0734e4b19fe34c97c38170ee0cf4643499 WHIRLPOOL a31975155e20470dfc670e64cc552f1456d4f6a75bc3986d76c8e5d1f1fd6f06fccea42d9d57bff809b7b226dfc752d743265d925e02d58e2bb2c9da1b0d6ff5
+EBUILD mulk-0.6.0.ebuild 808 SHA256 baf973a2ca32f3a2d967545cbe3a9d3664041be7d790dd92ad5fa6cae99251a3 SHA512 b19c6d6ac579f72fb128cae2ff6c7b39718942945866e1e2c84bcfeb513eb361895e10ccefe6e32151b87baff5bbe7c1830b03a2b2a900a6740c27ced35ea445 WHIRLPOOL 591eb197cd41cc9da9985f7448f1b0cd92bae890128cc9b162cd22ceb1c072691a9bfe782a0cec498e2bb515466631bb648fbb24388aeb3228d652844c94d899
+EBUILD mulk-0.7.0.ebuild 758 SHA256 2e2731b1d54c6ae3d314e277670376b19ee1f34650dd714a8dd8c28c80ea7178 SHA512 8cbd690937d3e4447e3b86a2667d89c740d59463c74578654cd52863b6dcbb2a2ef9e6091700a59996c688a0328d5500be1e80a737a18f0c6908f53faee71faf WHIRLPOOL 32b82b01002264abcb6c274acb364b5f35e69bac784b994fd97718eeb380ee2f930eba4437bb7cf304920cdce42405edcc0524cefad5c62f7e9d98bf7d0197b3
+MISC ChangeLog 2493 SHA256 0706801caf667fbbfbb0e9f040ac6b2c3c4089f720c3f9b9a2b5d728dc604e7b SHA512 2db95b1a413899e4797b9be1d19b9b458bc5f6b941dfbffbbb2274c807a5d0f569467de98afdc00ca9c9b7d5e8683a0058d19f65a54a4dbd670e0997e8077be7 WHIRLPOOL 27e45d4ce26680f593d4b9196120cdd98ce02c334bb6b03edf8ab540a06b1e18fb26fd03af47c5fc8421c661e4f08d07b0f20ac96995fe119d7727ca47c1d4ec
+MISC ChangeLog-2015 768 SHA256 65b8c1e519c5f531a3cb2893b736adf00c2a68bd6778bd239068d5dbc909e00e SHA512 8c890321ca1478eaa6a640f76756feb8c62beee67fba344391e3d9359ca72949bab827126437676ab5f7cdb7e2a84194169a3a950d15b9d8bc31b49f9c01274c WHIRLPOOL f7f4021ca689f3c6b42e819a535c75e6fff530cea8b09ee04c8a3e161e38b779ff1b21da9a2549b9de8ffd5813b97ce9494851a1f5e39dba4481991e742867d6
+MISC metadata.xml 529 SHA256 cca0aa5097f66fea2c8310155bc66eb667dc38278625c904362be25a0df99988 SHA512 889e8f520e741c56bf6d49b235af4cd3a1d39b63d37f6b5fd18ee6c29c2dd18c26bf4919dd98858e70f47921184bd1d39a3fc5836ae43753b029a0756a998b83 WHIRLPOOL 799c5bb2c38152b07ccaba1a9e099163e9f49f983ae298a65039f803f97f372f03116554181e681149e5d8ccaa607eed803891993aaad1e90d159bd24866e917
diff --git a/net-misc/mulk/files/mulk-0.6.0-large-file.patch b/net-misc/mulk/files/mulk-0.6.0-large-file.patch
new file mode 100644
index 000000000000..801433080e46
--- /dev/null
+++ b/net-misc/mulk/files/mulk-0.6.0-large-file.patch
@@ -0,0 +1,32 @@
+Index: mulk-0.6.0/lib/defines.h
+===================================================================
+--- mulk-0.6.0.orig/lib/defines.h
++++ mulk-0.6.0/lib/defines.h
+@@ -41,6 +41,12 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
++#ifdef HAVE_STDINT_H
++ #include <stdint.h>
++#endif
++#ifdef HAVE_INTTYPES_H
++ #include <inttypes.h>
++#endif
+ #include <curl/curl.h>
+ #include <curl/multi.h>
+ #include <uriparser/Uri.h>
+Index: mulk-0.6.0/lib/m_malloc.c
+===================================================================
+--- mulk-0.6.0.orig/lib/m_malloc.c
++++ mulk-0.6.0/lib/m_malloc.c
+@@ -34,10 +34,6 @@
+ 
+ #ifdef MULKDEBUG
+ 
+-#ifdef HAVE_STDINT_H
+-#include <stdint.h>  /* for uint32_t */
+-#endif
+-
+ #define HASH_TABLE_SIZE 131072 /* 2^17, use always power of 2 */
+ #define HASH_CHUNK_SIZE 2048 
+ #define INC_INDEX(i) i = ((i == HASH_TABLE_SIZE-1) ? 0 : i+1)
diff --git a/net-misc/mulk/metadata.xml b/net-misc/mulk/metadata.xml
new file mode 100644
index 000000000000..616f1fe1a5a0
--- /dev/null
+++ b/net-misc/mulk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<use>
+		<flag name="checksum">Enable checksum verification for Metalink from <pkg>dev-libs/openssl</pkg></flag>
+		<flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mulk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/mulk/mulk-0.6.0.ebuild b/net-misc/mulk/mulk-0.6.0.ebuild
new file mode 100644
index 000000000000..af8c80b6d579
--- /dev/null
+++ b/net-misc/mulk/mulk-0.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit base
+
+MY_PV=${PV/_beta/}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Download agent similar to wget/curl"
+HOMEPAGE="http://mulk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="checksum debug metalink"
+
+DEPEND="net-misc/curl
+	app-text/htmltidy
+	dev-libs/uriparser
+	metalink? (
+		media-libs/libmetalink
+		checksum? ( dev-libs/openssl )
+	)"
+
+REQUIRED_USE="checksum? ( metalink )"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-large-file.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable metalink) \
+		$(use metalink && use checksum && echo --enable-checksum)
+}
diff --git a/net-misc/mulk/mulk-0.7.0.ebuild b/net-misc/mulk/mulk-0.7.0.ebuild
new file mode 100644
index 000000000000..c6f3842a1e6d
--- /dev/null
+++ b/net-misc/mulk/mulk-0.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit base
+
+MY_PV=${PV/_beta/}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Download agent similar to wget/curl"
+HOMEPAGE="http://mulk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="checksum debug metalink"
+
+DEPEND="net-misc/curl
+	app-text/htmltidy
+	dev-libs/uriparser
+	metalink? (
+		media-libs/libmetalink
+		checksum? ( dev-libs/openssl )
+	)"
+
+REQUIRED_USE="checksum? ( metalink )"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable metalink) \
+		$(use metalink && use checksum && echo --enable-checksum)
+}
diff --git a/net-misc/nat-traverse/Manifest b/net-misc/nat-traverse/Manifest
new file mode 100644
index 000000000000..8061199358fa
--- /dev/null
+++ b/net-misc/nat-traverse/Manifest
@@ -0,0 +1,5 @@
+DIST nat-traverse-0.6.tar.bz2 17230 SHA256 71a7421512975c72e94859c44a54b75405ae6fc8b89c9517b2ed0dd7512f6bb9 SHA512 4ee940b1bdef9ea061d983e0df780378d1dfde16e770ac7af8c11c8746f867f5e4cc80280decfa478062defcf3f9f1f5023e212cd2f9c36e67758be68da254fc WHIRLPOOL 8bddc823f09ae1cc76e1874bdaad18b7142653241090da8d5aba757bb0444095cd76ad923ffa706c92a1169a8db297b6d03c4be0031cbb79abeaaae4138f9482
+EBUILD nat-traverse-0.6.ebuild 475 SHA256 55e02d89632836b770b7e547b7731982919167ebb022aa6ebedb08dccf6b8030 SHA512 23cd8d86e1d5ffb7a2ec64d8d75081557e81beee516fe5918663eb6fcaca8f781de00f3897ce0da0780b0b687ac3124d544557c4df93ccb3e2a44cacfd8987fa WHIRLPOOL 7a0ebe072e9823188fa4392ca3da442a6bfb142368ec403960aceb91727ff4bd2c85d620d2490f1acf5a28225d6c2234fb566d3f793258e0ea9c70ea57d0a239
+MISC ChangeLog 2733 SHA256 ff33a1dba7aa779b156862cea906115d1a386085eb9aecbd3246a938520f626b SHA512 7e4c92561178a207d0d3e62ff4540846e022578f0f44d1b8b20a367130159ca1f9d2c57b4b4f95dcb36d885bd5826043deea4a19721763630f255498c4844406 WHIRLPOOL 9d8525b1d915d5d964f8311e4849b40e6ef75dd9b08eeb7688378a289c99399d3850a4f35f584f863208445530c74805bfa7d98b81100db9dc8cee22547c860f
+MISC ChangeLog-2015 1633 SHA256 56a5308da004d0100bc858734a8bb0119bba5fa04c5ef287b83e294cdac04942 SHA512 b76f238459159ff64bfdf1cb01c0be69f855c586ea07fc9de4e43a55fd9409c44efb8405a2bfef8037eaa9865d5e3f9d7bc85cc85d36eb87965146a853eb333c WHIRLPOOL 36bdfb235b089755f36f30b04cdef33b86e414c6f3eba0f74458dba959bf20716620ee70759ca4f6b0fb20630f5d8788da2371c74d7a74443570d35bb0757bdc
+MISC metadata.xml 328 SHA256 9cf0423478badccc20361423c5b2e8c74fb6b1e75beb3d7671282580b2ec45e6 SHA512 f99c4f8d2b727ab369d6aaae249072fadc1b9ef30f800950b8b7ac6a1b59d0fee26f2e88b0f06a70b9a7173a72a618d9f0d2dc8597ccd49631146fecd1b42acf WHIRLPOOL ec058aaf017576d767e69cb0780de5ffe9678a273b2a6ca77318e56429d8eaaca2452f6f8565cc169376e43da3161d85a40d72f7976f604129e43c7dd1da96e2
diff --git a/net-misc/nat-traverse/metadata.xml b/net-misc/nat-traverse/metadata.xml
new file mode 100644
index 000000000000..1ed5bc11cf89
--- /dev/null
+++ b/net-misc/nat-traverse/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">linide</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/nat-traverse/nat-traverse-0.6.ebuild b/net-misc/nat-traverse/nat-traverse-0.6.ebuild
new file mode 100644
index 000000000000..254308b5289f
--- /dev/null
+++ b/net-misc/nat-traverse/nat-traverse-0.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Traverse NAT gateways with the Use of UDP"
+HOMEPAGE="http://linide.sourceforge.net/nat-traverse/"
+SRC_URI="http://linide.sourceforge.net/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6.1"
+
+src_install() {
+	doman nat-traverse.1
+	dobin nat-traverse
+
+	dodoc ChangeLog README
+}
diff --git a/net-misc/ncp/Manifest b/net-misc/ncp/Manifest
new file mode 100644
index 000000000000..039edc6408c7
--- /dev/null
+++ b/net-misc/ncp/Manifest
@@ -0,0 +1,5 @@
+DIST ncp-1.2.4.tar.bz2 6172 SHA256 6cfa72edd5f7717bf7a4a93ccc74c4abd89892360e2e0bb095a73c24b9359b88 SHA512 7332cffef56ec8dd8afefbb3f3dda455bc4465a61476cb7a751f9fa0b9cc1c125e22f1d89b9cab36e059f3f686c8dcc847015c4a44c23dd5bca8290b5666bdc8 WHIRLPOOL d95cf58a91fcaf828184c527c10af542194e58f3226b3016486dc65dba5854c92c31ee8fbb3421f951c85cda15c70bccc06caf02c446abb2b540551825f5e935
+EBUILD ncp-1.2.4.ebuild 853 SHA256 be6b3bba090963541c020b318e403c1d31f91eeb995eb23ad1c053dbce3cebd2 SHA512 b7495762fa68ceb0927159dd65f000fc062fdfdcc5f50f1333ce68e43ce4e32db899e16d538b74bcf366a3deff49e1e73ec796e6df41ba8ebc1e544b94849316 WHIRLPOOL bb39e2f7b5c2f42669b0c8747d465c2a9095db0bd7c2a7a5cae4b4403669f71a9bb380150ef8798daee5db9d8c7696f4a4f9485a18ebf7f12a524539d59ee562
+MISC ChangeLog 2557 SHA256 f0b8df28790aae8c2085ec80cf41184af93001d50fb9fc437b3c7f27925807d6 SHA512 386c5e8c324e9a7e42551e2f954e2d23968f669793978fed96983b49a7b9207ddc7be38270f8fc547c130fa9987fffedae9e2b780cd90373512498b9582c81b3 WHIRLPOOL 384bbf59a64487d852c115f8184739fd8781f54ba608ef7aea2bd273db4b02fd3926cd008d24cc3a8e63f756f25627bc35d1c028d080be081d8d2d73e311d441
+MISC ChangeLog-2015 773 SHA256 e4fdea69f14a2984c33ff18ea224901c61d4979376eaad8363e7082deba842b6 SHA512 bb61800b2545ceac577b54d1d706ca919bf1ce2147a215cc038d68a6f1bc6942c304cee3eca7ce7b89bcb288deb777e22dd654ebb03f735962b2d84fd834ae80 WHIRLPOOL 364ae6aa4f85f26f84633d729236fcc0c3004a1b62d518f3c86b9ba5babc68855728dcf9bffa431a93bc94bfa65b98fa2f85f1cfcbfdd6389840b84b8dc0b56d
+MISC metadata.xml 558 SHA256 965bd5e3f69b08eb3e5c3f3c5a43bce7e64924f7e4b6eb377dad1352b59f779e SHA512 464c2fd4788c533675368759bb5e41e56b114d6f93b4a69634bc7ac1e141f632f8ec437b701d3c8ac7d9e4dd35f31146adadc399ca27692da0a5bf8701cfa679 WHIRLPOOL 7b54a4d779c69a4b8da3dbb5321067773ccecb4019bab034ed72764c4bfb0e776dd43f4f4a2cc8f55642c4c65e712fa904bf70e2401062191eb5ddfe62b36d0f
diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml
new file mode 100644
index 000000000000..c04ba062f30f
--- /dev/null
+++ b/net-misc/ncp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<longdescription lang="en">
+"ncp" is a utility for copying files in a LAN. It has absolutely no security or integrity checking, no throttling, no features, except one: you don't have to type the coordinates of your peer.
+</longdescription>
+<use><flag name="diet">Compile against <pkg>dev-libs/dietlibc</pkg></flag></use>
+</pkgmetadata>
diff --git a/net-misc/ncp/ncp-1.2.4.ebuild b/net-misc/ncp/ncp-1.2.4.ebuild
new file mode 100644
index 000000000000..12a07aed2c18
--- /dev/null
+++ b/net-misc/ncp/ncp-1.2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="utility for copying files in a LAN (npoll, npush)"
+HOMEPAGE="http://www.fefe.de/ncp/"
+SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
+
+LICENSE="public-domain" # mail from author, bug 446540
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="diet"
+
+RDEPEND=""
+DEPEND=">=dev-libs/libowfat-0.28-r1
+	diet? ( dev-libs/dietlibc )"
+
+src_prepare() {
+	rm Makefile || die
+	sed -e '/^ncp:/,+5s:strip:#strip:' \
+		-i GNUmakefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(use diet && echo "diet -Os ")$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -I/usr/include/libowfat" \
+		LDFLAGS="${LDFLAGS}" \
+		STRIP="#"
+}
+
+src_install() {
+	dobin ${PN}
+	dosym ${PN} /usr/bin/npoll
+	dosym ${PN} /usr/bin/npush
+
+	doman ncp.1 npush.1
+	dodoc NEWS
+}
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
new file mode 100644
index 000000000000..c6d71373ff67
--- /dev/null
+++ b/net-misc/ndisc6/Manifest
@@ -0,0 +1,16 @@
+AUX rdnssd.conf 80 SHA256 7f7a6049ac070f1df2d9768a68fc36d71686dd4044436423d02c6cd1f07a329e SHA512 b9a806b24e0d466efbb633eeab0169c289475a50eb3cc627853a4b28dc97136a42988fbea0d71d8b0afe2dfe955c5b96c300607d6abf7a254beba4cefd486a57 WHIRLPOOL 7fa5f61ef910eb276515cb3e725238849fc341d9d117715f645946c14fff2ceedadb1d6e312898f74278b02e4a5a5afd594e02c1a0f8476c797dc07100ec6584
+AUX rdnssd.rc 498 SHA256 0da62e43838fa5c822f8ae8b1a072015aa0c402b9489c36fa892fb300286e936 SHA512 802248045080ed1f9fc5936a1edd2f36accdc8189b694b9d44fa30e28a2a72ef763baf08c9eaae5214808f40192d775f9e2e2d20db40fe7a14634c280b80abf4 WHIRLPOOL 76419fd9fea075dfde0c54b3c451c8dff3484d3444f7eefc92eaf579283425f401bf9400ea1845a0a6f546ac51fb8f86e262e4004cdce4553dfc5a5235976535
+AUX rdnssd.rc-1 502 SHA256 520a1693402fe97b2a2938c32fd8913de64a423c3eb28d67fea41c875b4c17db SHA512 0582ed315756d3e3c17d789252b3c68d1a7dfc6e74e600c0ea186775c976af447923cdc8182be23dd1418323503a91f8f82bc5068148a92bb40f9888a7c5cec2 WHIRLPOOL ffa65779724a30c9553c5e6d025ede43d923c690941059fb3080c887aaf3775b66cbb1d1b9c7095e77037063d731e0c2666e87ed483897a400dd2b4187bde6ba
+AUX resolvconf 148 SHA256 0334a0a5fd0ec66e0a60c2ac53b919293903f9b36b2b7e1a5d411942eef19f2e SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf WHIRLPOOL b7822e4bd1aab192ddc14ae37be970fee73a62b36ea727b5cb686ef3232aa6a2c2f45574b31f3d8f95a18f1a975ee1811a65bae37982e468327f72b427be2594
+AUX resolvconf-1 152 SHA256 edeb3ffd9248d4cba674f9f52e65d4f70d8899e45edc606289fdab0dda9564f2 SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83 WHIRLPOOL b36e2ec2f41aceb9a4b259db0b6bef04e678e7a71b27dbd25439cf394c1e07898cbc7db0ea2a2a5e854ec238df26ad5707e791bcf78fbd8d6cfdca9f4fcb7763
+DIST ndisc6-0.9.9.tar.bz2 233493 SHA256 fbc5909f9509082bf235c040071b3c2ff9f58af48b4e39c4c6bf706690c9cc44 SHA512 ff0853140328e0ef4075aca56d54b959e2d6804c4fb38c60b13eafba1bfd0befd7790a4ff3e6795bb25a2b2d7e90eb5c733190898223b08edf3d6f431cb21abe WHIRLPOOL bf1eafa31bbecc319c7ef210cdc1873dcc2b270b0a0a91d9dc6ce30cdabee3dc2c16323b616acb89acb01c71cd164ffdc2d72d3ee145a9fb1f146b5133c7943a
+DIST ndisc6-1.0.2.tar.bz2 239249 SHA256 6acec8a0cb9efa3ac98456f46c3016aeec0598b0c7557c95242b5228ad62ca7a SHA512 87441bc9d76f3fa22c6d173ca95fa295e0c30fca28c39d60ca13800f55278e83a9e6cae316e3b4a2c3675f813886d0f38999d538904fcefbb9ef7d171972d42a WHIRLPOOL a0a0c1c892d766e86ca5c70c7c80a01d9298b105cd8f8bc32bd7ab8ccdbcc985d2cb5f8399462dade5b6165e67f885090a7aaafdbc48c8161919e597f5139e63
+DIST ndisc6-1.0.3.tar.bz2 260294 SHA256 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821 SHA512 11dc9833edfc76650b46977d653686ed800dc1cc1dd069051410570f522d538ea9297b013a8d16b94aac3ebf33043cafdaee9fdccb5c02cc08b4c29ceaa96a54 WHIRLPOOL 2d80514b06846d66f89442dd225d17a34cca5a6d2c4a4eb8efcfc52fad5d6ca3f6963c347916277264725eaf1e1c6f7407973c2b0c34afea948fd67223f31ad3
+EBUILD ndisc6-0.9.9-r2.ebuild 667 SHA256 cc57ef079bcf30f36e8c6e786d42610eec048da888c841210554d4bce33a26ed SHA512 8150d0b74eae78284cdb6de3b3b9951120ad38c481ea2b27afc04cb1bc17350e460d9539b9507c7f9583355f920a41db2b17f61bfac187968aa79de9d6944e26 WHIRLPOOL 06d40de8a495d7e217f7a5d96c92d71ccc314f725b04e3c1a6f47eb871f346744b9ca70b13fe502e1e573af3715cd6be864015531e7d53f05e8ffa1cc71e45ef
+EBUILD ndisc6-0.9.9.ebuild 649 SHA256 141361b13ee5647218c5379ef7ac4903fd8f02acb8eab5b8c3035e53a0bcb6f1 SHA512 3346e9d0f757fcff94c44ba4569dd29d334eb846d727595aec905add6e2ca11d35f43da4e4b9951894fd8f95688f0543663f489f73f8d76f1527c833bb057ded WHIRLPOOL f630fa4fe90a2179ab1d1d956df93efbd9e3deedfae0ef84cbe8ca37442c3035d931d2e4bd95a1384fbb4ec8def584d303e0a3a1e989c84b7657239f5dfe17ff
+EBUILD ndisc6-1.0.2-r1.ebuild 735 SHA256 ac2cd0417d8d3e83313cc2faa96aa5287dffafdeca315274c655995413e2706b SHA512 1511b39b23aed938f4ba939a6a0152e47960c8abb9202752734f70a1d72c58230c4a1f7adc10ef86cf3b6ef287e9f65d5115cf22482231a846a205024c1799e5 WHIRLPOOL 6063c77bd3cea3d19b925e75821e3c0519a844f2c9e6f4067b9b073074e33e0a144f49a96dda0d826df7f8871a5ea52e2ecf3ec594e9712e167de88f741cfbfd
+EBUILD ndisc6-1.0.2.ebuild 667 SHA256 b6aabd0a40f37f2b653361ef02a137338e6b2006c60b7cd86640ce418da22ddb SHA512 a3be14a15b6b4cc4ee13f506fc8e7acfc4a60eb5a51f0f9998994a866d9788496176f42efbe409e225ab90ba1b98065764640f3d45e44c89d5256a23825d5423 WHIRLPOOL 6f9c285899637b42e82bc45be334d978bc7602205aabfc5b5cbd3b546eacef9c30f7ca671d3a20a9eb753268b72ca1950478e677c4294db5aa77089c612ed25d
+EBUILD ndisc6-1.0.3.ebuild 735 SHA256 ac2cd0417d8d3e83313cc2faa96aa5287dffafdeca315274c655995413e2706b SHA512 1511b39b23aed938f4ba939a6a0152e47960c8abb9202752734f70a1d72c58230c4a1f7adc10ef86cf3b6ef287e9f65d5115cf22482231a846a205024c1799e5 WHIRLPOOL 6063c77bd3cea3d19b925e75821e3c0519a844f2c9e6f4067b9b073074e33e0a144f49a96dda0d826df7f8871a5ea52e2ecf3ec594e9712e167de88f741cfbfd
+MISC ChangeLog 3287 SHA256 151d6c6f4f0fba6021d06419020c3a23ff27d48214a97497cfcb6ce158315225 SHA512 818f4a7dcca4d19036d6b92a9f24d025fedcc72b9b2bf4c95d404bf7f86dd2e27d144345360e78f1b8d7bb082544848de3f3d798551962a80d3814baff6496e2 WHIRLPOOL a0c1be703cbf2c4d124226dbdc4ac5494018f4e2dc7e93d9378865ce73687f8a1cc4501acd2a036206b003dbc493e3033bdf429b6f15c08892ef11dee1d5cb07
+MISC ChangeLog-2015 1344 SHA256 ad4f45213d3fa945f3700b540bb9fb8ce293da591335042d0ae2da2053a597a3 SHA512 37b7332fa56f986e1414d183fc4d7e456f2d057af570f35e6e40070f7cb58ab660b3fc8525fb5a4dffc670024df05037f70f2ba0e2e457d71e3bfd545e717a6f WHIRLPOOL 875fb5fb4aab927a9f90a2738f55a5b671db2dde7431cea10dfbe29d5587323db28f20951cebf4121669a46ecee5d6d515866b63d44a1feb4b009921b55cc0c3
+MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/net-misc/ndisc6/files/rdnssd.conf b/net-misc/ndisc6/files/rdnssd.conf
new file mode 100644
index 000000000000..c5bad72b0d96
--- /dev/null
+++ b/net-misc/ndisc6/files/rdnssd.conf
@@ -0,0 +1,2 @@
+# Options to pass to the rdnssd process
+RDNSSD_OPTS="-H /etc/rdnssd/resolvconf"
diff --git a/net-misc/ndisc6/files/rdnssd.rc b/net-misc/ndisc6/files/rdnssd.rc
new file mode 100644
index 000000000000..3b8d64cd035d
--- /dev/null
+++ b/net-misc/ndisc6/files/rdnssd.rc
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	before net
+	use logger
+}
+
+start() {
+	ebegin "Starting rdnssd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/rdnssd -- ${RDNSSD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping rdnssd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/rdnssd.pid
+	if [ -x /sbin/resolvconf ]; then 
+ 		/sbin/resolvconf -f -d rdnssd || true
+ 	fi
+	eend $?
+}
diff --git a/net-misc/ndisc6/files/rdnssd.rc-1 b/net-misc/ndisc6/files/rdnssd.rc-1
new file mode 100644
index 000000000000..83aef06a0416
--- /dev/null
+++ b/net-misc/ndisc6/files/rdnssd.rc-1
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	before net
+	use logger
+}
+
+start() {
+	ebegin "Starting rdnssd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/rdnssd -- ${RDNSSD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping rdnssd"
+	start-stop-daemon --stop --quiet --pidfile /var/lib/run/rdnssd.pid
+	if [ -x /sbin/resolvconf ]; then 
+ 		/sbin/resolvconf -f -d rdnssd || true
+ 	fi
+	eend $?
+}
diff --git a/net-misc/ndisc6/files/resolvconf b/net-misc/ndisc6/files/resolvconf
new file mode 100644
index 000000000000..335c6c2707df
--- /dev/null
+++ b/net-misc/ndisc6/files/resolvconf
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -x /sbin/resolvconf ]; then
+	exec /sbin/resolvconf -a rdnssd </var/run/rdnssd/resolv.conf
+else
+	exec "`dirname "$0"`"/merge-hook
+fi
diff --git a/net-misc/ndisc6/files/resolvconf-1 b/net-misc/ndisc6/files/resolvconf-1
new file mode 100644
index 000000000000..c08aa6a3df19
--- /dev/null
+++ b/net-misc/ndisc6/files/resolvconf-1
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -x /sbin/resolvconf ]; then
+	exec /sbin/resolvconf -a rdnssd </var/lib/run/rdnssd/resolv.conf
+else
+	exec "`dirname "$0"`"/merge-hook
+fi
diff --git a/net-misc/ndisc6/metadata.xml b/net-misc/ndisc6/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/net-misc/ndisc6/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/ndisc6/ndisc6-0.9.9-r2.ebuild b/net-misc/ndisc6/ndisc6-0.9.9-r2.ebuild
new file mode 100644
index 000000000000..92de33d50582
--- /dev/null
+++ b/net-misc/ndisc6/ndisc6-0.9.9-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
+HOMEPAGE="http://www.remlab.net/ndisc6/"
+SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-devel/gettext"
+RDEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd || die
+	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
+	exeinto /etc/rdnssd
+	newexe "${FILESDIR}"/resolvconf-1 resolvconf || die
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
diff --git a/net-misc/ndisc6/ndisc6-0.9.9.ebuild b/net-misc/ndisc6/ndisc6-0.9.9.ebuild
new file mode 100644
index 000000000000..a315a2999050
--- /dev/null
+++ b/net-misc/ndisc6/ndisc6-0.9.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
+HOMEPAGE="http://www.remlab.net/ndisc6/"
+SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-devel/gettext"
+RDEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	newinitd "${FILESDIR}"/rdnssd.rc rdnssd || die
+	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
+	exeinto /etc/rdnssd
+	doexe "${FILESDIR}"/resolvconf || die
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
diff --git a/net-misc/ndisc6/ndisc6-1.0.2-r1.ebuild b/net-misc/ndisc6/ndisc6-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..1b789b871e42
--- /dev/null
+++ b/net-misc/ndisc6/ndisc6-1.0.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
+HOMEPAGE="http://www.remlab.net/ndisc6/"
+SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="dev-lang/perl
+	sys-devel/gettext"
+RDEPEND=""
+
+src_configure() {
+	econf $(use_enable debug assert)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd || die
+	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
+	exeinto /etc/rdnssd
+	newexe "${FILESDIR}"/resolvconf-1 resolvconf || die
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
diff --git a/net-misc/ndisc6/ndisc6-1.0.2.ebuild b/net-misc/ndisc6/ndisc6-1.0.2.ebuild
new file mode 100644
index 000000000000..a7716c9b8996
--- /dev/null
+++ b/net-misc/ndisc6/ndisc6-1.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
+HOMEPAGE="http://www.remlab.net/ndisc6/"
+SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-devel/gettext"
+RDEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd || die
+	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
+	exeinto /etc/rdnssd
+	newexe "${FILESDIR}"/resolvconf-1 resolvconf || die
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
new file mode 100644
index 000000000000..1b789b871e42
--- /dev/null
+++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
+HOMEPAGE="http://www.remlab.net/ndisc6/"
+SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="dev-lang/perl
+	sys-devel/gettext"
+RDEPEND=""
+
+src_configure() {
+	econf $(use_enable debug assert)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd || die
+	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
+	exeinto /etc/rdnssd
+	newexe "${FILESDIR}"/resolvconf-1 resolvconf || die
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
diff --git a/net-misc/ndppd/Manifest b/net-misc/ndppd/Manifest
new file mode 100644
index 000000000000..e3be71023d73
--- /dev/null
+++ b/net-misc/ndppd/Manifest
@@ -0,0 +1,6 @@
+AUX ndppd.initd 323 SHA256 08e3d21ae7ddf658b28bbad5a4a9ca4b6cb842e5505089e6f5e479b6cd0092aa SHA512 4fe6632c70a02bed919391ac0dffb7d2b013a387055c8b4e5bb5f93d99e69e20f1ecf26cd7f6c59c01c14d28eec0df8ee6d1e8bad6bb227644d6ce94a1132b3e WHIRLPOOL 0f528c4c0260f9936fb17ecf716082f56024ef7118bba30594820515013b87260667666834b5aaec466c3e7fdbe93e32dc35c7a6475ce3ebe3e1f734802f5f6d
+DIST ndppd-0.2.5.tar.gz 31820 SHA256 ee934167f8357f0bd0015e201a77fbe4d028c59e89dc98113805c6855e1c3992 SHA512 85534594689c38c0203ad5e7c0c6373a705cbd7da7e2b0519689853a003be2fd7c953aa73529ca52d8c88bf0ce98524e39c475ea992669278090cde4a0e4ba2b WHIRLPOOL 0722c127b883c61fa45c54694665d070aec04257cc5d6514db36682f5b6a624d42ab9e9377b0eb2822d2ef690607cf5bfc332bd33d25992ece723642f2ceb7c3
+EBUILD ndppd-0.2.5.ebuild 554 SHA256 143b2a6833a6858f55fcc1837642dfb40797136a9cff157ae30ce6e05e17ab83 SHA512 e1ddff3bad5e4deb157547d20063071ce4f45bd3040645b5d2c676576d06f22e612a91e890ae4a658be82a8aa0c76c5622a9e8fe453d831b8210f51811b13d79 WHIRLPOOL b33328c43ca2a161501dde1c6d2061041bd4dc78953962871d9841b01243a2a12b9b3dc85c407887e40734f1b59dedff48998f2d5a6189640f09ed5247f3d436
+MISC ChangeLog 2638 SHA256 1b9bae8a2f6c121a4ccbcd7f8a97b06d570572f5d5a724df98b38b3c0b836e59 SHA512 d639e6391369ac048f5be28d46e4a9f4be0739a231d41dc5f4dde4dae2933f29e9fb0750c0d68525dce3d6fcb376b81359adaef5406bde91df90824a1af9ef71 WHIRLPOOL 3449ea4ee0e13d4b68537f2363f8a311cdf70a6092dd9b997a336bcc6b443329a130ed04240942993bde252ecc0e9e288de1f2c4025c939933eb8090230470f2
+MISC ChangeLog-2015 474 SHA256 177b4d1033b6838105eb9b5008312432dd6e47fe8021f3781d8a6a2ed1db06ee SHA512 ccb6a8add53cae5039f6f5b932d1140978b32b69d6b556b6e56c4736ead3debe5ec43b95b94009cccbe7fdad3c3c5abd0c6228be67e3a2af60a9fe297322a6be WHIRLPOOL f0f0daa5884256bed86bfd1f013519673796431151a775f51fede07010e66c93741e9ece739191e2ca30813d78b6e05b7f7951e3641780988f33b4603cee3e47
+MISC metadata.xml 505 SHA256 5583142df140f160a8266a68bfbbbdd5c17b208c3fc9816b6ff9ad32b4410f40 SHA512 53079b420f53630dcc1f03704025d56244b04b77b7f25e10857bb97063febaa4a60d488b777a57d91f01e9673c437bced067078f8f23bd532d7f106ccf92a6d4 WHIRLPOOL 23d0d15a02b49c74bd28f182cf21a29dbba584cf04e484b455a2b0ab9f9ec4f27fd47baffac4dd9f89ba650772274c7ad18aab0ce1d6f601b20f72a2e99069dc
diff --git a/net-misc/ndppd/files/ndppd.initd b/net-misc/ndppd/files/ndppd.initd
new file mode 100644
index 000000000000..ba99a1926556
--- /dev/null
+++ b/net-misc/ndppd/files/ndppd.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/ndppd"
+pidfile="/var/run/ndppd.pid"
+command_args="-p $pidfile -d"
+start_stop_daemon_args="--quiet"
+description="Proxies NDP messages between interfaces."
+
+depend() {
+	use net
+}
diff --git a/net-misc/ndppd/metadata.xml b/net-misc/ndppd/metadata.xml
new file mode 100644
index 000000000000..83f8029f254b
--- /dev/null
+++ b/net-misc/ndppd/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zx2c4@gentoo.org</email>
+    <name>Jason A. Donenfeld</name>
+  </maintainer>
+  <longdescription>
+		ndppd, or NDP Proxy Daemon, is a daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">DanielAdolfsson/ndppd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/ndppd/ndppd-0.2.5.ebuild b/net-misc/ndppd/ndppd-0.2.5.ebuild
new file mode 100644
index 000000000000..22897aa596c4
--- /dev/null
+++ b/net-misc/ndppd/ndppd-0.2.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Proxies NDP messages between interfaces"
+HOMEPAGE="https://github.com/DanielAdolfsson/ndppd"
+SRC_URI="https://github.com/DanielAdolfsson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install()
+{
+	emake PREFIX=/usr DESTDIR="${D}" install
+	insinto /etc
+	newins ndppd.conf-dist ndppd.conf
+	newinitd "${FILESDIR}"/ndppd.initd ndppd
+}
diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
new file mode 100644
index 000000000000..c21a998e521e
--- /dev/null
+++ b/net-misc/nemesis/Manifest
@@ -0,0 +1,10 @@
+AUX 1.4-libnet-1.0.patch 6278 SHA256 1e79c8c0a9d848a657c2e14d062f7c6d0a51fe66a7c9d56266dd65952acfdafc SHA512 c584afc645e64ac0f09907ba50a60b8ab10d1aad93749eda277dfdf645267a3b16a0617ca4b7812c8a1828f48170c0b7aa5f6077e537bb539e1fe8294efec6d2 WHIRLPOOL f7434c880efa2a040884cd68d5ae8296442c390f775539eb3a05380374629b23d0af2ed05df41b4f97b93699dab06e6e2441aa74f2d26028608c0f37ab885d44
+AUX nemesis-1.4-fileio.patch 1064 SHA256 76dd3b28ea2f67f93baa89ad466555971641ace6e3ff0a1a06927977270e83a3 SHA512 d50107668e19f7fb9cd27bbdd97c24cb594dd6bc7a82ebb6fc6c6a0ef9e344c9c9c0dc5f18bae5e97714ce8544b81f910ea469e4985137d3b1934745845cec95 WHIRLPOOL b845268655d5cf9c6e0ca18f395303d476a31dc163bf5cb346cc26db7616ad7394f2c8d8d5f0bcbf44caa45d4fb2fbb16c0261fe921748049a44839140fd4dc8
+AUX nemesis-1.4-libnet-1.0.patch 6278 SHA256 1e79c8c0a9d848a657c2e14d062f7c6d0a51fe66a7c9d56266dd65952acfdafc SHA512 c584afc645e64ac0f09907ba50a60b8ab10d1aad93749eda277dfdf645267a3b16a0617ca4b7812c8a1828f48170c0b7aa5f6077e537bb539e1fe8294efec6d2 WHIRLPOOL f7434c880efa2a040884cd68d5ae8296442c390f775539eb3a05380374629b23d0af2ed05df41b4f97b93699dab06e6e2441aa74f2d26028608c0f37ab885d44
+AUX nemesis-1.4-prototcp.patch 1376 SHA256 c7a2c97b25639574ba8e81fd70847ba5c7a741f37e6ea72a8683126833046d74 SHA512 2c502eb3a3caa3a1cd849827d43d247102d63cd574dcf142ef4b10e53c22b4b64f8016a4763cd57d2acef995354aeeef78294b97b2637f8454fd107b214efacd WHIRLPOOL 063faa66ed8c3c3c1036570e2c66787c288f2f3a765b6cec3c835c4555d435fe3c2a615166817671ae976e763cdec0b75482171a0491919f462b0f17f985e556
+DIST nemesis-1.4.tar.gz 144187 SHA256 803f5cf5c7c4af15128b8cd7f7610730cbed1427f062a31c2f5255790fb1bab4 SHA512 a8d4b434a9b0287e704ab923900c43051dc3aac4a7063e702aa93d7c89cfdeac287a6f40138bdca140e2c889e024f885288c4953940104ac12631cf7394501c8 WHIRLPOOL 9aff914eceed0a8db1c662f88ea2565d7bd56ad25d92cf15b6ee97e5567d6a535bbed72274fcdfea76171b2e3ba79388b2bfbba210f03ee6a1b8c43a701c4083
+EBUILD nemesis-1.4-r1.ebuild 620 SHA256 5e503b6acf90d06ed644088e0b47a893c57c1b3de7ebc020b2e0a64a0b3ac7ea SHA512 228079a6233df981052fc0118ddb65745989e91aee9712befd607352644e2ac30d3272486e3c6c07f05f084ca82b4801d2e576323d7c0a20353ce006598ea97b WHIRLPOOL 57a910cddb3f082b0ae9d103656b4e0b93a202375bef647057486620204e448c8b27ae549618812ea7cf83dc15a2c795ce6c48b75ef0861a9e9495f914e7859a
+EBUILD nemesis-1.4.ebuild 633 SHA256 04534490e43def79a72edb8f8d41bedd8bb61ddb40bdbd62b4f3f331d18caa94 SHA512 f9f037590bd629674944cbb9d5b1c9b064f28148e40815d6201e7fa4d033e91ed957ddb93777a865487c64bf78036222102f4dd6ae42399080d86527ef679697 WHIRLPOOL 78cb400ae9af36360ed6f620cf07cf657e44ba11565e17aeb5d34e9aaf4d7445c4ce9d914146a611896c5351d869e679484286eb6477acabb34985a715be9dd7
+MISC ChangeLog 2652 SHA256 8a2b3530bcbe803a91d66ab2ebfb5aba94aeed12748708e9202a49f612a1846e SHA512 ea1ad757263d98bb9e80519204e78ddbaca52f38e531cdae296bc8cf53ee9b0af7078ae867d3ed80e48627474e2d0e51f59401c389ea235e513f7b4ba80ea667 WHIRLPOOL 688a596d3d54729fa1f524e0f0277c3676039e6c47b1f74d65e7697e0c03ce026425cd32e957d383f0a61759a12d1326afeaef3032962fb529d43972cc002ab9
+MISC ChangeLog-2015 2747 SHA256 8dbb96a50d9d7c6f173e8a4e63f7bf98c1a290c4ce40faef102576735a05f3b5 SHA512 4d02ad55e64ecb47c13050c02d0d1bceba34dc552e8aac9006ff558ce42405fc3890d77c353e98740e5b9368ff78bfc20274ede8ee1f6f2e7f34a485a1a11571 WHIRLPOOL 5fb61ffcdf6170379cc4350bd1e299a6c96bbeb3ab03b35348a27d01a63130775d0703b3c2842d30ebc67e23026d52ae587d7efe7bd24fc8c9fce7b102c292dd
+MISC metadata.xml 431 SHA256 b87162c785063b463f76649e9cbf6db85cec3af56fd9a2ac69573e2fcd450d58 SHA512 5dd7f62f672d2c31476bbece365b05f84e3a4bf913b1bbf4ad2cc5b374284025a8f679400cbb705fa3389bac636ff097b1c232929bef03ed3659b1025d8aae47 WHIRLPOOL e7056b8985b057b6704ad6d6d279fb2693887ebab37e7dc7b785998a7303e366ae6499774787921d7f82bc74784a6dbfde933406c5b95bf4442f235adf3593e3
diff --git a/net-misc/nemesis/files/1.4-libnet-1.0.patch b/net-misc/nemesis/files/1.4-libnet-1.0.patch
new file mode 100644
index 000000000000..b4c55c374efa
--- /dev/null
+++ b/net-misc/nemesis/files/1.4-libnet-1.0.patch
@@ -0,0 +1,127 @@
+--- nemesis-1.4.orig/configure	2006-12-15 13:56:46.000000000 -0700
++++ nemesis-1.4/configure	2006-12-15 14:17:33.000000000 -0700
+@@ -4150 +4150 @@
+-CPPFLAGS="${CPPFLAGS} `libnet-config --defines`"
++CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --defines`"
+@@ -4153 +4153 @@
+-if test `libnet-config --cflags | wc -c` = "1"; then
++if test `libnet-1.0-config --cflags | wc -c` = "1"; then
+@@ -4157 +4157 @@
+-    CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`"
++    CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --cflags`"
+@@ -4160,3 +4160,3 @@
+-if test `libnet-config --libs | wc -c` = "1"; then
+-    { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system.  If you" >&5
+-echo "$as_me: WARNING: libnet-config --libs is broken on your system.  If you" >&2;}
++if test `libnet-1.0-config --libs | wc -c` = "1"; then
++    { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&5
++echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&2;}
+@@ -4167 +4167 @@
+-    LIBS="${LIBS} `libnet-config --libs | sed s/\-lnet//`"
++    LIBS="${LIBS} `libnet-1.0-config --libs | sed s/\-lnet-1.0//`"
+@@ -4712,2 +4712,2 @@
+-echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5
+-echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5
++echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6
+@@ -4718 +4718 @@
+-LIBS="-lnet  $LIBS"
++LIBS="-lnet-1.0  $LIBS"
+@@ -4781 +4781 @@
+-  LIBS="-lnet $LIBS"
++  LIBS="-lnet-1.0 $LIBS"
+@@ -5263 +5263 @@
+-for ac_header in libnet.h
++for ac_header in libnet-1.0.h
+@@ -5433 +5433 @@
+-    libnet_dir=`libnet-config --cflags | cut -dI -f2`
++    libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
+@@ -5438 +5438 @@
+-    if test -r $i/libnet.h; then
++    if test -r $i/libnet-1.0.h; then
+@@ -5444 +5444 @@
+-    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
++    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
+@@ -5455 +5455 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+@@ -5474 +5474 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-arp.h nemesis-1.4beta3/src/nemesis-arp.h
+--- nemesis-1.4beta3.orig/src/nemesis-arp.h	2003-08-19 15:45:45.675664688 -0400
++++ nemesis-1.4beta3/src/nemesis-arp.h	2003-08-19 15:47:07.631205552 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-dns.h nemesis-1.4beta3/src/nemesis-dns.h
+--- nemesis-1.4beta3.orig/src/nemesis-dns.h	2003-08-19 15:45:45.675664688 -0400
++++ nemesis-1.4beta3/src/nemesis-dns.h	2003-08-19 15:47:07.638204488 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ethernet.h nemesis-1.4beta3/src/nemesis-ethernet.h
+--- nemesis-1.4beta3.orig/src/nemesis-ethernet.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-ethernet.h	2003-08-19 15:47:07.641204032 -0400
+@@ -29 +29 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-functions.c nemesis-1.4beta3/src/nemesis-functions.c
+--- nemesis-1.4beta3.orig/src/nemesis-functions.c	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-functions.c	2003-08-19 15:47:07.656201752 -0400
+@@ -37 +37 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-icmp.h nemesis-1.4beta3/src/nemesis-icmp.h
+--- nemesis-1.4beta3.orig/src/nemesis-icmp.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-icmp.h	2003-08-19 15:47:07.665200384 -0400
+@@ -31 +31 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-igmp.h nemesis-1.4beta3/src/nemesis-igmp.h
+--- nemesis-1.4beta3.orig/src/nemesis-igmp.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-igmp.h	2003-08-19 15:47:07.670199624 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ip.h nemesis-1.4beta3/src/nemesis-ip.h
+--- nemesis-1.4beta3.orig/src/nemesis-ip.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-ip.h	2003-08-19 15:47:07.677198560 -0400
+@@ -26 +26 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ospf.h nemesis-1.4beta3/src/nemesis-ospf.h
+--- nemesis-1.4beta3.orig/src/nemesis-ospf.h	2003-08-19 15:45:45.677664384 -0400
++++ nemesis-1.4beta3/src/nemesis-ospf.h	2003-08-19 15:47:07.684197496 -0400
+@@ -33 +33 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-rip.h nemesis-1.4beta3/src/nemesis-rip.h
+--- nemesis-1.4beta3.orig/src/nemesis-rip.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis-rip.h	2003-08-19 15:47:07.717192480 -0400
+@@ -33 +33 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-tcp.h nemesis-1.4beta3/src/nemesis-tcp.h
+--- nemesis-1.4beta3.orig/src/nemesis-tcp.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis-tcp.h	2003-08-19 15:47:07.723191568 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-udp.h nemesis-1.4beta3/src/nemesis-udp.h
+--- nemesis-1.4beta3.orig/src/nemesis-udp.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis-udp.h	2003-08-19 15:47:07.728190808 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis.h nemesis-1.4beta3/src/nemesis.h
+--- nemesis-1.4beta3.orig/src/nemesis.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis.h	2003-08-19 15:47:07.731190352 -0400
+@@ -15 +15 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- nemesis-1.4.orig/src/nemesis-printout.c	2006-12-15 13:56:46.000000000 -0700
++++ nemesis-1.4/src/nemesis-printout.c	2006-12-15 14:47:14.000000000 -0700
+@@ -34 +34 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
diff --git a/net-misc/nemesis/files/nemesis-1.4-fileio.patch b/net-misc/nemesis/files/nemesis-1.4-fileio.patch
new file mode 100644
index 000000000000..07c96bc17a74
--- /dev/null
+++ b/net-misc/nemesis/files/nemesis-1.4-fileio.patch
@@ -0,0 +1,37 @@
+--- nemesis-1.4-orig/source/src/nemesis-fileio.c	Fri Oct 31 16:29:36 2003
++++ nemesis-1.4/source/src/nemesis-fileio.c	Fri May 19 17:31:13 2006
+@@ -63,7 +63,7 @@
+         fp = stdin;
+         fd = fileno(fp);
+     }
+-    else if ((fd = open(file, O_RDONLY)) < 0)
++    else if ((fp = fopen(file, "rb")) < 0)
+     {
+ #if !defined(WIN32)
+         fprintf(stderr, "ERROR: Unable to open %s file: %s. %s\n",
+@@ -82,8 +82,12 @@
+         return -1;
+     }
+ 
++#ifdef DEBUG
++    printf("DEBUG: trying to read max %u bytes from %s\n", maxsize, file);
++#endif
++
+     /* read() can return negative values on successful reads, test for -1 */
+-    if ((bytesread = read(fd, (void *)memory, maxsize)) == -1)
++    if ((bytesread = fread((void *)memory, 1, maxsize, fp)) == -1)
+     {
+ #if !defined(WIN32)
+         fprintf(stderr, "ERROR: Unable to read %s file: %s. %s\n",
+@@ -106,6 +110,11 @@
+         if (strncmp(file, "-", 1))
+             close(fd);
+     }
++
++#ifdef DEBUG
++    printf("DEBUG: bytes read from %s: %u.\n", file, bytesread);
++#endif
++
+     return bytesread;
+ }
+ 
diff --git a/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch b/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch
new file mode 100644
index 000000000000..b4c55c374efa
--- /dev/null
+++ b/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch
@@ -0,0 +1,127 @@
+--- nemesis-1.4.orig/configure	2006-12-15 13:56:46.000000000 -0700
++++ nemesis-1.4/configure	2006-12-15 14:17:33.000000000 -0700
+@@ -4150 +4150 @@
+-CPPFLAGS="${CPPFLAGS} `libnet-config --defines`"
++CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --defines`"
+@@ -4153 +4153 @@
+-if test `libnet-config --cflags | wc -c` = "1"; then
++if test `libnet-1.0-config --cflags | wc -c` = "1"; then
+@@ -4157 +4157 @@
+-    CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`"
++    CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --cflags`"
+@@ -4160,3 +4160,3 @@
+-if test `libnet-config --libs | wc -c` = "1"; then
+-    { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system.  If you" >&5
+-echo "$as_me: WARNING: libnet-config --libs is broken on your system.  If you" >&2;}
++if test `libnet-1.0-config --libs | wc -c` = "1"; then
++    { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&5
++echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&2;}
+@@ -4167 +4167 @@
+-    LIBS="${LIBS} `libnet-config --libs | sed s/\-lnet//`"
++    LIBS="${LIBS} `libnet-1.0-config --libs | sed s/\-lnet-1.0//`"
+@@ -4712,2 +4712,2 @@
+-echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5
+-echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5
++echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6
+@@ -4718 +4718 @@
+-LIBS="-lnet  $LIBS"
++LIBS="-lnet-1.0  $LIBS"
+@@ -4781 +4781 @@
+-  LIBS="-lnet $LIBS"
++  LIBS="-lnet-1.0 $LIBS"
+@@ -5263 +5263 @@
+-for ac_header in libnet.h
++for ac_header in libnet-1.0.h
+@@ -5433 +5433 @@
+-    libnet_dir=`libnet-config --cflags | cut -dI -f2`
++    libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
+@@ -5438 +5438 @@
+-    if test -r $i/libnet.h; then
++    if test -r $i/libnet-1.0.h; then
+@@ -5444 +5444 @@
+-    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
++    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
+@@ -5455 +5455 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+@@ -5474 +5474 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-arp.h nemesis-1.4beta3/src/nemesis-arp.h
+--- nemesis-1.4beta3.orig/src/nemesis-arp.h	2003-08-19 15:45:45.675664688 -0400
++++ nemesis-1.4beta3/src/nemesis-arp.h	2003-08-19 15:47:07.631205552 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-dns.h nemesis-1.4beta3/src/nemesis-dns.h
+--- nemesis-1.4beta3.orig/src/nemesis-dns.h	2003-08-19 15:45:45.675664688 -0400
++++ nemesis-1.4beta3/src/nemesis-dns.h	2003-08-19 15:47:07.638204488 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ethernet.h nemesis-1.4beta3/src/nemesis-ethernet.h
+--- nemesis-1.4beta3.orig/src/nemesis-ethernet.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-ethernet.h	2003-08-19 15:47:07.641204032 -0400
+@@ -29 +29 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-functions.c nemesis-1.4beta3/src/nemesis-functions.c
+--- nemesis-1.4beta3.orig/src/nemesis-functions.c	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-functions.c	2003-08-19 15:47:07.656201752 -0400
+@@ -37 +37 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-icmp.h nemesis-1.4beta3/src/nemesis-icmp.h
+--- nemesis-1.4beta3.orig/src/nemesis-icmp.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-icmp.h	2003-08-19 15:47:07.665200384 -0400
+@@ -31 +31 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-igmp.h nemesis-1.4beta3/src/nemesis-igmp.h
+--- nemesis-1.4beta3.orig/src/nemesis-igmp.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-igmp.h	2003-08-19 15:47:07.670199624 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ip.h nemesis-1.4beta3/src/nemesis-ip.h
+--- nemesis-1.4beta3.orig/src/nemesis-ip.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-ip.h	2003-08-19 15:47:07.677198560 -0400
+@@ -26 +26 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ospf.h nemesis-1.4beta3/src/nemesis-ospf.h
+--- nemesis-1.4beta3.orig/src/nemesis-ospf.h	2003-08-19 15:45:45.677664384 -0400
++++ nemesis-1.4beta3/src/nemesis-ospf.h	2003-08-19 15:47:07.684197496 -0400
+@@ -33 +33 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-rip.h nemesis-1.4beta3/src/nemesis-rip.h
+--- nemesis-1.4beta3.orig/src/nemesis-rip.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis-rip.h	2003-08-19 15:47:07.717192480 -0400
+@@ -33 +33 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-tcp.h nemesis-1.4beta3/src/nemesis-tcp.h
+--- nemesis-1.4beta3.orig/src/nemesis-tcp.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis-tcp.h	2003-08-19 15:47:07.723191568 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-udp.h nemesis-1.4beta3/src/nemesis-udp.h
+--- nemesis-1.4beta3.orig/src/nemesis-udp.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis-udp.h	2003-08-19 15:47:07.728190808 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis.h nemesis-1.4beta3/src/nemesis.h
+--- nemesis-1.4beta3.orig/src/nemesis.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis.h	2003-08-19 15:47:07.731190352 -0400
+@@ -15 +15 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- nemesis-1.4.orig/src/nemesis-printout.c	2006-12-15 13:56:46.000000000 -0700
++++ nemesis-1.4/src/nemesis-printout.c	2006-12-15 14:47:14.000000000 -0700
+@@ -34 +34 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
diff --git a/net-misc/nemesis/files/nemesis-1.4-prototcp.patch b/net-misc/nemesis/files/nemesis-1.4-prototcp.patch
new file mode 100644
index 000000000000..0e75a2e43c39
--- /dev/null
+++ b/net-misc/nemesis/files/nemesis-1.4-prototcp.patch
@@ -0,0 +1,33 @@
+--- nemesis-1.4-orig/source/src/nemesis-proto_tcp.c	Fri Oct 31 16:29:38 2003
++++ nemesis-1.4/source/src/nemesis-proto_tcp.c	Fri May 19 17:31:13 2006
+@@ -16,7 +16,7 @@
+         FileData *ipod, FileData *tcpod, char *device)
+ {
+    int n;
+-   u_int32_t tcp_packetlen = 0, tcp_meta_packetlen = 0;
++   u_int32_t tcp_packetlen = 0, tcp_meta_packetlen = 0, tcp_headerlen = 0, ip_headerlen = 0;
+    static u_int8_t *pkt;
+    static int sockfd = -1;
+    struct libnet_link_int *l2 = NULL;
+@@ -58,13 +58,20 @@
+ #endif
+     }
+ 
++    ip_headerlen = LIBNET_IP_H + ipod->file_s;
++    tcp_headerlen = LIBNET_TCP_H + tcpod->file_s;
++
+     tcp_packetlen = link_offset + LIBNET_IP_H + LIBNET_TCP_H + pd->file_s + 
+             ipod->file_s + tcpod->file_s;
+ 
+-    tcp_meta_packetlen = tcp_packetlen - (link_offset + LIBNET_IP_H);
++    tcp_meta_packetlen = LIBNET_TCP_H + pd->file_s;
+ 
+ #ifdef DEBUG
++    printf("DEBUG: link offsetlength %u.\n", link_offset);
++    printf("DEBUG: IP header  length %u.\n", ip_headerlen);
++    printf("DEBUG: TCP header length %u.\n", tcp_headerlen);
+     printf("DEBUG: TCP packet length %u.\n", tcp_packetlen);
++    printf("DEBUG: TCP meta   length %u.\n", tcp_meta_packetlen);
+     printf("DEBUG: IP  options size  %u.\n", ipod->file_s);
+     printf("DEBUG: TCP options size  %u.\n", tcpod->file_s);
+     printf("DEBUG: TCP payload size  %u.\n", pd->file_s);
diff --git a/net-misc/nemesis/metadata.xml b/net-misc/nemesis/metadata.xml
new file mode 100644
index 000000000000..d0f86294cbe0
--- /dev/null
+++ b/net-misc/nemesis/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rainbow@irh.it</email>
+		<name>rainbow</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">nemesis</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/nemesis/nemesis-1.4-r1.ebuild b/net-misc/nemesis/nemesis-1.4-r1.ebuild
new file mode 100644
index 000000000000..37cd943d341e
--- /dev/null
+++ b/net-misc/nemesis/nemesis-1.4-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux"
+HOMEPAGE="http://nemesis.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	=net-libs/libnet-1.0*"
+
+DOCS="CREDITS ChangeLog README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fileio.patch
+	epatch "${FILESDIR}"/${P}-libnet-1.0.patch
+	epatch "${FILESDIR}"/${P}-prototcp.patch
+}
diff --git a/net-misc/nemesis/nemesis-1.4.ebuild b/net-misc/nemesis/nemesis-1.4.ebuild
new file mode 100644
index 000000000000..28a43fa57943
--- /dev/null
+++ b/net-misc/nemesis/nemesis-1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux"
+HOMEPAGE="http://nemesis.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nemesis/${P/_}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 sparc x86"
+IUSE=""
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	=net-libs/libnet-1.0*"
+
+S=${WORKDIR}/${P/_}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-libnet-1.0.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc CREDITS ChangeLog INSTALL README
+}
diff --git a/net-misc/netctl/Manifest b/net-misc/netctl/Manifest
new file mode 100644
index 000000000000..6c393d78e19b
--- /dev/null
+++ b/net-misc/netctl/Manifest
@@ -0,0 +1,10 @@
+DIST netctl-1.10.tar.xz 43576 SHA256 106cc09f810b7922be8c117129ee739fcd3270c20ee57eb807410158cc560b03 SHA512 f42b6f5abf4115d745bac73af68562a2c3974347051699cab66cb0e1f7254e52492ddeda51c338498f7f6479226bf4c6e9f46d2c3a8b1f3594244dd9e10dddd9 WHIRLPOOL b7303273d1250de5dd2d85c988a21a427bfb13470096b29963993aee1dd82efc0444c8f953dfd308cddd42b02a5238ffce35c823e3c8774e0d54c515a5aa34ca
+DIST netctl-1.11.tar.xz 43868 SHA256 e154fd8e5dd0057ce2ec542d4dbbb895ff03bb8b3df276a27f4a5ab511d33477 SHA512 00bf4b016d755796980d492305332230a2089e843bf0921a7fd28ef17400e024bac0987a08c4caadf1c19becae73ce7f33d1e51ce1ea9f47e0129e1aff1ccd71 WHIRLPOOL 156e8a26890fc682137ca2cfe5dfb8aeb5e034688c21be2be739e5606ccb9664a27ab4df65f029a4e33a81cf7efcf459fc443e3a309412fb07aaf5cabf44a2ca
+DIST netctl-1.9.tar.xz 43256 SHA256 86040e40d28b1f6e12b8a34daa3bc107ef94005d5e0bff9c43ed8e22f7cb4181 SHA512 586cf8389d33c130d2cb94fa35479436a6dba70ff05bc7b59d2c3148760ddb3030f00d06bdb8c09cb6bac4fc0d94a4f3a3ced7d3b30973e58323af1676ef6f42 WHIRLPOOL dbff6d0d8c7389a5ec4da6555fbc8bec3f63a5498049e77148aae8b54d97f0820eada8e3e0458ddd06572d1aafb1cb3378579e4f11aa7433cb86ff6710a6c06e
+EBUILD netctl-1.10.ebuild 1724 SHA256 deee5043aa94dd355dbf02f3e9ec5d02fc4cb7572ed87e3fbe538e370044eb4f SHA512 ce0fc0548a06341428b6d01f071dc0e4f1dfae06b141d508382df8a742c9d3462b48984d529da9b3e4d50f9dbc22fef656969b3e4f947cc3288cff0450b8c9c6 WHIRLPOOL 9d0eede6d921cb5798eaa23cdc17e30f16de6402157f3102badfee941ac5fb098e92d8ac8a1c0085071f19dfab14f0c7f25e732b59e7ed92a34967b251fd964c
+EBUILD netctl-1.11.ebuild 1684 SHA256 8b39189461ea0dca316a1d05ce08c7bb057f26a22b0a790b6d3ae342a8385cd6 SHA512 9ca531641c48a8d0c3829433dc9c363dc06ea8135dd508c820c617d9b129278d10a3eecaf6cca31d22657e7f01f2541d53c3f6e604d4c0f4b936d95ed6d10931 WHIRLPOOL 2f95e6945edd69b57305a0b69892d001bf1952ae1a541b3def5b094dc9daa01a7f2fb6054b2aa1401cd3ce9ef22efad818ebec0a4c94de14967e86f27d459756
+EBUILD netctl-1.9.ebuild 1722 SHA256 9562c34ba789bdbf3777a34ea69cde3bd1aea4f48649e3c3e43f0fb44186a2fe SHA512 320d76469bf2534b1d137664ca20a8cedd20d4e2b26c22d1bb32abc8f899a6a027de74b5c19a29717aacdf8d475fc979c54c989ccba835e168eae4adc994b46f WHIRLPOOL 7bffefb8f71cbf6cd7f083bb6adb4d5bf3dceb1759874e9f98125a1711ec38a34515b33c57c748e236bdcd3856122ff2d96f778ff62681496df7206ee6168ba3
+EBUILD netctl-9999.ebuild 1679 SHA256 d110d22064c508e7ac1ee18cf9f52409ef909c4e8de1a7eb22a46713d1d4d827 SHA512 6991ea6d2a2fa753f97763b552b2defcd4400f8cb5bc6acea4657a95c17facd686f338a96f0f241ffe257bc8fc813dbb0fd357efbb2352784640bd5a8be91be1 WHIRLPOOL c1dcb2b413cb7daf4983b556595b9224fd68e09dd5b1ba942aa2e260578076dc2169a2124dc9ff944c9070460b211b34850140c067c88258719ce248a956474d
+MISC ChangeLog 2869 SHA256 f77702064380612ea6e4f20ee721fc384bc22af1d2783f17defe285a193d9b22 SHA512 32b8c8514c323a8ec56b79e2f3baa3e1feda810b3eef0fc02513a02e96816d2fb216e8e32f254cd05f66df0df468d712f6c8f92b42d76e8e212d0a6cbe801e53 WHIRLPOOL 019411c63f66573f5ce2394d80033ef56750a0bcf31e60a10d768297a53dfbbecf60d7e1ba5e12d3389be357610ae5a7f32a60873b456d80353a03a5ba156ac2
+MISC ChangeLog-2015 4159 SHA256 d449b35f2d8a14d9ee651f504a1dccbfeeee244ce5ca10f49bf5d050d2517924 SHA512 9db567e0ec9dca9847a970d6341cbb982efa41033af86aa5a811c1bf0d21ce51a67b4fbf763910c88958ce3d558c9e49d20a4e1b5cf18ec36e21d8edfa9fe28a WHIRLPOOL d716e7349ea824aa061a7786dbc70350c4364355472ff5ced466099ecf9944ca83f53f43a8077341dec54fd83e5c97a5489d1651ef109a57f100b0e46f34631a
+MISC metadata.xml 250 SHA256 82cd10ed821923440ecabf6b334bbda3beae48195f3b738d806468d411d5df2a SHA512 c1832990e49282daac7d60cef0249c7b287d4957dc820079efacf988ffee53463ec5a63fc0dd5551793808793fe14c5e5cfd4cd75701eb07dacae7c414a4a2c3 WHIRLPOOL fc01b2cdb412af371d16e9a99692a86cccea2f43f1182f5a92e74b39bbbc33a44473519a63ed6d2287c58207103536d755c4f2bbdb36d2dc665a71de3f3e23ba
diff --git a/net-misc/netctl/metadata.xml b/net-misc/netctl/metadata.xml
new file mode 100644
index 000000000000..18e140956483
--- /dev/null
+++ b/net-misc/netctl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/netctl/netctl-1.10.ebuild b/net-misc/netctl/netctl-1.10.ebuild
new file mode 100644
index 000000000000..7e5e03490612
--- /dev/null
+++ b/net-misc/netctl/netctl-1.10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://projects.archlinux.org/netctl.git"
+	inherit git-2
+	DEPEND="app-text/asciidoc"
+else
+	SRC_URI="https://sources.archlinux.org/other/packages/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Profile based network connection tool from Arch Linux"
+HOMEPAGE="https://wiki.archlinux.org/index.php/Netctl
+	https://www.archlinux.org/packages/core/any/netctl/
+	https://projects.archlinux.org/netctl.git/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/pkgconfig
+	sys-apps/systemd
+"
+RDEPEND="
+	>=app-shells/bash-4.0
+	>=net-dns/openresolv-3.5.4-r1
+	sys-apps/iproute2
+	sys-apps/systemd
+	!<net-misc/dhcpcd-6.4.0
+"
+
+src_prepare() {
+	sed -i -e "s:/usr/bin/ifplugd:/usr/sbin/ifplugd:" \
+		"services/netctl-ifplugd@.service" || die
+}
+
+src_compile() {
+	return 0
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" SHELL=bash install
+	dodoc AUTHORS NEWS README
+	newbashcomp contrib/bash-completion netctl
+	bashcomp_alias netctl netctl-auto wifi-menu
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh-completion _netctl
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To get additional features, a number of optional runtime dependencies may be"
+		elog "installed."
+		optfeature "DHCP support" net-misc/dhcpcd ">=net-misc/dhcp-5.6.7[client]"
+		optfeature "WPA support" net-wireless/wpa_supplicant
+		optfeature "interactive assistant" dev-util/dialog
+		optfeature "automatic connection" sys-apps/ifplugd
+		optfeature "bonding support" net-misc/ifenslave
+		optfeature "dialup support" net-dialup/ppp
+	fi
+}
diff --git a/net-misc/netctl/netctl-1.11.ebuild b/net-misc/netctl/netctl-1.11.ebuild
new file mode 100644
index 000000000000..de213cc97dfb
--- /dev/null
+++ b/net-misc/netctl/netctl-1.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://projects.archlinux.org/netctl.git"
+	inherit git-2
+	DEPEND="app-text/asciidoc"
+else
+	SRC_URI="https://sources.archlinux.org/other/packages/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Profile based network connection tool from Arch Linux"
+HOMEPAGE="https://wiki.archlinux.org/index.php/Netctl
+	https://www.archlinux.org/packages/core/any/netctl/
+	https://projects.archlinux.org/netctl.git/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/pkgconfig
+	sys-apps/systemd
+"
+RDEPEND="
+	>=app-shells/bash-4.0
+	>=net-dns/openresolv-3.5.4-r1
+	sys-apps/iproute2
+	sys-apps/systemd
+	!<net-misc/dhcpcd-6.4.0
+"
+
+src_prepare() {
+	sed -i -e "s:/usr/bin/ifplugd:/usr/sbin/ifplugd:" \
+		"services/netctl-ifplugd@.service" || die
+}
+
+src_compile() {
+	return 0
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" SHELL=bash install
+	dodoc AUTHORS NEWS README
+	newbashcomp contrib/bash-completion netctl
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh-completion _netctl
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To get additional features, a number of optional runtime dependencies may be"
+		elog "installed."
+		optfeature "DHCP support" net-misc/dhcpcd ">=net-misc/dhcp-5.6.7[client]"
+		optfeature "WPA support" net-wireless/wpa_supplicant
+		optfeature "interactive assistant" dev-util/dialog
+		optfeature "automatic connection" sys-apps/ifplugd
+		optfeature "bonding support" net-misc/ifenslave
+		optfeature "dialup support" net-dialup/ppp
+	fi
+}
diff --git a/net-misc/netctl/netctl-1.9.ebuild b/net-misc/netctl/netctl-1.9.ebuild
new file mode 100644
index 000000000000..bc3b83141261
--- /dev/null
+++ b/net-misc/netctl/netctl-1.9.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://projects.archlinux.org/netctl.git"
+	inherit git-2
+	DEPEND="app-text/asciidoc"
+else
+	SRC_URI="https://sources.archlinux.org/other/packages/${PN}/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="Profile based network connection tool from Arch Linux"
+HOMEPAGE="https://wiki.archlinux.org/index.php/Netctl
+	https://www.archlinux.org/packages/core/any/netctl/
+	https://projects.archlinux.org/netctl.git/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/pkgconfig
+	sys-apps/systemd
+"
+RDEPEND="
+	>=app-shells/bash-4.0
+	>=net-dns/openresolv-3.5.4-r1
+	sys-apps/iproute2
+	sys-apps/systemd
+	!<net-misc/dhcpcd-6.4.0
+"
+
+src_prepare() {
+	sed -i -e "s:/usr/bin/ifplugd:/usr/sbin/ifplugd:" \
+		"services/netctl-ifplugd@.service" || die
+}
+
+src_compile() {
+	return 0
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" SHELL=bash install
+	dodoc AUTHORS NEWS README
+	newbashcomp contrib/bash-completion netctl
+	bashcomp_alias netctl netctl-auto wifi-menu
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh-completion _netctl
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To get additional features, a number of optional runtime dependencies may be"
+		elog "installed."
+		optfeature "DHCP support" net-misc/dhcpcd ">=net-misc/dhcp-5.6.7[client]"
+		optfeature "WPA support" net-wireless/wpa_supplicant
+		optfeature "interactive assistant" dev-util/dialog
+		optfeature "automatic connection" sys-apps/ifplugd
+		optfeature "bonding support" net-misc/ifenslave
+		optfeature "dialup support" net-dialup/ppp
+	fi
+}
diff --git a/net-misc/netctl/netctl-9999.ebuild b/net-misc/netctl/netctl-9999.ebuild
new file mode 100644
index 000000000000..fb31bb4589b9
--- /dev/null
+++ b/net-misc/netctl/netctl-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://projects.archlinux.org/netctl.git"
+	inherit git-2
+	DEPEND="app-text/asciidoc"
+else
+	SRC_URI="https://sources.archlinux.org/other/packages/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Profile based network connection tool from Arch Linux"
+HOMEPAGE="https://wiki.archlinux.org/index.php/Netctl
+	https://www.archlinux.org/packages/core/any/netctl/
+	https://projects.archlinux.org/netctl.git/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/pkgconfig
+	sys-apps/systemd
+"
+RDEPEND="
+	>=app-shells/bash-4.0
+	>=net-dns/openresolv-3.5.4-r1
+	sys-apps/iproute2
+	sys-apps/systemd
+	!<net-misc/dhcpcd-6.4.0
+"
+
+src_prepare() {
+	sed -i -e "s:/usr/bin/ifplugd:/usr/sbin/ifplugd:" \
+		"services/netctl-ifplugd@.service" || die
+}
+
+src_compile() {
+	return 0
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" SHELL=bash install
+	dodoc AUTHORS NEWS README
+	newbashcomp contrib/bash-completion netctl
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh-completion _netctl
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To get additional features, a number of optional runtime dependencies may be"
+		elog "installed."
+		optfeature "DHCP support" net-misc/dhcpcd ">=net-misc/dhcp-5.6.7[client]"
+		optfeature "WPA support" net-wireless/wpa_supplicant
+		optfeature "interactive assistant" dev-util/dialog
+		optfeature "automatic connection" sys-apps/ifplugd
+		optfeature "bonding support" net-misc/ifenslave
+		optfeature "dialup support" net-dialup/ppp
+	fi
+}
diff --git a/net-misc/netdate/Manifest b/net-misc/netdate/Manifest
new file mode 100644
index 000000000000..ab0ac0bf1ede
--- /dev/null
+++ b/net-misc/netdate/Manifest
@@ -0,0 +1,6 @@
+DIST netdate-1.2.tar.bz2 7516 SHA256 f282e384408565b9d7f4198f01bcdad326d27dd2e6c83d2084f2bb43b10ea802 SHA512 a6c3dde42dfb886a01a137485b1a52f4cfb00150bec3a9603a7475405cecd621c5604fe66e2d3e4fd50feee18ac9d60423231a377fc5629e465530b16b0ce918 WHIRLPOOL a7225aaa83dbeccc820da431d18c9790fd62dcbdad9cf3dd521eef22840a8ff2386036ad617a9258db855889d6fe436fd96eebe07a304850e6e74f4be5c5e4ff
+EBUILD netdate-1.2-r1.ebuild 485 SHA256 a31fa3e2c627d5a45ca4f8ef0c903afd1c4b19fd76e2d0f5d4a04c6db8dbb981 SHA512 643b0997d6a0d1bdedce88aa50978c72b830c06d4bc47421de1b7bd98719f6fa782f1175a0d4e365859b8e67a9fce8f527db9efeac98603d2d62a3a2fddb03de WHIRLPOOL 367b8fcada3c3241eccabbcd2aae10a864d33d0bec7820953632f809e03a0b2feef7bb0ecde4953b7973d7466beec871cc702433813f57b9b46ee46241855476
+EBUILD netdate-1.2.ebuild 527 SHA256 45a718e92818065c8321f31e86400a7af59eda6d6b97726db92b196316fa0d3c SHA512 5cb71a991c54760d6f65db55aef54b1b75880ddc8b19f757a40352a62fb19d2be8d6243e4934fe8d79c4524e70b30aaae558f6cfd5b58b074f30d4cadebc22d9 WHIRLPOOL 916a81a19889f122d05532efe89d3af0a7dc86782f77982defe76d47d5256d6a499d4beee28de69c8f370701e5311071642658deff50844e42a1de185468b2dd
+MISC ChangeLog 2172 SHA256 2aa74467ba9019aafdb67b2fe7329491ce38a5a041659a64cdb4b2effd037f36 SHA512 de6ff35ef511bac680c03e557f746e2f0e0126c0eb9990f4931d526f50e2d93a1c4a231deb2e8d437be877f9817ee4254e9d2499b1bff1b1d24352227fc984bf WHIRLPOOL 68d4c7a8c7e521197ac30b67c3bb659937b4fe431ebaaa7ca048f02228adb263e6fbca58b45526440fb6f03de7aeabbe18e86e6de81cc87641b2bb77c45a7bd6
+MISC ChangeLog-2015 948 SHA256 1cbf2703944ae1ecaf5a20101e116493bc9ef0fe125ce97af81b0e455b086670 SHA512 d9d8b3630b747e67fa65329ae31e0069a6fee16c1fda437cb0e568a71740e1cca3a189844c9ecab28f6371ad4b2504c7d4d0e262dd43cfaacd114557fdfa35e6 WHIRLPOOL fdf7a50d14e0ca67a667689bb1ced08cbe1731aa2d39a65df2d6d64f2e1f3d0dbd700d103e5e921b6a18984628a08a833ce9bbeacce62a1375845383f95e727f
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
diff --git a/net-misc/netdate/metadata.xml b/net-misc/netdate/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/net-misc/netdate/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 type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/netdate/netdate-1.2-r1.ebuild b/net-misc/netdate/netdate-1.2-r1.ebuild
new file mode 100644
index 000000000000..951a5dfe9ef3
--- /dev/null
+++ b/net-misc/netdate/netdate-1.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="utility to synchronize the time with ntp-servers"
+HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/"
+SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sh ~sparc ~x86"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README )
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.8"
+	einstalldocs
+}
diff --git a/net-misc/netdate/netdate-1.2.ebuild b/net-misc/netdate/netdate-1.2.ebuild
new file mode 100644
index 000000000000..b8923cd83cce
--- /dev/null
+++ b/net-misc/netdate/netdate-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A Utility to synchronize the time with ntp-servers"
+HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/"
+SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips s390 sh sparc x86"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	dobin netdate || die
+	doman netdate.8
+	dodoc README
+}
diff --git a/net-misc/netfleet/Manifest b/net-misc/netfleet/Manifest
new file mode 100644
index 000000000000..d960a15b5edd
--- /dev/null
+++ b/net-misc/netfleet/Manifest
@@ -0,0 +1,5 @@
+DIST netfleet_0.2.1.tar.bz2 162733 SHA256 05ec6e3a47e59a89c740272f2f21d60ad019df8dd3dda03daa05f3e536ecf8e2 SHA512 6fa6e55fd94298798f84bd7416683dde0b7ef3219d7a745353d69973549f2886117408b1e2594033a4f911ef0d95f384ceef51823c4149fba95ea87bdf8c38cc WHIRLPOOL d59cb54d1e9920bcdc6518bd21c69e87409f33c22998d47a834753a43fbd2989569d541db5b775659f125d748581e094d2e74e896bb66a1c885663956b68b120
+EBUILD netfleet-0.2.1-r2.ebuild 564 SHA256 454dfae95fb7d0fc1542cb9caca9a1747e9f74f94cfe6a272682a8b36fca057f SHA512 5c3aa06c79a4aa2b29b4cb8f82a828979805414385e018f74831797fef8b4d6c5efe3e422b835276ba18baa31073c467a5d8400fb43bca12eeeeb9f2d993b05b WHIRLPOOL 3cc992b0f6ee61fe4f5e2125c251779360bd75faddd58200f3b6a05ba3d28172a8aa60006610487d9e3159815197235c62d33fd254bcf910dfdc3411effffee4
+MISC ChangeLog 3911 SHA256 3b306a8a84c64286a19afde3d14a58a4fa263010b01a4207202d36f8aea1c0db SHA512 5dec93b238cce579439ce3c72a9f1b56c64f2c0d5bb614b8bdc43ca6521c5d2d11b2898926b2e55acc66735727642c664bd0a4391369f09fe78065261f4ff7e6 WHIRLPOOL 8e705786936c4562329a17d021df21bf67010fa3d5233e2e537769f7d5c324f8e633065e15302197d496d90e97c5f4958013aee8d9eab81d4e8ea3fbd048e9b7
+MISC ChangeLog-2015 814 SHA256 391f9a39f6298c6abe0b4b435c67ea07b31f32d4577a66f5616f8a58d0df8ba9 SHA512 1f057083853eca833b1286cb2f549604a06d2657ced8ba9651f194bb3f253b23367b92049859b380591e7a941dbaea7433575b6c3604b81c8ecc818513269a79 WHIRLPOOL 4230ff69f4ee9ab1b4230e9bc93ff60214fec427f2e5b7a8b39ed859f49a068a2cef80a880f7748e2d8ea62a20a984c8bf8b02aef2b925df0fc3cb53c2034bd6
+MISC metadata.xml 325 SHA256 323e2c52970e29373ab9b1f58c030af06b2805b5ac7e8f22d0f7e819621ee2a9 SHA512 c5b66b2d7419e9be41d4644e24fbcf7b21a410a147ff51e89c91540431cc433058e2cf25fba4d9ea5407a4b040677c733d8d767b9d939e15e85629fcff572bbc WHIRLPOOL 17c232b7eee445b241971738447406656e1eb6a32d850f6d85844eb9c61e04c36b2281da8b37baa3a4f8ee67f824929887a7600b3f89915e8ac1180ce071626a
diff --git a/net-misc/netfleet/metadata.xml b/net-misc/netfleet/metadata.xml
new file mode 100644
index 000000000000..0602d77bce69
--- /dev/null
+++ b/net-misc/netfleet/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">netfleet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/netfleet/netfleet-0.2.1-r2.ebuild b/net-misc/netfleet/netfleet-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..c688de61da8c
--- /dev/null
+++ b/net-misc/netfleet/netfleet-0.2.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Qt4 cross-platform multi-threaded download utility"
+HOMEPAGE="http://qt-apps.org/content/show.php/?content=103312"
+SRC_URI="https://netfleet.googlecode.com/files/${PN}_${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
new file mode 100644
index 000000000000..b2a31717f573
--- /dev/null
+++ b/net-misc/netifrc/Manifest
@@ -0,0 +1,22 @@
+AUX netifrc-0.4.0-interface-types.patch 902 SHA256 fca27adf2811e693e3f02e7e47cf561286c332c50f4339138008bfb4ad0d46ed SHA512 ffc5e805e2130cee1f423bc0e10efc1c63e91ca6e7ac0329c38e9a2ea7e5197873c20a13d9f48c48f7c5927767a5817574d1b43acc2e443e7cdd92867d6b11e5 WHIRLPOOL 770cb1db8893f65c90a20f7b6427811d142bb9c0ddbcd7024ff34a0257ff2a1f27850f343123f6524df882b5051610bf23b7e27183674f4233048ba5fe730497
+DIST netifrc-0.2.2.tar.bz2 61115 SHA256 24c2748bec768691799d97c540061d46960756b390475107539e104868f36a4d SHA512 c31b5f5ccd5e76a568ba5acf143eea5413c5911fa7a14a00a983a71cbe737fc40e814686f4916377ac5404b35805503463c2cb371943a76a27124247fd9f9fe3 WHIRLPOOL 43010906bdd64e9631688f8f8a948d08ca4b42c9188c4941f406361e9455b712097596d4fbf86c3643bdb9d32a2c29367bc950edc025ebdcc771fbe30b87c080
+DIST netifrc-0.2.3.tar.bz2 61427 SHA256 c108d34caf555e411a80b56f08ef03693512e076e1a91c320d3aadd080ebc4b7 SHA512 fb3c555956e83831ae6bb0e73c8e1e0a6f3d9c806d148aa2f3e9dc92edc48a19bc65743eea1dc8ada924081eb2cedc5e02b14d8614145f08b1728e973cfd412d WHIRLPOOL 67e0492f1cabd0ca7630dfe38816dc64ec368615a8ac026e63bfdeff70bb72a01027212c3cf6aba720cca34ff10df8570542a718eff6bf7d95104bcfd33f4654
+DIST netifrc-0.2.4.tar.bz2 61828 SHA256 9b53eb3c8e6e80cd4073a34f911a28055c28b9f7a9f119a397002b0de7ac0691 SHA512 a8dd7d1d79e91eb37c938a7b06c835d667d5b39ad5e7bdbd6a1b18d17ac6f828935a83ca119d49b9903e9fe7ca48f0c003b28a6c52252f9f0217b96ec2c2df41 WHIRLPOOL dcc538f9cced599ba1689b96bf6a412c590a1557cdde7027ac2b5066977594352660f32c5d30ddc24a4c6fd870d62ea6f7f98e44a89a534fe37b1e8787ec1e04
+DIST netifrc-0.3.0.tar.bz2 68461 SHA256 9b0bd794a7714c06d2baa11553af018f694c2c71d121e657630d9c9ee94cafc6 SHA512 e28c00e5318c17e46bbdbcd471252729b73a4a0af930a4bf6213d30441650390b6bb83678cfd1fbeddd8102f947016a18976538dcf316cfab08461adf301686c WHIRLPOOL aa868e8b9dccb6d2ba48f37318adae57cf8314d1b45d9ad1fdc5d6b85b0b432b7b3f5b784d9d3ae824612699947b6bd47810c4cf44daf25aef52673a1fa2120c
+DIST netifrc-0.3.1.tar.bz2 69213 SHA256 a92a96b6f065981ee1c0232a507f3695230eeb7fb6172ec9048c2538b36cfea8 SHA512 de7d9291c3303e077c86e1fd42c6d9319308f0b51f28a034f9ed830aa504d2830ce96816a391811bcfadd07500e9c439acd4c4365555d7a3e47e58178b53465b WHIRLPOOL b2b0384880abb52a6d31a640688ecbdf17e4ba02aed9660e63c99c80eed315384459984abe1ef527526bed5a142e2c13275b7e7f68332fc6d9368bd98dcdd461
+DIST netifrc-0.4.0.tar.bz2 75517 SHA256 cc5c10d567530f64ca8c4fb8dcfc8218d102144f83393e1db769a5a5374c00df SHA512 a6b525a8f084a3cc9e4afa452617c001a225475689ed5ecb86703178eb252b70eb2dfc294789e29c6001098087a7ca2238ff9c8763accf3a66d39cff86614e85 WHIRLPOOL cdaa38a549106a3f73db88aa6376f77d71868cf774a1bb346276a52f6503ccc28f0049d12cbad6e068ab9af87b0fc37e69caa43f31efcbeb4e1a548a6b069c16
+DIST netifrc-0.5.0.tar.bz2 78738 SHA256 2937cd4fd0f0a6eee050b00cc0b32ba37d2793eee09de21e0366d4e0886f8257 SHA512 2348c0df590d6060de3756a5111ac2916047e21ce56d43fc0b8d99946f93ca02ce300abcd9243e1e4cbcd5ab89ea6ed0869785cdb5297a669aeb6812788933b0 WHIRLPOOL 32bca5ecc6a3f6b75e541778b9d0548102c69cc86fb9d61458bc36f458766470489f5bf86b9373e8db598ee0883c65e6986efa2a37d1873484297df9aad73015
+DIST netifrc-0.5.1.tar.bz2 78749 SHA256 11a6ff3dc1fb5673d8acd128b6b8cb53a4194df23c5dec170d57f8e6b8b7b1b9 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710 WHIRLPOOL 32ff62ba508a4f4c69c562709b1134f663b7027c3175bbe6aeca8c64c74293dfc1af2037e30e48405a4a8b96726c7621c4b37e7239463298a24e69d69b664ed9
+EBUILD netifrc-0.2.2.ebuild 1764 SHA256 f736478c5b9baeeae8176019231374d164f9333dd6084e3088d035d746a0b09a SHA512 57715aec43860cc8ea044486d10f0171317228343459417bcaa5e6716e8d32e2338089f24f97c0431d15c19cba2a94f824c90f6670e6de2bf680f4a2fe8865ed WHIRLPOOL c7dd7c62e45fd9718cef457a4c69e3de2ae32b6c88fff15e8f4b5ef7b5b6b13eae7bad2c591811495b47f451fc88214c67a17144325482cd87ca18ef83789238
+EBUILD netifrc-0.2.3.ebuild 1777 SHA256 e24d387d0abcfb6a372282898990ad2c95770bbb8f093db8932739b73f25d6c4 SHA512 2c09aa95b80921833bd05f6faa4197b627908bf5860d99bfb2db85236fc230059ca73c2af44bbead4651e66b289adc0fc17255743e2c0f2411eeea40dd7c6963 WHIRLPOOL 6a8421d377a313458b74ee09dd9725b8afc1f9a8975d4e086721bc02cd6f4c08724fd6890c840a6d64b49b53448db5d43e639a0f8f84a3aebe9c23cba3b7c1fa
+EBUILD netifrc-0.2.4.ebuild 1787 SHA256 c3a6632225e968a8670484f140fb647fa716b3748173ab012198b16a021a0ebd SHA512 748b52fd645a01c90c0bb9911602a616e05c3e23e209d567198439cc910c53dcc59a57d269cf470eee69ed73e40c5e84f1ed0c0c5d4db4f527284f64301e6344 WHIRLPOOL 46c2eaadfaf4212441f024cd8f1185ab9abffc9c98dd56fbeece44319e564c444d3680b7521a0945863f9cc79eaa6214f9e28b4321f60efd93e8fb96879229a9
+EBUILD netifrc-0.3.0.ebuild 2074 SHA256 4175f28fd8341917abc7038d86bedd1115823e9640c5968c1181d7f0abe6090e SHA512 c46ade5a0c246c147d17ae91f80e57c6d85e27bc26b66d0e6f7d2d887cd35c3fdb8e6f8415897e53e384ccae10104e8343998c39673b41bfeba0f3ba4416f428 WHIRLPOOL 7df143b916644fc09732e480fef73486161e8e188a314eefbcb55e7ba1abee85809348197f86055b6ef23ce82058f9d70a672583b5174946cd21f845141fbb55
+EBUILD netifrc-0.3.1.ebuild 2114 SHA256 0b062a4636092c7d9740e1e0feba71242a92973869a1de76aecd2555e63c3857 SHA512 7a57c692b7ac6966ec85f7701efd8b85430b2c1933d43599606ec2ae82c2229922330b2ce7fe8982f0da49e49be0b5fdbbb627efbedf65b336bb5399a1c961e2 WHIRLPOOL 480707e05277157cd073d32cf5ef944902afebf8dcac08325e4647b1febe2c051cc81f3f989aa668e30dae4ba32a46d0e015f61ca84deb11d2f43d0b9a5b35fa
+EBUILD netifrc-0.4.0-r1.ebuild 2200 SHA256 94ca13282805b3bc9b6a98eb9157da1a02e4ccb4adcee70867ebb3f6d076d7a8 SHA512 7063454cefeb6f58535f8d3555d99a35c0e41ebde45e47673cf8b1b6e49cdfb099e149c5b1fa556d320f7d83c2242657628b50c84eecc4989c2b1dec2ccf0105 WHIRLPOOL b3ff7ce64fe8cd14707bfd39d012bf391a80dfc73423f45d343099ff417378f29cf9f41cfdd466d69ed98438107fb9e6b6e7ce6dbb2cba4366a032db2aa58eb5
+EBUILD netifrc-0.4.0.ebuild 2114 SHA256 0b062a4636092c7d9740e1e0feba71242a92973869a1de76aecd2555e63c3857 SHA512 7a57c692b7ac6966ec85f7701efd8b85430b2c1933d43599606ec2ae82c2229922330b2ce7fe8982f0da49e49be0b5fdbbb627efbedf65b336bb5399a1c961e2 WHIRLPOOL 480707e05277157cd073d32cf5ef944902afebf8dcac08325e4647b1febe2c051cc81f3f989aa668e30dae4ba32a46d0e015f61ca84deb11d2f43d0b9a5b35fa
+EBUILD netifrc-0.5.0.ebuild 2144 SHA256 1d89639d960e793ec3fb94c2f551341d1ff257ee985aaebb7e44b72bae7c808d SHA512 8c004db0c367e51f3ee064c02e3ea73a18c34f3f3ee601373420c11ebf3f1bc2a2485ebfc476329e580d1122bf8683886bdab36bc96acd78273a649712b554fa WHIRLPOOL eaeddfa678b88767ed88e2c6ec38054390b6febfe092cd2e093b16e187c77cc927996b956a539ad2d25cd22fb95b3c37322bf172dcdc2661a054b93d9c77ca0b
+EBUILD netifrc-0.5.1.ebuild 2134 SHA256 d18967ca8a9517397c3402d39709064c3e440913a5685437f0fd85d935753431 SHA512 b57eeb599989d8840a5f1eb9c029ccdd6c1c6fa4be2857e74ade25c100e513a3b3ddff4cebd2052c1ae92047cdb0edb80be411fb4c5570111c4d03decdc8a6b3 WHIRLPOOL c702d101f10ec2fea1a685b8e76d7a30fb64d5e8777387bc65d5d328129a36f22bedba62a00838007845b279a10f6e2c46633218598c21871932c41175847154
+EBUILD netifrc-9999.ebuild 2144 SHA256 1d89639d960e793ec3fb94c2f551341d1ff257ee985aaebb7e44b72bae7c808d SHA512 8c004db0c367e51f3ee064c02e3ea73a18c34f3f3ee601373420c11ebf3f1bc2a2485ebfc476329e580d1122bf8683886bdab36bc96acd78273a649712b554fa WHIRLPOOL eaeddfa678b88767ed88e2c6ec38054390b6febfe092cd2e093b16e187c77cc927996b956a539ad2d25cd22fb95b3c37322bf172dcdc2661a054b93d9c77ca0b
+MISC ChangeLog 5959 SHA256 d455eb99845b33fbfefc39319524c484e1e1b527a0ca5bb75bf868c66e0dd87b SHA512 8cbdb7707e6041ba15558da091376816674b5c05955ca5cdc8997be8779e2057142d0da1b1863eedc477476b2eb40b8c1e28f7325f96a8a8badf380690533dbd WHIRLPOOL a0bc97db6cd7afc1aa40cd36bee672bf7408c0c5e933bded787c29ff36bb233fa24a026d588fecb5a1c3e285cd583de9d57e01680b4f061dfb4db1ff33ed7553
+MISC ChangeLog-2015 6323 SHA256 718a4bcc6044809e987d604065a60504ee408eed0c92f9afb9e036378bb4aed5 SHA512 e29fc5ffaa887cc1d3d51835adc2056098d5f278672200f39c82a88d0cf437b9a0da23189d195f16f73bcf7245dc68630496204f111f6587348aaa3eae2f64c3 WHIRLPOOL 9b9e987320e905a7896466a17681f6ae1de8ec84ee52a69b98c419ba4d6afe64596ad57fbe6c57e943ed76e5b2e88ea8d1e9dfd1f118d5b6e5903f78d1afa97f
+MISC metadata.xml 377 SHA256 0a8234fd0be667e203852dd403a01528164c14934733e710ca27fa7fbece6163 SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5 WHIRLPOOL bc6c5ab5e1a066898cc8068affcf257a975f93138f140d4eb4eaa6f690c691845a7a07a59655fbca8ab313a3c4292040c46d49e9145d2a187cba6cd3702b053e
diff --git a/net-misc/netifrc/files/netifrc-0.4.0-interface-types.patch b/net-misc/netifrc/files/netifrc-0.4.0-interface-types.patch
new file mode 100644
index 000000000000..5f00dc1bb101
--- /dev/null
+++ b/net-misc/netifrc/files/netifrc-0.4.0-interface-types.patch
@@ -0,0 +1,26 @@
+From 18dd0598b29d2158529466f1e7097bf894e584dc Mon Sep 17 00:00:00 2001
+From: Andrey Volkov <volkov.am@ekb-info.ru>
+Date: Fri, 15 Jul 2016 13:23:56 +0500
+Subject: Fix missing interface types
+
+(cherry picked from commit c8fe42141c95f5446dabf5c0b1f049151e51c2ad)
+---
+ net/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/Makefile b/net/Makefile
+index a03c171..ce73c1e 100644
+--- a/net/Makefile
++++ b/net/Makefile
+@@ -13,7 +13,7 @@ SRCS-Linux=	iwconfig.sh.in udhcpc.sh.in
+ INC-Linux=	adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
+ 		ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
+ 		ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
+-		vlan.sh macvlan.sh ip6rd.sh firewalld.sh
++		vlan.sh macvlan.sh ip6rd.sh firewalld.sh dummy.sh hsr.sh l2tp.sh
+ 
+ SRCS-NetBSD= ifwatchd.sh.in
+ INC-NetBSD=	ifwatchd.sh
+-- 
+cgit v0.12
+
diff --git a/net-misc/netifrc/metadata.xml b/net-misc/netifrc/metadata.xml
new file mode 100644
index 000000000000..174f393836d4
--- /dev/null
+++ b/net-misc/netifrc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netifrc@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		This package contains the Gentoo network interface management
+		scripts, which were separated from OpenRC.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/netifrc/netifrc-0.2.2.ebuild b/net-misc/netifrc/netifrc-0.2.2.ebuild
new file mode 100644
index 000000000000..fef98163eea5
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.2.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+COMMON_DEPEND="!<sys-fs/udev-init-scripts-26-r1
+	!<sys-fs/udev-172"
+DEPEND="${COMMON_DEPEND}
+	kernel_linux? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/openrc-0.12
+	!<sys-apps/openrc-0.12"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}
+		UDEVDIR=$(get_udevdir)"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-0.2.3.ebuild b/net-misc/netifrc/netifrc-0.2.3.ebuild
new file mode 100644
index 000000000000..1ecd11b424ed
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.2.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+COMMON_DEPEND="!<sys-fs/udev-init-scripts-26-r1
+	!<sys-fs/udev-172"
+DEPEND="${COMMON_DEPEND}
+	kernel_linux? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/openrc-0.12
+	!<sys-apps/openrc-0.12"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}
+		UDEVDIR=$(get_udevdir)"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-0.2.4.ebuild b/net-misc/netifrc/netifrc-0.2.4.ebuild
new file mode 100644
index 000000000000..e8e781d17e4e
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.2.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+COMMON_DEPEND="!<sys-fs/udev-init-scripts-26-r1
+	!<sys-fs/udev-172"
+DEPEND="${COMMON_DEPEND}
+	kernel_linux? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/openrc-0.12
+	!<sys-apps/openrc-0.12"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}
+		UDEVDIR=${EPREFIX}$(get_udevdir)"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-0.3.0.ebuild b/net-misc/netifrc/netifrc-0.3.0.ebuild
new file mode 100644
index 000000000000..4ab88729401a
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.3.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="kernel_linux? ( virtual/pkgconfig )
+	!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+		>=sys-apps/openrc-0.12"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+
+	# Install the service file
+	LIBEXECDIR=${EPREFIX}/lib/${PN}
+	UNIT_DIR="$(systemd_get_unitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-0.3.1.ebuild b/net-misc/netifrc/netifrc-0.3.1.ebuild
new file mode 100644
index 000000000000..fa4fbb8bc3db
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.3.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="kernel_linux? ( virtual/pkgconfig )
+	!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+		>=sys-apps/openrc-0.12"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+
+	# Install the service file
+	LIBEXECDIR=${EPREFIX}/lib/${PN}
+	UNIT_DIR="$(systemd_get_unitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..9cf45711926d
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="kernel_linux? ( virtual/pkgconfig )
+	!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+	>=sys-apps/openrc-0.15
+	!<sys-fs/udev-init-scripts-27"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	epatch "${FILESDIR}"/${P}-interface-types.patch #588872
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+
+	# Install the service file
+	LIBEXECDIR=${EPREFIX}/lib/${PN}
+	UNIT_DIR="$(systemd_get_unitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-0.4.0.ebuild b/net-misc/netifrc/netifrc-0.4.0.ebuild
new file mode 100644
index 000000000000..fa4fbb8bc3db
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.4.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="kernel_linux? ( virtual/pkgconfig )
+	!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+		>=sys-apps/openrc-0.12"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+
+	# Install the service file
+	LIBEXECDIR=${EPREFIX}/lib/${PN}
+	UNIT_DIR="$(systemd_get_unitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-0.5.0.ebuild b/net-misc/netifrc/netifrc-0.5.0.ebuild
new file mode 100644
index 000000000000..ef1c1971295e
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.5.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="kernel_linux? ( virtual/pkgconfig )
+	!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+	>=sys-apps/openrc-0.15
+	!<sys-fs/udev-init-scripts-27"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+
+	# Install the service file
+	LIBEXECDIR=${EPREFIX}/lib/${PN}
+	UNIT_DIR="$(systemd_get_unitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-0.5.1.ebuild b/net-misc/netifrc/netifrc-0.5.1.ebuild
new file mode 100644
index 000000000000..4d4f9f5d299f
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.5.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="kernel_linux? ( virtual/pkgconfig )
+	!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+	>=sys-apps/openrc-0.15
+	!<sys-fs/udev-init-scripts-27"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+
+	# Install the service file
+	LIBEXECDIR=${EPREFIX}/lib/${PN}
+	UNIT_DIR="$(systemd_get_unitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild
new file mode 100644
index 000000000000..ef1c1971295e
--- /dev/null
+++ b/net-misc/netifrc/netifrc-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="kernel_linux? ( virtual/pkgconfig )
+	!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+	>=sys-apps/openrc-0.15
+	!<sys-fs/udev-init-scripts-27"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+
+	# Install the service file
+	LIBEXECDIR=${EPREFIX}/lib/${PN}
+	UNIT_DIR="$(systemd_get_unitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netkit-bootparamd/Manifest b/net-misc/netkit-bootparamd/Manifest
new file mode 100644
index 000000000000..be027dcfba1a
--- /dev/null
+++ b/net-misc/netkit-bootparamd/Manifest
@@ -0,0 +1,11 @@
+AUX 0.17-jumpstart.patch 1163 SHA256 99a6ca055bf905fc12f53dbef031b754225579087ba0fa072b21070399aef562 SHA512 ac359816aeeae110af0fef69692cc1d3d6f9a72f3ef58dcb2a84a5c4462aea7a214561032ba4683481d8e2a08bc62c0d67af09205f2ebee62c340aea434a6bf8 WHIRLPOOL 7e2634af700dd0b33a11bc7e041a910ad840c837659f8ced9ea81ceb774f9fdf77db480282c67ed777b9338edb5422daaa86d99847a306924a50c254141a3edd
+AUX 0.17-libtirpc.patch 455 SHA256 f9cc3b6a198c319f6b0d34067f8d145e6b770115eb3dfa1c944114fc79063c9b SHA512 d7c378e2b65019fdd04fb0ff076c2a8c81fac6bba19a707bc43d47ba161dabb0ac0ffe10b9912820a761eb364b0e977349b9544fb6a64ba0bd6aecf9b352847b WHIRLPOOL e36a3b000c3e4ed462cf06f94d8020b39033b3698fd48e9069a6551035ea383002b607644e9492b70bbc42cd9ac3254d78286a9f0bd2aec6679af6bba158197b
+AUX bootparamd.confd 29 SHA256 92110747111cfb4a9a375fa7be116c4417471eef70eea937f03b2d6e4a9e656e SHA512 4f2e6cfef21053bc3a37fada11e77338de57a9e034963c9e91bdc8d6829df29e6b5d69eda3531e67ea3c03599f22da28bb3f7f64a282cc6a2e63927236c1765e WHIRLPOOL 32e25e9648ca15e57f0b608309aeadc2061f05451580106f94c6f9fd29691cadbb4568dfa6f5d101e297b36db7cd46eea4ddb1f0455291147570ec57cf23732b
+AUX bootparamd.initd 502 SHA256 8c55fb5e59bf5458543d303c0f881555726c9c202dfaf374870a296fabfe7c12 SHA512 9326e3a3dfca43cd7233a289b1f58c22db22aabc2136cba2d61a4bdab17652f9d031e4eddc877126aa09e08e048e63ba9fcf4219f9dbbf55d6787e03d5ee2548 WHIRLPOOL 34bfea5a11d77682e0e7f344736a21e5423190e7ddbf282c9094fc17625041d6b16d39cc41f75552ff24445dc28b17eaf07d058f3a76b2142b5f89f2858ff5d8
+DIST netkit-bootparamd_0.17.orig.tar.gz 13934 SHA256 7fd44b14f7ee5bf930bdd03b0c3a15bdb6efb60a862af47269b05361c4ed395c SHA512 fc237c72efd0c7a671c179ee4596f64e13a7a637441d32c9e82e81f4133d987f468c98b00611fbada1f7d6e5fa791c9b513978bfc7a58efe7d93102a2d3b4dca WHIRLPOOL ba83ea8fee7558047ea2320c2ab83adae23fa15c92069b6e3e42bde9aa1f2fd2a7ff2b7ac3b22540961845000e86a1c34fe80b76d0ca507e268555f98651d817
+EBUILD netkit-bootparamd-0.17-r2.ebuild 980 SHA256 8adca9a8716682eab9ab3dc63e4caaa9988bd51bb6b7c4af13535d5be299b121 SHA512 462e64f42f5319d16c1a46a615ea46f8dd0b75177953ecfb593ed9fc7d563b94441889e58bbe7f88f9cac445b59b72435ed5390df14b55cdbe2ba1b83401733e WHIRLPOOL 09fdeaa809f82efefde093b09abb316efd3db5a332273cce8bc352f5b74707b00436348f2fa3d261afe315c9b8a934f73b799fac943cf8fad9d11aea7039c598
+EBUILD netkit-bootparamd-0.17-r3.ebuild 1197 SHA256 a9d64b29439e5657282c6cd6fa6b52036f48d045633e9f35edfd0b379f6c8eb0 SHA512 b2841f185d425053b8483b25b8a03f0a1a30b02f007640d3c70b9283ac6e7e271701e00b2eb7d114b1260ee93b815154286ef1f9de139cd7a25470e521adb713 WHIRLPOOL 13d2a4a183133c99e8d6a9990e451942c0b229c3a58d40e8ec6d25c55be41b7e3d8da899c802327ed448bbc8b49d91200de42e25c34b32579fd89d14e5aefc4c
+EBUILD netkit-bootparamd-0.17-r4.ebuild 1456 SHA256 55a150ea2a2919ec210fe3468b3ba01646a909e641fbad5e279e1b74dd7400f5 SHA512 cb9fa0168a3d8dc83fcd67a37a6f2e67ffe087b8f34bf0624c5de15fc92280561db3782f77e81c610302517c5f94fc6935fd58954e5cb56ed99c6505d36e89bd WHIRLPOOL f502eaefd673d383f216eb25a506a829623b0c73f80b75dd0e471065924d72a2948823de07a19fc0c2271746a3d124762a2c19a344e1ae3ca31dccd6a1d8de28
+MISC ChangeLog 2502 SHA256 f1bd4943af21bb728ef5bc150a83756b506f2c070b6f1382c3ac257a9f583722 SHA512 738ebb26c934b6920355f7e99b159042918e72fe12bc4e0fd397c76f892a13374613b62a0bf4e9c818cd1cbdab6296ff645da6c73e7b4ae1f01e357a5153378b WHIRLPOOL 7ae738b0d5bc7a2110162d7ca7b3f4fe921959c5b53ee53d1c730423ba82b3f9b817ca2ed3637bb53697e88b36a37ae6c9b8729abf86289dc3eefdf6f67c5d81
+MISC ChangeLog-2015 2008 SHA256 255ff5e692c1058876b577359d68b80fff16ca00c2b36963d562c61bda5ef419 SHA512 ac1a3f3e638694b810bf68db5d63818f5979171991b00c247dca1affe9582f5c5995dbe1e6f73929c946a446c1917630b164003efde2d0305bfe6fdff3d11599 WHIRLPOOL 251a083e1f9712cf16f5f965b371b0a8535db959ec14c76b2b6f707965811140f5696a4d02265730d1c530e3b1295ea2f4cc0953e58c9d766274ce6fd9b972c6
+MISC metadata.xml 338 SHA256 0de2de5bd04e750cd0d9fabc3d07dfc624180d567c5cf01a4111a54f06415fef SHA512 d054668c4f93e1bb54cdb4bf6557feb53c07416435ca091498173a33cdc148e5292b2a8126b15fd9a57a993db536cee43ee0fecea0879adcdd83247017573dcf WHIRLPOOL 1dc0be6ecec7a9ff74e9702b6ec752b6ada6838b5428e8dd7fde3fb791d24497653b6f5857f4ef7938a4eb590e93f07e2c0eee3c71bb73342690ffe078c61203
diff --git a/net-misc/netkit-bootparamd/files/0.17-jumpstart.patch b/net-misc/netkit-bootparamd/files/0.17-jumpstart.patch
new file mode 100644
index 000000000000..41b471b5075f
--- /dev/null
+++ b/net-misc/netkit-bootparamd/files/0.17-jumpstart.patch
@@ -0,0 +1,25 @@
+diff -urN netkit-bootparamd-0.17.old/rpc.bootparamd/rpc.bootparamd.c netkit-bootparamd-0.17/rpc.bootparamd/rpc.bootparamd.c
+--- netkit-bootparamd-0.17.old/rpc.bootparamd/rpc.bootparamd.c	2000-07-22 12:23:56.000000000 -0400
++++ netkit-bootparamd-0.17/rpc.bootparamd/rpc.bootparamd.c	2004-09-13 17:42:43.000000000 -0400
+@@ -136,11 +136,16 @@
+ 	    strncpy(path, where, sizeof(path));
+ 	    path[sizeof(path)-1] = 0;
+ 	    he = gethostbyname(hostname);
+-	    if (!he) goto failed;
+-	    bcopy( he->h_addr, &res.server_address.bp_address_u.ip_addr, 4);
+-	    res.server_name = hostname;
+-	    res.server_path = path;
+-	    res.server_address.address_type = IP_ADDR_TYPE;
++	    if (!he) {	/* jumpstart parameters are not valid hosts */
++		res.server_name = hostname;
++		res.server_path = path;
++		bzero(&res.server_address.bp_address_u.ip_addr,4);
++	    } else {
++	    	bcopy( he->h_addr, &res.server_address.bp_address_u.ip_addr, 4);
++	        res.server_name = hostname;
++		res.server_path = path;
++		res.server_address.address_type = IP_ADDR_TYPE;
++	    }
+ 	}
+ 	else { /* special for dump, answer with null strings */
+ 	    if (!strcmp(getfile->file_id, "dump")) {
diff --git a/net-misc/netkit-bootparamd/files/0.17-libtirpc.patch b/net-misc/netkit-bootparamd/files/0.17-libtirpc.patch
new file mode 100644
index 000000000000..1cdf263efb25
--- /dev/null
+++ b/net-misc/netkit-bootparamd/files/0.17-libtirpc.patch
@@ -0,0 +1,15 @@
+diff -ruN netkit-bootparamd-0.17.orig/rpc.bootparamd/main.c netkit-bootparamd-0.17/rpc.bootparamd/main.c
+--- netkit-bootparamd-0.17.orig/rpc.bootparamd/main.c	2000-07-22 16:23:56.000000000 -0000
++++ netkit-bootparamd-0.17/rpc.bootparamd/main.c	2017-10-04 14:17:49.887552574 -0000
+@@ -17,9 +17,11 @@
+ 
+ 
+ #ifdef __GLIBC__
++#ifndef _TIRPC_RPC_H
+ 	/* quick fix */
+ 	void get_myaddress(struct sockaddr_in *);
+ #endif
++#endif
+ 
+ int debug = 0;
+ int dolog = 0;
diff --git a/net-misc/netkit-bootparamd/files/bootparamd.confd b/net-misc/netkit-bootparamd/files/bootparamd.confd
new file mode 100644
index 000000000000..f7e233a46de3
--- /dev/null
+++ b/net-misc/netkit-bootparamd/files/bootparamd.confd
@@ -0,0 +1,3 @@
+# 
+
+OPTS_RPC_BOOTPARAMD="-s"
diff --git a/net-misc/netkit-bootparamd/files/bootparamd.initd b/net-misc/netkit-bootparamd/files/bootparamd.initd
new file mode 100644
index 000000000000..251e8994969a
--- /dev/null
+++ b/net-misc/netkit-bootparamd/files/bootparamd.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+[ -e /etc/conf.d/bootparamd ] && . /etc/conf.d/bootparamd
+
+rpc_bin=/usr/sbin/rpc.bootparamd
+
+depend() {
+	use ypbind net
+	need portmap 
+	after quota
+}
+
+start() {
+	ebegin "Starting bootparamd"
+	${rpc_bin} ${OPTS_RPC_BOOTPARAMD}
+	eend $? "make sure DNOTIFY support is enabled ..."
+}
+
+stop() {
+	ebegin "Stopping bootparamd"
+	start-stop-daemon --stop --exec ${rpc_bin}
+	eend $?
+}
diff --git a/net-misc/netkit-bootparamd/metadata.xml b/net-misc/netkit-bootparamd/metadata.xml
new file mode 100644
index 000000000000..dde8ad441958
--- /dev/null
+++ b/net-misc/netkit-bootparamd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<use>
+<flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r2.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r2.ebuild
new file mode 100644
index 000000000000..325766a3fe1a
--- /dev/null
+++ b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Netkit - bootparamd"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="mirror://debian/pool/main/n/netkit-bootparamd/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~hppa ~mips ppc sparc x86"
+IUSE=""
+
+DEPEND="!<=net-misc/netkit-bootpd-0.17-r2"
+RDEPEND=${DEPEND}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/0.17-jumpstart.patch
+}
+
+src_compile() {
+	# Note this is not an autoconf configure
+	./configure || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	into /usr
+	dosbin rpc.bootparamd/bootparamd || die "installing binary failed"
+	dosym bootparamd /usr/sbin/rpc.bootparamd
+	doman rpc.bootparamd/bootparamd.8
+	dosym bootparamd.8.gz /usr/share/man/man8/rpc.bootparamd.8.gz
+	doman rpc.bootparamd/bootparams.5
+	dodoc README ChangeLog
+	newdoc rpc.bootparamd/README README.bootparamd
+}
diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r3.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r3.ebuild
new file mode 100644
index 000000000000..f0ac67f05819
--- /dev/null
+++ b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Netkit - bootparamd"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~mips ppc sparc x86"
+IUSE=""
+
+DEPEND="!<=net-misc/netkit-bootpd-0.17-r2"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/0.17-jumpstart.patch
+
+	# don't reset LDFLAGS (bug #335457), manpages into /usr/share/man
+	sed -i -e '/^LDFLAGS=/d ; /MANDIR=/s:man:share/man:' configure || die
+
+	sed -i -e 's:install -s:install:' rpc.bootparamd/Makefile || die
+}
+
+src_configure() {
+	# Note this is not an autoconf configure
+	CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ./configure || die
+}
+
+src_install() {
+	dodir usr/bin usr/sbin usr/share/man/man8 || die
+	emake INSTALLROOT="${D}" install || die
+
+	newconfd "${FILESDIR}"/bootparamd.confd bootparamd || die
+	newinitd "${FILESDIR}"/bootparamd.initd bootparamd || die
+
+	doman rpc.bootparamd/bootparams.5 || die
+	dodoc README ChangeLog || die
+	newdoc rpc.bootparamd/README README.bootparamd || die
+}
diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
new file mode 100644
index 000000000000..b52721ceadcf
--- /dev/null
+++ b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Netkit - bootparamd"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="+libtirpc"
+
+DEPEND="
+	!<=net-misc/netkit-bootpd-0.17-r2
+	libtirpc? ( net-libs/rpcsvc-proto net-libs/libtirpc )
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	eapply "${FILESDIR}"/0.17-jumpstart.patch
+	eapply "${FILESDIR}"/0.17-libtirpc.patch
+
+	# don't reset LDFLAGS (bug #335457), manpages into /usr/share/man
+	sed -i -e '/^LDFLAGS=/d ; /MANDIR=/s:man:share/man:' configure || die
+
+	sed -i -e 's:install -s:install:' rpc.bootparamd/Makefile || die
+
+	default
+}
+
+src_configure() {
+	if use libtirpc ; then
+		append-cflags -I/usr/include/tirpc
+		sed -i -e 's:^LIBS=$:LIBS=-ltirpc:' configure || die
+	fi
+
+	# Note this is not an autoconf configure
+	CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" ./configure || die
+}
+
+src_install() {
+	dodir usr/bin usr/sbin usr/share/man/man8
+	emake INSTALLROOT="${D}" install
+
+	newconfd "${FILESDIR}"/bootparamd.confd bootparamd
+	newinitd "${FILESDIR}"/bootparamd.initd bootparamd
+
+	doman rpc.bootparamd/bootparams.5
+	dodoc README ChangeLog
+	newdoc rpc.bootparamd/README README.bootparamd
+}
diff --git a/net-misc/netkit-bootpd/Manifest b/net-misc/netkit-bootpd/Manifest
new file mode 100644
index 000000000000..d8155bbfa341
--- /dev/null
+++ b/net-misc/netkit-bootpd/Manifest
@@ -0,0 +1,6 @@
+AUX netkit-bootpd-2.4.patch 19727 SHA256 f29376488e650d328c02aec3eb42a22a11d7f24e37906fe6c5f2ac1048b7a07a SHA512 251fb2652c808bbfc18d4d1cdbe746aa3f52f09a53e3c09de426ab94ea6b016d6861e88f45f2cb0740fb5be3a76b6156a772f27d17221eb9f792ab3454c3282d WHIRLPOOL 71162b1f9476913f9fcc7c91450700e4cb8ec7287f4a498d1dd617d0700db3926488e974bd8a532a02b6c127e1ef8bbedb865ee99efcc087a07b0db02d2f4913
+DIST bootpd-2.4.tar.gz 99765 SHA256 13edffae98fd92d99e23b19456b0199d9496fd2121c1325c762bccd23f586682 SHA512 aaed30b724c660973e2efac8c18ead48caf1e8e5e35d4af6c6476080c32f8ce8c8722fd1c18d864e557301d37615cbb313e2ab0140da8963fbd23d5000e60379 WHIRLPOOL 41ef2aee15a1229d5061484b7024c99493508a063f578e7ad49aea953c449c7f88afa99a28814b183a23ed7f98c28bec3d569d4cf0c9c7868d2541fc77573b15
+EBUILD netkit-bootpd-2.4-r1.ebuild 745 SHA256 7bb157de3e8bef510b163c17558d7a6caf9ad39f9b175046cfee2a3935a028b7 SHA512 33482a2d68c91b0bfca2d397083921bf83dbf6e71f6da59ad04c3ade91943ced4488650ad7991f55a0913a6a58ce4c9793f0da9ff48d2c78837021863f4b9d19 WHIRLPOOL 2340c7f136fb6fd10035b80c59031e97ac91027dc71f29ca5f8876cf675317a2b2085424a58adcb91b698019b51c01fa41f085077b6b9c13b63e1531cff0e099
+MISC ChangeLog 2267 SHA256 435da188ba36effc7898a62ca8513a288b9fbed98f11ae3c7b411e71809581d6 SHA512 5646be97fda2e20b9cad3494996978b66d0c9853722feb6ae7354379a2cf9ee5c8eacf89755ad5ca95162376fca1558b7c86a9e7b71314dbabb8f184df77ccfd WHIRLPOOL 4df52729be47f89ccaaac3bc800234f43cde45994a5e4fcd95068232c308d173bc21f3b52baff7580b0a479036bf0ac452440e825174560f594a8e8120ded93a
+MISC ChangeLog-2015 3370 SHA256 1c0971dc74e6a0791b494645d03d82ff94382d8312aa9b95d12562dffcfd7ff5 SHA512 f229216352ba60e4781c999b601c7328602852f40a89aae95d2118e064b4515d0c8726ec664b4fb4e0dbe19deed7e123524b9da35a3253bc53bd9a8b62dc3332 WHIRLPOOL 9a14a8aed77b501854928f39d42a1e58ce4fb55123562541f5db0b1eb5aaabac5daca955db556df1a1345f954b6167d0d294f5c9fe7f6add22567ba990d15c78
+MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/net-misc/netkit-bootpd/files/netkit-bootpd-2.4.patch b/net-misc/netkit-bootpd/files/netkit-bootpd-2.4.patch
new file mode 100644
index 000000000000..1daf765a95e1
--- /dev/null
+++ b/net-misc/netkit-bootpd/files/netkit-bootpd-2.4.patch
@@ -0,0 +1,701 @@
+diff -ur bootpd-2.4.orig/bootpd.c bootpd-2.4/bootpd.c
+--- bootpd-2.4.orig/bootpd.c	1995-02-19 17:53:02.000000000 +0200
++++ bootpd-2.4/bootpd.c	2010-07-07 14:55:03.000000000 +0300
+@@ -117,14 +117,14 @@
+ extern void dumptab P((char *));
+ 
+ PRIVATE void catcher P((int));
+-PRIVATE int chk_access P((char *, int32 *));
++PRIVATE int chk_access P((char *, int32_t *));
+ #ifdef VEND_CMU
+ PRIVATE void dovend_cmu P((struct bootp *, struct host *));
+ #endif
+-PRIVATE void dovend_rfc1048 P((struct bootp *, struct host *, int32));
++PRIVATE void dovend_rfc1048 P((struct bootp *, struct host *, int32_t));
+ PRIVATE void handle_reply P((void));
+ PRIVATE void handle_request P((void));
+-PRIVATE void sendreply P((int forward, int32 dest_override));
++PRIVATE void sendreply P((int forward, int32_t dest_override));
+ PRIVATE void usage P((void));
+ 
+ #undef	P
+@@ -185,7 +185,7 @@
+  * main server loop is started.
+  */
+ 
+-void
++int
+ main(argc, argv)
+ 	int argc;
+ 	char **argv;
+@@ -339,7 +339,7 @@
+ 						"%s: invalid timeout specification\n", progname);
+ 				break;
+ 			}
+-			actualtimeout.tv_sec = (int32) (60 * n);
++			actualtimeout.tv_sec = (int32_t) (60 * n);
+ 			/*
+ 			 * If the actual timeout is zero, pass a NULL pointer
+ 			 * to select so it blocks indefinitely, otherwise,
+@@ -559,9 +559,9 @@
+ 			break;
+ 		}
+ 	}
++	return(0);
+ }
+ 
+-
+ 
+ 
+ /*
+@@ -616,9 +616,9 @@
+ 	struct bootp *bp = (struct bootp *) pktbuf;
+ 	struct host *hp = NULL;
+ 	struct host dummyhost;
+-	int32 bootsize = 0;
++	int32_t bootsize = 0;
+ 	unsigned hlen, hashcode;
+-	int32 dest;
++	int32_t dest;
+ 	char realpath[1024] = {""};
+ 	char *clntpath;
+ 	char *homedir, *bootfile;
+@@ -726,7 +726,7 @@
+ 	 * with a timestamp lower than the threshold.
+ 	 */
+ 	if (hp->flags.min_wait) {
+-		u_int32 t = (u_int32) ntohs(bp->bp_secs);
++		uint32_t t = (uint32_t) ntohs(bp->bp_secs);
+ 		if (t < hp->min_wait) {
+ 			if (debug > 1)
+ 				report(LOG_INFO,
+@@ -997,7 +997,7 @@
+ PRIVATE void
+ sendreply(forward, dst_override)
+ 	int forward;
+-	int32 dst_override;
++	int32_t dst_override;
+ {
+ 	struct bootp *bp = (struct bootp *) pktbuf;
+ 	struct in_addr dst;
+@@ -1110,12 +1110,12 @@
+ PRIVATE int
+ chk_access(path, filesize)
+ 	char *path;
+-	int32 *filesize;
++	int32_t *filesize;
+ {
+ 	struct stat st;
+ 
+ 	if ((stat(path, &st) == 0) && (st.st_mode & (S_IREAD >> 6))) {
+-		*filesize = (int32) st.st_size;
++		*filesize = (int32_t) st.st_size;
+ 		return 0;
+ 	} else {
+ 		return -1;
+@@ -1211,7 +1211,7 @@
+ dovend_rfc1048(bp, hp, bootsize)
+ 	struct bootp *bp;
+ 	struct host *hp;
+-	int32 bootsize;
++	int32_t bootsize;
+ {
+ 	int bytesleft, len;
+ 	byte *vp;
+diff -ur bootpd-2.4.orig/bootpd.c-org bootpd-2.4/bootpd.c-org
+--- bootpd-2.4.orig/bootpd.c-org	1994-11-27 15:36:21.000000000 +0200
++++ bootpd-2.4/bootpd.c-org	2010-07-07 14:55:03.000000000 +0300
+@@ -117,14 +117,14 @@
+ extern void dumptab P((char *));
+ 
+ PRIVATE void catcher P((int));
+-PRIVATE int chk_access P((char *, int32 *));
++PRIVATE int chk_access P((char *, int32_t *));
+ #ifdef VEND_CMU
+ PRIVATE void dovend_cmu P((struct bootp *, struct host *));
+ #endif
+-PRIVATE void dovend_rfc1048 P((struct bootp *, struct host *, int32));
++PRIVATE void dovend_rfc1048 P((struct bootp *, struct host *, int32_t));
+ PRIVATE void handle_reply P((void));
+ PRIVATE void handle_request P((void));
+-PRIVATE void sendreply P((int forward, int32 dest_override));
++PRIVATE void sendreply P((int forward, int32_t dest_override));
+ PRIVATE void usage P((void));
+ 
+ #undef	P
+@@ -339,7 +339,7 @@
+ 						"%s: invalid timeout specification\n", progname);
+ 				break;
+ 			}
+-			actualtimeout.tv_sec = (int32) (60 * n);
++			actualtimeout.tv_sec = (int32_t) (60 * n);
+ 			/*
+ 			 * If the actual timeout is zero, pass a NULL pointer
+ 			 * to select so it blocks indefinitely, otherwise,
+@@ -606,9 +606,9 @@
+ 	struct bootp *bp = (struct bootp *) pktbuf;
+ 	struct host *hp = NULL;
+ 	struct host dummyhost;
+-	int32 bootsize = 0;
++	int32_t bootsize = 0;
+ 	unsigned hlen, hashcode;
+-	int32 dest;
++	int32_t dest;
+ 	char realpath[1024];
+ 	char *clntpath;
+ 	char *homedir, *bootfile;
+@@ -716,7 +716,7 @@
+ 	 * with a timestamp lower than the threshold.
+ 	 */
+ 	if (hp->flags.min_wait) {
+-		u_int32 t = (u_int32) ntohs(bp->bp_secs);
++		uint32_t t = (uint32_t) ntohs(bp->bp_secs);
+ 		if (t < hp->min_wait) {
+ 			if (debug > 1)
+ 				report(LOG_INFO,
+@@ -987,7 +987,7 @@
+ PRIVATE void
+ sendreply(forward, dst_override)
+ 	int forward;
+-	int32 dst_override;
++	int32_t dst_override;
+ {
+ 	struct bootp *bp = (struct bootp *) pktbuf;
+ 	struct in_addr dst;
+@@ -1100,12 +1100,12 @@
+ PRIVATE int
+ chk_access(path, filesize)
+ 	char *path;
+-	int32 *filesize;
++	int32_t *filesize;
+ {
+ 	struct stat st;
+ 
+ 	if ((stat(path, &st) == 0) && (st.st_mode & (S_IREAD >> 6))) {
+-		*filesize = (int32) st.st_size;
++		*filesize = (int32_t) st.st_size;
+ 		return 0;
+ 	} else {
+ 		return -1;
+@@ -1201,7 +1201,7 @@
+ dovend_rfc1048(bp, hp, bootsize)
+ 	struct bootp *bp;
+ 	struct host *hp;
+-	int32 bootsize;
++	int32_t bootsize;
+ {
+ 	int bytesleft, len;
+ 	byte *vp;
+diff -ur bootpd-2.4.orig/bootpd.h bootpd-2.4/bootpd.h
+--- bootpd-2.4.orig/bootpd.h	1994-11-27 15:36:13.000000000 +0200
++++ bootpd-2.4/bootpd.h	2010-07-07 14:55:03.000000000 +0300
+@@ -180,8 +180,8 @@
+ 			    htype,  /* RFC826 says this should be 16-bits but
+ 				       RFC951 only allocates 1 byte. . . */
+ 			    haddr[MAXHADDRLEN];
+-    int32		    time_offset;
+-    unsigned int32	    bootsize,
++    int32_t		    time_offset;
++    uint32_t	    bootsize,
+ 			    msg_size,
+ 			    min_wait;
+     struct in_addr	    bootserver,
+diff -ur bootpd-2.4.orig/Bootpd-linux.diffs bootpd-2.4/Bootpd-linux.diffs
+--- bootpd-2.4.orig/Bootpd-linux.diffs	1995-02-28 02:14:29.000000000 +0200
++++ bootpd-2.4/Bootpd-linux.diffs	2010-07-07 14:55:03.000000000 +0300
+@@ -21,17 +21,17 @@
+ --- 494,499 ----
+ ***************
+ *** 619,625 ****
+-  	int32 bootsize = 0;
++  	int32_t bootsize = 0;
+   	unsigned hlen, hashcode;
+-  	int32 dest;
++  	int32_t dest;
+ ! 	char realpath[1024] = {""};
+   	char *clntpath;
+   	char *homedir, *bootfile;
+   	int n;
+ --- 609,615 ----
+-  	int32 bootsize = 0;
++  	int32_t bootsize = 0;
+   	unsigned hlen, hashcode;
+-  	int32 dest;
++  	int32_t dest;
+ ! 	char realpath[1024];
+   	char *clntpath;
+   	char *homedir, *bootfile;
+diff -ur bootpd-2.4.orig/bootpef.c bootpd-2.4/bootpef.c
+--- bootpd-2.4.orig/bootpef.c	1994-11-27 15:36:13.000000000 +0200
++++ bootpd-2.4/bootpef.c	2010-07-07 14:55:03.000000000 +0300
+@@ -97,7 +97,7 @@
+ #define P(args) ()
+ #endif
+ 
+-static void dovend_rfc1048 P((struct bootp *, struct host *, int32));
++static void dovend_rfc1048 P((struct bootp *, struct host *, int32_t));
+ static void mktagfile P((struct host *));
+ static void usage P((void));
+ 
+@@ -139,7 +139,7 @@
+  * Initialization such as command-line processing is done and then the
+  * main server loop is started.
+  */
+-void
++int
+ main(argc, argv)
+ 	int argc;
+ 	char **argv;
+@@ -275,6 +275,7 @@
+ 		mktagfile(hp);
+ 		hp = (struct host *) hash_NextEntry(nmhashtable);
+ 	}
++	return(0);
+ }
+ 
+ 
+diff -ur bootpd-2.4.orig/bootpgw.c bootpd-2.4/bootpgw.c
+--- bootpd-2.4.orig/bootpgw.c	1994-11-27 15:36:21.000000000 +0200
++++ bootpd-2.4/bootpgw.c	2010-07-07 14:55:03.000000000 +0300
+@@ -139,7 +139,7 @@
+ int pktlen;
+ char *progname;
+ char *servername;
+-int32 server_ipa;				/* Real server IP address, network order. */
++int32_t server_ipa;				/* Real server IP address, network order. */
+ 
+ char myhostname[64];
+ struct in_addr my_ip_addr;
+@@ -152,7 +152,7 @@
+  * main server loop is started.
+  */
+ 
+-void
++int
+ main(argc, argv)
+ 	int argc;
+ 	char **argv;
+@@ -298,7 +298,7 @@
+ 						"%s: invalid timeout specification\n", progname);
+ 				break;
+ 			}
+-			actualtimeout.tv_sec = (int32) (60 * n);
++			actualtimeout.tv_sec = (int32_t) (60 * n);
+ 			/*
+ 			 * If the actual timeout is zero, pass a NULL pointer
+ 			 * to select so it blocks indefinitely, otherwise,
+@@ -481,6 +481,7 @@
+ 			break;
+ 		}
+ 	}
++	return(0);
+ }
+ 
+ 
+diff -ur bootpd-2.4.orig/bootp.h bootpd-2.4/bootp.h
+--- bootpd-2.4.orig/bootp.h	1994-11-27 15:36:13.000000000 +0200
++++ bootpd-2.4/bootp.h	2010-07-07 14:55:03.000000000 +0300
+@@ -31,7 +31,7 @@
+  *
+  */
+ 
+-#include "bptypes.h"	/* for int32, u_int32 */
++#include "bptypes.h"	/* for int32_t, uint32_t */
+ 
+ #define BP_CHADDR_LEN	 16
+ #define BP_SNAME_LEN	 64
+@@ -44,7 +44,7 @@
+     unsigned char    bp_htype;			/* hardware addr type */
+     unsigned char    bp_hlen;			/* hardware addr length */
+     unsigned char    bp_hops;			/* gateway hops */
+-    unsigned int32   bp_xid;			/* transaction ID */
++    uint32_t   bp_xid;			/* transaction ID */
+     unsigned short   bp_secs;			/* seconds since boot began */
+     unsigned short   bp_flags;			/* RFC1532 broadcast, etc. */
+     struct in_addr   bp_ciaddr;			/* client IP address */
+@@ -133,13 +133,13 @@
+ 
+ struct cmu_vend {
+ 	char		v_magic[4];	/* magic number */
+-	unsigned int32	v_flags;	/* flags/opcodes, etc. */
++	uint32_t	v_flags;	/* flags/opcodes, etc. */
+ 	struct in_addr 	v_smask;	/* Subnet mask */
+ 	struct in_addr 	v_dgate;	/* Default gateway */
+ 	struct in_addr	v_dns1, v_dns2; /* Domain name servers */
+ 	struct in_addr	v_ins1, v_ins2; /* IEN-116 name servers */
+ 	struct in_addr	v_ts1, v_ts2;	/* Time servers */
+-	int32		v_unused[6];	/* currently unused */
++	int32_t		v_unused[6];	/* currently unused */
+ };
+ 
+ 
+diff -ur bootpd-2.4.orig/bootptest.c bootpd-2.4/bootptest.c
+--- bootpd-2.4.orig/bootptest.c	1994-11-27 15:36:19.000000000 +0200
++++ bootpd-2.4/bootptest.c	2010-07-07 14:55:03.000000000 +0300
+@@ -125,12 +125,12 @@
+ 	char *servername = NULL;
+ 	char *vendor_file = NULL;
+ 	char *bp_file = NULL;
+-	int32 server_addr;			/* inet addr, network order */
++	int32_t server_addr;			/* inet addr, network order */
+ 	int s;						/* Socket file descriptor */
+ 	int n, tolen, fromlen, recvcnt;
+ 	int use_hwa = 0;
+-	int32 vend_magic;
+-	int32 xid;
++	int32_t vend_magic;
++	int32_t xid;
+ 
+ 	progname = strrchr(argv[0], '/');
+ 	if (progname)
+@@ -286,8 +286,8 @@
+ 	bp = (struct bootp *) sndbuf;
+ 	bzero(bp, sizeof(*bp));
+ 	bp->bp_op = BOOTREQUEST;
+-	xid = (int32) getpid();
+-	bp->bp_xid = (u_int32) htonl(xid);
++	xid = (int32_t) getpid();
++	bp->bp_xid = (uint32_t) htonl(xid);
+ 	if (bp_file)
+ 		strncpy(bp->bp_file, bp_file, BP_FILE_LEN);
+ 
+diff -ur bootpd-2.4.orig/bptypes.h bootpd-2.4/bptypes.h
+--- bootpd-2.4.orig/bptypes.h	1994-11-27 15:36:14.000000000 +0200
++++ bootpd-2.4/bptypes.h	2010-07-07 14:55:03.000000000 +0300
+@@ -1,18 +1,10 @@
+ /* bptypes.h */
++#include <sys/types.h>
+ 
+ #ifndef	BPTYPES_H
+ #define	BPTYPES_H
+ 
+ /*
+- * 32 bit integers are different types on various architectures
+- */
+-
+-#ifndef	int32
+-#define int32 long
+-#endif
+-typedef unsigned int32 u_int32;
+-
+-/*
+  * Nice typedefs. . .
+  */
+ 
+diff -ur bootpd-2.4.orig/dovend.c bootpd-2.4/dovend.c
+--- bootpd-2.4.orig/dovend.c	1994-11-27 15:36:19.000000000 +0200
++++ bootpd-2.4/dovend.c	2010-07-07 14:55:03.000000000 +0300
+@@ -385,7 +385,7 @@
+ 
+ void
+ insert_u_long(value, dest)
+-	u_int32 value;
++	uint32_t value;
+ 	byte **dest;
+ {
+ 	byte *temp;
+diff -ur bootpd-2.4.orig/dovend.h bootpd-2.4/dovend.h
+--- bootpd-2.4.orig/dovend.h	1994-11-27 15:36:14.000000000 +0200
++++ bootpd-2.4/dovend.h	2010-07-07 14:55:03.000000000 +0300
+@@ -8,6 +8,6 @@
+ 
+ extern int dovend_rfc1497 P((struct host *hp, u_char *buf, int len));
+ extern int insert_ip P((int, struct in_addr_list *, u_char **, int *));
+-extern void insert_u_long P((u_int32, u_char **));
++extern void insert_u_long P((uint32_t, u_char **));
+ 
+ #undef P
+diff -ur bootpd-2.4.orig/getether.c bootpd-2.4/getether.c
+--- bootpd-2.4.orig/getether.c	1994-11-27 15:36:20.000000000 +0200
++++ bootpd-2.4/getether.c	2010-07-07 14:58:09.000000000 +0300
+@@ -14,6 +14,8 @@
+ #include <ctype.h>
+ #include <syslog.h>
+ 
++#include <string.h> /* bzero and strcpy */
++
+ #include "report.h"
+ #define EALEN 6
+ 
+@@ -340,7 +342,7 @@
+ 	if (ioctl(fd, SIOCGIFHWADDR, &phys) < 0) {
+ 		report(LOG_ERR, "getether: ioctl SIOCGIFHWADDR failed");
+ 	} else {
+-		bcopy(phys.ifr_hwaddr, eap, EALEN);
++		bcopy(&phys.ifr_hwaddr, eap, EALEN);
+ 		rc = 0;
+ 	}
+ 	close(fd);
+diff -ur bootpd-2.4.orig/lookup.c bootpd-2.4/lookup.c
+--- bootpd-2.4.orig/lookup.c	1994-11-27 15:36:15.000000000 +0200
++++ bootpd-2.4/lookup.c	2010-07-07 14:55:03.000000000 +0300
+@@ -69,7 +69,7 @@
+ int
+ lookup_ipa(hostname, result)
+ 	char *hostname;
+-	u_int32 *result;
++	uint32_t *result;
+ {
+ 	struct hostent *hp;
+ 	hp = gethostbyname(hostname);
+@@ -90,10 +90,10 @@
+  */
+ int
+ lookup_netmask(addr, result)
+-	u_int32 addr;				/* both in network order */
+-	u_int32 *result;
++	uint32_t addr;				/* both in network order */
++	uint32_t *result;
+ {
+-	int32 m, a;
++	int32_t m, a;
+ 
+ 	a = ntohl(addr);
+ 	m = 0;
+diff -ur bootpd-2.4.orig/lookup.h bootpd-2.4/lookup.h
+--- bootpd-2.4.orig/lookup.h	1994-11-27 15:36:15.000000000 +0200
++++ bootpd-2.4/lookup.h	2010-07-07 14:55:03.000000000 +0300
+@@ -1,6 +1,6 @@
+ /* lookup.h */
+ 
+-#include "bptypes.h"	/* for int32, u_int32 */
++#include "bptypes.h"	/* for int32_t, uint32_t */
+ 
+ #ifdef	__STDC__
+ #define P(args) args
+@@ -9,7 +9,7 @@
+ #endif
+ 
+ extern u_char *lookup_hwa P((char *hostname, int htype));
+-extern int lookup_ipa P((char *hostname, u_int32 *addr));
+-extern int lookup_netmask P((u_int32 addr, u_int32 *mask));
++extern int lookup_ipa P((char *hostname, uint32_t *addr));
++extern int lookup_netmask P((uint32_t addr, uint32_t *mask));
+ 
+ #undef P
+diff -ur bootpd-2.4.orig/Makefile bootpd-2.4/Makefile
+--- bootpd-2.4.orig/Makefile	1995-02-28 12:59:19.000000000 +0200
++++ bootpd-2.4/Makefile	2010-07-07 14:57:07.000000000 +0300
+@@ -40,7 +40,7 @@
+ BINDIR=/usr/etc
+ MANDIR=/usr/local/man
+ 
+-CFLAGS= $(OPTDEFS) $(SYSDEFS) $(FILEDEFS) $(MOREDEFS)
++CFLAGS+= $(OPTDEFS) $(SYSDEFS) $(FILEDEFS) $(MOREDEFS)
+ PROGS= bootpd bootpef bootpgw bootptest
+ TESTS= trylook trygetif trygetea
+ 
+@@ -86,7 +86,7 @@
+ 
+ # DEC/OSF1 on the Alpha
+ alpha:
+-	$(MAKE) SYSDEFS="-DETC_ETHERS -Dint32=int -D_SOCKADDR_LEN" \
++	$(MAKE) SYSDEFS="-DETC_ETHERS -Dint32_t=int -D_SOCKADDR_LEN" \
+ 		STRERROR=strerror.o
+ 
+ # Control Data EP/IX 1.4.3 system, BSD 4.3 mode
+@@ -124,7 +124,7 @@
+ # Linux
+ ###
+ linux:
+-	$(MAKE) CC="gcc -O2" \
++	$(MAKE) CC="${CC}" \
+ 		SYSDEFS="-Dlinux" \
+ 		SYSLIBS="" \
+ 		LOG_FACILITY="-DLOG_BOOTP=LOG_LOCAL2" \
+@@ -143,36 +143,36 @@
+ OBJ_D=	bootpd.o dovend.o readfile.o hash.o dumptab.o \
+ 	 lookup.o getif.o hwaddr.o tzone.o report.o $(STRERROR)
+ bootpd: $(OBJ_D)
+-	$(CC) -o $@ $(OBJ_D) $(SYSLIBS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJ_D) $(SYSLIBS)
+ 
+ OBJ_EF=	bootpef.o dovend.o readfile.o hash.o dumptab.o \
+ 	 lookup.o hwaddr.o tzone.o report.o $(STRERROR)
+ bootpef: $(OBJ_EF)
+-	$(CC) -o $@ $(OBJ_EF) $(SYSLIBS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJ_EF) $(SYSLIBS)
+ 
+ OBJ_GW= bootpgw.o getif.o hwaddr.o report.o $(STRERROR)
+ bootpgw: $(OBJ_GW)
+-	$(CC) -o $@ $(OBJ_GW) $(SYSLIBS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJ_GW) $(SYSLIBS)
+ 
+ OBJ_TEST= bootptest.o print-bootp.o getif.o getether.o \
+ 	 report.o $(STRERROR)
+ bootptest: $(OBJ_TEST)
+-	$(CC) -o $@ $(OBJ_TEST) $(SYSLIBS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJ_TEST) $(SYSLIBS)
+ 
+ # This is just for testing the lookup functions.
+ TRYLOOK= trylook.o lookup.o report.o $(STRERROR)
+ trylook : $(TRYLOOK)
+-	$(CC) -o $@ $(TRYLOOK) $(SYSLIBS)
++	$(CC) $(LDFLAGS) -o $@ $(TRYLOOK) $(SYSLIBS)
+ 
+ # This is just for testing getif.
+ TRYGETIF= trygetif.o getif.o report.o $(STRERROR)
+ trygetif : $(TRYGETIF)
+-	$(CC) -o $@ $(TRYGETIF) $(SYSLIBS)
++	$(CC) $(LDFLAGS) -o $@ $(TRYGETIF) $(SYSLIBS)
+ 
+ # This is just for testing getether.
+ TRYGETEA= trygetea.o getether.o report.o $(STRERROR)
+ trygetea : $(TRYGETEA)
+-	$(CC) -o $@ $(TRYGETEA) $(SYSLIBS)
++	$(CC) $(LDFLAGS) -o $@ $(TRYGETEA) $(SYSLIBS)
+ 
+ # This rule just keeps the LOG_BOOTP define localized.
+ report.o : report.c
+diff -ur bootpd-2.4.orig/print-bootp.c bootpd-2.4/print-bootp.c
+--- bootpd-2.4.orig/print-bootp.c	1994-11-27 15:36:21.000000000 +0200
++++ bootpd-2.4/print-bootp.c	2010-07-07 14:55:03.000000000 +0300
+@@ -170,9 +170,9 @@
+ 
+ 	TCHECK(bp->bp_vend[0], vdlen);
+ 	printf(" vend");
+-	if (!bcmp(bp->bp_vend, vm_rfc1048, sizeof(u_int32)))
++	if (!bcmp(bp->bp_vend, vm_rfc1048, sizeof(uint32_t)))
+ 		rfc1048_print(bp->bp_vend, vdlen);
+-	else if (!bcmp(bp->bp_vend, vm_cmu, sizeof(u_int32)))
++	else if (!bcmp(bp->bp_vend, vm_cmu, sizeof(uint32_t)))
+ 		cmu_print(bp->bp_vend, vdlen);
+ 	else
+ 		other_print(bp->bp_vend, vdlen);
+@@ -192,7 +192,7 @@
+  * a: ASCII
+  * b: byte (8-bit)
+  * i: inet address
+- * l: int32
++ * l: int32_t
+  * s: short (16-bit)
+  */
+ char *
+@@ -281,7 +281,7 @@
+ 	u_char tag;
+ 	u_char *ep;
+ 	register int len, j;
+-	u_int32 ul;
++	uint32_t ul;
+ 	u_short us;
+ 	struct in_addr ia;
+ 	char *optstr;
+@@ -289,7 +289,7 @@
+ 	printf("-rfc1395");
+ 
+ 	/* Step over magic cookie */
+-	bp += sizeof(int32);
++	bp += sizeof(int32_t);
+ 	/* Setup end pointer */
+ 	ep = bp + length;
+ 	while (bp < ep) {
+diff -ur bootpd-2.4.orig/readfile.c bootpd-2.4/readfile.c
+--- bootpd-2.4.orig/readfile.c	1994-11-27 15:36:22.000000000 +0200
++++ bootpd-2.4/readfile.c	2010-07-07 14:55:03.000000000 +0300
+@@ -149,7 +149,7 @@
+ 
+ PRIVATE int nhosts;				/* Number of hosts (/w hw or IP address) */
+ PRIVATE int nentries;			/* Total number of entries */
+-PRIVATE int32 modtime = 0;		/* Last modification time of bootptab */
++PRIVATE int32_t modtime = 0;		/* Last modification time of bootptab */
+ PRIVATE char *current_hostname;	/* Name of the current entry. */
+ PRIVATE char current_tagname[8];
+ 
+@@ -260,7 +260,7 @@
+ 	get_shared_string P((char **));
+ PRIVATE char *
+ 	get_string P((char **, char *, u_int *));
+-PRIVATE u_int32
++PRIVATE uint32_t
+ 	get_u_long P((char **));
+ PRIVATE boolean
+ 	goodname P((char *));
+@@ -279,7 +279,7 @@
+ PRIVATE byte *
+ 	prs_haddr P((char **, u_int));
+ PRIVATE int
+-	prs_inetaddr P((char **, u_int32 *));
++	prs_inetaddr P((char **, uint32_t *));
+ PRIVATE void
+ 	read_entry P((FILE *, char *, u_int *));
+ PRIVATE char *
+@@ -415,7 +415,7 @@
+ 		 */
+ 		if (goodname(hp->hostname->string)) {
+ 			char *hn = hp->hostname->string;
+-			u_int32 value;
++			uint32_t value;
+ 			if (hp->flags.iaddr == 0) {
+ 				if (lookup_ipa(hn, &value)) {
+ 					report(LOG_ERR, "can not get IP addr for %s", hn);
+@@ -798,8 +798,8 @@
+ 	byte *tmphaddr;
+ 	struct shared_string *ss;
+ 	struct symbolmap *symbolptr;
+-	u_int32 value;
+-	int32 timeoff;
++	uint32_t value;
++	int32_t timeoff;
+ 	int i, numsymbols;
+ 	unsigned len;
+ 	int optype;					/* Indicates boolean, addition, or deletion */
+@@ -1674,11 +1674,11 @@
+ PRIVATE int
+ prs_inetaddr(src, result)
+ 	char **src;
+-	u_int32 *result;
++	uint32_t *result;
+ {
+ 	char tmpstr[MAXSTRINGLEN];
+-	register u_int32 value;
+-	u_int32 parts[4], *pp;
++	register uint32_t value;
++	uint32_t parts[4], *pp;
+ 	int n;
+ 	char *s, *t;
+ 
+@@ -1862,11 +1862,11 @@
+  * point to the first illegal character.
+  */
+ 
+-PRIVATE u_int32
++PRIVATE uint32_t
+ get_u_long(src)
+ 	char **src;
+ {
+-	register u_int32 value, base;
++	register uint32_t value, base;
+ 	char c;
+ 
+ 	/*
+diff -ur bootpd-2.4.orig/report.c bootpd-2.4/report.c
+--- bootpd-2.4.orig/report.c	1994-11-27 15:36:16.000000000 +0200
++++ bootpd-2.4/report.c	2010-07-07 14:55:03.000000000 +0300
+@@ -10,6 +10,7 @@
+ 
+ #include <stdio.h>
+ #include <syslog.h>
++#include <errno.h>
+ 
+ #include "report.h"
+ 
+diff -ur bootpd-2.4.orig/tzone.c bootpd-2.4/tzone.c
+--- bootpd-2.4.orig/tzone.c	1994-11-27 15:36:17.000000000 +0200
++++ bootpd-2.4/tzone.c	2010-07-07 14:55:03.000000000 +0300
+@@ -19,7 +19,7 @@
+ #include "tzone.h"
+ 
+ /* This is what other modules use. */
+-int32 secondswest;
++int32_t secondswest;
+ 
+ /*
+  * Get our timezone offset so we can give it to clients if the
+diff -ur bootpd-2.4.orig/tzone.h bootpd-2.4/tzone.h
+--- bootpd-2.4.orig/tzone.h	1994-11-27 15:36:17.000000000 +0200
++++ bootpd-2.4/tzone.h	2010-07-07 14:55:03.000000000 +0300
+@@ -1,3 +1,3 @@
+ /* tzone.h */
+-extern int32 secondswest;
++extern int32_t secondswest;
+ extern void tzone_init();
diff --git a/net-misc/netkit-bootpd/metadata.xml b/net-misc/netkit-bootpd/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/net-misc/netkit-bootpd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild
new file mode 100644
index 000000000000..7ae6c8941158
--- /dev/null
+++ b/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+inherit eutils toolchain-funcs
+
+MY_P=${P/netkit-}
+
+DESCRIPTION="Netkit - bootp"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake linux || die
+}
+
+src_install() {
+	dosbin bootp{d,ef,gw,test} || die
+
+	for x in d ef gw test; do
+		dosym bootp${x} /usr/sbin/in.bootp${x} || die
+	done
+
+	doman *.5 *.8
+	dodoc Announce Changes Problems README{,-linux} ToDo
+}
diff --git a/net-misc/netkit-fingerd/Manifest b/net-misc/netkit-fingerd/Manifest
new file mode 100644
index 000000000000..75a7fc3f3061
--- /dev/null
+++ b/net-misc/netkit-fingerd/Manifest
@@ -0,0 +1,8 @@
+AUX fingerd.xinetd 250 SHA256 b952f642f8ffefe94f107bb25470eccab9473df631f066118447de634ac66fa1 SHA512 7867a6463fd1c0d6994d2c6a0f2d6e7ebb558b2d3131df478cd736aa2028a6c5246d3d7f3959af9057a6446a2350f25bcf1d956d0b6cf4809d729a5dae2a004b WHIRLPOOL a56b332f9708bbe91f32df0e7550ce765f1354878347ed3706f40869aaa0f6beb3273fe7f89ba7e24d231d729afb6fe48f23af62c37fda39d16aac8d0ead1387
+AUX netkit-fingerd-0.17-name-check.patch 681 SHA256 d0c5b654751e29b6853c93a0b75b960e6d82a5625bec94e030fb65e2e038ac62 SHA512 832afddbf7c5d9985fd5ffd87f3354be1c2aba4a82146e2ebfca81045c80b91238b31f94ef72409042e8fd8c250108d2d29feb3a1ce1acd77769d3df8a09c23a WHIRLPOOL 1b70f3bc096c40c1760297fd0c8056903d7c35804400a938d47128c57abd36115dd02f5195011a2a9c7f29dbaca8ad602c711518f3f070a7e7edc014c85a0861
+AUX netkit-fingerd-0.17-r2-gentoo.diff 603 SHA256 5abad3b9d3088d9fbe46de2e3c7a94f7a6ccfc656b0069b7a004b276906ba596 SHA512 1948a9c350a31497fa681aa6061ac859a5a3b18b9efb4b87a323a45a1472c6ddc31e50da33b891701f2e7196ea6fa07a40c31575ba261f9c2f3a6e28b35dbbb1 WHIRLPOOL 1d077f2123f395ff50c32d239cf4096a4f7fc8027f2b3e0d84bf0c04a1111dc99b29023245208d0116da2d4adef4a8b4fdc785735c865a73f162c1c965042b13
+DIST bsd-finger_0.17.orig.tar.gz 25521 SHA256 84885d668d117ef50e01c7034a45d8343d747cec6212e40e8d08151bc18e13fa SHA512 07570a9a5797579273938ef728f222f483c733e78eb6acb00e2bce9ff9df29aa85ed715872032701c8f67fcbc7cf5501f12dc2b8234c30df7d25f50cc38359b0 WHIRLPOOL bb1fe0bcba7197513fb8a56a60f17a52049e82e37d1f21a2012943aeb5092cdcc711421e621536d9497383e26466237a7cfeb50884e23575c2b522b2784fb39b
+EBUILD netkit-fingerd-0.17-r3.ebuild 1141 SHA256 ffb900ae711f1f3c9b6ad23ee065d10842f7fa6f4182e9b2f0cd224446fe6f84 SHA512 1e2e9633e73d10e52bcd6e29d748f6d935cd294b0bafdb33ebd7c822afeeeb924f74d3e1997c5e7efb230b7250ad049f4821c946bcff8de54458ee99f1cba373 WHIRLPOOL aa831a73bba1d992c227ba614a9605b689d49b116d7274464cebc0788749f0dd8ccd32b6a75082dd26095aaa89240e0cdce5f240918040e58b129194be3176ac
+MISC ChangeLog 2567 SHA256 353715b5397ebef99fe10628e8a94196bf49c37a838b084bc7c48bfb155cee3e SHA512 01ac9fb176f6f4fc337bcadb175ee494497885015e38205571db5459da286ba0e0701f6004d9bc1957d139a3f67ea1ca7e9c3c71c3f4d8f493f186d132727412 WHIRLPOOL 08d8def6cb05932266819e917d39048bbb0ef1e2ca46fd49b1f60fe7807a5853325977864057733dd0c27954c1c6dfe8b7a0062ac62fcfee65217df882abdee1
+MISC ChangeLog-2015 2865 SHA256 cc3fcca3e61895b8b0de4dded3d5d6fe421bf769a3e11d98599e11f0f45541a9 SHA512 36ff8d19dd1fb5e70ad87a3bd24f258bc0cae747753427514e672581f6561b137ff91f304945c8b3bdada602b8ccbc270cdbcf27ff1016c7fd4aafc495a22370 WHIRLPOOL a2979c9d6649325d81d3ef194cc630bc8c65943f802bc235e71f499d7e713a5a86cb62aa0f2428b971750a3677968d0250496466e74127deb8fbadd2aeb6cd29
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/net-misc/netkit-fingerd/files/fingerd.xinetd b/net-misc/netkit-fingerd/files/fingerd.xinetd
new file mode 100644
index 000000000000..f5a86e3686b3
--- /dev/null
+++ b/net-misc/netkit-fingerd/files/fingerd.xinetd
@@ -0,0 +1,10 @@
+service finger
+{
+        socket_type     = stream
+        protocol        = tcp
+        wait            = no
+        user            = nobody
+        server          = /usr/sbin/in.fingerd
+        server_args     = -w
+        disable         = yes
+}
diff --git a/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-name-check.patch b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-name-check.patch
new file mode 100644
index 000000000000..aa40221f4e01
--- /dev/null
+++ b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-name-check.patch
@@ -0,0 +1,26 @@
+fix possible usage of uninitialized memory
+
+http://bugs.gentoo.org/80286
+
+--- bsd-finger-0.17/finger/lprint.c
++++ bsd-finger-0.17/finger/lprint.c
+@@ -100,7 +100,7 @@
+ 	 *	office, office phone, home phone if available
+ 	 */
+ 	xprintf("Login: %-15s\t\t\tName: %s\nDirectory: %-25s",
+-		pn->name, pn->realname, pn->dir);
++		pn->name, pn->realname ? pn->realname : "", pn->dir);
+ 	xprintf("\tShell: %-s\n", *pn->shell ? pn->shell : _PATH_BSHELL);
+ 
+ 	/*
+--- bsd-finger-0.17/finger/util.c
++++ bsd-finger-0.17/finger/util.c
+@@ -149,6 +149,8 @@
+ 		rname[j] = 0;
+ 
+ 		pn->realname = rname;
++	} else {
++		pn->realname = NULL;
+ 	}
+ 
+ 	pn->office =      fields[1] ? strdup(fields[1]) : NULL;
diff --git a/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff
new file mode 100644
index 000000000000..e7c2d776147d
--- /dev/null
+++ b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff
@@ -0,0 +1,22 @@
+--- bsd-finger-0.17/finger/lprint.c~	Tue Sep 14 12:51:11 1999
++++ bsd-finger-0.17/finger/lprint.c	Sun Apr 29 21:49:04 2001
+@@ -48,7 +48,7 @@
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <sys/stat.h>
+-#include <sys/time.h>
++#include <time.h>
+ #include "finger.h"
+ 
+ static void lprint(PERSON *pn);
+--- bsd-finger-0.17/finger/sprint.c~	Sun Dec 12 19:59:33 1999
++++ bsd-finger-0.17/finger/sprint.c	Sun Apr 29 21:49:22 2001
+@@ -40,7 +40,7 @@
+ #endif /* not lint */
+ 
+ #include <sys/types.h>
+-#include <sys/time.h>
++#include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/net-misc/netkit-fingerd/metadata.xml b/net-misc/netkit-fingerd/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/net-misc/netkit-fingerd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
new file mode 100644
index 000000000000..e450f0098835
--- /dev/null
+++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+MY_PN="${PN/netkit/bsd}"
+MY_PN="${MY_PN/rd/r}"
+DESCRIPTION="Netkit - fingerd and finger client"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="mirror://debian/pool/main/b/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-r2-gentoo.diff
+	epatch "${FILESDIR}"/${P}-name-check.patch #80286
+}
+
+src_configure() {
+	# We'll skip this stage as the configure script is crappy and not really
+	# needed -- src_install installs all files by hand.
+	touch MCONFIG
+	tc-export CC
+}
+
+src_compile() {
+	emake CC="${CC}"
+}
+
+src_install() {
+	dobin finger/finger
+	dosbin fingerd/fingerd
+	dosym fingerd /usr/sbin/in.fingerd
+	doman finger/finger.1 fingerd/fingerd.8
+	dosym fingerd.8 /usr/share/man/man8/in.fingerd.8
+	dodoc README ChangeLog BUGS
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/fingerd.xinetd fingerd
+}
diff --git a/net-misc/netkit-routed/Manifest b/net-misc/netkit-routed/Manifest
new file mode 100644
index 000000000000..0738c6311993
--- /dev/null
+++ b/net-misc/netkit-routed/Manifest
@@ -0,0 +1,9 @@
+AUX netkit-routed-0.17-printf.patch 460 SHA256 5b7ee6027ad2264baedf0ae173b1e466abe52001c84c9a12af87f443e0b0e4d9 SHA512 b96f6826b18dc2bb2ce5395a18582e339d941a20c0613bc9bd4582756de07264679e2bb8b0c5ff979ab87ccbaaa1152ddf983598ae05a5960d2fc586c3381d0c WHIRLPOOL 6322a4d86a45c1117d55f84f945c5aeabc2767e829d5f587bebeb330ad3790a66d8fa1f42f29fd56668b5af0187d7b09c29e49583a0671fbecb171208e7e02c7
+AUX netkit-routed-0.17-time.patch 568 SHA256 513a784dfe842bfba17ccd1f582b2fb566859a66fc527c7bc221c194fbe6c429 SHA512 ba39437103ddfd6fc0a875de726f181aaaca4014cb0c641129c42bc68c09d18f09368de5c4780f2b11b738a7c75bddafc74560c7e7829e9200eb436735d7ac81 WHIRLPOOL 52eb562833cd054c1de9f800ea9f06fbb4c74dbca0ddc720b471ed8c4852646ea1cd239ace5d83fcecee5a44eecb77225241bd2a5e3e3834b7da22539732b342
+AUX routed.confd 589 SHA256 609f2210f57ce8f76ecd6b5335dc73dc0d34fc2807d257b880ec334af90f919a SHA512 ce7d67dbf1fd7c18bdd8154eaa4ae46ccdbf178224383a3209577cbe7292f4442b294af40e5e9e9b3d6c801982f719943a988cf19f26176a06cd7fc1444942f3 WHIRLPOOL 8f0b8f8c27500580568da99b710b0e1ca5a3f4955e02822c6008a8972a35c5f83f05582b6f544d74af42f4a929631d201b38db8ceb7399e4ad8ccdcd61689f5c
+AUX routed.initd 396 SHA256 bb34ba5715377c72704c41e7e53cd22e7119e2e9da5c72bc3045c7aaf2ea947c SHA512 62cb5ae462bb9baeeb383a1ab2afd3e24407403592ea613854bc8f48def576b7fb3d4c211f138b49b3c1d3cc818fb7c08be12fb2b5b973dcb9b669c9c01800ca WHIRLPOOL e21dfaed21f1e693dde029d7c68bdae1f7e6c34049d4f19b1ed2ff4c2c3c3c328db8d9c3c79558d176a92f99f6b8533143c3724c74b0914d19120149a58e0375
+DIST netkit-routed_0.17.orig.tar.gz 36435 SHA256 0d6e7eb31e2ece9eccca1e0cbf01425b8a749bf08b83fbacad4164cc67784824 SHA512 9dea1048af22d5bbcec0aa9722a518e81d4415c7cc3219ae13d38450b0960fb30e0b082648717336c5870fa65f921a3830aadca23d0595ca719f89f4615afbc9 WHIRLPOOL 7a5ab21cf9faf11361f70b2efcaf6a6be04534b6f7696ce61ff462734e93043d764ed1a88dff8f52eeb016883848b51607d87a3112777bd06ee64d08cc7f4bf1
+EBUILD netkit-routed-0.17-r5.ebuild 1063 SHA256 646d58e70aecaa24be8942f5523d4402b893b8d11b2bb76b644a2ec299157efe SHA512 4687f384dfda7d661726e498307b57a4f4279a659cc523db905522709f90758d2a61541ecf71b63541dd30b26a1466f5b70c775a2538486e098353d332ad2b77 WHIRLPOOL b08cbef2b899944a078dbd8600d8368a8627a9e335f6bebf24297e960b18d61bc6f3c0454bc82cbe8021271880465c2ba0d3d0a773af90ac7e483f6b4b3ab5a5
+MISC ChangeLog 3093 SHA256 fe3171186ee60c3a6b9a69d120f38b21234fe50dcfe75652cbfd89f5eb9a10c5 SHA512 7ab2ef2ea512ad7d5f4ca0fe0e1ae858b3d4ae6917ec7808f143f55510afb093bda998152b48fc57620bb88366686c9c19f2933c9aeaf44ca2111ebf785a7ffe WHIRLPOOL a4d8151ae5a7ee203cf10de7a95e78f9092fede72e5dd3b09f9086c61d7b1e6b1e3143ee5d9e53c1793368e588da8773027b15176983f8118871d3525f26febc
+MISC ChangeLog-2015 3212 SHA256 7adefe474211ab80413bf8292ee95316172f642f9a0544cd951f613920b930d6 SHA512 e5a769d4eba86117097d29b942bf253b079eba9602706746626548532887e606ad45564dfe276fcc9a5e09049ba0414137830f76ff697dc0313240ed4ad47a13 WHIRLPOOL b8d8a4411f464d035f3a65a3342e2104926906c3c5ccac4ff0aa1480a248f9c44cacfa2cc6cad43453e6f1936f504e37e617a4c59beb6b99e0f8076fd8dce723
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/netkit-routed/files/netkit-routed-0.17-printf.patch b/net-misc/netkit-routed/files/netkit-routed-0.17-printf.patch
new file mode 100644
index 000000000000..16607a22b9b1
--- /dev/null
+++ b/net-misc/netkit-routed/files/netkit-routed-0.17-printf.patch
@@ -0,0 +1,20 @@
+echo -n isn't supported by all shells, use printf instead, which is portable.
+
+Patch by Andrew Miller.
+
+https://bugs.gentoo.org/529992
+
+--- a/configure
++++ b/configure
+@@ -235,10 +235,7 @@
+ 
+ echo 'Generating MCONFIG...'
+ (
+-    echo -n '# Generated by configure (confgen version 2) on '
+-    date
+-    echo '#'
+-    echo
++    printf "#\n# Generated by configure (confgen version 2) on $(date)\n#\n\n"
+ 
+     echo "SBINDIR=$SBINDIR"
+     echo "MANDIR=$MANDIR"
diff --git a/net-misc/netkit-routed/files/netkit-routed-0.17-time.patch b/net-misc/netkit-routed/files/netkit-routed-0.17-time.patch
new file mode 100644
index 000000000000..9aa866d48367
--- /dev/null
+++ b/net-misc/netkit-routed/files/netkit-routed-0.17-time.patch
@@ -0,0 +1,20 @@
+--- a/routed/main.c	2000-01-06 00:16:12.000000000 +0100
++++ b/routed/main.c	2010-08-26 23:04:56.000000000 +0200
+@@ -57,6 +57,7 @@
+ #include <syslog.h>
+ #include <assert.h>
+ #include <sys/utsname.h>
++#include <time.h>
+ 
+ #define BUFSPACE (127*1024)	/* max. input buffer size to request */
+ 
+--- a/routed/trace.c	2000-07-23 01:25:11.000000000 +0200
++++ b/routed/trace.c	2010-08-26 23:05:17.000000000 +0200
+@@ -50,6 +50,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include "pathnames.h"
++#include <time.h>
+ 
+ #define	NRECORDS	50		/* size of circular trace buffer */
+ 
diff --git a/net-misc/netkit-routed/files/routed.confd b/net-misc/netkit-routed/files/routed.confd
new file mode 100644
index 000000000000..1b27653ec59d
--- /dev/null
+++ b/net-misc/netkit-routed/files/routed.confd
@@ -0,0 +1,16 @@
+# /etc/conf.d/routed
+
+# Normally routed is simply run as "/usr/sbin/routed".  Set this
+# option to run routed with additional parameters, for example:
+#
+#   -d  Enable additional debugging information
+#   -s  Force routed to supply routing information
+#   -q  Opposite of the -s option
+#
+# Additional options are listed in the routed(8) manual page.
+#
+# Our default configuration is to run quietly, i.e. don't publish
+# routes.  This is to keep from catching users unaware since routed
+# will publish routes if there's more than one interface configured on
+# the machine.
+ROUTED_OPTS="-q"
diff --git a/net-misc/netkit-routed/files/routed.initd b/net-misc/netkit-routed/files/routed.initd
new file mode 100644
index 000000000000..3b022fb54586
--- /dev/null
+++ b/net-misc/netkit-routed/files/routed.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting routed"
+	/sbin/start-stop-daemon --start --quiet \
+		--exec /usr/sbin/routed -- ${ROUTED_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping routed"
+	/sbin/start-stop-daemon --stop --quiet --exec /usr/sbin/routed
+	eend $?
+}
diff --git a/net-misc/netkit-routed/metadata.xml b/net-misc/netkit-routed/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/netkit-routed/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild b/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild
new file mode 100644
index 000000000000..01bd8c91915a
--- /dev/null
+++ b/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Netkit - routed"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="mirror://debian/pool/main/n/netkit-routed/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~mips ppc sparc x86"
+IUSE=""
+
+src_prepare() {
+	sed -i configure -e '/^LDFLAGS=/d' || die
+	epatch "${FILESDIR}"/${P}-time.patch
+	epatch "${FILESDIR}"/${P}-printf.patch #529992
+}
+
+src_configure() {
+	# Not an autotools generated configure script
+	./configure --with-c-compiler=$(tc-getCC) || die
+}
+
+src_install() {
+	# ripquery
+	dosbin ripquery/ripquery
+	doman ripquery/ripquery.8
+
+	# routed
+	dosbin routed/routed
+	dosym routed /usr/sbin/in.routed
+	doman routed/routed.8
+	dosym routed.8 /usr/share/man/man8/in.routed.8
+
+	# docs
+	dodoc README ChangeLog
+	newdoc routed/README README.routed
+
+	# init scripts
+	newconfd "${FILESDIR}"/routed.confd routed
+	newinitd "${FILESDIR}"/routed.initd routed
+}
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
new file mode 100644
index 000000000000..8414f275f397
--- /dev/null
+++ b/net-misc/netkit-rsh/Manifest
@@ -0,0 +1,13 @@
+AUX rexec.pamd-pambase 251 SHA256 3227d179ed7dc96b4ba300f462a623e798d43876f22fe69cab3a4ffbcf3005ee SHA512 f787317e812f8308c19554b3868d2ccd67e1f6fd017c40fad911c43bc383d9b521cc597477e48d7e082901f2af1c8125cc0476e9a697469244a62b306ab35dc6 WHIRLPOOL 10605712acfd5f880e0cf04903af09addbab2594456003840bcf5e41444415bffe5d47ac7512951a34466404b4c2c889e2359cbd6125f7a51b15e1e8c22158f6
+AUX rexec.xinetd 280 SHA256 52e523dacdf1e8f6b296e97a6a6a33a3addbccf7cbd8a94e8eeaaf20ef644bc1 SHA512 3443858e0d0f3f97669338b1f800ddb736a975a56af62dd553f4a41a4c6e4bd35149399c37734144de9076c1c7e7058c403d2b7af63fc79e8f3e6e1cc9d58ffb WHIRLPOOL 3b494440a48eca42f865927eb763447096c5e852cac038823998ccc6843617e3c9cf58fe2d668769c1f9ecdb3d0603444157506bad15f0d41dc2db56b72f6462
+AUX rlogin.pamd-pambase 343 SHA256 dead2624a30cd1446c0d0fc947953144092ce4d9955ec90eb32e4314a9b35a11 SHA512 639bd648ca75c854a23f18716568c23ee61e7358ac098e315e2d7ab2bd5f047c0bcbc878096225d86198f139a1fcbf9a51544f52e83e043422c6c29efb37902d WHIRLPOOL 51d26b283688e6217cb0fdc66e8a5685c4dfc4112522c787846d24393db47011997fe1977762e5f287d40a9fab6a3828447ca3cf52e8a4fc3a7b4c362c298028
+AUX rlogin.xinetd 282 SHA256 13bd540eb312acada08f778d29c05bbffb81138962c5b9f2d638ce905ac54312 SHA512 2e8a468420cb2cb08111d0d9a6498b02e6c768682bf9ea9d06a7dcbe1b12336fea25265e2705f2fa028d91cf453ca5fc1a9245f1d03a83e4d99064b078a2f322 WHIRLPOOL edc6517296a4db59c490d42adce5dea869688a40b9a64e777c0244d342dee9f94004cf3ee4ba4733f01a8914ae97222e889a65f5aa5f6fb0eb30c3d216c0c9bc
+AUX rsh.pamd-pambase 365 SHA256 903d04746b46799cf2ceebb70e7b939120682147ef7b2cd8514809599dc26466 SHA512 cbf7af64773b39254136d04e5195ac3737815ff7c033278b3bfd6173ec3a0ae569393c86d5def38da11072718c004a5aeb75733b1910ec9dc0125c72edaa915b WHIRLPOOL 16b93ea64859790387d9bf237f97662da024b06e17ed8be7b88a2e1d3312ccacd2981d3fae7f5e2472f2646edae805cb29f2b2025666b71353546f5fd6c8944f
+AUX rsh.xinetd 279 SHA256 0b4ca94d07628a9096400846bae40c80c4ab92123bfd2722d07e364c48fa00dd SHA512 3c6b29e51adf5766ba417ef85763d5c85384be653109e02df307ed61047eb4d4706980da56b121f3bcc63b74b842c5e8ecaaf2629d18e5d2723b3aac08e0282d WHIRLPOOL 4b8a163152f4315fb1aee3afdc4ffa2c955ae7684fc2ebe1a724f4997f5306b2e6a1a624a2a3d3465b39498a1826db938686eefcc19676b85bea3de15aec5055
+DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 SHA256 e7ab523e06cf12cf2b88b404106fd56534ec15b65621e660dfd6e833037680f0 SHA512 0d9c6a8a8d13264b8f2eb6b62e6c65b67cf8b09bd36043acae405c7b2154724733db15d653e4f7ac7d21feebcfa6cd365ca89993fc77eabc5a709d7a6383b187 WHIRLPOOL 9aff6b1cbe1a94cd8bfb371c007cbdd0f0ad6b048fe769eba67bef5b66a4a7fdc3280fef93a9b27be78434e2d97f122445c563aa413a83a8b22224b101ba0df5
+DIST netkit-rsh-0.17.tar.gz 58268 SHA256 edcac7fa18015f0bc04e573f3f54ae3b638d71335df1ad7dae692779914ad669 SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218 WHIRLPOOL 25ea38f5f7883fc89ab9c1dce6b850b177ec78ea2d619341f6001acca61e619bbf1e9d6b79b13eee164d16261ba1b72d07c74f522f192272ce61a2280c4a01b4
+DIST rexec-1.5.tar.gz 18469 SHA256 9bcf9986eb9637d1b8e8ab62a61c80f3422d628e837e72c6ad8c2e38604ccaf4 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a WHIRLPOOL 3356766c1c048da0c8be0a62cfb2d1f2c13aad0122bf4bfd8540f0e3622a40e9646aa2a9ebbe2f588d9d18a84f70960a60eb496f727b4367f4e20f9d9548ca6d
+EBUILD netkit-rsh-0.17-r10.ebuild 1772 SHA256 7eed50d650c8eb62b0d1dfeeff1ce9d701f2e7a0d656b85ab364a80cead72b2d SHA512 3e287721009f744bc6bac09539a89e8435226d97f5f2a8c98c6acb03cbac0333099f88d1e992edf78c53e897ff3361436c33e6bcc7ec04ab79759510ceb420b0 WHIRLPOOL d8a4a8a4482aa48a3aa8447dfdaf540a587183afbc992c18bf1ff66073f4cc78a7f0d8d8aa3f7db6dedd48c7c6da5d3c753645906640fd13bb013b48fbf8057a
+MISC ChangeLog 3093 SHA256 69aec263f8f1f887643b91da6b0651b97aea5f14240f291618e3ea7c1def2db8 SHA512 dc46195af17b219fb08ac34366567d831b058cb0f3db3044c844987fa2303439400a58451f59f1b5ff45ac5eeaf755000002f55d1147589fca46b4b33440063d WHIRLPOOL e441ae5ed1a2178ee95f50417775a1cf1e4183e3698c6479233426b94aeaac9a2128ab114a36ce3e0269463136a8e7d54b0cebe0b9ded2d33a30eddd45da45c7
+MISC ChangeLog-2015 11856 SHA256 52548a899cb27940796ec7096689e1a654e21fd77d655fd967bc07b2fe5492a5 SHA512 86c1b0ad3e18e6c947f4e70689bdd2562fbe9096f3d0f1f0cfa0e0cfb7e72c625f25273c3a484d53900d03d6b2c43e878e5a7d7f9237ea5876614b0e5a71d5fe WHIRLPOOL e748caff791c4bd8393fa202dddd3a0cfda3f541a3a7784f109366429f8b72572f10256eeea222c9c65ee8fee76ffc096e69babdecb47b8298b070c396f31544
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/net-misc/netkit-rsh/files/rexec.pamd-pambase b/net-misc/netkit-rsh/files/rexec.pamd-pambase
new file mode 100644
index 000000000000..8657883e32aa
--- /dev/null
+++ b/net-misc/netkit-rsh/files/rexec.pamd-pambase
@@ -0,0 +1,6 @@
+# For root login to succeed here with pam_securetty, "rexec" must be
+# listed in /etc/securetty.
+auth       required	pam_securetty.so
+auth       include	system-remote-login
+account    include	system-remote-login
+session    include	system-remote-login
diff --git a/net-misc/netkit-rsh/files/rexec.xinetd b/net-misc/netkit-rsh/files/rexec.xinetd
new file mode 100644
index 000000000000..fea3710ec664
--- /dev/null
+++ b/net-misc/netkit-rsh/files/rexec.xinetd
@@ -0,0 +1,12 @@
+service exec
+{
+	socket_type     = stream
+	protocol        = tcp
+	wait            = no
+	user            = root
+	group           = tty
+	server          = /usr/sbin/in.rexecd
+	log_on_success  = PID HOST USERID EXIT DURATION
+	log_on_failure  = USERID ATTEMPT
+	disable         = yes
+}
diff --git a/net-misc/netkit-rsh/files/rlogin.pamd-pambase b/net-misc/netkit-rsh/files/rlogin.pamd-pambase
new file mode 100644
index 000000000000..9b4481edd6f8
--- /dev/null
+++ b/net-misc/netkit-rsh/files/rlogin.pamd-pambase
@@ -0,0 +1,9 @@
+#%PAM-1.0
+# For root login to succeed here with pam_securetty, "rlogin" must be
+# listed in /etc/securetty.
+auth       required		pam_securetty.so
+auth       sufficient		pam_rhosts.so
+auth       include		system-remote-login
+account    include		system-remote-login
+password   include		system-remote-login
+session    include		system-remote-login
diff --git a/net-misc/netkit-rsh/files/rlogin.xinetd b/net-misc/netkit-rsh/files/rlogin.xinetd
new file mode 100644
index 000000000000..76a99beba8d1
--- /dev/null
+++ b/net-misc/netkit-rsh/files/rlogin.xinetd
@@ -0,0 +1,12 @@
+service login
+{
+	socket_type     = stream
+	protocol        = tcp
+	wait            = no
+	user            = root
+	group           = tty
+	server          = /usr/sbin/in.rlogind
+	log_on_success  = PID HOST USERID EXIT DURATION
+	log_on_failure  = USERID ATTEMPT
+	disable         = yes
+}
diff --git a/net-misc/netkit-rsh/files/rsh.pamd-pambase b/net-misc/netkit-rsh/files/rsh.pamd-pambase
new file mode 100644
index 000000000000..460a2cd99f99
--- /dev/null
+++ b/net-misc/netkit-rsh/files/rsh.pamd-pambase
@@ -0,0 +1,11 @@
+#%PAM-1.0
+# For root login to succeed here with pam_securetty, "rsh" must be
+# listed in /etc/securetty.
+auth       required	pam_securetty.so
+
+# Uncomment this and comment the following to use rhosts_auth module
+#auth       required pam_rhosts.so
+auth       include	system-remote-login
+
+account    include	system-remote-login
+session    include	system-remote-login
diff --git a/net-misc/netkit-rsh/files/rsh.xinetd b/net-misc/netkit-rsh/files/rsh.xinetd
new file mode 100644
index 000000000000..3d1fa6527943
--- /dev/null
+++ b/net-misc/netkit-rsh/files/rsh.xinetd
@@ -0,0 +1,12 @@
+service shell
+{
+	socket_type     = stream
+	protocol        = tcp
+	wait            = no
+	user            = root
+	group           = tty
+	server          = /usr/sbin/in.rshd
+	log_on_success  = PID HOST USERID EXIT DURATION
+	log_on_failure  = USERID ATTEMPT
+	disable         = yes
+}
diff --git a/net-misc/netkit-rsh/metadata.xml b/net-misc/netkit-rsh/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/net-misc/netkit-rsh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
new file mode 100644
index 000000000000..98ca83dfefd9
--- /dev/null
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils pam toolchain-funcs fcaps
+
+PATCHVER="3"
+DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
+	mirror://gentoo/rexec-1.5.tar.gz
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.lzma"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="pam"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( >=sys-auth/pambase-20080219.1 )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+FILECAPS=(
+	cap_net_bind_service usr/bin/r{cp,login,sh}
+)
+
+src_unpack() {
+	default
+
+	cd "${S}"
+	rm -rf rexec
+	mv ../rexec rexec
+}
+
+src_prepare() {
+	[[ -n ${PATCHVER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+
+	if tc-is-cross-compiler ; then
+		# Can't do runtime tests when cross-compiling
+		sed -i -e "s|./__conftest|: ./__conftest|" configure
+	fi
+}
+
+src_configure() {
+	tc-export CC
+	${CONFIG_SHELL:-/bin/sh} ./configure $(usex pam '' '--without-pam') || die
+
+	sed -i \
+		-e "s:-pipe -O2:${CFLAGS}:" \
+		-e "/^LDFLAGS=$/d" \
+		-e "s:-Wpointer-arith::" \
+		MCONFIG || die
+}
+
+src_install() {
+	local b exe
+	insinto /etc/xinetd.d
+	for b in rcp rexec{,d} rlogin{,d} rsh{,d} ; do
+		if [[ ${b} == *d ]] ; then
+			dosbin ${b}/${b}
+			dosym ${b} /usr/sbin/in.${b}
+			doman ${b}/${b}.8
+		else
+			dobin ${b}/${b}
+			doman ${b}/${b}.1
+			if [[ ${b} != "rcp" ]]; then
+				newins "${FILESDIR}"/${b}.xinetd ${b}
+				newpamd "${FILESDIR}/${b}.pamd-pambase" ${b}
+			fi
+		fi
+	done
+	dodoc README ChangeLog BUGS
+	newdoc rexec/README README.rexec
+}
diff --git a/net-misc/netkit-rusers/Manifest b/net-misc/netkit-rusers/Manifest
new file mode 100644
index 000000000000..e84bedc54899
--- /dev/null
+++ b/net-misc/netkit-rusers/Manifest
@@ -0,0 +1,6 @@
+AUX netkit-rusers-0.17-include.patch 864 SHA256 14c8ccc0bad9c7644e3831527a156b7bfafea55bb95b41da912709048c569fd1 SHA512 59f031b72f227fe55f49c1d41a4132408389466a85fbb0fa31192361f1d128fe25759655dbb731acfb1ec127c7f57a785616dfe3b0cda5afbe0bb10356cb0c57 WHIRLPOOL e9f704d05e076e7398989d8d777918a3065cd74fd9eb003dbf0a1863a289add13722b4176370c8b07d77bf934a933a2dd5ac43c29d78e200723acaec9ee52555
+DIST netkit-rusers-0.17.tar.gz 22063 SHA256 f00138651865ad2dcfec5dedda0cda403cb80c4ab68efcc3bbccafe198c24b6d SHA512 4bc64ead60941c7d92f9d45f18806bd8575441d95d5d2679a718cec58a31001b1b7320d34e20bd7f2f6b5072fc703e003b97c7cfde014d73a767c8e4d3f2b9b6 WHIRLPOOL 59becdbedfd07b2feb6604861840027313a3c08ba716d013495cd902b21607028ef8f9a2664516d38475969cfbfa90b4f200a74dd4c58bdca21392de75e17871
+EBUILD netkit-rusers-0.17-r1.ebuild 930 SHA256 1baac24ffe29bd66be3f68dca019d5f3269326ea35d1ec9f22ddfe8177976516 SHA512 820f84afde8531320942c6dbfa6d23d14e62ef84afbd092a71eea73e61bbd74135a546e9fe1c43b7557f82066cab558a1894b9941dae86f4996e6f72cab5572f WHIRLPOOL 151b21b1f36df36cefadafc2cef20bfc5a2fef0c50a3069de68de1ae1c9de742b9cbed7938e5bf88b5d67233f96345262388b3e9e59012d1281cb7efa0d8096a
+MISC ChangeLog 2587 SHA256 1e4aeea4b90caac0ed8ec1d6e6d71e2369ab0376cf053290346e80befcf9b333 SHA512 d3995207d71866559a7a974e1872ee74a4a7f4f7ccdda5f3ab0074e84775434888b8d0fabf915458ebab291b4ff4354cdf132b967403b88a64a1de3920f3514f WHIRLPOOL 7c819b77da2ff177b373b5d7f7fdeb0a3eab70f9aaa5485aa93497bc3ce96f8ca5619ae37aaeb5fddd4712637aa77e2311992a9cb9d80fde4942957dc2662479
+MISC ChangeLog-2015 1234 SHA256 8b6873fbc0badb5ce81a62d6c023a3ad625360f1e9a21e20f802af06b74e058a SHA512 34883d144f2aa2329b1e446d040c410b90ee545abc46a37bd803956185b555c6624d9c1e7df13a9f45de10db528ecb096aaa9b1465fae0ddfab7bbe0509ac25b WHIRLPOOL d76266c6b9371199851ba93e2fec257d31e19b0a3ccad21c56b00032d36da208ddea0d3e886cc8ec34aa1618eabea75a6c7e99c081a8cbe3315e89931761cead
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/netkit-rusers/files/netkit-rusers-0.17-include.patch b/net-misc/netkit-rusers/files/netkit-rusers-0.17-include.patch
new file mode 100644
index 000000000000..9dccf5442c41
--- /dev/null
+++ b/net-misc/netkit-rusers/files/netkit-rusers-0.17-include.patch
@@ -0,0 +1,30 @@
+--- ./rup/err.c.orig	1997-04-06 00:13:31.000000000 +0200
++++ ./rup/err.c	2010-12-31 19:29:41.000000000 +0100
+@@ -8,6 +8,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <err.h>
++#include <stdlib.h> /* exit() */
+ 
+ void err(int eval, const char *fmt, ...) {
+     va_list ap;
+--- ./rpc.rusersd/rusers_proc.c.orig	2000-07-23 05:11:56.000000000 +0200
++++ ./rpc.rusersd/rusers_proc.c	2010-12-31 19:27:50.000000000 +0100
+@@ -40,6 +40,7 @@
+ #include <sys/socket.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
++#include <time.h> /* time() */
+ #ifdef XIDLE
+ #include <setjmp.h>
+ #include <X11/Xlib.h>
+--- ./rusers/rusers.c.orig	1999-12-12 20:32:05.000000000 +0100
++++ ./rusers/rusers.c	2010-12-31 19:30:33.000000000 +0100
+@@ -44,6 +44,7 @@
+ #include <utmp.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <time.h> /* ctime() */
+ 
+ #include "../version.h"
+ 
diff --git a/net-misc/netkit-rusers/metadata.xml b/net-misc/netkit-rusers/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/netkit-rusers/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/netkit-rusers/netkit-rusers-0.17-r1.ebuild b/net-misc/netkit-rusers/netkit-rusers-0.17-r1.ebuild
new file mode 100644
index 000000000000..f2369aa640a1
--- /dev/null
+++ b/net-misc/netkit-rusers/netkit-rusers-0.17-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Netkit - rup rpc.rusersd rusers"
+HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-include.patch
+	sed -i configure -e '/^LDFLAGS=/d' || die "sed configure"
+}
+
+src_configure() {
+	./configure --with-c-compiler=$(tc-getCC) || die
+	sed -i MCONFIG -e "s:-O2::" -e "s:-Wpointer-arith::" || die "sed MCONFIG"
+}
+
+src_compile() {
+	# see bug #244867 for parallel make issues
+	emake -j1 || die
+}
+
+src_install() {
+	into /usr
+	dobin rup/rup
+	doman rup/rup.1
+	dobin rpc.rusersd/rusersd
+	doman rpc.rusersd/rpc.rusersd.8
+	dobin rusers/rusers
+	doman rusers/rusers.1
+	dodoc README ChangeLog
+}
diff --git a/net-misc/netkit-rwall/Manifest b/net-misc/netkit-rwall/Manifest
new file mode 100644
index 000000000000..5d75d4c7fd7e
--- /dev/null
+++ b/net-misc/netkit-rwall/Manifest
@@ -0,0 +1,5 @@
+DIST netkit-rwall-0.17.tar.gz 11861 SHA256 97bd59f787d19bc3dff633d35eeb627176574aa7adf65b64a6a4d8dc08f752ed SHA512 2ecbb275a539006f640ab594e5cf3de80120d1879a7f2948bea5ea45d06c1f43b75a4ee4078ed08e7778b0609193bb215198bffc6f259154c22bdc62f6011fb1 WHIRLPOOL 750e840bd9cbc21be8c195b137df0103e287e814b2747f1320a3e5db6b914bac98d651364753139284da6a284ca45c0efe27642b4a9eae2f13cb2297e2268670
+EBUILD netkit-rwall-0.17-r1.ebuild 810 SHA256 7a31a6084904aa69d34cd34f818a03577e9bc1342e76d9621b2155c04aeb3ade SHA512 c2146c2a67d8f78ead32fad4b72ca560c4f68841f8b0b6820f3df96c393f5f2fca514a0a92473e3e2070ebf588221c795d36096ef6be11daaf3d13a61898e030 WHIRLPOOL 88de5042f5e47b4bd22300672fd0a2c812b834865fbde5f6efd9985a7209eba09b28df107b82a1f72575867b44d03f1c7887b89752209d5e5e3131fc6af87887
+MISC ChangeLog 2541 SHA256 286c3f686c510146ada3ec2e61ad575432cf3cf3f6129a770a382fe7f7ff268e SHA512 e9c9fda003c8c012443e66e5774bddbb192d3d35be970a276fa22ec6e5f7cd968c2358d3a54ae69915d3ae9611f704896e2ce9f9a971877280a71b9df68f49df WHIRLPOOL d34c1e05a511378a2e07bdf20b059ff37dc96f7c271b17b4fffea5ee5345a6b5aa3011592e6d10e010a75bcf1527a97317372938f5273a6017ed91de7e5782bc
+MISC ChangeLog-2015 1295 SHA256 6bdbdbb443258360c97b2a053b6c67ce92a8293987fd4b4907186b57cc1cc0ad SHA512 45ec91e0f3298bd023f4aee61f3fbc5118e2384be4ede60f760f56a840836521e4b981bd9869a14e87bd09b86e0d3c7ff2b873170347c8e9feeeaae8ccdee072 WHIRLPOOL e0b5b35cc6629ab1972fe1ed0c534431ceef5f50ae19bbf8d736407c7c4541d27e6e3f0433b5e57524d499092aa1fc8fa8be6cd7179908543b9f688737d814c3
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/netkit-rwall/metadata.xml b/net-misc/netkit-rwall/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/netkit-rwall/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/netkit-rwall/netkit-rwall-0.17-r1.ebuild b/net-misc/netkit-rwall/netkit-rwall-0.17-r1.ebuild
new file mode 100644
index 000000000000..bd20a79e6fc2
--- /dev/null
+++ b/net-misc/netkit-rwall/netkit-rwall-0.17-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Netkit - rwall"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	sed \
+		-e "s:-O2 -Wall:-Wall:" \
+		-e "s:-Wpointer-arith::" \
+		-i MCONFIG.in || die
+	sed \
+		-e '/^LDFLAGS=/d' \
+		-i configure || die "sed configure"
+}
+
+src_configure() {
+	./configure \
+		--verbose \
+		--with-c-compiler=$(tc-getCC) || die
+}
+
+src_install() {
+	dobin rwall/rwall
+	doman rwall/rwall.1 	rpc.rwalld/rpc.rwalld.8
+	dosbin rpc.rwalld/rwalld
+	dosym rpc.rwalld.8 /usr/share/man/man8/rwall.8
+	dodoc README ChangeLog BUGS
+}
diff --git a/net-misc/netkit-rwho/Manifest b/net-misc/netkit-rwho/Manifest
new file mode 100644
index 000000000000..05355fc481b5
--- /dev/null
+++ b/net-misc/netkit-rwho/Manifest
@@ -0,0 +1,10 @@
+AUX netkit-rwho-0.17-confd 93 SHA256 6ad0939f180cc4a758b81bb40d3c74472ffb18f59d5222d04b2d3a4f5fa63208 SHA512 c6c0a074c1b41272706f913c822b95ad1edba82a7fbf9ec0e4f3859622d5526203e18ed84d253e190a73b0275d0b9f6ea693fa5c933866f2c03ea18dee9e7a16 WHIRLPOOL 1a0f9658aab0f23e1da8610821d9901cf21afaea4222423a3e376f5b8719c0f13213f8debd5b5f3af7413e18272b17d6d1fc65be288a6a2929506a12506bbae8
+AUX netkit-rwho-0.17-cron 277 SHA256 f0f156c8090b0a9945b3867618885a8daa239f3d033efe4c39d7cfcafd85d3d3 SHA512 64a20ccc05abbfbbfb63c93ea9954b4c5e3b5313bf8a9d69ddad2d24d3f2a372d5e5f0c7c91278f8e23632b02f64b4ff8b2250a780c1e423460ce9d7d5e5a738 WHIRLPOOL e670370dc23af69ca84152a771204e46667f6419df8a75a865d78dc0bec12e02222c6f29c3c1ec946fb580fc99bf293e6752df9a7015c8a814acf7305120f72e
+AUX netkit-rwho-0.17-printf.patch 620 SHA256 288143c5125158cbf63de1700aceeebfcb03c47e822e885bcdf89a70aa961815 SHA512 4435f838ee044f9fff4364d24ec4afa11c2826dd4b943eea12e44698dc100e55b46f45905f3ff7261b84bd1f5051618da225f05a0b292690fb36f7ecaf8452f0 WHIRLPOOL 43314ab72902c34b5a9acc8af7a4b19bb7cc77c8805c7ae762c6db8ab17f0bc1e333715652fa1285d462b8f40d657af7bbe761c0111a19af9939ed52fdc45a78
+AUX netkit-rwho-0.17-rc 271 SHA256 79c11ff4978e1e9da9eba6a8861dc27aa9027786722fc3836e7d3b693c4956d6 SHA512 83aedd9c88e81ff95db278c6588fa298f2b76b6418d338c9b3cbf6818fcd5746417b622af91b2d7657c24e2138d881eab6a8283d8031b7c430479ff9eaf770c9 WHIRLPOOL 97e922dd0a546f888d2a7e26ac2257526448fb646148d460ef3100bd00ec56733b00a80f07e5a8fe548fe2d69ea158a463a9b7c3eb1f26e31c5fd52712e19498
+DIST netkit-rwho-0.17-patches.tar.bz2 7725 SHA256 c666d60fa21538f909374cdc1a3e661875559c3859f759fe060f35047dc3e54e SHA512 947f62316220791af7f36eee3d44481224ebda3410fb3e527fb1f066a663f56d6aec44483955edbbff1936972e86aeff9d6905d123ed78cb10d72ee6cb0f7454 WHIRLPOOL 5b8c47050a44ee3a80b6b622da9b947e30176d535cce2682a160df3c46153a321d279a30386df4aa21c69bdb12ecbaf20e0fa5867648e96917697f3ede394842
+DIST netkit-rwho-0.17.tar.gz 20610 SHA256 0409e2ce4bfdb2dacb2c193d0fedfc49bb975cb057c5c6b0ffcca603a1188da7 SHA512 ea1444b613d95f53100cf8f8d374dd132611432380b9142182c4fb5595014605896656b9a272945534371265e226fe591c22c12a9bdde9c763794249660e7b58 WHIRLPOOL 65a7d4851cba7c94d240e56e254df4978741eb780dd269063773620289894cc7269e5491e5955c22746345f4e4191379d10a022a1317a091a1e3a13210de1418
+EBUILD netkit-rwho-0.17-r4.ebuild 1080 SHA256 0d0e0fa289520d62d658af144de0d3d5f807fffaba5d3c6a2351423aaf62739f SHA512 be8d05847f7cb057224fd820cf93e8e475b5dc0c77ee2fd59e3b4df399091ec626ebfb8ae0a6c496f7b354757da3c48d1220f14e7d94df8f308af275cc7d8136 WHIRLPOOL 8f20521ee05098f856ac5bf8ef1f4c2a30a919be593b0a6e17319226eefd0e42a95c8de481f915fc84f1f0110d1668029cd0cd7798d34c3b6401311416715dea
+MISC ChangeLog 2712 SHA256 7b3b5a61a972e3fc3e7bd267d7e4b5b0acc707b5b0e48dd819d4c32599889b4a SHA512 6975f19eb238f80c3bc46a05bd729fbebe16be3b1d8989c1550b7a99fd591dd8c7a6cba888bcf396323a24aadc68120d225579af7125403be829f2b510513d16 WHIRLPOOL e07aa58812e552ff5102fce65ad7567ad95efbfa8a4d0ad142aa7c0a77cb6bd70f86f84e9b8fbd989c2bc2b76b560567b459918298db73f837e36f6cd51cbd00
+MISC ChangeLog-2015 4617 SHA256 489c7ca980f0785cef352a72ed9e302f97ab1584a71773fb3204db60f74b006b SHA512 f634938187751f68b9dbb8256eed62d121ebe1642f5f5ac86c24d7c9eb16d4e549cb779bebe3c03fe00a059770f685cbc3e1cc550783eb4f6b06379bdb44f1cb WHIRLPOOL f8586f7fb605b54d0ad695f2a0436f8ec78a5b430b2768e3a579d4c444ae15e330ac66cae589390c2c84152bf7edcad6299d429cadfb26a860591f14d3a64735
+MISC metadata.xml 286 SHA256 61b7f36c3fb4ce2345ee3017334a6013dd52429ba107768abc2c146629e84dcd SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760 WHIRLPOOL bb6b105c081b12e37fbf26bc041e829ef7ab8ba855b96f040479ca85ad9633b8e83c7be4afa686838991ebf358ad8cf78c1a79fd54ad51f7928aaa7a63f0e5bb
diff --git a/net-misc/netkit-rwho/files/netkit-rwho-0.17-confd b/net-misc/netkit-rwho/files/netkit-rwho-0.17-confd
new file mode 100644
index 000000000000..3a5f684f1544
--- /dev/null
+++ b/net-misc/netkit-rwho/files/netkit-rwho-0.17-confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/rwhod: config file for /etc/init.d/rwhod
+
+# rwhod arguments
+RWHOD_OPTIONS="-b"
diff --git a/net-misc/netkit-rwho/files/netkit-rwho-0.17-cron b/net-misc/netkit-rwho/files/netkit-rwho-0.17-cron
new file mode 100644
index 000000000000..9fab9f25ee0e
--- /dev/null
+++ b/net-misc/netkit-rwho/files/netkit-rwho-0.17-cron
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# Clean up stale rwho entries after one month
+find /var/spool/rwho -mindepth 1 -maxdepth 1 -type f ! -name .keep \
+    ! -ctime -30 -print0 | xargs -r0 rm -f
diff --git a/net-misc/netkit-rwho/files/netkit-rwho-0.17-printf.patch b/net-misc/netkit-rwho/files/netkit-rwho-0.17-printf.patch
new file mode 100644
index 000000000000..89eaf82881f8
--- /dev/null
+++ b/net-misc/netkit-rwho/files/netkit-rwho-0.17-printf.patch
@@ -0,0 +1,23 @@
+echo -n isn't supported by all shells, use printf instead, which is portable.
+
+Note, if you apply this patch after 0004-ldflags.patch, the changes begin at line 276.
+If you run it before 0004-ldflags.patch, the changes begin at line 277.
+
+Patch by Andrew Miller.
+
+https://bugs.gentoo.org/529974
+
+--- a/configure
++++ b/configure
+@@ -276,10 +276,7 @@
+ 
+ echo 'Generating MCONFIG...'
+ (
+-    echo -n '# Generated by configure (confgen version 2) on '
+-    date
+-    echo '#'
+-    echo
++    printf "#\n# Generated by configure (confgen version 2) on $(date)\n#\n\n"
+ 
+     echo "BINDIR=$BINDIR"
+     echo "SBINDIR=$SBINDIR"
diff --git a/net-misc/netkit-rwho/files/netkit-rwho-0.17-rc b/net-misc/netkit-rwho/files/netkit-rwho-0.17-rc
new file mode 100644
index 000000000000..af06c00b918d
--- /dev/null
+++ b/net-misc/netkit-rwho/files/netkit-rwho-0.17-rc
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting rwhod"
+	/sbin/start-stop-daemon --start --quiet --exec /usr/sbin/rwhod -- $RWHOD_OPTIONS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping rwhod"
+	/sbin/start-stop-daemon --stop --quiet --name rwhod
+	eend $?
+}
diff --git a/net-misc/netkit-rwho/metadata.xml b/net-misc/netkit-rwho/metadata.xml
new file mode 100644
index 000000000000..789a44405524
--- /dev/null
+++ b/net-misc/netkit-rwho/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild b/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild
new file mode 100644
index 000000000000..a3fa25da9c79
--- /dev/null
+++ b/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Netkit - ruptime/rwho/rwhod"
+HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
+	https://dev.gentoo.org/~jer/${P}-patches.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~mips ppc s390 sh sparc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${WORKDIR}"/000{1,2,3,4}-*.patch
+	epatch "${FILESDIR}"/${P}-printf.patch #529974
+}
+
+src_configure() {
+	# Not an autotools build system
+	./configure --with-c-compiler=$(tc-getCC) || die
+	sed -i \
+		-e "s:-O2::" \
+		-e "s:-Wpointer-arith::" \
+		MCONFIG || die
+}
+
+src_install() {
+	keepdir /var/spool/rwho
+
+	into /usr
+	dobin ruptime/ruptime rwho/rwho
+	dosbin rwhod/rwhod
+
+	doman ruptime/ruptime.1 rwho/rwho.1 rwhod/rwhod.8
+	dodoc README ChangeLog
+
+	newinitd "${FILESDIR}"/${P}-rc rwhod
+	newconfd "${FILESDIR}"/${P}-confd rwhod
+
+	exeinto /etc/cron.monthly
+	doexe "${FILESDIR}"/${P}-cron
+}
diff --git a/net-misc/netkit-talk/Manifest b/net-misc/netkit-talk/Manifest
new file mode 100644
index 000000000000..50272bbfd6f6
--- /dev/null
+++ b/net-misc/netkit-talk/Manifest
@@ -0,0 +1,8 @@
+AUX netkit-talk-0.17-ipv6.diff 1587 SHA256 daafeb1643c0bbaddddb1cba61ffd69f6ffed305b337c68ca2fa8e5ee4159833 SHA512 6545182872092864f136f7c5e464435679cf06d5393d587b564cb19930c2a1fc068d737bdc8a4bdcbc8a708c891284d66625ad85efd1d5e60c3cf49abe4215f1 WHIRLPOOL 15e03a224112be06d1f11450b7e816810e026566efc80abb914a91c000ab9ae7e260a3d3261675deddaaaec9dadd2a0cedc9db5cedbac865fb19a430616c3d91
+AUX netkit-talk-0.17-time.patch 385 SHA256 8e3a5ee7c9c0e60783919533a13ebadb7a6c57480b1ae289ed7f87f31175fc35 SHA512 4da0417515e8e357cdc3b5b46b3edaa324dba767ae9dea6aa374ac8e4cf835dc0a4766684edc1e2b254840858721558a1e29940ea95ae274b06ded99fbf5499f WHIRLPOOL 0f2e1f707f513864676e13d6ccf1af451e617f47aef26b19207c059ef3d9f224f73d0770c9d8a344f84544db01adae72e70b48ac49c67a75d9620ecc32c55dce
+AUX talk.xinetd 265 SHA256 6ce5286c8d51ce80c7c0833d4fdbf2f29657ad3dd3c58b6fb6da7b444766baa7 SHA512 f4f29a6e57aa80ffd6acc45b3c4a5bc5086fc6061f8d9bdfbe4fea4f874cedbdd5f85f60e311aa473e53119c16c42289161011699d24b944992aee0aec9ccb1f WHIRLPOOL b69bc470a1040e7fedb3ed62d22166e4da3752dce44cd7e2c7ae783133657791e52eb6ead7ad22febabc4fea723ecd6ce16a01b5a47d154f066476471e7151fd
+DIST netkit-ntalk-0.17.tar.gz 37396 SHA256 d8f614e8d4d7981a0adf0f84d2d3954018d5fe0e57a8e5731256d66cbcf45e90 SHA512 5a886c0f73179060f926d4af781a6b9d4de7b62562a69db7b93c4fd783ad12b488ee967af18e5a11f98e7f94d659c1688d2a3d4ba4a00bdec31869aa39a321c5 WHIRLPOOL 0c37b9dffb1a17e93105ebf56b42f4014bd839abc077d4e8b11aa3d4d49cb8f791bbff704ed6d6b248302b2a8f3554a7093da2f86c9e975424adbaa084e2ca15
+EBUILD netkit-talk-0.17-r5.ebuild 1188 SHA256 a426b87294ca1bfa1a560faae2e5be215aef5b4177348f0ee4cdbae17268bcaf SHA512 01061c29d9e0e1b1e62e3642091f0932022625a78d4dea7945c9cd48493c9dd69c426574d0eb69950904368968d1db997834dd9cb03621b97e879a530c08b4bf WHIRLPOOL 2d976f01a8200365aebf1df3ab8cb614d5172604f20a735cf5ef0cc7db8dd740b81ec0fb0024de19e9105f9f584d3fb28a4ac786e356f778772dfecaa6f27cf0
+MISC ChangeLog 2631 SHA256 79ae7340bc50348e1ed2b0edeb789499040e8a816a4f30ddf0feeb327b35ddc7 SHA512 a2229fd53d7e0e3c042e5e9e95dc6b9154dd02d40bdcb40a1be758f369ec0a8bceabbcc799fe4d5d48bb24a2f1e2cecb1d5b9030028661c4497aada78bc4049d WHIRLPOOL 078ba377c634b033e97d2feb10952dd64c21c5613ef62b48588f3d74023f5ad248a72943182f90ac5a56524d67ac4e2258350c98ab09d37377d6965d6c428df4
+MISC ChangeLog-2015 5331 SHA256 96ec8da96232ef36de2efc1708c6817485e29f0fbe19b481e74b9c530a1197e3 SHA512 e0e509f954de8f9bab4f3dfc18cd092a2df613c55828928e880331357f3e1828b3414eb8991e78f5aa0e6ab74e293103283a34af63bafd48ff53d8ab6baa2412 WHIRLPOOL 859fa3ea231db3ee171d091276c671f4e92097ca4c20a420328508bb9ea4ee60a03b4d5b1bd0c3a1d2f78ab4e14a71a7ec79c477a9ab2b3b7f3eb23fe9c02a43
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.diff b/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.diff
new file mode 100644
index 000000000000..f426bf7dfadf
--- /dev/null
+++ b/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.diff
@@ -0,0 +1,56 @@
+--- a/talkd/talkd.c
++++ b/talkd/talkd.c
+@@ -164,13 +164,14 @@
+ 	const char *theirip;
+ 
+ 	struct hostent *hp;
++	struct sockaddr_in6 addr;
+ 	struct sockaddr_in sn;
+ 	int cc, i, ok;
+ 	socklen_t addrlen;
+ 
+-	addrlen = sizeof(sn);
++	addrlen = sizeof(addr);
+ 	cc = recvfrom(0, inbuf, sizeof(inbuf), 0,
+-		      (struct sockaddr *)&sn, &addrlen);
++		      (struct sockaddr *)&addr, &addrlen);
+ 	if (cc<0) {
+ 		if (errno==EINTR || errno==EAGAIN) {
+ 			return;
+@@ -185,14 +186,30 @@
+ 	 */
+ 	lastmsgtime = time(NULL);
+ 
+-	if (addrlen!=sizeof(sn)) {
+-		syslog(LOG_WARNING, "recvfrom: bogus address length");
+-		return;
+-	}
+-	if (sn.sin_family!=AF_INET) {
++        sn.sin_family = AF_INET;
++	switch (addr.sin6_family)
++	{
++        case AF_INET:
++            sn.sin_addr=((struct sockaddr_in*)&addr)->sin_addr;
++            sn.sin_port=((struct sockaddr_in*)&addr)->sin_port;
++            break;
++	case AF_INET6:
++            // addr must be ::FFFF:x.x.x.x
++            if (addr.sin6_addr.s6_addr32[0]!=0 ||
++                addr.sin6_addr.s6_addr32[1]!=0 ||
++                addr.sin6_addr.s6_addr16[5]!=0xffff ||
++                addr.sin6_addr.s6_addr16[4]!=0)
++            {
++                syslog(LOG_WARNING, "IPv6 address family not supported by talkd");
++                return;
++            }
++            sn.sin_port=addr.sin6_port;
++            sn.sin_addr.s_addr=addr.sin6_addr.s6_addr32[3];
++            break;
++        default:
+ 		syslog(LOG_WARNING, "recvfrom: bogus address family");
+ 		return;
+-	}
++        }
+ 
+ 	/* 
+ 	 * If we get here we have an address we can reply to, although
diff --git a/net-misc/netkit-talk/files/netkit-talk-0.17-time.patch b/net-misc/netkit-talk/files/netkit-talk-0.17-time.patch
new file mode 100644
index 000000000000..3a0ccadcb744
--- /dev/null
+++ b/net-misc/netkit-talk/files/netkit-talk-0.17-time.patch
@@ -0,0 +1,20 @@
+--- a/talkd/table.c
++++ b/talkd/table.c
+@@ -57,6 +57,7 @@
+ 
+ #include "prot_talkd.h"
+ #include "proto.h"
++#include <time.h>
+ 
+ #define MAX_ID 16000	/* << 2^15 so I don't have sign troubles */
+ 
+--- a/talkd/announce.c
++++ b/talkd/announce.c
+@@ -49,6 +49,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <paths.h>
++#include <time.h>
+ #include "prot_talkd.h"
+ #include "proto.h"
+ 
diff --git a/net-misc/netkit-talk/files/talk.xinetd b/net-misc/netkit-talk/files/talk.xinetd
new file mode 100644
index 000000000000..524282582b24
--- /dev/null
+++ b/net-misc/netkit-talk/files/talk.xinetd
@@ -0,0 +1,13 @@
+# default: off
+# description: The talk server accepts talk requests for chatting with users \
+#	on other systems.
+service ntalk
+{
+#	flags			= IPv4
+	disable			= yes
+	socket_type		= dgram
+	wait			= yes
+	user			= nobody
+	group			= tty
+	server			= /usr/sbin/in.talkd
+}
diff --git a/net-misc/netkit-talk/metadata.xml b/net-misc/netkit-talk/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/netkit-talk/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild
new file mode 100644
index 000000000000..c80e21f953ce
--- /dev/null
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MY_P=netkit-ntalk-${PV}
+S=${WORKDIR}/netkit-ntalk-${PV}
+
+DESCRIPTION="Netkit - talkd"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="ipv6"
+
+COMMON_DEPEND=">=sys-libs/ncurses-5.2"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	virtual/inetd
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-time.patch
+	use ipv6 && epatch "${FILESDIR}"/${P}-ipv6.diff
+	sed -i configure -e '/^LDFLAGS=/d' || die
+}
+
+src_configure() {
+	# not autotools based?
+	./configure --with-c-compiler=$(tc-getCC) || die
+}
+
+src_compile() {
+	emake LIBCURSES="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
+src_install() {
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/talk.xinetd talk
+	dobin talk/talk
+	doman talk/talk.1
+	dosbin talkd/talkd
+	dosym talkd /usr/sbin/in.talkd
+	doman talkd/talkd.8
+	dosym talkd.8 /usr/share/man/man8/in.talkd.8
+	dodoc README ChangeLog BUGS
+}
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
new file mode 100644
index 000000000000..dca87d7e0206
--- /dev/null
+++ b/net-misc/netkit-telnetd/Manifest
@@ -0,0 +1,11 @@
+AUX net.issue.sample 117 SHA256 14c92d55c12c680c69f557bbfbeaa4d03e652d4e06d1bedd8fecf7faaf076706 SHA512 f290b0fc214dd58acfb186c269180aae29c42768bfeab21aa72604ad8ce50c354f18d9b568d04885554c5d1c27017dd7132e406933050450d8605d16d9263b79 WHIRLPOOL 776ca20ccc850124378750354c44943938c8f7d93e2aba30793022b267c393bd17c56cf9e3daf979d5b4fdf98c5909a0efc4fc05034dd1e5e6c7ce0c853e5b2f
+AUX netkit-telnetd-0.17-cflags-gnu_source.patch 830 SHA256 14da0f4796691e0a7e656e72cb78bfd599d5f83b1f6aadd4c2870bcfd6e1cfaa SHA512 881065a2156414381e5cb3776ea91e4de0ad2d09065ba8ebecf8001b7f6a87278e6724dd5aa6d43f66554aed38fb0eb1b9103c2720ccc1a6aba4f074a5ec0f8a WHIRLPOOL eac690495c1a05db7da5d7d715a635987a6340afa9f8db9826ea530515d606840b249619ba17a6a74840e0388a841af59d8137a596571e98acbbef7f5576a83d
+AUX telnetd.xinetd 205 SHA256 cb8fe24c1f6113ca397e712898d3decc5ba901994c68262b0ff9e2b091e4576c SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c WHIRLPOOL f38f70e9cefd57878088867babf3831b46063851fc116fb45a51e0e2c41a1398498cacd8dde2d4d4a1c21f968c26c539e7629eb88727f253a3cd677f44afedbc
+DIST netkit-telnet-0.17.tar.gz 133749 SHA256 9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00 SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3 WHIRLPOOL 0a04763f8d42b1985295f9db3472aa80f4f1cc96a151ab66e34275c18809dcbc1a072c4754c0a989cca576a7d7ff6d8795865f6b372b1fe4953dbe0e87665728
+DIST netkit-telnet_0.17-36.diff.gz 27226 SHA256 cd192e3acbef83a3e8fbacfa26e1f6ededfe50587e9b372b5a38ce5928d746f7 SHA512 7cd1ec5f96fcacee551700d65f62b6c217e0d9b5220a218aa60fceb3883d0754831606a247355dc2bf6486a02175b8d9b27058d6bc788de8e1b80545fdedbf9a WHIRLPOOL c651f4cacabe5b42fefb9f9fa1f306d5aafad7c8b3e0c5eb6afcf15609487ef726991a1e5eb88c7f95364a1e166b26f01814b3671b72ffec14673e5927898a7b
+DIST netkit-telnet_0.17-40.debian.tar.xz 36104 SHA256 41e0f50d1d674e487dd42d7b9aac25973a2d45b2b78f301a7f01ca5b34d66e20 SHA512 7fd13a7bf95a9b09b5a81080d2b8904150646f5b48ec2f8f0736b41caaf640a6369ab5fcd056677de029e7c571586982a7e8354f74c3b1f94d048d31d7a3e1d2 WHIRLPOOL c7fe212485206080fa2fd697f31caa2c872b81c4fff3cfbd9117d26184ce39b554fd6eb42916d9f96911c73217a98a0f15b7ba03fde59f9b6632560c9e2f66ad
+EBUILD netkit-telnetd-0.17-r10.ebuild 2481 SHA256 b185810b51887140bc38e0e518fe5722c966ec1dbb1c2c9ca98e5a00b087b37a SHA512 d81d197c9fd78d21cd387de65e544b5a7d349e0dbc32dd333f016cdf68fa1647f50839d91d024099d8803fffcfe4458cbc47022c9a2265e37e4da93b16c43487 WHIRLPOOL bc2e9a810bfca7bba1e1eca1a00df1f94f83dbd37316f94a64563c885a0496a142d65e6a8480277770b0f4d415e1da4218d65658aec0bd48a8af8d81dabf0dc0
+EBUILD netkit-telnetd-0.17-r11.ebuild 2515 SHA256 d4994ab9e4391b761a4e240278722aa46d370e6a6f42ffd67f150309432b7134 SHA512 74b064da4a679c634e5103196f2783acd93da7d553bb9917614e92499d18db30e8b4ec7e4fdd8e064debaf2a7ce6f0aacfccb1da655ff3511b8701fea333587e WHIRLPOOL 0fabe29debb21fbb923d8b65b149f6c382734b5404dc1772fb73581640ee8e8e1d98cd3cfede6b33eb41ad014a4e705227707b44b4d97a3ca5b056f2c45ff0e7
+MISC ChangeLog 3764 SHA256 d6f1edc126642b11955d56e6ad5ec040935164114ab713f4350c4445181dd8b0 SHA512 4b88071148a772ade3d94ac7f92ac4e6d1f3ddae903c2e915fcc8ea8b35ddf43afa76404909fce81fd26c17a8a4d3f982321d71f737b8add044a8afb310c0a6d WHIRLPOOL 144983b30d136fc62a82e3007c66ea28450a910f525808266367695ce9e5a73d2a5cd84cf5f3f791e8c65000685b07dfd1074a1f8d083eff787dc5fb4eeb625a
+MISC ChangeLog-2015 8046 SHA256 d6934cdd7fa4d95eabd9b6274adc813d691f92edf7fee91b994fb6e03c99a436 SHA512 dfff5f4d755a70a09e7f46c4b66530c1acb1116a5bd9707bfff7f8acf44df806a2f8c8fe6952f5c4963b504b9ef668f67b19907096ad3bba28bc3bfe99fd5e42 WHIRLPOOL a102f6a3aed0ea8aef09bf2f89f9f3ee082facf8a4047c18026d42811cd679a66d03ca4e8a2459e07bcc168b07c866d8059d4571c6d86cdd51880a395dda942a
+MISC metadata.xml 598 SHA256 01abbdd7e1fc1944d5e824c0a584cbfee97eb774df4c7e1ecc5e68ed9f0a87a9 SHA512 0e67cc6f6f92fd784726eb82124652850e84be55006f00fd4b8071272219f7d9581d2f52c82df26a509a6dd1abcfe8ea7cb0c1eb442750a3700d637163335f83 WHIRLPOOL 4a0b0dbf1fa42a8e0ae7e9fb4b6df3ea24a55e2f0f2e14aaa118dcb2650d8bd7f00024299a28148e8eac229e65bbbf4d7cc70f3a86e4edd957e6db36ffd370bb
diff --git a/net-misc/netkit-telnetd/files/net.issue.sample b/net-misc/netkit-telnetd/files/net.issue.sample
new file mode 100644
index 000000000000..79a4f21259d3
--- /dev/null
+++ b/net-misc/netkit-telnetd/files/net.issue.sample
@@ -0,0 +1,4 @@
+# Example /etc/issue.net(5)
+
+# This is %h running %s:%r on a %m
+# You are on /dev/ttyp%t at %d' > ${D}/etc/issue.net
diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch
new file mode 100644
index 000000000000..1ebbda77c078
--- /dev/null
+++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch
@@ -0,0 +1,23 @@
+--- telnetd/Makefile.orig	2004-09-29 22:16:50.175839840 -0500
++++ telnetd/Makefile	2004-09-29 22:09:30.439689896 -0500
+@@ -10,7 +10,7 @@
+ 
+ CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \
+ 	   -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS \
+-	   -DLOGIN_WRAPPER=\"/usr/lib/telnetlogin\"
++	   -DLOGIN_WRAPPER=\"/usr/sbin/telnetlogin\" -D_GNU_SOURCE
+ # LIBS += $(LIBTERMCAP)
+ 
+ OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \
+--- telnet/Makefile.orig    2004-11-01 15:23:29 -0500
++++ telnet/Makefile     2004-11-01 16:05:05 -0500
+@@ -6,7 +6,7 @@
+ #CXXFLAGS:=$(patsubst -O2, -g, $(CXXFLAGS))
+ 
+ # -DAUTHENTICATE
+-CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE
++CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE -D_GNU_SOURCE
+ LIBS = $(LIBTERMCAP)
+ 
+ SRCS = commands.cc main.cc network.cc ring.cc sys_bsd.cc telnet.cc \
+
diff --git a/net-misc/netkit-telnetd/files/telnetd.xinetd b/net-misc/netkit-telnetd/files/telnetd.xinetd
new file mode 100644
index 000000000000..63dd6dac9e7f
--- /dev/null
+++ b/net-misc/netkit-telnetd/files/telnetd.xinetd
@@ -0,0 +1,10 @@
+service telnet
+{
+	flags           = REUSE
+	socket_type     = stream
+	wait            = no
+	user            = root
+	server          = /usr/sbin/in.telnetd
+	log_on_failure += USERID
+	disable         = yes
+}
diff --git a/net-misc/netkit-telnetd/metadata.xml b/net-misc/netkit-telnetd/metadata.xml
new file mode 100644
index 000000000000..428ad1b85200
--- /dev/null
+++ b/net-misc/netkit-telnetd/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>paolo.pedroni@iol.it</email>
+		<name>Paolo Pedroni</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<longdescription>The telnetd program is a server which supports the DARPA telnet interactive communication protocol.</longdescription>
+	<upstream>
+		<remote-id type="launchpad">netkit-telnet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
new file mode 100644
index 000000000000..c4cb608960bd
--- /dev/null
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+PATCHLEVEL=36
+DESCRIPTION="Standard Linux telnet client and server"
+#old HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+# This might be the best HOMEPAGE now?
+HOMEPAGE="https://launchpad.net/netkit-telnet"
+# http://packages.debian.org/stablesource/netkit-telnet
+# http://packages.debian.org/testing/source/netkit-telnet
+# No upstream mirror exists anymore?
+# old ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz
+SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
+	mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2:=
+	!net-misc/telnet-bsd"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/netkit-telnet-${PV}
+
+src_prepare() {
+	# Patch: [0]
+	# Gentoo lacks a maintainer for this package right now. And a
+	# security problem arose. While reviewing our options for how
+	# should we proceed with the security bug we decided it would be
+	# better to just stay in sync with debian's own netkit-telnet
+	# package. Lots of bug fixes by them over time which were not in
+	# our telnetd.
+	epatch "${WORKDIR}"/netkit-telnet_0.17-${PATCHLEVEL}.diff
+
+	# Patch: [1]
+	# after the deb patch we need to add a small patch that defines
+	# gnu source. This is needed for gcc-3.4.x (needs to be pushed
+	# back to the deb folk?)
+	epatch "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch
+
+	# Fix portability issues.
+	sed -i \
+		-e 's:echo -n:printf %s:' \
+		configure || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# Not a real autoconf script.
+	./configure --prefix=/usr || die
+
+	sed -i \
+		-e "s:-pipe -O2:${CFLAGS}:" \
+		-e "s:^\(LDFLAGS=\).*:\1${LDFLAGS}:" \
+		-e "s:-Wpointer-arith::" \
+		MCONFIG || die
+}
+
+src_compile() {
+	emake
+	emake -C telnetlogin
+}
+
+src_install() {
+	dobin telnet/telnet
+
+	dosbin telnetd/telnetd
+	dosym telnetd /usr/sbin/in.telnetd
+	dosbin telnetlogin/telnetlogin
+	doman telnet/telnet.1
+	doman telnetd/*.8
+	doman telnetd/issue.net.5
+	dosym telnetd.8 /usr/share/man/man8/in.telnetd.8
+	doman telnetlogin/telnetlogin.8
+	dodoc BUGS ChangeLog README
+	dodoc "${FILESDIR}"/net.issue.sample
+	newdoc telnet/README README.telnet
+	newdoc telnet/TODO TODO.telnet
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/telnetd.xinetd telnetd
+}
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r11.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r11.ebuild
new file mode 100644
index 000000000000..6c1cadefb044
--- /dev/null
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r11.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+PATCHLEVEL=40
+DESCRIPTION="Standard Linux telnet client and server"
+#old HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+# This might be the best HOMEPAGE now?
+HOMEPAGE="https://launchpad.net/netkit-telnet"
+# http://packages.debian.org/stablesource/netkit-telnet
+# http://packages.debian.org/testing/source/netkit-telnet
+# No upstream mirror exists anymore?
+# old ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz
+SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
+	mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.debian.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2:=
+	!net-misc/telnet-bsd"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/netkit-telnet-${PV}
+
+src_prepare() {
+	# Patch: [0]
+	# Gentoo lacks a maintainer for this package right now. And a
+	# security problem arose. While reviewing our options for how
+	# should we proceed with the security bug we decided it would be
+	# better to just stay in sync with debian's own netkit-telnet
+	# package. Lots of bug fixes by them over time which were not in
+	# our telnetd.
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" epatch "${WORKDIR}"/debian/patches
+
+	# Patch: [1]
+	# after the deb patch we need to add a small patch that defines
+	# gnu source. This is needed for gcc-3.4.x (needs to be pushed
+	# back to the deb folk?)
+	epatch "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch
+
+	# Fix portability issues.
+	sed -i \
+		-e 's:echo -n:printf %s:' \
+		configure || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# Not a real autoconf script.
+	./configure --prefix=/usr || die
+
+	sed -i \
+		-e "s:-pipe -O2:${CFLAGS}:" \
+		-e "s:^\(LDFLAGS=\).*:\1${LDFLAGS}:" \
+		-e "s:-Wpointer-arith::" \
+		MCONFIG || die
+}
+
+src_compile() {
+	emake
+	emake -C telnetlogin
+}
+
+src_install() {
+	dobin telnet/telnet
+
+	dosbin telnetd/telnetd
+	dosym telnetd /usr/sbin/in.telnetd
+	dosbin telnetlogin/telnetlogin
+	doman telnet/telnet.1
+	doman telnetd/*.8
+	doman telnetd/issue.net.5
+	dosym telnetd.8 /usr/share/man/man8/in.telnetd.8
+	doman telnetlogin/telnetlogin.8
+	dodoc BUGS ChangeLog README
+	dodoc "${FILESDIR}"/net.issue.sample
+	newdoc telnet/README README.telnet
+	newdoc telnet/TODO TODO.telnet
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/telnetd.xinetd telnetd
+}
diff --git a/net-misc/netkit-timed/Manifest b/net-misc/netkit-timed/Manifest
new file mode 100644
index 000000000000..2aee1b35bdfd
--- /dev/null
+++ b/net-misc/netkit-timed/Manifest
@@ -0,0 +1,8 @@
+AUX 0.17-CFLAG-DEF-fix.patch 1551 SHA256 5639d351222ca7c7425eea214ed536966a5861418148f91dec50971b8698b962 SHA512 397af8f497dc422d7e60f67e72edaefa64210ec834ac01a80696d9a9db808fcef3ff6a84b1ba1a8e3a29a76c7b47557df641c1a9028546513cc4409ee0484bbe WHIRLPOOL 6784b109f81f7467ea105fd29cf7ee58d86f5a054ff6fd5b5976bf5cdadbae1e6c8c377d07dd1bd46798bcfbf895da8e5da397d9f591db86bf34f9bebe5fbe15
+AUX 0.17-timed-opt-parsing.patch 403 SHA256 cdb27b74ee275e59bfb6eef7a78399d03b4615781935ec4edb6719132c3ee1a2 SHA512 76631e8ebcbe3a49f8454d6f72110803de58ddd5b3b5614e8abcd82f348e3bb1d9e706b3608b9c1f0672d529806dcbd571e27ae96b8fa5c7c9a4cd1b1762ad03 WHIRLPOOL ce7f5d65678750c447ce074a523a1669be7257c28c7ae42cbc992f7b5c094180d4893697c693dfa82d2e2be69acc4119dcfc753aa158640131d99db2fa7e736d
+AUX timed.rc6 358 SHA256 0b1d394331d5a357d78bc31700b5bfbdd81dad478c967e79e53a4e17c187f529 SHA512 cde2063563dd02b404560fa84bfa536f2f7c75e9271225e94b08630348d78639e386b8a0f59f04b389ad66f2d714c63edf2eed507b690d5ba989780b400547a4 WHIRLPOOL 41e0df0525314bc39307d25b9e463e0ce7cfbfaa5bc701db88cc24f2784956cac2f47f4dca0037fd8b9acf6116031c5dc910ac107919788a5b6c34890325dd62
+DIST netkit-timed-0.17.tar.gz 48655 SHA256 3be296794158639a350fd71506ffdad9ebd5d2a2640bbf533147e95d55d592fe SHA512 781a41555953a165949dde7e7279298d4faf348575ba1214c6ce60cdbc74f6f03ab31002d57a441cbcaf674f7e2cc00afa17632bc3fcb28e2afd95d39cd70b99 WHIRLPOOL 299c6a3980043d9ccc82b950a6a1d7703bafacd6dadfd67992a0374f39fe77a9b9dc02d2f63b708a6a6510d8d25952aae16083f7ebac995fc8993f8744465ea9
+EBUILD netkit-timed-0.17-r10.ebuild 1020 SHA256 ca76b66a7af733f6f1b43bf61618ba2b660224be7d300589224093f21650a960 SHA512 267312c5a49304fd6f449023f84bf508956ae8dab13a5901809d5b0e75b5234e08984c0bdb5d4f6195a4df59da12911b1c27aa29ebf1c45383d8f1a110087fef WHIRLPOOL 9e63eb7518fcc1ee0b16063f0a1553d5d3b08f78f6ca6bc3eaadfd39d41645634055b3a6dce40ed8b182749a0d3a3934ea61f87a8bf43d6a25ffaf6716b05735
+MISC ChangeLog 3052 SHA256 f79297841b4959090c90e2b1e5b3256b1d652da65212225b72869f88c96d3cd1 SHA512 b69b66332167899ed1604814f8cbdd648344046bf04f722d1724d31618a2bb683cba7d3f2a4aaef8077944cd15e65a0655102078237f3426f7eacb12e7b2f476 WHIRLPOOL cf38dfe75bbc68c0f69e5e40c64fe62b96328963058593478cff4736fb3b731e54bf6cde74f83d349d00d29a11eb81561f7d1cb01a06fd963669f01f70721f85
+MISC ChangeLog-2015 4639 SHA256 e32658f717a20422a6763c45a3d97d647177061a3da91b53b4c14df068b3ef54 SHA512 07165a989c39b0975c71d253b0329991d545c9c028576213d54c8bc0eedae88b320ca54bac0e65089ec207007d5f05b7d70d037c913b7521fde41b754af55316 WHIRLPOOL 2ceb0b3d53a7c4feada2f89e7e12e0b3d76c9ad6f47a342f600203022a41c558b52d67fcb9e1915f53449a3175ec3c72456167b19ee54223b8ce9c7b0b748768
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/netkit-timed/files/0.17-CFLAG-DEF-fix.patch b/net-misc/netkit-timed/files/0.17-CFLAG-DEF-fix.patch
new file mode 100644
index 000000000000..6d3fbf704ba5
--- /dev/null
+++ b/net-misc/netkit-timed/files/0.17-CFLAG-DEF-fix.patch
@@ -0,0 +1,55 @@
+diff -ru netkit-timed-0.17/configure netkit-timed-0.17.fixed/configure
+--- netkit-timed-0.17/configure	2000-07-23 15:12:26.000000000 +0930
++++ netkit-timed-0.17.fixed/configure	2004-08-07 09:22:47.860505136 +0930
+@@ -115,39 +115,6 @@
+      echo 'no'
+ fi
+ 
+-if [ x$DEBUG = x ]; then
+-    echo -n "Checking if $CC accepts -O2... "
+-    if (
+-         $CC -O2 __conftest.c -o __conftest
+-       ) >/dev/null 2>&1; then
+-         echo 'yes'
+-         CFLAGS="$CFLAGS -O2"
+-    else
+-         echo 'no'
+-         echo -n "Checking if $CC accepts -O... "
+-         if (
+-              $CC -O __conftest.c -o __conftest
+-            ) >/dev/null 2>&1; then
+-              echo 'yes'
+-              CFLAGS="$CFLAGS -O"
+-         else
+-              echo 'no'
+-         fi
+-    fi
+-
+-else
+-    echo -n "Checking if $CC accepts -g... "
+-    if (
+-         $CC -g __conftest.c -o __conftest
+-       ) >/dev/null 2>&1; then
+-         echo 'yes'
+-         CFLAGS="$CFLAGS -g"
+-    else
+-         echo 'no'
+-    fi
+-
+-fi
+-
+ LDFLAGS=
+ LIBS=
+ 
+diff -ru netkit-timed-0.17/timed/timed/timed.c netkit-timed-0.17.fixed/timed/timed/timed.c
+--- netkit-timed-0.17/timed/timed/timed.c	1999-12-13 03:35:07.000000000 +0930
++++ netkit-timed-0.17.fixed/timed/timed/timed.c	2004-08-07 09:26:32.299385240 +0930
+@@ -898,7 +898,7 @@
+ void
+ get_goodgroup(int force)
+ {
+-# define NG_DELAY (30*60*CLK_TCK)	/* 30 minutes */
++# define NG_DELAY (30*60*CLOCKS_PER_SEC)	/* 30 minutes */
+ 	static unsigned long last_update = -NG_DELAY;
+ 	unsigned long new_update;
+ /*	struct hosttbl *htp; */
diff --git a/net-misc/netkit-timed/files/0.17-timed-opt-parsing.patch b/net-misc/netkit-timed/files/0.17-timed-opt-parsing.patch
new file mode 100644
index 000000000000..5b5855478d5a
--- /dev/null
+++ b/net-misc/netkit-timed/files/0.17-timed-opt-parsing.patch
@@ -0,0 +1,12 @@
+diff -ur netkit-timed-0.17.orig/timed/timed/timed.c netkit-timed-0.17/timed/timed/timed.c
+--- netkit-timed-0.17.orig/timed/timed/timed.c	2006-07-28 00:12:03.000000000 -0700
++++ netkit-timed-0.17/timed/timed/timed.c	2006-07-28 00:12:52.000000000 -0700
+@@ -158,7 +158,7 @@
+ 	struct nets *nt;
+ 	struct sockaddr_in server;
+ 	u_short port;
+-	char c;
++	signed char c;
+ #ifdef sgi
+ 	FILE *timetrim_st;
+ #endif
diff --git a/net-misc/netkit-timed/files/timed.rc6 b/net-misc/netkit-timed/files/timed.rc6
new file mode 100644
index 000000000000..eb939565310a
--- /dev/null
+++ b/net-misc/netkit-timed/files/timed.rc6
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting timed"
+	start-stop-daemon --start --quiet --exec /usr/sbin/timed
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping timed"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/timed
+	eend $?
+}
diff --git a/net-misc/netkit-timed/metadata.xml b/net-misc/netkit-timed/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/netkit-timed/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild b/net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild
new file mode 100644
index 000000000000..bde888f10c2d
--- /dev/null
+++ b/net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs
+
+IUSE=""
+DESCRIPTION="Netkit - timed"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
+LICENSE="BSD GPL-2"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	eapply "${FILESDIR}"/0.17-CFLAG-DEF-fix.patch
+	eapply "${FILESDIR}"/0.17-timed-opt-parsing.patch
+	sed -i configure \
+		-e '/^LDFLAGS=/d' \
+		|| die "sed configure"
+	default
+}
+
+src_configure() {
+	# Note this is not an autoconf configure script. econf fails
+	append-flags -DCLK_TCK=CLOCKS_PER_SEC
+	./configure --prefix=/usr --with-c-compiler=$(tc-getCC) || die "bad configure"
+}
+
+src_install() {
+	dosbin timed/timed/timed
+	doman  timed/timed/timed.8
+	dosbin timed/timedc/timedc
+	doman  timed/timedc/timedc.8
+	dodoc  README ChangeLog BUGS
+
+	newinitd "${FILESDIR}"/timed.rc6 timed
+}
diff --git a/net-misc/netpipe/Manifest b/net-misc/netpipe/Manifest
new file mode 100644
index 000000000000..b873581bc6b0
--- /dev/null
+++ b/net-misc/netpipe/Manifest
@@ -0,0 +1,6 @@
+DIST netpipe.tar.gz 30593 SHA256 89cfcd5ca5898d77fd5cd64634610667f3b9e087db20536d7636739295d7cdf3 SHA512 ce21a8bd298db990b7981a5501e70bbf8d6eac9d802d1f01c41d47f02ee9afb6fb095478496590f470318463491ec36da920047d668d2a8abe1e7559f53b1a37 WHIRLPOOL b79081b808c05d98652c17f9b864ee97fb1b4c9ce606b7f7f9888cf50bd0e75e3da8fb126eb62b646e63e2efa50d046e2d22ecd2b96dfeed8eb5ba1e55952d4e
+EBUILD netpipe-1.0.0_beta2-r1.ebuild 675 SHA256 8cdeb814440e337f73ddfe45bb5f231cb25dfda47b41a8631c2538bb0261041a SHA512 a56303baf01031a48cdf491d1538ba5d6c9c2bff074bc1d336d67b1dc383f55dfb9f1eb09a77b73eb3204c5553cfa2ccdbe48b6fe64936452058ebc28a39f3f2 WHIRLPOOL 1aa95dc951e84c5cce8a75a47f555aac44698db79e3b77fbd524226b83147fccfa4f9e63544ce8effac86c7ab9ab37fd0ed105ce69b7963e53297ccb33b6f43f
+EBUILD netpipe-1.0.0_beta2.ebuild 652 SHA256 3f48fdb292898f082811842f4a4e34147986668ca519f6554254cedc03be9f64 SHA512 f92757750fed05d6d55db7bca52d5fb79607c7a1b9c24ac8cbc60d82be510a5070b73b7e1b443f6594a45d9cd7438e2e28aaab8c833b252923e9b8b547c3a098 WHIRLPOOL c61de463df4421a8e5e0c75b3edcf765eb10246ba0b7007c5f07161d37fa4058172ab10824a3621a2a98bb6b236d7b887a0ba7fc5cc930d41e753c81f1866f5c
+MISC ChangeLog 2604 SHA256 84acf9caa1687ae714fb869075c633acac8bfe15e295d24e8e517bec7d728af9 SHA512 5c068fbdce8f77c78d07313df6d6418f68afc5a5c8ed938698cc49212ce0916762e93e335798af52251a3f186479b5b6160d9b6860b720490a77dd987879a4cb WHIRLPOOL 2a5d7cf78f1e914646a960f0b4b4ba7a3493bf5c4b98378cce5a4b83d2e583d7b756fea7534e7bea6b162d52a4b4e9691484b1241abdf35130edde30586678f2
+MISC ChangeLog-2015 1547 SHA256 eca0a322e81c2a87e0ab283ecdb20c2d87850b320c3beb003383e8913f855283 SHA512 669282414c21d05e99dac7bd9b5575af6d2d36af9be356286fdd623f3126026cc75e1e1b4e9ce56c105a3f04e83507f4cc2b2ce66f1ed2158ff0e21ff4429f6f WHIRLPOOL 02fe292a14da1f8bc37d84d8b571644a0779f6515501f7c379a1646e527620f2c0ff389abf056d501bc8c4e53906385f48685cdaf532338f1c4a0a6eb4c70ea6
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/netpipe/metadata.xml b/net-misc/netpipe/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/netpipe/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild b/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..9eb6659d8bf4
--- /dev/null
+++ b/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="tool to reliably distribute binary data using UDP broadcasting techniques"
+HOMEPAGE="http://www.wudika.de/~jan/netpipe/"
+SRC_URI="http://www.wudika.de/~jan/${PN}/${PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "s:^OPT=.*:OPT = ${CFLAGS} ${LDFLAGS}:" \
+		-e "s:^CC=.*:CC = $(tc-getCC):" \
+		Makefile || die "sed failed"
+}
+
+src_install() {
+	dobin netpipe || die "dobin failed"
+	dodoc DOCUMENTATION INSTALL TECH-NOTES || die
+}
diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild b/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
new file mode 100644
index 000000000000..51599bd00c5f
--- /dev/null
+++ b/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="tool to reliably distribute binary data using UDP broadcasting techniques"
+HOMEPAGE="http://www.wudika.de/~jan/netpipe/"
+SRC_URI="http://www.wudika.de/~jan/netpipe/${PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "s:^OPT=.*:OPT = ${CFLAGS}:" \
+		-e "s:^CC=.*:CC = $(tc-getCC):" \
+		Makefile
+}
+
+src_install() {
+	dobin netpipe || die "dobin failed"
+	dodoc DOCUMENTATION INSTALL TECH-NOTES
+}
diff --git a/net-misc/netpipes/Manifest b/net-misc/netpipes/Manifest
new file mode 100644
index 000000000000..1a92f69f1369
--- /dev/null
+++ b/net-misc/netpipes/Manifest
@@ -0,0 +1,6 @@
+AUX netpipes-4.2-string.patch 179 SHA256 ebf50461f9c8d47dc17e938b2b40db75a8f00420633fe68fb55d26c571802806 SHA512 5eedd31bf184dd28b85dbfac07ba008e36d12419339181ad04f427d062f99d6be886720d212fe9f4f612988647be8c4f35e977bb0023f6c20e718da01bdbf9de WHIRLPOOL 25e0583738c516bed584d52312e8d340989083cfbb8b53699fca8f1191d7033c4c566e34c0261aed64bdea7c00787414e74ea6c430b75a50c7cfc0ca328efbfe
+DIST netpipes-4.2-export.tar.gz 75276 SHA256 0712b2cd55ad78084385d215f8037aad3c53b06a6fd8c9bda83ec23afd440a27 SHA512 a875922d179b98d5d663825cb83dc92b515ca3fa77e44ce05941a0de58951840626836b597ea244a660be637d61be3428de7dab413a1c439e4673c82dae02531 WHIRLPOOL 555850c5ff14be9b7517782dc855683c5b7bc4921d81c4c6ec091cde1a18a8ca89844214dff2eb2fb04f2165fbd3929ae2be6d7a9407fccfd4f9e48b53f0c523
+EBUILD netpipes-4.2-r2.ebuild 729 SHA256 3debc4b3f2eb4f04f70d1f65551de9743fff2dc8aaa244e1ead86f79223b1490 SHA512 4848eb2a845a2ec7ca7d103838a0a7552d83e5a5c2bf4f96fd53994822c56d59e19ceb435fdbe619903631b802b4077ac60fff87efee6fad220390ec7e02e3fe WHIRLPOOL 37158aa8806e975aa30ea86fed8538b290b8da6c1487d8e8acb3bf916a42b65c3436e6aed38d4b55c90fc706fb7600c388eb5eb950959560bbc8f97954990147
+MISC ChangeLog 2466 SHA256 39f6f44182c82b2420e13581dd40c90f46cae205bb5e66cd957188551146584e SHA512 70cc0cee199af4966f1fcd23989bff30c950a15910b7c59ac964600d6ca2f75e549558d73a30ae85bcbf5438033fb49501f7b8c01f2bb14399e52f7338631069 WHIRLPOOL 2b1951412de27a19a1d347c51ca36441303c9a18555fdd34b3bb4b279e887f117234a18067894827309a57229c4ba41435294ce0119bf07975fba2b03372d953
+MISC ChangeLog-2015 2051 SHA256 9ecb8fea63d9150cda66851e366c7bd548df5964642e093afe968ede1eab7fbb SHA512 8b02f66b5dbac749552866a0e7a7ca516f17c07fc8d218b2d638788f0ed2c5e64726ae26cfa6030d8c5959606b2038883c6d8b2fb07e8383c9992e6955340618 WHIRLPOOL a15166a7ab7f0a2f3194beb3622b236e0c03ed2eb108054dfcb211c9363a27f0b9c357ee9a9ed09be479b3edb9adce860a529d4159d67aa842ce6bd5f0193117
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-misc/netpipes/files/netpipes-4.2-string.patch b/net-misc/netpipes/files/netpipes-4.2-string.patch
new file mode 100644
index 000000000000..8dfc3cdcd137
--- /dev/null
+++ b/net-misc/netpipes/files/netpipes-4.2-string.patch
@@ -0,0 +1,10 @@
+--- a/timelimit.c
++++ b/timelimit.c
+@@ -30,6 +30,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <string.h>
+ extern int errno;
+ #include "common.h"
+ 
diff --git a/net-misc/netpipes/metadata.xml b/net-misc/netpipes/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-misc/netpipes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/netpipes/netpipes-4.2-r2.ebuild b/net-misc/netpipes/netpipes-4.2-r2.ebuild
new file mode 100644
index 000000000000..36be1f20476a
--- /dev/null
+++ b/net-misc/netpipes/netpipes-4.2-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a package to manipulate BSD TCP/IP stream sockets"
+HOMEPAGE="http://web.purplefrog.com/~thoth/netpipes/"
+SRC_URI="http://web.purplefrog.com/~thoth/netpipes/ftp/${P}-export.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S=${WORKDIR}/${P}-export
+
+src_prepare() {
+	sed -i \
+		-e 's:CFLAGS =:CFLAGS +=:' \
+		-e '/ -o /s:${CFLAGS}:$(CFLAGS) $(LDFLAGS):g' \
+		Makefile || die
+
+	epatch "${FILESDIR}/${P}"-string.patch
+}
+
+src_compile () {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dodir /usr/share/man
+	emake INSTROOT="${D}"/usr INSTMAN="${D}"/usr/share/man install
+}
diff --git a/net-misc/netprofiles-ims/Manifest b/net-misc/netprofiles-ims/Manifest
new file mode 100644
index 000000000000..349a88cb0846
--- /dev/null
+++ b/net-misc/netprofiles-ims/Manifest
@@ -0,0 +1,5 @@
+DIST netprofiles-ims-0.1.0134.tar.gz 4218 SHA256 c981082edab9080cfb12e21e44bd977f9fa7fc43e9aee47336bc74cb5a6f25ab SHA512 e58e6c0b50096a755442c2b8443e5101e2021362175ec40b57da7a4edf5b54a6435f220b7018253da8f896d37e8c0e37e9bec9bbc36a606487fca39b1958be18 WHIRLPOOL 5ea06c8655b8d1d0238a45bf3529e9d67abe9c38903adc462d6b271f1ab5298d47aa1b8f6bf877d98e2a4aa8863fe7cde03ac05983d5e9e38d3ccd715cd031c0
+EBUILD netprofiles-ims-0.1.0134.ebuild 430 SHA256 a04ce8a9dbc0c2b3de29187456096d67e03cff1cce169ed573d50929a0b63265 SHA512 46591bb21a7ac96a94292dd9758cbe87195cdfeaba48c3ec873b419a050049bd1ebfd13df2ef95a5cd90e66dffd66faa5fbb009c6f20f0c78357d5f023b2018d WHIRLPOOL 4df04d4e11905f6bdab4cf01c330c155fa1e1b2343ffb3eeaccb4a00b36420518ec0e5a6db4d823e3b8e756561cba3e2ced13869c1d67b4a578707f484c071b2
+MISC ChangeLog 2552 SHA256 7b749fd4a5c03e87c520e279f58065663aee852a600eae9f82585c0f774ff844 SHA512 ca6688fc59619ba32d07d8d06b45f3c1e4fe11680758c5b38fb7c28fba417794f159158b3fe34a68cdb04eecc774ff3866380f15c596661b54785bd64f9f4c90 WHIRLPOOL eb0ad134f0b2ccfc518cc746fec404d3e51393e656273b152c375b4a07d8eb55bcb111b6c93ed483b61b2ac4663a54f6c5282a6dfb809b81646e07bdc13fcfae
+MISC ChangeLog-2015 1047 SHA256 dc90437b8eea63b0a340748e0f505b060dd0f2fb8cc80ffc4170015399b8ee6c SHA512 d2ab5287fdcc82f0ca8165c6fa06c4aa66e969b64e92fcf7edc735bba29039589428f541a0c53480730475332a994f91544a484d3df9218737a70dc7ba9e3e93 WHIRLPOOL 53c829c70cbb6d27740bb4d235ae937e3a66d39a58e7f3ce8fd309800880a5f1b8df5f4b2ff77c61559a4dbe422fc5d613a790ca7cf97bbc782424541ddb8643
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/netprofiles-ims/metadata.xml b/net-misc/netprofiles-ims/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/netprofiles-ims/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild b/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild
new file mode 100644
index 000000000000..61d914c4da63
--- /dev/null
+++ b/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Netprofiles Interface Management System manages network configurations"
+
+HOMEPAGE="http://www.furuba.net/~buckminst/gentoo/"
+SRC_URI="http://www.furuba.net/~buckminst/gentoo/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+DEPEND=""
+
+src_install() {
+	dosbin netprofiles
+	doinitd netprofiles-ims
+}
diff --git a/net-misc/netsed/Manifest b/net-misc/netsed/Manifest
new file mode 100644
index 000000000000..b1260c19150b
--- /dev/null
+++ b/net-misc/netsed/Manifest
@@ -0,0 +1,6 @@
+DIST netsed.tgz 6352 SHA256 a04f6b235d787b1efd96ecdb398e6c8456301dbf965840e6fcbad36c68372dce SHA512 edef6ef6e39a17a46a3b4d8019ba2e742b2b5852f804df5e952461a792e3ba7a49fcc33353abf7e532e51586927f28f4b7c6da4f4fbd34a32cdf093f26163dd7 WHIRLPOOL 3caed1edc870afa94a10c2635ccca14aaaa5593690b8dbf0face5504ea7dce875fd31d7149ccc3af9a2ed982b318cec55296cc2be687af689a36f84ce7ab793d
+DIST netsed_0.01c-2.diff.gz 3140 SHA256 90799c1da3a219e61b12e4c19810b6b5558de3760ce75e38c592b8b423ac7426 SHA512 5a729e9800051449f7f52989cb65232e262ac6023f21b8ec688f3ce33ed4be79f9d00993aed7773d83dbe109927a5fc6c64e4775d4958136e5c891b6b82e6b83 WHIRLPOOL 62b5fca3875b638bacd91dc1fc1612719d3e739cd30802e74176dcb933b82eebb8336fff772c34d0ca1aab1d527136314493fece4ad682da3fb353dc1bafff0f
+EBUILD netsed-0.01b.ebuild 654 SHA256 2f0928b4cf0acfcd4367e87578bc2e72e3cd1126a64342ab61113034b5bbada0 SHA512 f2feb622c2ea871d697a4067e0021b5154ee82b1b85fa1414dc8bc664d901c30474d6c5011b243ba0f8b73b31554d6b3c465ed8b129629988def61926cbae2ce WHIRLPOOL 2329fd465d9d35f0e7a6d7c5597c6ae56139c12c671e95fc078ee77a2e079b2000ac0d487e7fc09e3f146c4d2265db00c04de1cf42fcf91ef0bac4b230be3307
+MISC ChangeLog 2519 SHA256 7c5f68494a6fd08f77735020d96b1397f271225aed09f3d701ff76a6a5a98ba1 SHA512 25ed0e25ab0e17fd97066e110ce3d66f2574c916807324323684575945bc88966702dfa37d8d236d90a15acc35d35305c1435a04b42a716ca1c728b3bf68a32c WHIRLPOOL 69f7253dc41f12cf09da4b972481d1678413fc9f835bfa714c29ef785a9c850a785b020d3aafc0a2fe80b9628735e74027ea358b309b6d03d4f4850016747125
+MISC ChangeLog-2015 1105 SHA256 6cd28ab0631190e6d4094e64ef041b94999e7dc365743e2dbb1626b94c82312c SHA512 dec517950ddf5eb40283f6d5ce27d0932e892a70dd25dfceca1d4b756640eec05bb3d95b3fab62c12664f6c66e2dfa2c5e0269aa7a865dff595a54296c0516e7 WHIRLPOOL cb6ec527d16c01726859f80840f10004ad2bdd0a7aa1760b9d22e0e1b94efa8f2ac8dfeaf3fb4a1ce661c78a4c59933578135c6722ebc87501646c9b894130fb
+MISC metadata.xml 246 SHA256 9f718cc8f49450334f4246bb648863843ccd449e9b70e4db28aeb7e0ca20f29e SHA512 68010e77c1c73aa0f8b81bd63ec9734de511e7b3fef0edd156df2584f25b6d485656a4d11f200af89e53a1b3ece9d6d15e93a2d1ba63f83adf944841183cdf00 WHIRLPOOL 644e919f3dcc2130493142ccbbd58b5c1525360ccb4f1364b8cdfc3badea9ea1ff010caf28be9c95fe7da35ab7e1e5d2dfa34ea75a81534ef4f57cab63d7edf7
diff --git a/net-misc/netsed/metadata.xml b/net-misc/netsed/metadata.xml
new file mode 100644
index 000000000000..40f04073415b
--- /dev/null
+++ b/net-misc/netsed/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="freshmeat">netsed</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/netsed/netsed-0.01b.ebuild b/net-misc/netsed/netsed-0.01b.ebuild
new file mode 100644
index 000000000000..09f849d6048c
--- /dev/null
+++ b/net-misc/netsed/netsed-0.01b.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Small tool for altering forwarded network data in real time"
+HOMEPAGE="http://freshmeat.net/projects/netsed"
+SRC_URI="http://dione.ids.pl/~lcamtuf/${PN}.tgz
+	http://http.us.debian.org/debian/pool/main/n/netsed/${PN}_0.01c-2.diff.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	mkdir -p "${S}"
+	cd "${S}"
+	unpack ${A}
+}
+
+src_compile() {
+	epatch "${DISTDIR}"/${PN}_0.01c-2.diff.gz
+	make CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin netsed
+	doman debian/netsed.1
+	dodoc README
+}
diff --git a/net-misc/netstat-nat/Manifest b/net-misc/netstat-nat/Manifest
new file mode 100644
index 000000000000..43a671d13b5f
--- /dev/null
+++ b/net-misc/netstat-nat/Manifest
@@ -0,0 +1,6 @@
+AUX netstat-nat-1.4.10-install.patch 362 SHA256 cf33c489373ccf314fc396071ae66a45496c03c0ef32839d6c36732012837745 SHA512 003405d6967a9f29e1776b0209dee976e8a26010a2243f095d9c9e20665adc1ca799d9987462fd6d03f5885b9ec9fd447d32e4bd569fac868c8c849ae2e599ff WHIRLPOOL f9917270b87e4f2ac6868ebf0cc939dcc84ad980cf3cabc28ef375ce9294ae61ba0d87bc795046001f352f6e6ad425c9b1a878f7e45eb463e7e18ab2b0ceeb6c
+DIST netstat-nat-1.4.10.tar.gz 83865 SHA256 e945faa283a49f33af15de915a949c9273a230fc17154925364c547adab676ca SHA512 2089119b26039e656fbe76701e556f7d766159c96b18968195f255e15072af37972c83a8f05edb0b767a12f0521598975673d10d8ba5e6ed6b754a927d4f069d WHIRLPOOL 531c2989a69e26d2b66657727e0a30aebb57f689be458d6df8339adfb9f47b1cadf438c917ef49e1859c8b239379c9cd991528be887f734b833741e15aadc838
+EBUILD netstat-nat-1.4.10.ebuild 422 SHA256 86eb5de6fc73b442b326b9376c7eebab2b2188a2ef4615c2c76a7f6aa6273ec5 SHA512 2837689f4a38493cec7f00ad799e8f2eb2fb06919a404dc416eb33a90b2fad6fdd8e8377fbbe5d9fcb352ce00f445ae16a18f269ad42af712f54e7e9358bec9a WHIRLPOOL 34096b279a7714ddedda758bc07924a2b7a4815e745ecede0245190f0ce7e1a1bf8d7bdb63a6f5d0255e7c7ea5a2fcb4540554064738b5b493002fbd321029ea
+MISC ChangeLog 2484 SHA256 81a78c6f7304968e889a2f2a5ca768c3d1b2a1db393f61554000824eecb633f5 SHA512 bf389cf109e859c3a96f65de5e175f05a36f4154ac211d48d981cf2cbeb41ec90ccfb784d0713a520cd31b9472d46dc0a9debaa162c635b4d61221bae98ae705 WHIRLPOOL 501ca67e98f28fcf962fbd7ffe4336df7d80d94f68b4bf411500a83d59b82f4ee07f132d5403b1d1a1da5538c8b152f103d5b19172d3c2e1d0e823e99c0b43da
+MISC ChangeLog-2015 5460 SHA256 c48c0c9cc89de89308b2faa1ffa3c840b216f107cfb2a2daa767f1fcc29f2e08 SHA512 9bf687091944faf885dd38ab7be3964032c59f1bb7301cc60d5017562c6828510703a1146f0767171e8fe4897e9580b01f7de954e8f04f0c9abbf841b94399fd WHIRLPOOL 83345343aef50a934c777d5edab0159d924fb0fcfa9dc2f55b0af1db0d16f3d05cc7553da26783440bbbb56361f5f5475446ae2b6c442f5d7b900002f17eef2d
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-misc/netstat-nat/files/netstat-nat-1.4.10-install.patch b/net-misc/netstat-nat/files/netstat-nat-1.4.10-install.patch
new file mode 100644
index 000000000000..f56300fb432c
--- /dev/null
+++ b/net-misc/netstat-nat/files/netstat-nat-1.4.10-install.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = netstat-nat
+ netstat_nat_SOURCES = netstat-nat.c netstat-nat.h
+ docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+-doc_DATA = INSTALL NEWS README ChangeLog AUTHORS COPYING NEWS
++doc_DATA = NEWS README ChangeLog AUTHORS
+ dist_man_MANS = netstat-nat.1
+ EXTRA_DIST = netstat-nat.spec
+ SUBDIRS = 
diff --git a/net-misc/netstat-nat/metadata.xml b/net-misc/netstat-nat/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-misc/netstat-nat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
new file mode 100644
index 000000000000..cc7e4cb41180
--- /dev/null
+++ b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Display NAT connections"
+HOMEPAGE="http://tweegy.nl/projects/netstat-nat/index.html"
+SRC_URI="http://tweegy.nl/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc sparc x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-install.patch
+	eautoreconf
+}
diff --git a/net-misc/networkmanager-fortisslvpn/Manifest b/net-misc/networkmanager-fortisslvpn/Manifest
new file mode 100644
index 000000000000..e4d879e581b8
--- /dev/null
+++ b/net-misc/networkmanager-fortisslvpn/Manifest
@@ -0,0 +1,8 @@
+AUX networkmanager-fortisslvpn-1.2.2-location-fix.diff 776 SHA256 9a84503a3b4bb98abe78e5d990606b1bb6b0b45ace6c6e7596f474bcfca15cfa SHA512 a233657d82b1f60dd154e211991f3ec2ef1fea34d447690d8a864bcafe3451853bc3de56457b4185838c79d4337669902f9dd9a9067a15aaa6fb24404c1304d0 WHIRLPOOL f230b13ded1864681e5819465359dfa165e5faca36e16f5af18e5ceee78ad838f2e4aae9e8fa32a1a19c92838be711947958c6879a8e8ee62d603d712344f40d
+AUX networkmanager-fortisslvpn-1.2.6-location-fix.diff 1257 SHA256 31af2c9755286d1aa1e7143d31240ab510ff05eb62f1687552bd406fa2d3df53 SHA512 586e408a65cc83cc3e0e8238eab673b484188eb7e7d62c8bc14abaf05a82acff24f9281a904624fe45aae08b0804e7516c393d7ef52f1c2dcbb4949f23873bca WHIRLPOOL 28199e171a63a219f888bfd9f46dd7a7925bf7b5c045c8fb7d83d333450d5f330b20eae6fb3f466cd5417107ce02cb9f692c0645e3dce8e40b2333f1719557d6
+DIST NetworkManager-fortisslvpn-1.2.2.tar.xz 294576 SHA256 d7d9e396bee90df73ecaa3e49ef55308cab2666771ee1dd72060701eeb11a04f SHA512 db9660107e3ce9dec436ad0aeaba922b1a883a016ad19bb1946b310f2b97168451c72803f5f6fceec68ca766fd30720dc8b6d5fcdcd8f52543bc707341c30737 WHIRLPOOL 77355c2cc0af80e7e4974e82ebdda91b2daa787f8dbd8375eda5760d26d9ca1ccf45b6d24fb95af8642569e252a503e1e63ad444e5fc8d695395c8cdc7e1b606
+DIST NetworkManager-fortisslvpn-1.2.6.tar.xz 324048 SHA256 8ec489c37c92ca2d382e889ade109caac11737d448c9c64f7bc5848d5e512b17 SHA512 5f1bd180a810ca778bfc4d58522e827281a941f6a9b63bcbcadf42f94edadbe556db6693d77a55f42422fa657b37fc64df9480f4ae691151fa65688247bce69d WHIRLPOOL d4428c163ff643a2da5ee710818d2ff1397c7e6fa8575cf90520bfa9497bfba3d85ef7b56c7a75eb681c691dbb3e64f4a0957ee8bbfb1dda74c74e28846f7902
+EBUILD networkmanager-fortisslvpn-1.2.2.ebuild 980 SHA256 2130a0ebd93de00b49db2fa59c5753c24d0ef6cd72cfc20a56fefeee979506f2 SHA512 2cafbc99f5cbc3111249a1a5a55bd633f5111507186079b46f90685f0db317fcb5db85bbd7de0d70daeccbec1b6a0102b3255f098d45a453971373f0aaa578e5 WHIRLPOOL 0d6830120c60c7625bd8dc7ca9280fba84171bd8d66d11de5092d83897e81a847290069440ef3b190667f7b931ebabf4ecd99a916b2d82655022e85663de4973
+EBUILD networkmanager-fortisslvpn-1.2.6.ebuild 954 SHA256 9b4e7f54e9db7f6c564ad89e84d26c7bdd64ddcea9c482cc56330c69074d46d5 SHA512 f029b138fe96ee5f109a2c9f91ab925eea9586acb98f52a9a021d23de9b2e031b3c10b9ca02ab7dccc5a8ca91c4053ef56929e34c684510f17f35878961459c8 WHIRLPOOL 9b8da82d2d7d6d94db558a29d7d9bc41bc3d39d3f9f8603eccfed709c0aadbc473873a0ea94a6c37c4e862f02e118ccecaea70c7f50aae26919733d7cd61d293
+MISC ChangeLog 880 SHA256 63b53ee380d34a52e5cd706c3377f756b24f72dc3007943d988f3550335ea134 SHA512 6bc77d4519edf6420d8deee5b01bb30e7a97deb3385b56a8ea59ae0ed3896440a8b9fe41de8383dd0fc57b11dd34ac8bd3af56da232de30eb5b07749171e5268 WHIRLPOOL a0fa1f640ce40bdd7c28a7d2660dedbde6965230ca0826abef14205cb6d6032d86f33b4919cd9793ef6f980131732e1143e2da3ae6f075764448b09e43fe003d
+MISC metadata.xml 380 SHA256 9df86b9901d0f35d186944ea7016c90c455c4b16fccb823f5074585d2bd8acc9 SHA512 ebbe00af25885a8178a56f6b8341a75125c506dd8e374cb061acaefb8f0bddd0678d7231cc2eb13a319b1fb8a080f6c2d66fdbdd8aa022a7dc1216dac6c53c89 WHIRLPOOL 9403d5d9b46e2907c1ba0f98471d3e570516678d9e0c34e1e33a24058db70d030d7332afeff41fed06c983bf729bdabb83910a4708109275f7c9a13d8b890e90
diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.2-location-fix.diff b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.2-location-fix.diff
new file mode 100644
index 000000000000..39beeb1e37fc
--- /dev/null
+++ b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.2-location-fix.diff
@@ -0,0 +1,26 @@
+From 377ba9ca7fb33f3fb2ba5258a5af666869947597 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Wed, 18 May 2016 10:16:35 +0200
+Subject: [PATCH] service: don't use sharedstatedir
+
+GNU CS and thus autoconf default to a location that doesn't make any
+sense on Linux:
+
+http://www.redhat.com/archives/fedora-extras-list/2006-March/msg01546.html
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2725b48..7c0f811 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-fortisslvpn_statedir = $(sharedstatedir)/$(PACKAGE)
++fortisslvpn_statedir = $(localstatedir)/lib/$(PACKAGE)
+ 
+ install-data-hook:
+ 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(fortisslvpn_statedir)
+-- 
+2.7.3
+
diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
new file mode 100644
index 000000000000..c0439bf0e394
--- /dev/null
+++ b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
@@ -0,0 +1,37 @@
+diff --git a/Makefile.am b/Makefile.am
+index 59ba94121..6419e9f57 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -26,6 +26,8 @@ dbusservice_DATA = nm-fortisslvpn-service.conf
+ nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
+ nmvpnservice_DATA = nm-fortisslvpn-service.name
+ 
++fortisslvpn_statedir = $(localstatedir)/lib/$(PACKAGE)
++
+ BUILT_SOURCES =
+ 
+ ###############################################################################
+@@ -276,7 +278,7 @@ auth_dialog_nm_fortisslvpn_auth_dialog_LDADD = \
+ if WITH_LIBNM_GLIB
+ # Install a file with full path to plugins for an old gnome-shell
+ # https://bugzilla.gnome.org/show_bug.cgi?id=693590
+-install-data-hook:
++install-compat-name-file:
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
+ 	sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \
+ 	    -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
+@@ -286,8 +288,14 @@ install-data-hook:
+ 
+ uninstall-hook:
+ 	 rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-fortisslvpn-service.name
++else
++install-compat-name-file:
++	@:
+ endif
+ 
++install-data-hook: install-compat-name-file
++	$(mkinstalldirs) -m 0700 $(DESTDIR)$(fortisslvpn_statedir)
++
+ appdatadir = $(datadir)/appdata
+ appdata_files = $(appdata_in_files:.xml.in=.xml)
+ if WITH_GNOME
diff --git a/net-misc/networkmanager-fortisslvpn/metadata.xml b/net-misc/networkmanager-fortisslvpn/metadata.xml
new file mode 100644
index 000000000000..b7fa921dff8f
--- /dev/null
+++ b/net-misc/networkmanager-fortisslvpn/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mathy@vanvoorden.be</email>
+    <name>Mathy Vanvoorden</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild
new file mode 100644
index 000000000000..8cae2a63466a
--- /dev/null
+++ b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 autotools
+
+DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.1:=
+	>=dev-libs/glib-2.32:2
+	net-dialup/ppp:=
+	>=net-vpn/openfortivpn-1.2.0
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Upstream patch 377ba9ca7fb33f3fb2ba5258a5af666869947597
+	eapply "${FILESDIR}/${P}-location-fix.diff"
+
+	eapply_user
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--localstatedir=/var \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
new file mode 100644
index 000000000000..98442620baa3
--- /dev/null
+++ b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2:=
+	>=dev-libs/glib-2.32:2
+	net-dialup/ppp:=
+	>=net-vpn/openfortivpn-1.2.0
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Upstream patch e5d476076e068f58ef4fa938f09945159fce36a6
+	"${FILESDIR}"/${P}-location-fix.diff
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--localstatedir=/var \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/networkmanager-libreswan/Manifest b/net-misc/networkmanager-libreswan/Manifest
new file mode 100644
index 000000000000..bfd81b9a2ce7
--- /dev/null
+++ b/net-misc/networkmanager-libreswan/Manifest
@@ -0,0 +1,3 @@
+DIST NetworkManager-libreswan-1.2.6.tar.xz 348312 SHA256 604fc207598dc9bac2c37e3d242e41bd80d6a74e2a9358e66debc9b667672c96 SHA512 385b7e7cfc0720be1eae0a3c7e080efd17eb6f243d069ba881b97c9638fc3bb951b3c8f1c9b44422fe81a2dc9fc85b675f977284111aeaa6304ad31750f62798 WHIRLPOOL 533e98c552027dff94962e69d29f1009e29cc6841099171612e94ced1d4cbba20c751bed06357bba140d7878642f083c0b22323f12bd8bdfdc5765cc15655b36
+EBUILD networkmanager-libreswan-1.2.6.ebuild 839 SHA256 ca871a0f482102058aa7ac758e4f2a23a5c1b643a26ceb1142b930865596c4e0 SHA512 c43dd0db9d4f4836127365c66f572bc5ad7e27f76393303da2a41ab2f75b1ca36bd937e55bd20c1afad5683e83a8704db1c6990c1073a4cab570feaa677e23a7 WHIRLPOOL 6bc0bc94d0bd2fe94a30aad1eabda796c34c8b62ce1015d0eece8efe0b5396598a03867d7cab026b8b40d6a093e7795c9b331be5850dae108c61aa3d1836aadf
+MISC metadata.xml 246 SHA256 87fa83ef14035e5fbb6dac93f3d4afd4085e971aab6d7401ac2b6bed9e5eb84d SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b WHIRLPOOL 1e17af59af785717b26fdd3df4e84788475fa23ad410fc7a9214c0b86c57b80b54cd66742f44ef0a29d9c96611842d57d833d41568a4859b3e2fe491d691d55a
diff --git a/net-misc/networkmanager-libreswan/metadata.xml b/net-misc/networkmanager-libreswan/metadata.xml
new file mode 100644
index 000000000000..de09ffd8b089
--- /dev/null
+++ b/net-misc/networkmanager-libreswan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild b/net-misc/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild
new file mode 100644
index 000000000000..39ef3b9d7dbe
--- /dev/null
+++ b/net-misc/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-libreswan"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager libreswan plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libnl-3.2.8:3
+	>=net-misc/networkmanager-1.2.0:=
+	net-vpn/libreswan
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+	!net-misc/networkmanager-openswan
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--with-dist-version=Gentoo
+		$(use_with gtk gnome)
+	)
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/net-misc/networkmanager-openconnect/Manifest b/net-misc/networkmanager-openconnect/Manifest
new file mode 100644
index 000000000000..43b1fdd9ea6d
--- /dev/null
+++ b/net-misc/networkmanager-openconnect/Manifest
@@ -0,0 +1,6 @@
+DIST NetworkManager-openconnect-1.2.4.tar.xz 647944 SHA256 a177e0cf683b63e225ecc08049a1d57f05868b5660f0907c65d5ecab39474996 SHA512 203652a468525c3f6d374ce7fbf2f5b904a13b5e74fb3898dbfeec863c64a60fd9826fc5d9edb52c3e75b9871f49cb78580914e37a3522e4676ca1c29102d0a2 WHIRLPOOL e03fc657e0bb02b1d588f29e09e15e30cb8a2571655303497dfc7e6f600574fcb8394b22a63ca7536bed9d8b05d227cb2d88b8cad90269f5183cf4c85e082f9c
+EBUILD networkmanager-openconnect-1.2.4-r1.ebuild 1119 SHA256 ace8d4dbee6fba48dce9bffa8c998d2ba50ff4d4fb4101ef5f3f795189870a76 SHA512 6b9e79bbd19569ca9810564c395e4a6e098a5f7c7d222a43fb92148dec7d50f7507cd55c9254e97141fced56dc0fa74d107576f1d14c6bb8879f2ea76883909c WHIRLPOOL b1b721c09d82edf7a89d0a78d56f5c07e331563f7076cdf9d1c98beb8974cd3b7f4eae7cee4181a35f80b41bdcdf3f2c66fcc67405b3aed3e541d806e224f2d3
+EBUILD networkmanager-openconnect-1.2.4.ebuild 926 SHA256 99ef1944a86de1b907353d7f73c94274764b213081311c6f7a88bf85d76528da SHA512 915eb881bb06bab4d2ec5fad2664e61088939685e2422d301de80916a7f8c384a1d99651389e89100b9684621f47013a7135f416f12bfcccbcd15bb6d6b8c97e WHIRLPOOL dcfd98683cd3736c9157f7916ac35646b854f96eb1f919f36c43c53cb7601027af474cd7e77481801d8395325a61081c12cc3fa69b8e438a1f92730f2e8c2eae
+MISC ChangeLog 5697 SHA256 c40be18d4c7e29f30215ed56dd913ad64cc20144144262d5db9dd9454a4b7494 SHA512 674085d96ef350d1f5ed95ee90cb09e8c125398b125226d66d142d7f93c0db3a6651bfc3cebc9d2b8c7233d31328e74f56757cd2b59b5a41633b0e5aeb11784f WHIRLPOOL abc7f8a530eed2f4c3e04e5a7019145b6bba29d22e840b918a62cb9c71dbab1bda426cb8887400c123dc045c3d17b07ad9d30da55520d8112349014b8be341e7
+MISC ChangeLog-2015 7974 SHA256 1deff883f15a71c813bc593fb536db859be6d6aee4e235122e47dbe18700f951 SHA512 5d90c79dab66489a7d228430510e03087084d07951a2a168ff4587fcb319dee8c6906c2ce43ef5b16e17da23702f3720dc143fd5e460fc81a38f1e1ab9d53ad6 WHIRLPOOL 3441652d41edb1c50c1ebb3dcedc2da88f46b71da4fcd179436225f79d057c1fc951cbd96380ac40a22d92eae8efae7fa84e35ca21c73fe7600901e28485685a
+MISC metadata.xml 364 SHA256 e6a633c44ccc4f899313669263d9153e6d3166aa5652abd5b41d4620f73bd3cc SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6 WHIRLPOOL a5e20ea714cf2b258d3384e537c7a51c63a9831e2305e57f13d0544fd2250dc684ad7471054f2b4a1660e61088bb9006488d69c36fc3539d73b2daf6bda907a9
diff --git a/net-misc/networkmanager-openconnect/metadata.xml b/net-misc/networkmanager-openconnect/metadata.xml
new file mode 100644
index 000000000000..30c8deabf55b
--- /dev/null
+++ b/net-misc/networkmanager-openconnect/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+		<email>steev@gentoo.org</email>
+		<name>Stephen Klimaszewski</name>
+	</maintainer>
+<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..d4a682d33f0d
--- /dev/null
+++ b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenConnect plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2:=
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/dbus-glib-0.74
+	dev-libs/libxml2:2
+	>=net-vpn/openconnect-3.02:=
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=x11-libs/gtk+-3.4:3 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# We cannot drop libnm-glib support yet (--without-libnm-glib)
+	# because gnome-shell wasn't ported yet:
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1394977
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1398425
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		$(use_with gtk gnome) \
+		$(use_with gtk authdlg)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	enewgroup nm-openconnect
+	enewuser nm-openconnect -1 -1 -1 nm-openconnect
+}
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild
new file mode 100644
index 000000000000..d8c3b6555b58
--- /dev/null
+++ b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenConnect plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2:=
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/dbus-glib-0.74
+	dev-libs/libxml2:2
+	>=net-vpn/openconnect-3.02:=
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=x11-libs/gtk+-3.4:3 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--without-libnm-glib \
+		$(use_with gtk gnome) \
+		$(use_with gtk authdlg)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	enewgroup nm-openconnect
+	enewuser nm-openconnect -1 -1 -1 nm-openconnect
+}
diff --git a/net-misc/networkmanager-openswan/Manifest b/net-misc/networkmanager-openswan/Manifest
new file mode 100644
index 000000000000..5ae3e8f7ec1d
--- /dev/null
+++ b/net-misc/networkmanager-openswan/Manifest
@@ -0,0 +1,7 @@
+DIST NetworkManager-openswan-1.0.6.tar.xz 306648 SHA256 79e1f85d10d6b80548594bedaed990643b730dbc738a2465ca78112dfa5db4e1 SHA512 e1f4fd9fe6e535fa717deb862cbf08e73e5f66a7a3d8ca328f653f009229a3a811de5157f641588a884528a8c9e2d63b22759864fa4d02276b1cf0721c8932ce WHIRLPOOL bf7fc847e8e28180821d14710717bd7cde90786dc3461bcd1791b194b9e619e895044bdd319754ffe6e50390e76e5b40e14d652ef58966e1c9e3db29ca5f30f8
+DIST NetworkManager-openswan-1.0.8.tar.xz 318672 SHA256 c7324c200da5ac177bc6dc4c2498ef89b49cdeb06b22c24bcdd3184db8e0922c SHA512 66a3948493dd51def3d0afd57ccbb2e38a2f1b3c37df85b47059a0c06457093d574aed4165710080b9cfcc914e4459a60d6946170199dd3f75482c6350e9ed6a WHIRLPOOL 59a50c1f5af4e85d0cac9ce9b2dfe599b35057120092c7c8d09e9c93fdf5116e8e9850281f757be0014da8107880e7ea018382a1868c9e99246baf90bff7b8c8
+EBUILD networkmanager-openswan-1.0.6.ebuild 844 SHA256 fd40bd2f884f5c870c88e243be8922a772b7b00f655b514c124a063bf7028803 SHA512 8cfb84d687f2a2cc34f70dc0e9d79525b2b3f4c265084f5ede3e2918e7952d1d89b89a83e713cc2c8cd07cc95546925e1c3c409d93cf8f8e0583a9fc514e8c73 WHIRLPOOL d4f6ff8d92bc12e50b484ea16ef81d7de8b2dc46393cd75e99b9464666b7ba1768d378569ecae7a68e3951539e2407e5943c50938d1d701c77f435c0176d473c
+EBUILD networkmanager-openswan-1.0.8.ebuild 844 SHA256 fd40bd2f884f5c870c88e243be8922a772b7b00f655b514c124a063bf7028803 SHA512 8cfb84d687f2a2cc34f70dc0e9d79525b2b3f4c265084f5ede3e2918e7952d1d89b89a83e713cc2c8cd07cc95546925e1c3c409d93cf8f8e0583a9fc514e8c73 WHIRLPOOL d4f6ff8d92bc12e50b484ea16ef81d7de8b2dc46393cd75e99b9464666b7ba1768d378569ecae7a68e3951539e2407e5943c50938d1d701c77f435c0176d473c
+MISC ChangeLog 4162 SHA256 c0a8d6ae5b20b4994b410c432efb47aa4346b0ee530cf47e708b8fc95c484f51 SHA512 467401924ed9f05c06a04eb797dc0f47b627185c7c46a463a135e4e5be86fab57440edbb06521be5a899ef1cceb28bd0503c3ae9a661b723b9b674f7ba53e826 WHIRLPOOL f0750a189b93d16cce21379926babbbc449de0b6f1ee49c92d4c53d8df1bd34a2bd257e49a220e83431958b533694cbc4275cce002459e023946a15d3cb4a5e4
+MISC ChangeLog-2015 5605 SHA256 f3c5b641bcdb85db8e40dc7b2e7bb202e2bb233452bec0ea8be512670858acb6 SHA512 2da7f5832e04bc5bca9874763863a6d2e4a838df13839ba2a8f9cdcb16e8952ff3bbc6e4f92305fc56b9adc16d15fe83f8c9f13f782a0388fa0e88414d3f9593 WHIRLPOOL a89882dcc72c57f6a1147e4c31f5e0edf7705eebd94bac3ed08b96cb2513848c73cfb5ff0d740f256a552c0602bd440027a8bd844c1b700afc078e3309e6044c
+MISC metadata.xml 364 SHA256 e6a633c44ccc4f899313669263d9153e6d3166aa5652abd5b41d4620f73bd3cc SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6 WHIRLPOOL a5e20ea714cf2b258d3384e537c7a51c63a9831e2305e57f13d0544fd2250dc684ad7471054f2b4a1660e61088bb9006488d69c36fc3539d73b2daf6bda907a9
diff --git a/net-misc/networkmanager-openswan/metadata.xml b/net-misc/networkmanager-openswan/metadata.xml
new file mode 100644
index 000000000000..30c8deabf55b
--- /dev/null
+++ b/net-misc/networkmanager-openswan/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+		<email>steev@gentoo.org</email>
+		<name>Stephen Klimaszewski</name>
+	</maintainer>
+<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
new file mode 100644
index 000000000000..dcd10236ee5c
--- /dev/null
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager Openswan plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libnl-3.2.8:3
+	>=net-misc/networkmanager-0.9.10:=
+	>=dev-libs/dbus-glib-0.74
+	|| ( net-misc/openswan net-vpn/libreswan )
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-0.9.10
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
new file mode 100644
index 000000000000..dcd10236ee5c
--- /dev/null
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager Openswan plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libnl-3.2.8:3
+	>=net-misc/networkmanager-0.9.10:=
+	>=dev-libs/dbus-glib-0.74
+	|| ( net-misc/openswan net-vpn/libreswan )
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-0.9.10
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
new file mode 100644
index 000000000000..943e65f3c73d
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -0,0 +1,9 @@
+DIST NetworkManager-openvpn-1.2.10.tar.xz 509148 SHA256 ac86a7a539d78df90095676e9183f2d422fb93dbfe4b3afef22f81825d303d61 SHA512 d597e8b3d2935c6874a283d2a036c511e1f3625aed7f5e6fbf5c77d3c3f5f6d170b19fe69202d74b2b1ac6d47d3704d3177598fd1889a19003fed98416ea6521 WHIRLPOOL 75669197a378d775eef26e6a69e764578d5628b2d8a6f11bf08b93e60a2e823b8138827e2456b37d8296def2c074362d0d4bc28b8e56389f5a826bcbdf19b502
+DIST NetworkManager-openvpn-1.2.6.tar.xz 494132 SHA256 2373e2bb0a8a876cb2997cd8b0e3d6e10012d9bef3705ea3ac21f6394b3f1fb0 SHA512 973b13937bd14891181cfac4b3c8df891bbbd8aad31769130d7acd6f3c41e23fb3359a49a750c885e2c72c94aaf357ff1e326ece7a304b2154c6b33c35118a05 WHIRLPOOL b99542e3529b73d21770dc1ca492e29131f04de0336b6a53f58ed9a4e1f886e04bbebd32b33dc3a1b11483dd6a73779964af3a64d06edd8fb6f4c759c021cc2a
+DIST NetworkManager-openvpn-1.2.8.tar.xz 498732 SHA256 3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654 SHA512 e6d64106cd93f91d292a6b2346dc31317e1056d2bbaf09a376c84ffaaa8fd584f92999865bdf52531b44de7ae144e1ae9271b9efc564d99f8569b0d059ab8019 WHIRLPOOL ead14f8ca4e194c0ff2b9b2151b44e3a2d97c81a4c89187c701090ce891861ba0f5a947e4b132bb2c70a28647ddb976d3989b1a3f54be87a22e983afad49f161
+EBUILD networkmanager-openvpn-1.2.10.ebuild 1243 SHA256 5d13cba073020830242f5fad22dc1dcc10ff645abbb21117c4783620a1a5aaf6 SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33 WHIRLPOOL 8d5df4f8a45b19a133651d59b00070b771fc690b6f16d20c402969b72c6af57d346204d41072861668ab11ff91193b67cbe5d33522048bd67ee76464a312f832
+EBUILD networkmanager-openvpn-1.2.6.ebuild 1243 SHA256 5d13cba073020830242f5fad22dc1dcc10ff645abbb21117c4783620a1a5aaf6 SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33 WHIRLPOOL 8d5df4f8a45b19a133651d59b00070b771fc690b6f16d20c402969b72c6af57d346204d41072861668ab11ff91193b67cbe5d33522048bd67ee76464a312f832
+EBUILD networkmanager-openvpn-1.2.8.ebuild 1245 SHA256 234a539a6cc0ebf77faa1ec4f97124f0bf6a6b43128a9ce25cdc3d8d9c1d0bbe SHA512 caa8db384290d9bf0700e3b3c827a70283c8ddae7fe83b37736bae29010a542f075f8ce06337f3cbd7eb5bcb9cb56990f797fffd812e61be8bff3b51d3d44d27 WHIRLPOOL 7796beba48b6b4b74807184642ff41179367e5f1f91da5588be844f7ba2ff9821178bf3095fef99a21aad07d442c3217d8703cf6e2d48495ce6b058451041fd8
+MISC ChangeLog 6211 SHA256 f2380c9cff2bf554d42c7e59f6f110bba3e5538d10c59519e7dedfb550038a13 SHA512 d67c67ef8813695dc23432e047d51be81322f8143377a7261ead6811f33b03c2b24fea5e5895613ce9d9ff3ba6396b07c244adaa4560f37c15c0e1f9c6f5a98c WHIRLPOOL f807fecc1858b4ad433fb7c002c518dff5db7772f01b282edf3447490ae6c2ae4cbdf21c9465d071237105511f7b67aed6cc5b797bc7b874561122d0eea6d12d
+MISC ChangeLog-2015 10215 SHA256 8a2dc9e16a52b5984d2662f79bd4d0e29019afdee312eac6071214c9104ddde5 SHA512 4141295a2b577c691a404e81350fff792628fc3a9a4dd9f968a1514ef178b1fcd3d941fabbc5acfb3f9c77e3cea3d5f4485c0c1be591aec63e1d6563b2456353 WHIRLPOOL ed7aa3cd25fd7dab23bcad9edc8bf065527d3feb0f63ff48a87227a4652e1f0aa83f632c5746c2e40c7f16086b57cc2619c48886e0f3baf2fc118303c255346b
+MISC metadata.xml 364 SHA256 e6a633c44ccc4f899313669263d9153e6d3166aa5652abd5b41d4620f73bd3cc SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6 WHIRLPOOL a5e20ea714cf2b258d3384e537c7a51c63a9831e2305e57f13d0544fd2250dc684ad7471054f2b4a1660e61088bb9006488d69c36fc3539d73b2daf6bda907a9
diff --git a/net-misc/networkmanager-openvpn/metadata.xml b/net-misc/networkmanager-openvpn/metadata.xml
new file mode 100644
index 000000000000..30c8deabf55b
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+		<email>steev@gentoo.org</email>
+		<name>Stephen Klimaszewski</name>
+	</maintainer>
+<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.10.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.10.ebuild
new file mode 100644
index 000000000000..2d450d056704
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.2.0:=
+	>=net-vpn/openvpn-2.1_rc9
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild
new file mode 100644
index 000000000000..2d450d056704
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.2.0:=
+	>=net-vpn/openvpn-2.1_rc9
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.8.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.8.ebuild
new file mode 100644
index 000000000000..17fe3108517a
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.2.0:=
+	>=net-vpn/openvpn-2.1_rc9
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
new file mode 100644
index 000000000000..7ab8c6792b5c
--- /dev/null
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -0,0 +1,5 @@
+DIST NetworkManager-pptp-1.2.4.tar.xz 382512 SHA256 bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e SHA512 b8983c6a6415e2f8757e91dfdeba66a7ba1264c01569f39b6da830def86d2c09d1084f4b561ca5ff48511b48f83d94fa004342efd54862d235ab75a49e4e7b33 WHIRLPOOL 27a0531ca37647b1b590a6bd41162cd6fd56721e6e0ae761f6fdd46e981d01d709911ed857cd35a73225f86a5e98d90bdce6bbfaf6f1e562da7a233f84dd24fa
+EBUILD networkmanager-pptp-1.2.4.ebuild 1164 SHA256 bd06fb71d08cb1770fa68d408b238c02a47b175a12af06e3f7d25b64ba64d0a3 SHA512 1d7bfc257fe3927bf5591cdfa1e57c57fac968e56f28b6abd67ea284ed02aa8865aa662c1bd18a4979b90d41e6cf41d2d22d170ef2e46aba446ddd4d7726860b WHIRLPOOL e3340e94378bc3a4061c3ce8a6d902578c6c13c0b191a317a8ee678a7d9b0268cfe1133d95a20ffc376cded376c2aadf91666e76405999ed01da6029be4ccfc6
+MISC ChangeLog 5191 SHA256 7cb48d11645e555798efbef13156d6cc9c2963a755d580003c71b0154c1bcbd0 SHA512 ec100c4a74b665bc403c588e6693e4ee9e9b1e8eab55e03fd9dd9afae663aacb9248641f10313c46c10ccf0e530965e6f92ff251d2123ae40852edb2376ef7e0 WHIRLPOOL 4c8993fead357009a8893630ae86bd1fa27887fba9d38cfcf9246b753c5c60297b4378c4f4fefe62c5e02d5a869ae68919453ebd42b17127f37e9ee5a22a28d9
+MISC ChangeLog-2015 8341 SHA256 bc0fca91e55efe181ff3c3337223187d499597c531e7426647bf9358478bce54 SHA512 7b98ca22451d6e87e8081792e451e468088806761072be9cc24939f4883f43d4034da9cb621c20bd8d0ed16e101ea79a7cdfae0afad9f2a72d2ede0e5412e090 WHIRLPOOL 72c3425b74354510816f22e1cd9e1dcb82b6112d928af6faed59b2175288eda12ac5c88174be06471062a334d1327f576368b9e81543e3cc43e1238f08edf368
+MISC metadata.xml 364 SHA256 e6a633c44ccc4f899313669263d9153e6d3166aa5652abd5b41d4620f73bd3cc SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6 WHIRLPOOL a5e20ea714cf2b258d3384e537c7a51c63a9831e2305e57f13d0544fd2250dc684ad7471054f2b4a1660e61088bb9006488d69c36fc3539d73b2daf6bda907a9
diff --git a/net-misc/networkmanager-pptp/metadata.xml b/net-misc/networkmanager-pptp/metadata.xml
new file mode 100644
index 000000000000..30c8deabf55b
--- /dev/null
+++ b/net-misc/networkmanager-pptp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+		<email>steev@gentoo.org</email>
+		<name>Stephen Klimaszewski</name>
+	</maintainer>
+<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.4.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.4.ebuild
new file mode 100644
index 000000000000..7e80aec2b71a
--- /dev/null
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager PPTP plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2.0:=
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32:2
+	net-dialup/ppp:=
+	net-dialup/pptpclient
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	local PPPD_VER=`best_version net-dialup/ppp`
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+	myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
+
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome) \
+		${myconf}
+}
diff --git a/net-misc/networkmanager-sstp/Manifest b/net-misc/networkmanager-sstp/Manifest
new file mode 100644
index 000000000000..c0e3637d1fa3
--- /dev/null
+++ b/net-misc/networkmanager-sstp/Manifest
@@ -0,0 +1,5 @@
+DIST NetworkManager-sstp-1.2.0.tar.bz2 440695 SHA256 3de57474cf24445b68eb91057ae1195b6e19caa52f38064ef469ffd2f28fb3a7 SHA512 31c7f61c2d0326c2ddc681690d4a9e0a25f29b3b5f51c44ea196cd74aab1002a6eb66bd06bddd8218961b18e666d5c28e57cfe0b2694a686ea8eb4195fcd9776 WHIRLPOOL cb2d85fc78cd8a32a96715f7bcec77724f9382c2f5c9031f0c0f4744afc8f59aefa63556bbdbad36604c574ed0d324cb5e47d8628be989249e038fdc5e323622
+EBUILD networkmanager-sstp-1.2.0.ebuild 1162 SHA256 b75b4b1ecca537ae7eb57880b0babd3684671630bb1364ff39f1e71053ee6a29 SHA512 f23af17221827fdd8e0a871489bcbca52cc706351520c74372e0f8415b502c1ec12b6392b5b34dffb98a838d06aa7074c9ae661a783172b875efc92eb4439570 WHIRLPOOL 359c1ba62ff6ec57e2a2c5778177fbda0ccb6d01fa6c6ac43e053d2a8e288505c1c219fbd810d2482d63ac472bf8e840c3071795e36fd7cfded6d3ca3f2e0242
+MISC ChangeLog 2881 SHA256 a02f3c8161bc645d101037659a50ed8132ab6428a1f85a31de878f0f1a66246b SHA512 3349c0db291476603850cec5ae8adf28f55e210240a2dcfece6d5b94774cf6874d79f7929078cbdd43abb94799b84aacbd6894616ee82cf10adb6269c6cecee5 WHIRLPOOL 1bf284bf1b5ad06d940b38bf1ce5aa03c1ecaeb7547f34e521ce57551323b32c17f3dbf685de49896bca86324e7770a2b25c1c1e582f95e3f4ad9563a9eb5b16
+MISC ChangeLog-2015 850 SHA256 9d5a9f60ada5d0b0982f0f9de27a77798f1184cf80c508cca9e81013df83ccce SHA512 8d8f868539b9ec2639e10e63ac6360fdb5d6e4154ed79a58720dabbd29ed5261769ec0c27135e96b3329b3ffa68137fe991ba484a4f16f6e0b36ddc729ecce19 WHIRLPOOL 92d5f8dbdbec4d6b531140fc846eb0551d2ab2363795ee5a7b8994553a4669bdcc834b1a978fa75ea1f61b5f527c53b4d7be010be9ef00be2b807d9e0ea92206
+MISC metadata.xml 321 SHA256 522ab957b84d4ceaeadef5a16171e18fa3172c96a0042c8460ea8c4aeb7d5660 SHA512 304851925158260c6e40edafe4cace5f63bb057c48cacbf7bf540d7cde0d1a5a24242e4212fdf8a61add139fead4b7ea4ddcd005cb5ce42ce37732a4f6a81770 WHIRLPOOL ec1a7ea5effeec310aa8a9d715b543c0111e5912af97499d7bdbc34d9ed52bbe8cf64083fa1e5a6e6910b91a37052d2de9c1bc7e341bec7791f92b1ec7d34eb3
diff --git a/net-misc/networkmanager-sstp/metadata.xml b/net-misc/networkmanager-sstp/metadata.xml
new file mode 100644
index 000000000000..39465ceb7743
--- /dev/null
+++ b/net-misc/networkmanager-sstp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>pinkbyte@gentoo.org</email>
+	<name>Sergey Popov</name>
+</maintainer>
+<upstream>
+	<remote-id type="sourceforge">sstp-client</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/net-misc/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild b/net-misc/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild
new file mode 100644
index 000000000000..42e7b976ce88
--- /dev/null
+++ b/net-misc/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PN="NetworkManager-sstp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)"
+HOMEPAGE="https://sourceforge.net/projects/sstp-client/"
+SRC_URI="mirror://sourceforge/project/sstp-client/network-manager-sstp/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND=">=dev-libs/dbus-glib-0.74
+	net-misc/sstp-client
+	>=net-misc/networkmanager-${PV}
+	net-dialup/ppp:=
+	gtk? (
+		x11-libs/gtk+:3
+		gnome-base/gnome-keyring
+		gnome-base/libgnome-keyring
+	)
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local PPPD_VERSION="$(echo $(best_version net-dialup/ppp) | sed -e 's:net-dialup/ppp-\(.*\):\1:' -e 's:-r.*$::')"
+	econf \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VERSION}" \
+		 $(use_with gtk gnome)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-misc/networkmanager-vpnc/Manifest b/net-misc/networkmanager-vpnc/Manifest
new file mode 100644
index 000000000000..d8ca5b1c084a
--- /dev/null
+++ b/net-misc/networkmanager-vpnc/Manifest
@@ -0,0 +1,5 @@
+DIST NetworkManager-vpnc-1.2.4.tar.xz 402428 SHA256 39c7516418e90208cb534c19628ce40fd50eba0a08b2ebaef8da85720b10fb05 SHA512 313fec1b054870d14908df3eba6db28eaf4b3c45cdd745ddea682870a6eb058971bbc1dccbd399b2270ab63c6e8ceeeded12bf7b9c7eb283ea591b2c0715ecbc WHIRLPOOL 87b2ec0bf9e23b44141ceda12946c2217ce33d0d8a04fa2197de479e71965a2ac6fa28b765d23d66fcebfc89e00022db41a5d79e96f622f220689d78e941dbd6
+EBUILD networkmanager-vpnc-1.2.4.ebuild 1067 SHA256 defc355573a2788d97075e729565e271f9a57dea727458ea9479931063ed8cad SHA512 685f946d3082aad04e2b03d834a52b669dcc02382fe994cf80c965ffdbbd650090c0c26c5ab18972b02f273eac82d38c7c9c6bb224bcf20165e161b8f5dc86e6 WHIRLPOOL 694d639e8b54bb1fb741f87540bf213fee27a524a7c9f68f633aa7fced19e054e24a121e96ab7e83e696b218b23705311dd6b7ac539d7c4d5d345156b83b5bfe
+MISC ChangeLog 5191 SHA256 5285daa5719cfdfbc9db05229defe3a33f9202306cbd8e4b4d7f5e1a1b3e7570 SHA512 fe3fb9e79f8dcecd80b934be5ba494c86b527e9385dcee9becf0b19e2d5538a64adbbcd632fa68c2f1116c118ee96adf1e58047495250584907403feed90d7d3 WHIRLPOOL e47fd4de61525b088f174eca463601236c0f3100e7bbb00db2a8a1aa07cdcc973cee22bd228fb979fd37e9c9ebb69606dc64619fdbb678392756db42155b7920
+MISC ChangeLog-2015 8133 SHA256 a18faf9b83634a110440b93f09d6dd420878b7b28adc89697aeddfaccfcfd46b SHA512 7623a0e06da9d94aa82a4ecb4c5478a32647c46071ee611c2a1e279e9f7486ba826d5402bdf10167152e2a514fb359a9405bace1b04ecb366dbbef1fa2f84e35 WHIRLPOOL 55f862fd45044299bfdf90dbc2cda4b4ce299a49eac2eb40f055eacb2ae235e952a16a9d9381ac692647d64e8a9622c8a822c2065f8d6530cab792b6ead7939d
+MISC metadata.xml 364 SHA256 e6a633c44ccc4f899313669263d9153e6d3166aa5652abd5b41d4620f73bd3cc SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6 WHIRLPOOL a5e20ea714cf2b258d3384e537c7a51c63a9831e2305e57f13d0544fd2250dc684ad7471054f2b4a1660e61088bb9006488d69c36fc3539d73b2daf6bda907a9
diff --git a/net-misc/networkmanager-vpnc/metadata.xml b/net-misc/networkmanager-vpnc/metadata.xml
new file mode 100644
index 000000000000..30c8deabf55b
--- /dev/null
+++ b/net-misc/networkmanager-vpnc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+		<email>steev@gentoo.org</email>
+		<name>Stephen Klimaszewski</name>
+	</maintainer>
+<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild
new file mode 100644
index 000000000000..4ac018da3dcf
--- /dev/null
+++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager VPNC plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2.0:=
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32:2
+	>=net-vpn/vpnc-0.5.3_p550
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# https://bugzilla.gnome.org/show_bug.cgi?id=742708
+	sed '/test_non_utf8_import (plugin/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
new file mode 100644
index 000000000000..4800e78898c7
--- /dev/null
+++ b/net-misc/networkmanager/Manifest
@@ -0,0 +1,15 @@
+AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 SHA256 702e1e702ec633608fd75dfd44f66437896421c9d2d7fe9966df8e4ef1d93a6c SHA512 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214 WHIRLPOOL b89a4069cc973cf55001a5f0028c75a90ce4ea070c4424b5a22f3e9b8e61ee34ff7b06891eb1c6f8fa24735b3e5d98e61f0bfefca7dd12eeb615b83e72225c8b
+AUX 10-openrc-status-r4 1182 SHA256 f8ed424818b866a0bf882c569f4484e8b1485ce7ac8c472f060fd877f2dcfe65 SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec WHIRLPOOL c71c923c293730894a660c8db3371fee2697666388f49947ecc2508b18a0a0d16a72643f34e8a1dadb559743ea1b56a34d3abfd95bced85dc0d753a33d661fb8
+AUX conf.d.NetworkManager 230 SHA256 4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a WHIRLPOOL 7dbb15bf184e918369187605af91816ed11c460147066ede11f200d73103bb6f7f63ccc7abe7996d485294f44282d6bbd9520cc9e50f04ce41262c9817f7b994
+AUX init.d.NetworkManager-r1 1822 SHA256 861445d46e8863dca26a91018da3dd9fee6a64467a93e7512774dfd88914539d SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658 WHIRLPOOL f028c78b1afc1cacb835bb61971910bde1ee6596578e5d7a3d88228a449528be0804fdca4b745894c4d8058980f48b93d976a922ce46727a0492680c085fa8cc
+DIST NetworkManager-1.4.4.tar.xz 3762664 SHA256 829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14 WHIRLPOOL d5e4ca3868c2aa8bceec2029c573b61ccc2fbc9f9a84cb8360ecf7d7503011f0501e9bffd54b163de8e84606ad7977b3c187adb78beed3a44bf2a3ee9821631f
+DIST NetworkManager-1.8.0.tar.xz 3811100 SHA256 fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e SHA512 1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c WHIRLPOOL 3e94a50cd50582f9cad26937ee8d597fe275a857882b1fe7ee3a85e3a30cedf16f559064f92afcb00e1703c42b34c0438a0b798538dcedf8cd29da596390b93a
+DIST NetworkManager-1.8.2.tar.xz 3818844 SHA256 71a5efcd9e4c237ab57b2893ccc8f91f884ace3bec0e2bd4b31a4c9677ff1bf4 SHA512 7bebea66d8f494c052313224e9d5b1b4cf665482f07ee5d93defc3543f32296545a2d1097ab1fff27dbebb58e07a4bc47fbc0101163db92953ae66ac9b95524d WHIRLPOOL 5928c3d4c1a35dc9485c303f3ce7e7b33c3949a058bd566f8b779d5d6dfa11ee8fc365e1a7954a214cabea70f2239b0f6e2079a67616f5487abbd1d6053260a3
+DIST NetworkManager-1.8.4.tar.xz 3821500 SHA256 625e2eb36386dcae599075226200140d010f213b47f7202d83b3b1a202029212 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1 WHIRLPOOL 68d5721b06a978f4fa5db496f79eb5e56a007fe8966f4e083ed9f6140893e7fcbe0aedaa6357ed6f7fb4ceeae9c8b7aa8d92dd51c3ccd46048d1e1e5f62c1656
+EBUILD networkmanager-1.4.4-r1.ebuild 11420 SHA256 5065691e58dd0e77431fefd34bab4bd7f0b7a20469d9e609bb4c2e08ba6dbecf SHA512 35e42a8b58ebbf86980c15807c010246a2e7b90ae537a039c481266393bc1975ce2f7576dfb8bebd65fed2eb090d053bb8accdc09732549ff586b0ac1a04a956 WHIRLPOOL 44bffe10d76e1bf2f8d3e782d1c911dffa8529acabba125e926228289756b39382011102cf9ae9496f6940b874f1c5bdcddee73f8fd24dded68b170454439ce1
+EBUILD networkmanager-1.8.0.ebuild 10634 SHA256 84ce9dcb011ab3c0b52f5ba389eaf91e07a0c76ee6c759469ff2aed49f72ee5d SHA512 540491cac8d661c19e36b425261b4c595045577f3194cac666e5d2aa7d8dfff09500ceb84f87532a2570637243412ec7f4240545e7180c3415e487e19618455d WHIRLPOOL c3343f6b90cebcd3db6283b293b70a6cbf66cf5342db6373d761ca3e0be71db6e6b4e76ecd4035b5896535808f50bd22812ff5bb2af2d0c96eb7054074722d14
+EBUILD networkmanager-1.8.2.ebuild 10688 SHA256 42f88c40ee6bce09ab611616e59943ae6fc29090113c39c53bb4dde006c6af81 SHA512 373537eb5ec7a6f002f4ba46d87a8e0b774700622a9155bd0eb5e712b65a98ab8f514c4f820abf8dce245677af53d203d7290afb8b8d25fdc8fecdb02e9d281e WHIRLPOOL 14beb42d478c0bc1c24ecbe269acafe03a104debde86038f670bd1a47875f0c1eaebab1312b97c5c5b9003bcda106a1d183f0f67c022981a5207438c9d68eb1f
+EBUILD networkmanager-1.8.4.ebuild 10688 SHA256 42f88c40ee6bce09ab611616e59943ae6fc29090113c39c53bb4dde006c6af81 SHA512 373537eb5ec7a6f002f4ba46d87a8e0b774700622a9155bd0eb5e712b65a98ab8f514c4f820abf8dce245677af53d203d7290afb8b8d25fdc8fecdb02e9d281e WHIRLPOOL 14beb42d478c0bc1c24ecbe269acafe03a104debde86038f670bd1a47875f0c1eaebab1312b97c5c5b9003bcda106a1d183f0f67c022981a5207438c9d68eb1f
+MISC ChangeLog 18350 SHA256 32926898bf2db151a74ce32b9a06757fca3ce9b0e46f0624ba42e2edd5f0f037 SHA512 1cda8910d73db5325233f3488dc7bbec5ef3ded472303da3cff4dac6dd11ae8ca37457c7cfd2469ab1f1f71baf27961b14de8f074f6c1cef90c167afb65c355a WHIRLPOOL 93f37ff54debe1d790388a18da90586781d0430d9daf7a42b7d6cc1140f7e13ae29ed532f8fdf7046a2e7fdecf9db42dae7ff49c05e0ad9fdf44775eb65582bd
+MISC ChangeLog-2015 56894 SHA256 2eecf2475336ee9b6c9f11e12711781286b88c0129dce40eed8a9d93401672e8 SHA512 bd721e9a4545fd7b66773665a111a33c9bff257a920ad06305c53dbb1b350b88b5f61ddbd6b11b2cd434cccfe558a37443fd413ac2570eb74009280f0f32a543 WHIRLPOOL 546065bc1c6f13b0b75d8019e144ccedcf76a07b62406f34098717d49eb4076c9aea1185d07e28fde7f1a133184de4fd71bd8c28fd458f5ff8b84fbb52db9aed
+MISC metadata.xml 1771 SHA256 ee2f0f65eaf3effc914d94105b1b44113cccd50ef09de57d6f37319406ed0a9f SHA512 4a61288c3e91ab8eb040053c706fe147e53fd1e9000b9597dc5b2f0920e08efd0e896f308e32758b4af6371b8fb9737f495355d0a9e2e95a9fd883bd10a8c535 WHIRLPOOL 2c91ccec729d06338d05ec4f3641607b4ac29e1228f9407964426db94c44b21d0fc473413395c9356e486b5c680cdd27a2468bf75ce164923aa874df83e9e1da
diff --git a/net-misc/networkmanager/files/01-org.freedesktop.NetworkManager.settings.modify.system.rules b/net-misc/networkmanager/files/01-org.freedesktop.NetworkManager.settings.modify.system.rules
new file mode 100644
index 000000000000..d00b268537e1
--- /dev/null
+++ b/net-misc/networkmanager/files/01-org.freedesktop.NetworkManager.settings.modify.system.rules
@@ -0,0 +1,7 @@
+// Let users in plugdev group modify NetworkManager
+polkit.addRule(function(action, subject) {
+    if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" &&
+        subject.isInGroup("plugdev") && subject.active) {
+        return "yes";
+    }
+});
diff --git a/net-misc/networkmanager/files/10-openrc-status-r4 b/net-misc/networkmanager/files/10-openrc-status-r4
new file mode 100644
index 000000000000..e195ccc19687
--- /dev/null
+++ b/net-misc/networkmanager/files/10-openrc-status-r4
@@ -0,0 +1,35 @@
+#!/bin/sh
+# Copyright (c) 2012 Alexandre Rostovtsev
+# Released under the 2-clause BSD license.
+
+# Ensures that the NetworkManager OpenRC service is marked as started and
+# providing net only when it has a successful connection.
+
+if [ ! -e "/run/openrc/softlevel" ]; then
+	# OpenRC is not running
+	exit 0
+fi
+
+# Ensure rc-service is in PATH
+PATH="${PATH}:@EPREFIX@/sbin:@EPREFIX@/usr/sbin"
+
+# Exit if the NetworkManager OpenRC service is not running
+rc-service NetworkManager status 2>&1 | grep -Eq "status: (starting|started|inactive|stopping)" || exit 0
+
+# Call rc-service in background mode so that the start/stop functions update
+# NetworkManager service status to started or inactive instead of actually
+# starting or stopping the daemon
+export IN_BACKGROUND=YES
+
+case "$2" in
+	up) nm-online -t 0 -x &&
+		! rc-service NetworkManager status 2>&1 | grep -q started &&
+		exec rc-service NetworkManager start ;;
+	down) nm-online -t 0 -x ||
+		rc-service NetworkManager status 2>&1 | grep -q stopped ||
+		exec rc-service NetworkManager stop ;;
+	pre-sleep) rc-service NetworkManager status 2>&1 | grep -q stopped ||
+		exec rc-service NetworkManager stop ;;
+esac
+exit 0
+# vim: set ts=4:
diff --git a/net-misc/networkmanager/files/conf.d.NetworkManager b/net-misc/networkmanager/files/conf.d.NetworkManager
new file mode 100644
index 000000000000..4a99229654fa
--- /dev/null
+++ b/net-misc/networkmanager/files/conf.d.NetworkManager
@@ -0,0 +1,4 @@
+# If NetworkManager does not establish a connection within $INACTIVE_TIMEOUT
+# seconds after starting, the service will be marked as inactive, and it will
+# continue to wait for a connection in background mode.
+INACTIVE_TIMEOUT=1
diff --git a/net-misc/networkmanager/files/init.d.NetworkManager-r1 b/net-misc/networkmanager/files/init.d.NetworkManager-r1
new file mode 100644
index 000000000000..3209644c511f
--- /dev/null
+++ b/net-misc/networkmanager/files/init.d.NetworkManager-r1
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
+# Copyright 2013-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="NetworkManager daemon. The service is marked as started only \
+when a network connection is established."
+
+depend() {
+	need dbus
+	use consolekit
+	provide net
+}
+
+start() {
+	# If we are re-called by a dispatcher event, we want to mark the service
+	# as started without starting the daemon again
+	yesno "${IN_BACKGROUND}" && return 0
+
+	[ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1"
+
+	ebegin "Starting NetworkManager"
+	start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \
+		--exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid
+	local _retval=$?
+	eend "${_retval}"
+	if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then
+		einfo "Marking NetworkManager as inactive. It will automatically be marked"
+		einfo "as started after a network connection has been established."
+		mark_service_inactive
+	fi
+	return "${_retval}"
+}
+
+stop() {
+	# If we are re-called by a dispatcher event, we want to mark the service
+	# as inactive without stopping the daemon
+	if yesno "${IN_BACKGROUND}"; then
+		mark_service_inactive "${SVCNAME}"
+		return 0
+	fi
+
+	ebegin "Stopping NetworkManager"
+	local pidfile=/run/NetworkManager/NetworkManager.pid
+	if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then 
+		# Try stopping the pid file used by <0.9.7
+		pidfile=/var/run/NetworkManager.pid
+		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
+		ret=$?
+		[ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}"
+		eend ${ret}
+	else
+		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
+		eend $?
+	fi
+}
+
+# vim: set ft=gentoo-init-d ts=4 :
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
new file mode 100644
index 000000000000..8d695c7325d3
--- /dev/null
+++ b/net-misc/networkmanager/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<use>
+		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and
+			<pkg>net-firewall/iptables</pkg> for connection sharing</flag>
+		<flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session
+			tracking</flag>
+		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for
+			getting ip</flag>
+		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag>
+		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
+		<flag name="json">Enable JSON validation via <pkg>dev-libs/jansson</pkg>
+			in libnm.</flag>
+		<flag name="modemmanager">Enable support for mobile broadband devices
+			using <pkg>net-misc/modemmanager</pkg></flag>
+		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
+		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
+		<flag name="ppp">Enable support for mobile broadband and PPPoE
+			connections using <pkg>net-dialup/ppp</pkg></flag>
+		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing
+			DNS information</flag>
+		<flag name="teamd">Enable Teamd control support</flag>
+		<flag name="wifi">Enable support for wifi and 802.1x security using
+			<pkg>net-wireless/wpa_supplicant</pkg></flag>
+		<flag name="wext">Enable support for the deprecated Wext (Wireless
+			Extensions) API; needed for some older drivers (e.g. ipw2200,
+			ndiswrapper)</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..c1d6830c9208
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection \
+json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \
+systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: need multilib janson (linked to libnm.so)
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libnl-3.2.8:3=
+	>=sys-auth/polkit-0.106
+	net-libs/libndp
+	>=net-libs/libsoup-2.40:2.4=
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( dev-libs/jansson )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? ( >=net-misc/libteam-1.9 )
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	else
+		return 0
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		linux-info_pkg_setup
+	fi
+	enewgroup plugdev
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		mkdir man || die
+		find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
+	else
+		# libnl, libndp are only used for executables, not libraries
+		myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
+	fi
+
+	# ifnet plugin always disabled until someone volunteers to actively
+	# maintain and fix it
+	# Also disable dhcpcd support as it's also completely unmaintained
+	# and facing bugs like #563938 and many others
+	#
+	# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+	# still not ready for removing that lib
+	ECONF_SOURCE=${S} \
+	runstatedir="/run" \
+		gnome2_src_configure \
+			--disable-more-warnings \
+			--disable-static \
+			--localstatedir=/var \
+			--disable-lto \
+			--disable-config-plugin-ibft \
+			--disable-ifnet \
+			--disable-qt \
+			--without-netconfig \
+			--with-dbus-sys-dir=/etc/dbus-1/system.d \
+			--with-libnm-glib \
+			--with-nmcli=yes \
+			--with-udev-dir="$(get_udevdir)" \
+			--with-config-plugins-default=keyfile \
+			--with-iptables=/sbin/iptables \
+			$(multilib_native_with libsoup) \
+			$(multilib_native_enable concheck) \
+			--with-crypto=$(usex nss nss gnutls) \
+			--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
+			--with-suspend-resume=$(multilib_native_usex systemd systemd consolekit) \
+			$(multilib_native_use_with audit libaudit) \
+			$(multilib_native_use_enable bluetooth bluez5-dun) \
+			$(multilib_native_use_enable introspection) \
+			$(multilib_native_use_enable json json-validation) \
+			$(multilib_native_use_enable ppp) \
+			$(use_with dhclient) \
+			--without-dhcpcd \
+			$(multilib_native_use_with modemmanager modem-manager-1) \
+			$(multilib_native_use_with ncurses nmtui) \
+			$(multilib_native_use_with ofono) \
+			$(multilib_native_use_with resolvconf) \
+			$(multilib_native_use_with selinux) \
+			$(multilib_native_use_with systemd systemd-journal) \
+			$(multilib_native_use_enable teamd teamdctl) \
+			$(multilib_native_use_enable test tests) \
+			$(multilib_native_use_enable vala) \
+			--without-valgrind \
+			$(multilib_native_use_with wext) \
+			$(multilib_native_use_enable wifi) \
+			"${myconf[@]}"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in api libnm libnm-util libnm-glib; do
+			ln -s "${S}"/docs/${d}/html docs/${d}/html || die
+		done
+	fi
+
+	# Disable examples
+	# https://bugzilla.gnome.org/show_bug.cgi?id=769711
+	cat > examples/Makefile <<-EOF
+	.PHONY: all check install
+	all:
+	check:
+	install:
+	EOF
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		emake all-am
+		emake -C shared
+		emake -C introspection # generated headers, needed for libnm
+		emake -C libnm-core
+		emake -C libnm
+		emake -C libnm-util
+		emake -C libnm-glib
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		emake DESTDIR="${D}" install-am
+		emake DESTDIR="${D}" install -C shared
+		emake DESTDIR="${D}" install -C introspection
+		emake DESTDIR="${D}" install -C libnm-core
+		emake DESTDIR="${D}" install -C libnm
+		emake DESTDIR="${D}" install -C libnm-util
+		emake DESTDIR="${D}" install -C libnm-glib
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	# Remove empty /run/NetworkManager
+	rmdir "${D}"/run/NetworkManager "${D}"/run || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  574d0cfa7e911b1f7792077003060240* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.8.0.ebuild b/net-misc/networkmanager/networkmanager-1.8.0.ebuild
new file mode 100644
index 000000000000..ccf11ee170c4
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.8.0.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: need multilib janson (linked to libnm.so)
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	net-misc/curl
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( sys-auth/elogind )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( dev-libs/jansson )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		linux-info_pkg_setup
+	fi
+	enewgroup plugdev
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--disable-lto
+		--disable-config-plugin-ibft
+		# ifnet plugin always disabled until someone volunteers to actively
+		# maintain and fix it
+		--disable-ifnet
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib
+		--with-libnm-glib
+		--with-nmcli=yes
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+			libnm-util/libnm-util.la
+			libnm-glib/libnm-glib.la
+			libnm-glib/libnm-glib-vpn.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libdeprecatedHEADERS
+			install-libnm_glib_libnmvpnHEADERS
+			install-libnm_glib_libnmincludeHEADERS
+			install-libnm_util_libnm_util_includeHEADERS
+			install-libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmvpnHEADERS
+			install-nodist_libnm_util_libnm_util_includeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.8.2.ebuild b/net-misc/networkmanager/networkmanager-1.8.2.ebuild
new file mode 100644
index 000000000000..55ec2f85cec3
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.8.2.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: need multilib janson (linked to libnm.so)
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( dev-libs/jansson )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		linux-info_pkg_setup
+	fi
+	enewgroup plugdev
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--disable-lto
+		--disable-config-plugin-ibft
+		# ifnet plugin always disabled until someone volunteers to actively
+		# maintain and fix it
+		--disable-ifnet
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib
+		--with-libnm-glib
+		--with-nmcli=yes
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+			libnm-util/libnm-util.la
+			libnm-glib/libnm-glib.la
+			libnm-glib/libnm-glib-vpn.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libdeprecatedHEADERS
+			install-libnm_glib_libnmvpnHEADERS
+			install-libnm_glib_libnmincludeHEADERS
+			install-libnm_util_libnm_util_includeHEADERS
+			install-libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmvpnHEADERS
+			install-nodist_libnm_util_libnm_util_includeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.8.4.ebuild b/net-misc/networkmanager/networkmanager-1.8.4.ebuild
new file mode 100644
index 000000000000..55ec2f85cec3
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.8.4.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: need multilib janson (linked to libnm.so)
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( dev-libs/jansson )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		linux-info_pkg_setup
+	fi
+	enewgroup plugdev
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--disable-lto
+		--disable-config-plugin-ibft
+		# ifnet plugin always disabled until someone volunteers to actively
+		# maintain and fix it
+		--disable-ifnet
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib
+		--with-libnm-glib
+		--with-nmcli=yes
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+			libnm-util/libnm-util.la
+			libnm-glib/libnm-glib.la
+			libnm-glib/libnm-glib-vpn.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libdeprecatedHEADERS
+			install-libnm_glib_libnmvpnHEADERS
+			install-libnm_glib_libnmincludeHEADERS
+			install-libnm_util_libnm_util_includeHEADERS
+			install-libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmvpnHEADERS
+			install-nodist_libnm_util_libnm_util_includeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
new file mode 100644
index 000000000000..8ed2407740d6
--- /dev/null
+++ b/net-misc/nextcloud-client/Manifest
@@ -0,0 +1,8 @@
+DIST nextcloud-client-2.3.1.tar.gz 654810 SHA256 5fc6f9f981d68110982ab006cdf9d68caa0c59015e57f4491b9a705fb6c83dd6 SHA512 f8210c8cc08e0bfb80e63b18af305c2a8e2309f673caca5bc748c130d960d444ab2db3fad3e43dbfffbe072748c85e15a50d0ebe1fd491dec7553ac8d9552cfe WHIRLPOOL 5a38a708647758ddb54d7d47dd30a71e59b03c3c45e6cfd9ac218c013da9dfc56d07b247982056f58e083d82c138576679525d994665717c739cc9f5cdd0238b
+DIST nextcloud-client-2.3.2.tar.gz 671944 SHA256 fbebbcfc538654d7a5373062d2165638a9bd9e5dbe62b5f4552a942b0b931617 SHA512 0447a3e5ee3338cb98b9d503a94d32c926f9092a25fee11e3686e5d662362137dce09865350cdc3c9af62ac8a6ebfa7fcd00f817edbb10189512a6df8e587628 WHIRLPOOL f5bf0526ffad6eb12be7169f8b61b35be31e01b44bb5fee4ab03c5d3449e3e30496719cc4f84c587b62a0638d99a70fd2fa1723231f6f7fa9c7ba80d095daeec
+DIST owncloudclient-2.3.1.tar.xz 12260696 SHA256 93143752234a0bc4c9798b69d8239996d92130eecdc1d93b75e3d49b899f3914 SHA512 2dec3d4b452faca32e15c1a461d3fec97fc1c2e85bbfe2cb02035371a5426b8458be1382ed6b4a1102a4f38241580c3d49980ea388344365297a4a84f8dc9add WHIRLPOOL 49abeb9b9843a024338cd2d7c3a87625f7cd4f832db03513dc4d7b0d5d1908a5691d6f1e7b7437175084c30a5e3e18d837785afa5647971fdcb8e963db2d54b5
+DIST owncloudclient-2.3.2.tar.xz 12266008 SHA256 a1199d2b957a28081aff11a2a7e471ca09c965bbb1b51b1b7b7a8706304f5f09 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c WHIRLPOOL 099c963940b6fec67d5d14b8d3a62eaf378617a7e8a73ca9b82c6f82451a6e80a6da4f0f0ea44e6064d5fceada68f6e1591e499e3ea2f6dfe14c6e0efa01537a
+EBUILD nextcloud-client-2.3.1-r2.ebuild 2474 SHA256 f5c397e9512b17f80b9b0466dba8294605290248046c69f8d85dca1fe37bffd6 SHA512 8cad340d97bee8bc20d3d49a8796ab0da92689487dbf5fb0e2d39a24df5cc599f807661b142650b3fd80bf23581e23fe3710f5b6a62711f3fe2f5eebd4ea49ba WHIRLPOOL 6f5365e1ce5245f0a2bdbfd30452bd4a39e382761e2d8131ec9492f11a4b807c29329131c108f0644b77e9aeda179b2f2cb2ccb674e7c7501cc2bf809ea707fd
+EBUILD nextcloud-client-2.3.2.ebuild 2492 SHA256 b8dbcae35054dcb20c939c644c7ef691c59b5a527167b4e8303201d15934cb7d SHA512 511bb30b06975fc585eaac6ad50581689997a9b9575aaf35dec607ed35211f43d207abfecd1c0eed1fae5bcffc037cdcc9c3b3bffd2a814d4a00d90785dd2fc6 WHIRLPOOL f00ca0209ef1f19e37c1cf1dda18c4f7b33dc090351393a96e0c0a744b2dc5ca8a08fb1abcb67ef1dd430af1aa1193a59d1c142b3c682bba353545a96b6812ce
+MISC ChangeLog 1236 SHA256 eb0a61a70ba44c3ed03b635747bb00f7aa58a9a6dbf5b0e5b443b5678cc40be7 SHA512 d9545757f9886ac6d9b879c65dfe03964953f63abecf552cfa2390f346fe149993824c8688c428f0163d9f724a5d78a85f3cf3048a2b54f5927236ff188c6884 WHIRLPOOL 817122fc1fdcd790fd67625a6d6637532ad400795d6cabaf6b9b3f527277c867e8e7435e69ab0dac888a4f131e1d48958de6045fcd8b205a6003007413eb9f6f
+MISC metadata.xml 684 SHA256 40590dbeba611ac96fab673d198b0a6843d3b0dceecaf00e1a01171af72ed14b SHA512 914f49b010493ae3019d678fcaf92e2d41a2cdd7cee3b7041db7a65a8c122dba81fc3e6df237201d6a69b8755768fee5b65fb9df83c977449a48eb5fc1479b29 WHIRLPOOL 63ad89fc1c3fdcf6cbeca2bb243dc841f292cac37cf80c2e27c14ab7e14ad1899b89b59b1e81def7f211995c4bffdfa2eb91ea892b91a5bd85149c7898ddf746
diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
new file mode 100644
index 000000000000..51270e9f5eca
--- /dev/null
+++ b/net-misc/nextcloud-client/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<use>
+		<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
+		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
+		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
+		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">nextcloud/client_theming</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..01e8d34e1547
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Nextcloud themed desktop client"
+HOMEPAGE="https://github.com/nextcloud/client_theming"
+SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
+	https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	sys-fs/inotify-tools
+	virtual/libiconv
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/owncloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/client_theming-${PV}
+
+src_unpack() {
+	default
+
+	rmdir "${S}"/client || die
+	mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
+		|| die
+}
+
+src_prepare() {
+	CMAKE_USE_DIR="${S}"/client
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
+	# Fix icon name
+	sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
+		-i client/mirall.desktop.in || die
+
+	if ! use nautilus; then
+		pushd client/shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DBUILD_WITH_QT4=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+		-DOEM_THEME_DIR="${S}"/nextcloudtheme
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild
new file mode 100644
index 000000000000..67f8b9ea2be2
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Nextcloud themed desktop client"
+HOMEPAGE="https://github.com/nextcloud/client_theming"
+SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
+	https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	sys-fs/inotify-tools
+	virtual/libiconv
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/owncloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/client_theming-${PV}
+
+src_unpack() {
+	default
+
+	rmdir "${S}"/client || die
+	mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
+		|| die
+}
+
+src_prepare() {
+	CMAKE_USE_DIR="${S}"/client
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
+	# Fix icon name
+	sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
+		-i client/mirall.desktop.in || die
+
+	if ! use nautilus; then
+		pushd client/shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DBUILD_WITH_QT4=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+		-DOEM_THEME_DIR="${S}"/nextcloudtheme
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/ng-utils/Manifest b/net-misc/ng-utils/Manifest
new file mode 100644
index 000000000000..ef9a0190385e
--- /dev/null
+++ b/net-misc/ng-utils/Manifest
@@ -0,0 +1,5 @@
+DIST ng-utils-0.6.tar.gz 83119 SHA256 bfad56e6b7418500c77f58ba9c308b36144962e446874af19dea60b091d02862 SHA512 781e3a1cb0cdd54513dba8baa17b21813f595b67a7d250326651930656e3810d6166f52762fd2a1c8cea128a11da98ad1c4bb2743ef906578f21fe1ad2ef5fc4 WHIRLPOOL f87480ba22003aeeac4c82945ef99afd8e0051c91f845c4d99d5ff9351e9714a600363d033e59d527f0ae2c9cb1287132a47db5a09e34b7095b23535c08ddf5a
+EBUILD ng-utils-0.6.ebuild 449 SHA256 46ecb42c9463ddcda9a14c4c4a7eec8b139380a5f3de8c4d3d8dca94ab11299b SHA512 4bb34af0374e5198e5947aea3daf513a5ce03a9b16196863bbdee8ef477e56d6eac3f7a4a945219477ee9111d1cea9ebb87515e120ec491a3fb02d22197d00d0 WHIRLPOOL bede2039b89ffdf4afd431e44680412d901339ef53fff30eed346f739ce483e9bf1fde5e8e065de02cacc8b467dd15d8eae26a974827ccf086a950ab08b4a8ee
+MISC ChangeLog 2521 SHA256 a14b09841d0f81e59a6b9620545315a6cf32946eaaa5b4cfb082f074dfb7f9dd SHA512 8ed7e4506f7849e397be9a6968979695085e8598406fffdc5ade3b2a5d96d8686e55ff83f0a3b7acc692900876b3608cdbae3a18526d0700a08ffe0d6d85142e WHIRLPOOL fe500b00ecf39aaac9f92e60689edc69ad1c7791f1865b77ef7e39888a63b5bdba1ba5c972b7824c68fc1a8219366779b1275ada13b3a691f1f0194244a3cdbc
+MISC ChangeLog-2015 518 SHA256 3c40dbe61f2eaf8ec061e4bd6eb9dc8a4978eaaeee7924d32659c0b0046bbe27 SHA512 eda4c951128f1dfe33025241a026b152e4e65bf8e258fe9a5b2bfe0a802a98fd9ff96faa25f95ba45ac2a3e71c7a26c6bc54a6d2dc7b42d2c41d80d16d248da7 WHIRLPOOL 9a1a07ab48c3474f44dc45b33babd2985a755bb85b92cf23e60f876043941c1a80b11d6d576aa30bd2169368edbb782c57e7f0ec9e93fe39d4ca4409419446c3
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/ng-utils/metadata.xml b/net-misc/ng-utils/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/ng-utils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/ng-utils/ng-utils-0.6.ebuild b/net-misc/ng-utils/ng-utils-0.6.ebuild
new file mode 100644
index 000000000000..0453fc774394
--- /dev/null
+++ b/net-misc/ng-utils/ng-utils-0.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A collection of small tools for accessing netgroup contents"
+HOMEPAGE="ftp://ftp.hungry.com/pub/hungry/ng-utils"
+SRC_URI="ftp://ftp.hungry.com/pub/hungry/ng-utils/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
diff --git a/net-misc/nicstat/Manifest b/net-misc/nicstat/Manifest
new file mode 100644
index 000000000000..5fc3738196bf
--- /dev/null
+++ b/net-misc/nicstat/Manifest
@@ -0,0 +1,3 @@
+DIST nicstat-1.95.tar.gz 33601 SHA256 0556e890e7c671ee85ccef861ede034719101125c06f750166e723f2bff34e37 SHA512 542de1e0a388f699e184e8f92ca732ce68974a3adc3b60247170cc32a737fd191c43a9b7a761cc8b8ed411e914756f1ae3727b1a5a8e5753643f98a80443ad5a WHIRLPOOL 8fe4bae340e0a84bc6f2a8e4880abffcfa3c3e62f44ee3fa23a06c11a1de1964ff40124055d1b1d1ab3e853d295171017d96de0165f1c11d824cd85d6ab6a7a2
+EBUILD nicstat-1.95.ebuild 724 SHA256 63a1fa036fb00e4aa18f6f57c37eafbfac75ef7f1b3d3bd0736c3fddb2af7ae8 SHA512 e40bab7bad19eeec1a418956918657bbfb47f1eb3ad78eda1de46055b034763cd7eb92e48ce23be234428f5c4e39d05d763335b31341cdb212899cf1f8d56610 WHIRLPOOL b47dc01989221dc7056b403d54912da62bf86caae4ebc7e60b8b43d17c01d310113b659b8e3e2db36ddbaa7a89b3a83086858c83838ed656212d82b007a48983
+MISC metadata.xml 349 SHA256 d58cb0f92c318773fccbbfca38c69ab0a939a6190eceaecc4c6929ef4c65b068 SHA512 263be94844b4e73c9cadbf7c090b75229735bef5cbeafb790c553c80af15719b2712981331c2e46acc5f13abf1004e2220276317c49c943a1aa9c8ad6781fe36 WHIRLPOOL a48d698f788f3482c61890c2fd6317daee405a1d8c278ae5815586bcc8d5a4c7d777b9063d03fe1261acde08e045e06dfe1f344b44285b72bc63040e15e8a4ed
diff --git a/net-misc/nicstat/metadata.xml b/net-misc/nicstat/metadata.xml
new file mode 100644
index 000000000000..d0f2dbf42bee
--- /dev/null
+++ b/net-misc/nicstat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">scotte/nicstat</remote-id>
+		<remote-id type="sourceforge">nicstat</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/nicstat/nicstat-1.95.ebuild b/net-misc/nicstat/nicstat-1.95.ebuild
new file mode 100644
index 000000000000..1936dbeeb9d5
--- /dev/null
+++ b/net-misc/nicstat/nicstat-1.95.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Network traffic statics utility for Solaris and Linux"
+HOMEPAGE="https://sourceforge.net/projects/nicstat/ https://github.com/scotte/nicstat/"
+EGIT_COMMIT="a716ee81cbf1e177267e20a880b5a0d9fa5b689e"
+SRC_URI="https://github.com/scotte/nicstat/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${PN}.c -o ${PN} ${LDFLAGS} || die
+}
+
+src_install() {
+	dobin {e,}${PN}
+	doman ${PN}.1
+	dodoc BUGS.md ChangeLog.txt README*
+}
diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest
new file mode 100644
index 000000000000..ba456cfb2480
--- /dev/null
+++ b/net-misc/npapi-sdk/Manifest
@@ -0,0 +1,8 @@
+DIST npapi-sdk-0.27.2.tar.bz2 65811 SHA256 01bf34bdd0fcaa546ba3d5c96f5d91f91dd117d4ed5ffe13f56bbd5aa566ae77 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842 WHIRLPOOL 9de6204b6112eff9a2621b3885475b0ea9fae9fd5d9d36200583e856126b6170edff5f7cfcbe21bbc5b133150479e7c2f68de7fd0b5b1f5e50c5c19542275bfb
+DIST npapi-sdk-0.27.tar.bz2 64040 SHA256 6c674423bdea1ea8a60ac6009bcb28c3343f1a5abe727cc0bbe869d5eccff15e SHA512 12e28c354cca36a15578cd507d78644e016dff03e4940140d11ecb598a89464898e8be9fb17e7e86a696906fe9992f3c55da18c41dd1b0b8d33cb049e2056607 WHIRLPOOL 4a00c1927f15e99a4ae7fb2483c578e9ec152d36ef447d14c5e5b2f24b1d4f1aa99888e90ef413843a8dc21a78a52c70bf0998dc64079b87d0d853e1a3760c15
+EBUILD npapi-sdk-0.27.2.ebuild 429 SHA256 5aa86b8e82257b8423ac31ecc69539a2d814e0168dcb3ccadfac0fccae5c0e5d SHA512 93358b8b28f8d61accc7288514469458e8b3832a7f125dd9e68d4680fe034efc09312b397e29220fb78b9de2a379921a00d51b0abbab8b6177c15ae01b43ce1b WHIRLPOOL d673f460ece503f3e2dd692474412a2fe5328b318f7de0172bab58dbd7a9d0ca15d6e25fef00de509528c721500203787bbf39d0a915770cd5ed93050eab624e
+EBUILD npapi-sdk-0.27.ebuild 421 SHA256 4befd3df7e4a401c072299ece0ae19fd9ea5984837cf762b741f0fba39f3dfe8 SHA512 7d682da51c4d174ce44af8f3a8e61d37fcbdee7f8d7201568c372298223aac892f50adb9528e7db4f2230016712ac0d56013a49357d6fddc832a2f8cfc2e4804 WHIRLPOOL c53bb5f4380ddbcb69bc9236826d53e50d04e86c73477452535b184f014f09fca83a76f45d9286147a9a829dbfce79e9862ee25039b031c7c67ae6e6e22ef99b
+EBUILD npapi-sdk-9999.ebuild 587 SHA256 0b8cf52ba4928e1790c25a8f64e66a7e2d3acb056f4cd5aac0e934b5d56be391 SHA512 fac1cd12c7ce982fbc2bb4507b39d5a41a8d34cd6c5a7ffa886d0423eeeb17d7b034d6337215ec5f20ce7c91b3fa8957e8f022ad0e7157169c09bd60b6aec145 WHIRLPOOL df2176039bcb0b8364a160222f8cc7cb33d6df97a9afe2ed02f492accf096a78e761d0a776205bd2db433d8230b20ee88618787be8b769368fcc22b879f6edb0
+MISC ChangeLog 2543 SHA256 8d2cba9cb2a55d78dcde349d1aaf5bcbd7e3a5073b3a27d8e1c6e2380f024e46 SHA512 4e26af34a8ca456804ff9f934e38b59415be5748237dbede295de39faa23dc53e31e59d0ab1409906ae742f6598d4c63c6d9049a1ed5eb666c461be61b2d8d27 WHIRLPOOL 6263b2f283efbba71515e5af0a72bdba4e2aca7666e33769a6bbb87315d32f905f00f631e0fc4702cad22e19a9aae8ed990afb58b41b3dec90ad3c0e28b59182
+MISC ChangeLog-2015 3810 SHA256 42f281d75897962b218458beae31987032dc8ebfa92c14e065b416a39fe1c518 SHA512 3bfaa814b9ded57767067070d6822bd0068ec8fb3fbfb02a2a71b2361719bf8065dcc6c2c33330528c2465490d5ad55601f9c7fdd28d90b62edb020b5e008d6c WHIRLPOOL 97efd2116aac9a25e9f38d3b79e34314386c56119ba9547d3800b0fde1f74ae0fbce8eda5ec3bcfbef5c223f82e0012a755367d3fba91a121184e1ecb42e443d
+MISC metadata.xml 554 SHA256 f9a9a6b11b47e4ecc98e186ce01a2d35bde409f0d70ecb3242360be251ed80e9 SHA512 f64e6e5dcb310e3529ccee303071fe765de9dc1df0230969b654a11e0df90ce011cb6c999151db0e913f4fbaa2b5456395c32fe08ac50885dd92762da7d9e2bb WHIRLPOOL 3ec41c249e032b3ad9f7bc990469fd25ce0878d48f71c7c7eae92351d4e6a5aee89fcfa4c70077f6d2b48694be18c9fa8ad13bb4a077d156cae81a33f9da8c2e
diff --git a/net-misc/npapi-sdk/metadata.xml b/net-misc/npapi-sdk/metadata.xml
new file mode 100644
index 000000000000..1df7a04f2cb5
--- /dev/null
+++ b/net-misc/npapi-sdk/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>anarchy@gentoo.org</email>
+		<name>Jory A. Pratt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>mozilla@gentoo.org</email>
+		<name>Gentoo Mozilla Team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">mgorny/npapi-sdk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
new file mode 100644
index 000000000000..a53d63e60da6
--- /dev/null
+++ b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="NPAPI headers bundle"
+HOMEPAGE="https://bitbucket.org/mgorny/npapi-sdk/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="virtual/pkgconfig"
diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild
new file mode 100644
index 000000000000..f6975d378fcb
--- /dev/null
+++ b/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools-utils
+
+DESCRIPTION="NPAPI headers bundle"
+HOMEPAGE="https://bitbucket.org/mgorny/npapi-sdk/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="virtual/pkgconfig"
diff --git a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild
new file mode 100644
index 000000000000..554054da6774
--- /dev/null
+++ b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
+
+inherit git-r3
+#endif
+
+inherit autotools-utils
+
+DESCRIPTION="NPAPI headers bundle"
+HOMEPAGE="https://bitbucket.org/mgorny/npapi-sdk/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="virtual/pkgconfig"
+#if LIVE
+
+KEYWORDS=""
+SRC_URI=
+#endif
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
new file mode 100644
index 000000000000..4836ada87315
--- /dev/null
+++ b/net-misc/ntp/Manifest
@@ -0,0 +1,30 @@
+AUX man-pages/genmans.sh 1882 SHA256 455bf5a731355c60cb43305befeffbf528a5a6f33e17a72999d0eed65eec59e5 SHA512 7f5161c8c25066f1a08e0c228956716aa55e2b5c54e4a67e1d9b18ffcd9bdc56e95c345ffbee9c35d974146652909b80c87a2796053b26dd0b2a0ac40afefd6d WHIRLPOOL a5bf5f75edb7d32ad6804324a43736a25afabcea5a90e514dc1f83506953a62080e81842300ce9d69740e733df9e23f7503cb67941845c61e8372166611f5645
+AUX man-pages/ntp.conf.5.patch 503 SHA256 d26c1006d72d76591588fbd058000596b17b0b9bcbd184d4e6cedbc31c3b1027 SHA512 6e75a7900c2cde0484e57e18b1244ed188b58be54b6622c3777251a2f412a27a98c41a65d6d62d93f9e84856f211bb268bd005aca146bc27aed982daf63f24fe WHIRLPOOL f5d8d571206478a12f1f80e483b4b7cb94707e1c0caf55c45c319e81fb5425d5e61686ad3eb13c0bb4c694621858f8a9399eb5f5b92237fb39ccb5aaba90b6cd
+AUX man-pages/ntp.xsl 5831 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a93157672c5bf8db03d SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd WHIRLPOOL 0376d57f0e657c9a09fa83c69485fe202f4ef6d46957d7a2680410cb08ac0d5083e4bcb4221175acc942d211fdbb7ffbbf4d9ed00a43b8087c90fbe2a4e3f808
+AUX ntp-4.2.8-ipc-caps.patch 471 SHA256 2b63684fdf2d77d4b85081b1d2809a52b34b1406c0d469000ae12795c4b91394 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f WHIRLPOOL c3dd13f7ef04d4f42e37da3ad6c205d91a312600eb45ff1497c8a6ecb58cc83f400763e23ce2f19aff0b025ce9890082d2b7f84cfa69acb13ca6d895a3e84cce
+AUX ntp-4.2.8-sntp-test-pthreads.patch 325 SHA256 3af800a07382a217cfa854166664dbe6c91c54d23cca9c7a2bab01d433d50cd2 SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4 WHIRLPOOL d8151be7a9a0966bd390246d4d31f229e0071969c94293a0c01944bfd610ba50a0c6d639832fe026dc0708e827a3aa0674320251f82badf0e321958ea6b50b32
+AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 SHA256 312c45416216f0061777f6cf02b5dde6ec6d3c75fbf3a70fff11d947d93e043b SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9 WHIRLPOOL 7db8ad867eb39b6b913d536229171134b04a99772594a6b0a6dfa0a87f59a1f8ba505945a6d5dd4d4f9ca9396c383b72b8b9d9e1068c86366a5c4c29b8dc5493
+AUX ntp-4.2.8_p10-libressl.patch 1669 SHA256 1f77e7b0d125e8f3502139e6052d46849b5861d9915adfda9b11616fab42e9a8 SHA512 2a44b250fa33725d0cee075dbf3fdbe616335432f7b31a0753c037765cfb91445aea35dee0f245f6dfbbb27d9eb1d107a412ab6325707711b65650a4785695df WHIRLPOOL e59916ac22db745f2742e775cabe85c30612154ce42d239de579bf957ea0ecc40eb968b44f2b28367a407ac3ac7c7e86c555a1faf6e15370aafb0aa5ce572f98
+AUX ntp-4.2.8_p10-ntpq-fpic.patch 464 SHA256 189d24170b6d8df22feac6881394f0a64aa06c04e6e1e8cd2d39104fbb5e753a SHA512 706f199b612f7a30f385668a2624cc442bcf0b2674f779488a03f94d659c5efa5355fcfb4e221e14d7eed608edd5a678dce4d1e110c97640d8e489d50e223b09 WHIRLPOOL 629d44eb3193bc222f6ec09c0f42c79ba24d9735c10137ac1478836c5263b3bf962a4e02d4d6fc5949cad6a5f12722020b32bbf279266a35527ea254aae22f15
+AUX ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch 7611 SHA256 ede0c5ef472de78cf7c083f6e1e7372430fd51d8de39d2b841f8354212b45dd0 SHA512 630a29233b86bddaa2439a130533ebfb5bdff5cda5be6c578600a0022f8c1439538dbb72b6a9de65023920782ff7912e0ec63291f92d5e4bb7d4908fd39db692 WHIRLPOOL 4d1c6f5b74171c2ab0f7440687d13a5fc1dee5e65cbb44998e015acd87a76944fc435c0bcaaf571dff8f1b7541dd52b8dd8e03ecbddfb8b6d8b260c3b7e358b0
+AUX ntp-client.confd 776 SHA256 c7dc517cdb5ee10e2a07ccea15ec47ba0b7aff8ac1469204c8d7faf71bcae2c5 SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6 WHIRLPOOL 7282c74d564f776cb6e8e15d79cb77e60088c516a71f87c28d96bda7e67bddc3d35e01cf86eac58655c2536d0a4a023b6142527bc8ec62318524114502d5cc99
+AUX ntp-client.rc 720 SHA256 49f6634a258d4a91dc12c3b6bf9014b05a39cfe121ad52f826721ab791a28aa3 SHA512 557cb44fc911dcf34d21227c5d92c2ab56ca3fd855a5d2715c5f7343ae45a91c4b5492a84ac01a712bc251ea2a83810f4eb33e467b456b42c79052454a68dc81 WHIRLPOOL a5dd1c93b007255ed2148e1e48e3a1447b730031a7be5f7f7744559304028f11d622e668b5f6a2564f9d1a18734bfa0964c30862e66b40503e59da0e37033fce
+AUX ntp.conf 1614 SHA256 1e644397a0360a997064d0704b489c66b17ae2c50b49278ba46ec04942f13fb6 SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c WHIRLPOOL c84ab4e53d8c778f64a656a920aa062b4c03cd871684814f3f2bf6a3d8b76870a921d91676cfe71d84db0865b887f64ebe3d403a81a91af656987d74469cc6cf
+AUX ntpd.confd 192 SHA256 40803821f498267f6567436eedc18201b5ae4b5390d6872fb15a94200c2ac06f SHA512 a9e96a214d3c21a3f4863709c48a11f9dedc73e2d83a9b20761021df44a9acb56757e77f113aa0314f5f3923e9cb26bc6e0147658d20e8a74d078d415a171d91 WHIRLPOOL 75ba0559326dac961a6b228d6ee58ea8b4442ace200c36ef07101bc00b8fc12dfca78bc6474870f29928c1b9cb1397a4bfc8706befdf33178abad1a5f558b372
+AUX ntpd.rc-r1 489 SHA256 cdccb5f0009d1498be90a3f423158d7a3c603a1398f8993ae6fb828224a7cdaa SHA512 d51856ebff9160a01e1331114c5a8ea7337f9c8b570da75f36bbb29dcaf1924a40cdbbbf56e03148fc0f540103846e58d15175acf2e9d83c6b68d55c1e199734 WHIRLPOOL 63c1fbe43942a9d4ab82d2d9893531c143ea9d20d008a4cddb21be9009386a79cb3d5f46e527e282929095920966b4346544bdb9a3f6071bbd1a9cb0a755cd1d
+AUX ntpd.service-r2 207 SHA256 b56980a381794bd1021d3cdd2352552553da657c329da7c22765110a80874356 SHA512 c6425efdc046f5a8981a2ec97993d65454fe4a0c4162f8e8d873abf91280a4263509657e1d582baf5b02ce0ba536b87ca49158725f69914c9b01502f8c0e97f1 WHIRLPOOL 3ee731db643fc4f6525755febb1751d856b7ad000fe0575e876c58ff622ebe54e1171d1b9e32de869a96aa479bfb79c7f9147f879249b2d1abc7e9d15f0d0c93
+AUX ntpdate.service-r1 316 SHA256 06fe9929bb92318fa079b029266cbd88060b71305bc7250e1c208a8ee572b174 SHA512 156a6e48be3534ddd6e699315fa65d7ea0ee070594d7b7049962adeb8b411c0f2b919b93afe3f2976392a300792c6e6139529cc576dab6af3f8b94919af27eab WHIRLPOOL af1c2a3a8be1400905e2da7a27af2e809d17642b9e84c002febff66835e49e2e891a57bf2bf7282936dae0bfb377a9289db9e2b7ffce916b78ae994c3a174d06
+AUX ntpdate.service.conf 119 SHA256 a7f886d6f5e671005da8ef9b53567884a8467239528bf860db61230b73097eb3 SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 WHIRLPOOL 6d99157e99026fdd4734674647bbb9a721f8766d5708f6c6f725fa88687bbb2995233fd02ccb34ebed7b80570e1a309a857ddb58fc08e0255268880eb8d18d9e
+AUX sntp.confd 149 SHA256 97282007801cb9c0e3b431e2930dec3bb8ce8869f63f7e02d903846e96734684 SHA512 28c8f1fd3a69bbdfacc2379a3ce01f254ae21fd8b91d893600086d27e5fb9cccf05d1bf62022ab26fcb53fa2080d4178961619811fd7a56f4e7502893f8ea13b WHIRLPOOL 65af6af349f56b2379afdb6c53042571de19e799a079b0997dcb9f6185849a04292000a584e22e7e03af5bc9c10e0627037a72b748b8f083ee4a51a1e608e94a
+AUX sntp.rc 484 SHA256 d1ba585272e6158a942d536d508a2979a1ca17316d4b97766d78bad4e9a6a7b8 SHA512 17b48cf31f5b15f5219d4a7f69a5eb84805bea256f8ae5b4888e56ec4de7e9a2640c7a36e236a467ecc7881a1757a12c24124697694730341f24bdeb751d8d7d WHIRLPOOL e3a99b8d50c2a81a702703ca18d77b006770c5e9191c090d47aee0812aff084c519b275e293e591ecfc252329dacc996486241f1429d89b24c06bb169c38e093
+AUX sntp.service-r2 324 SHA256 4e36dca24d29c0debf5882193b870685f32e65f37f02068bb81c10c35c5c0d00 SHA512 8626967f3bf9ef01fa5a2b7268b220ed7c518974db450a6f56316ede7b57947351171fb8ae6d28d32599e50c1d5506b4547dfd03cdbd80c5b873efb7d606cf17 WHIRLPOOL 48ba2b1cbebb0549698b27de617cc48bc43837b98675bdf73ca621398d7b50d61e53041ee4246c9711a8075935e9b17a40a93d2e005ec08020d3b80d8b1c0932
+AUX sntp.service.conf 119 SHA256 a7f886d6f5e671005da8ef9b53567884a8467239528bf860db61230b73097eb3 SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 WHIRLPOOL 6d99157e99026fdd4734674647bbb9a721f8766d5708f6c6f725fa88687bbb2995233fd02ccb34ebed7b80570e1a309a857ddb58fc08e0255268880eb8d18d9e
+DIST ntp-4.2.8p10-manpages.tar.xz 25004 SHA256 7d968a7e68e0ce26c56635e452468b3583e2cb8bfcf558127c753c62e31d7007 SHA512 5b31a1429484ad30a35c8fa38157190a66b0983b5bf1a802c0817613901b5e0644941a3f4d5b660fcfe4ca04968766a5981331a6f9353316e7de953e55c33a09 WHIRLPOOL 6f5d593be7003fa9212364c0409f7e1ae7adcd6d1134c6db5bfb92fbbeb181495c3d484ff73bdfe55f231bb323e286ef4e1eb2ba588fcf3acd360ac8bf53b259
+DIST ntp-4.2.8p10.tar.gz 6998648 SHA256 ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f SHA512 67e01ab533c3dfabb0bdd3ced848bdd239980bde28fdb2791d167b7e9690ab3b3759e1bd99e9fddcce03ddef4cd63a47eb85941bb127ceb79b7ecff22cce9c05 WHIRLPOOL 7a72762d349591808c0f3d4686bbb2fbf60a0915769e77140414795892d6929feb0aae30cf2f2ea1febd3c4fecb9d3d62401e1f66033bb2dc57e3245f41708c8
+DIST ntp-4.2.8p9-manpages.tar.xz 24988 SHA256 a7814373e7ceb73a9e426b2e60a9966b6d053f145fd0253bbccf407af9f7ad3f SHA512 23ba80c540d12e78012a448348b94ccb68d0a8078e2e6fe05be58d89aa5e6e31ee8d686920c0f841ad12eade84a081e393885760fdf81bad5c30c76006df0094 WHIRLPOOL 49259ef4bade074bbcb5d87dd21bd93538a3a17405a42e483d10168fd609f908b59c86c73b01d2db2e683ff43fa0fdc0cdf297bfcc452d223dcb78bcef3f46c3
+DIST ntp-4.2.8p9.tar.gz 7231884 SHA256 b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72 SHA512 ffd9e34060210d1cfb8ca0d89f2577df1c5fbe3ba63c620cdadc3ccc3c9d07f518783c6b91e57bffc77b08f449fdbab12faf226672ebd2dde5a0b4a783322a04 WHIRLPOOL ea96b106fd06f2b536394ad2a3dcc2a973aa0cec96140a292bc13b6ceb4159208a59b9c51936240c8a44fa7b2caa4be60d07d3c53066ce8588b0561bef64c070
+EBUILD ntp-4.2.8_p10-r1.ebuild 4509 SHA256 26b89ffff258d7e1fbf788d6f3e06a39370f4dcc4c5c2629f214bcbd4b815260 SHA512 8fc3394ea6cfca15557422ffd6c87dbe074cb955af8537ff8f912dd061015fae3597680de9b7d14dfe99ff871643567e519aa75f10f85e74be427c555b861230 WHIRLPOOL 2a30aee1615dd94b84705129572ae57275a6f9a28f692561a20bd87de14621c7d68734a11c3819269ebc4cc1abc3e919a17938432500c9c19e8a4c98c83c1928
+EBUILD ntp-4.2.8_p9.ebuild 4406 SHA256 e7a849cb4c96c7a8c96a07cc932c4a32d1da0a3f8a6a32c74f44fa8e15371566 SHA512 9fa23bbb7e9ad2283064b22f4661ce2a5855cbc93be296c80aa909303577cff999538cb53ab79dee77999d37a88f27ee9443f418f6505de93e2da9530f54807d WHIRLPOOL 85712eb9b856f2f40e65533771db6bbd870b34ec503763e2eb9dd39618b659a53c8f3fdff0baa3adfbf448f709b339d0423b39ba1da79925fbaab28bceabaa98
+MISC ChangeLog 13329 SHA256 4af69e0b1f274b3ab6e6c2a5762160ef6d3a586968ccf1e07001611240081294 SHA512 fbd7c3013a20ff722226fda2a417715c344669b99e2e2b746c581251334a2fd1fa7180702d33d61a90b9f381bbd31fb52d89bc9923f2fc2c274231b930ddf22f WHIRLPOOL 891184bca6aab64014578c812dd13bd28b0255f98fed3168d5a88b0ce3084ffda8a4acde412c43ca02855b4c5733b9c1ea8133056e438d1cc9e56f8c55d6c0e0
+MISC ChangeLog-2015 35438 SHA256 b1ee0c5247f54077d519bdc0f28d204058b1bc0f27ce0e633b11855c619bd28e SHA512 23317f991b73a9da7eac36d54739e7904ddb33ff652a40ed998c27a3a974eb4f05a359d131dc60960cf52cee5491476b45850a7a13611f339d54fccbdd8a2f82 WHIRLPOOL fcc2d0fd512bc87440c6ee5d4ba79d9c462a0a4946cbf6c481f8141a9f5b868086cd8478f322daa794fdaa53499faffdd76c02c3d56bef1bebcc69ecd117b302
+MISC metadata.xml 1014 SHA256 76b51a00c0cc2ba0dc0d3438da3b1ddf576197fb1e867e2956daa1908bbc8ac6 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650 WHIRLPOOL c5aabcb26063c306bd27b069b2f2ce099c330110089ec07e26559d383678812117fa94cbc3ea039f73d1c833dc9a2a1b5c38368dbf004b203e69f2c3286e6781
diff --git a/net-misc/ntp/files/man-pages/genmans.sh b/net-misc/ntp/files/man-pages/genmans.sh
new file mode 100755
index 000000000000..bae21e265f90
--- /dev/null
+++ b/net-misc/ntp/files/man-pages/genmans.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+# ntpman.sh  -- Create man pages for ntp
+#
+
+VERSION=$1
+if [[ -z ${VERSION} ]] ; then
+	VERSION=$(ls -1d ntp-*/ 2>/dev/null | LC_COLLATE=C sort | sed -n '${s:/::;p;Q}')
+	if [[ -z ${VERSION} ]] ; then
+		VERSION=$(ls "${0%/*}"/../../ntp-*.ebuild | LC_COLLATE=C sort | sed -n '${s:.*/::;s:_::;s:[.]ebuild::;p;Q}')
+		if [[ -z ${VERSION} ]] ; then
+			echo "Usage: $0 <version>"
+			exit 1
+		fi
+	fi
+fi
+[[ ${VERSION} != ntp-* ]] && VERSION="ntp-${VERSION}"
+
+SRCDIR=${0%/*}
+HTMLDIR=${SRCDIR}/${VERSION}/html
+DISTFILE=/usr/portage/distfiles/${VERSION}.tar.gz
+MANDIR=${SRCDIR}/man
+
+rm -rf ${SRCDIR}/${VERSION}
+if [[ ! -d ${HTMLDIR} ]] ; then
+	if [[ -f ${DISTFILE} ]] ; then
+		tar zxf ${DISTFILE} -C ${SRCDIR} || exit 1
+	else
+		echo "ERROR: $HTMLDIR / $DISTFILE does not exist"
+		exit 1
+	fi
+fi
+
+# Process a single HTML file
+processfile() {
+    HTMLFILE=$1
+    MANFILE=$2
+    echo -n "Processing $HTMLFILE ..."
+	sed -e "s:<csobj.*<:csobj>/:" $HTMLDIR/$HTMLFILE > .$HTMLFILE
+	xsltproc --html --stringparam version $VERSION ${SRCDIR}/ntp.xsl .$HTMLFILE > $MANDIR/$MANFILE || exit 1
+	rm -f .$HTMLFILE
+    echo "Done."
+}
+
+# Print information
+echo "Generates ntp man files from HTML documentation. Using:"
+echo "VERSION:   $VERSION"
+echo "HTMLDIR:   $HTMLDIR"
+echo "MANDIR:    $MANDIR"
+echo "Press enter to continue, or Ctrl-C to cancel."
+read
+
+# Process HTML files
+rm -rf ${MANDIR}
+mkdir ${MANDIR}
+for f in ntp{date,dc,d,q,time,trace,dsim} keygen tickadj ; do
+	processfile ${f}.html ${f}.8
+done
+echo
+
+cp -vi /usr/local/src/freebsd/src/usr.sbin/ntp/doc/*.5 ${MANDIR}
+(
+d=${PWD}
+cd ${MANDIR}
+shopt -s nullglob
+for p in $d/*.5.patch ; do
+	patch -F0 -p0 < $p || exit 1
+done
+) || exit 1
+cp -vi ${SRCDIR}/*.patch ${SRCDIR}/genmans.sh ${SRCDIR}/ntp.xsl ${MANDIR}
+
+tar -jcf ${VERSION}-manpages.tar.bz2 -C ${MANDIR}/.. man
+du -b ${VERSION}-manpages.tar.bz2
+
+rm -rf ${MANDIR} ${SRCDIR}/${VERSION}
diff --git a/net-misc/ntp/files/man-pages/ntp.conf.5.patch b/net-misc/ntp/files/man-pages/ntp.conf.5.patch
new file mode 100644
index 000000000000..c3d812302297
--- /dev/null
+++ b/net-misc/ntp/files/man-pages/ntp.conf.5.patch
@@ -0,0 +1,27 @@
+--- ntp.conf.5
++++ ntp.conf.5
+@@ -24,16 +24,6 @@
+ .Fl c
+ command line option).
+ .Pp
+-The
+-.Pa /etc/rc.d/ntpdate
+-script reads this file to get a list of NTP servers to use if the
+-variable
+-.Dq Li ntpdate_hosts
+-was not declared.
+-Refer to the
+-.Xr rc.conf 5
+-man page for further info about this.
+-.Pp
+ The file format is similar to other
+ .Ux
+ configuration files.
+@@ -2686,7 +2676,6 @@
+ Diffie-Hellman agreement parameters
+ .El
+ .Sh SEE ALSO
+-.Xr rc.conf 5 ,
+ .Xr ntpd 8 ,
+ .Xr ntpdc 8 ,
+ .Xr ntpq 8
diff --git a/net-misc/ntp/files/man-pages/ntp.xsl b/net-misc/ntp/files/man-pages/ntp.xsl
new file mode 100644
index 000000000000..ed9c1f8b8e51
--- /dev/null
+++ b/net-misc/ntp/files/man-pages/ntp.xsl
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+ 
+<!-- 
+Description:
+    Stylesheet for converting the HTML documentation 
+    for various ntp commands into proper manual pages 
+    (in troff format).
+
+Author:
+    Per Cederberg, <per at percederberg dot net>
+-->
+
+<!DOCTYPE stylesheet [
+<!ENTITY newline "
+">
+]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+  
+  <!-- ### INPUT PARAMETERS ### -->
+  <xsl:param name="version" select="''" />
+
+
+  <!-- ### OUTPUT DECLARATION ### -->
+  <xsl:output method="text"
+              encoding="ISO-8859-1" />
+
+  <xsl:strip-space elements="html" />
+
+
+  <!-- ### TEMPLATES ### -->
+  <xsl:template match="/">
+    <xsl:text>.\" Automatically generated from HTML source. </xsl:text>
+    <xsl:text>DO NOT EDIT!&newline;</xsl:text>
+    <xsl:apply-templates />
+  </xsl:template>
+
+  <xsl:template match="head">
+    <xsl:text>.TH </xsl:text>
+    <xsl:value-of select="substring-before(title, ' ')" />
+    <xsl:text> 1 "" "ntp </xsl:text>
+    <xsl:value-of select="$version" />
+    <xsl:text>"</xsl:text>
+    <xsl:text>&newline;</xsl:text>
+    <xsl:text>.SH NAME</xsl:text>
+    <xsl:text>&newline;</xsl:text>
+    <xsl:value-of select="title" />
+    <xsl:text>&newline;</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="body">
+    <xsl:apply-templates select="*[preceding-sibling::hr]" />
+  </xsl:template>
+
+  <xsl:template match="h3">
+  </xsl:template>
+
+  <xsl:template match="h4">
+    <xsl:variable name="text">
+      <xsl:call-template name="stringToUpper">
+        <xsl:with-param name="str" select="." />
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:if test="name(preceding-sibling::*[1]) = 'tt'">
+      <xsl:text>&newline;</xsl:text>
+    </xsl:if>
+    <xsl:text>.SH </xsl:text>
+    <xsl:value-of select="$text" />
+    <xsl:text>&newline;</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="address">
+    <xsl:text>.SH AUTHOR</xsl:text>
+    <xsl:text>&newline;</xsl:text>
+    <xsl:apply-templates />
+  </xsl:template>
+
+  <xsl:template match="p">
+    <xsl:variable name="text">
+      <xsl:apply-templates />
+    </xsl:variable>
+    <xsl:if test="starts-with($text, 'Disclaimer:')">
+      <xsl:text>&newline;</xsl:text>
+    </xsl:if>
+    <xsl:text>.P</xsl:text>
+    <xsl:text>&newline;</xsl:text>
+    <xsl:value-of select="$text" />
+    <xsl:text>&newline;</xsl:text>
+  </xsl:template>
+ 
+  <xsl:template match="dd/p">
+    <xsl:text>&newline;</xsl:text>
+    <xsl:text>&newline;</xsl:text>
+    <xsl:apply-templates />
+  </xsl:template>
+ 
+  <xsl:template match="hr">
+  </xsl:template>
+
+  <xsl:template match="pre">
+    <xsl:text>&newline;</xsl:text>
+    <xsl:text>.ft CW</xsl:text>
+    <xsl:text>&newline;</xsl:text>
+    <xsl:text>.nf</xsl:text>
+    <xsl:text>&newline;</xsl:text>
+    <xsl:call-template name="trim-newlines">
+      <xsl:with-param name="str" select="." />
+    </xsl:call-template>
+    <xsl:text>&newline;</xsl:text>
+    <xsl:text>.ft R</xsl:text>
+    <xsl:text>&newline;</xsl:text>
+    <xsl:text>.fi</xsl:text>
+    <xsl:text>&newline;</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="ul">
+  </xsl:template>
+
+  <xsl:template match="nobr">
+    <xsl:text> </xsl:text>
+    <xsl:apply-templates />
+    <xsl:text> </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="dl">
+    <xsl:apply-templates />
+  </xsl:template>
+
+  <xsl:template match="dt">
+    <xsl:text>.TP&newline;</xsl:text>
+    <xsl:text>.B </xsl:text>
+    <xsl:value-of select="normalize-space(.)" />
+    <xsl:text>&newline;</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="dd">
+    <xsl:apply-templates />
+    <xsl:text>&newline;</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="tr">
+    <xsl:if test="position() &gt; 1">
+      <xsl:apply-templates />
+      <xsl:text>&newline;</xsl:text>
+      <xsl:text>&newline;</xsl:text>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="tt">
+    <xsl:text>&newline;</xsl:text>
+    <xsl:text>\fB</xsl:text>
+    <xsl:apply-templates />
+    <xsl:text>\fR </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="i">
+    <xsl:text>&newline;</xsl:text>
+    <xsl:text>\fI</xsl:text>
+    <xsl:apply-templates />
+    <xsl:text>\fR </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="a">
+    <xsl:text> </xsl:text>
+    <xsl:apply-templates />
+    <xsl:text> </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="br">
+    <xsl:text>&newline;</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="text()">
+    <xsl:value-of select="normalize-space(.)" />
+  </xsl:template>
+
+
+  <!-- ### HELPER FUNCTIONS ### -->
+  <xsl:template name="stringToUpper">
+    <xsl:param name="str" />
+    <xsl:value-of select="translate($str,
+                                    'abcdefghijklmnopqrstuvwxyz',
+                                    'ABCDEFGHIJKLMNOPQRSTUVWXYZ')" />
+  </xsl:template>
+
+  <xsl:template name="trim-newlines">
+    <xsl:param name="str" />
+    <xsl:choose>
+      <xsl:when test="starts-with($str,'&newline;')">
+        <xsl:call-template name="trim-newlines">
+          <xsl:with-param name="str" select="substring($str, 2)" />
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="trim-newlines-tail">
+          <xsl:with-param name="str" select="$str" />
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="trim-newlines-tail">
+    <xsl:param name="str" />
+    <xsl:variable name="len" select="string-length($str)" />
+    <xsl:choose>
+      <xsl:when test="substring($str,$len) = '&newline;'">
+        <xsl:call-template name="trim-newlines-tail">
+          <xsl:with-param name="str" select="substring($str, 1, $len - 1)" />
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$str" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/net-misc/ntp/files/ntp-4.2.8-ipc-caps.patch b/net-misc/ntp/files/ntp-4.2.8-ipc-caps.patch
new file mode 100644
index 000000000000..a1e558052dfa
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8-ipc-caps.patch
@@ -0,0 +1,16 @@
+http://bugs.ntp.org/show_bug.cgi?id=2646
+https://bugs.gentoo.org/533966
+
+--- a/ntpd/ntpd.c
++++ a/ntpd/ntpd.c
+@@ -971,8 +971,8 @@ getgroup:
+ 			char *captext;
+ 			
+ 			captext = (0 != interface_interval)
+-				      ? "cap_sys_time,cap_net_bind_service=pe"
+-				      : "cap_sys_time=pe";
++				      ? "cap_ipc_lock,cap_sys_time,cap_net_bind_service=pe"
++				      : "cap_ipc_lock,cap_sys_time=pe";
+ 			caps = cap_from_text(captext);
+ 			if (!caps) {
+ 				msyslog(LOG_ERR,
diff --git a/net-misc/ntp/files/ntp-4.2.8-sntp-test-pthreads.patch b/net-misc/ntp/files/ntp-4.2.8-sntp-test-pthreads.patch
new file mode 100644
index 000000000000..4f8d15ff854a
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8-sntp-test-pthreads.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/563922
+http://bugs.ntp.org/show_bug.cgi?id=2906
+
+--- a/sntp/tests/Makefile.in
++++ b/sntp/tests/Makefile.in
+@@ -783,6 +783,7 @@ base_LDADD = \
+ 	$(LIBOPTS_LDADD)			\
+ 	$(LDADD_LIBEVENT)			\
+ 	$(top_builddir)/../libntp/libntp.a	\
++	$(PTHREAD_LIBS) \
+ 	$(LDADD_LIBNTP)				\
+ 	$(LDADD_NTP)				\
+ 	$(NULL)
diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
new file mode 100644
index 000000000000..1b532c6d8931
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
@@ -0,0 +1,39 @@
+Fix building with libressl or without SSL.
+
+Origin: http://bugs.ntp.org/attachment.cgi?id=1481
+
+LibreSSL fix from Joe Kappus (https://bugs.gentoo.org/show_bug.cgi?id=600668#c2)
+
+--- a/include/libssl_compat.h
++++ b/include/libssl_compat.h
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ /* ----------------------------------------------------------------- */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ /* ----------------------------------------------------------------- */
+ 
+ # include <openssl/objects.h>
+--- a/libntp/libssl_compat.c
++++ b/libntp/libssl_compat.c
+@@ -26,7 +26,7 @@
+ /* ----------------------------------------------------------------- */
+ 
+ /* ----------------------------------------------------------------- */
+-#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+ /* ----------------------------------------------------------------- */
+ 
+ #include "libssl_compat.h"
+--- a/libntp/ssl_init.c
++++ b/libntp/ssl_init.c
+@@ -21,7 +21,7 @@
+ 
+ int ssl_init_done;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ static void
+ atexit_ssl_cleanup(void)
diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch
new file mode 100644
index 000000000000..98ca61af4595
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch
@@ -0,0 +1,35 @@
+diff -ur a/include/libssl_compat.h ntp-4.2.8p10/include/libssl_compat.h
+--- ntp-4.2.8p10.orig/include/libssl_compat.h	2017-03-21 06:04:20.000000000 -0700
++++ ntp-4.2.8p10/include/libssl_compat.h	2017-03-30 16:34:03.892173084 -0700
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ /* ----------------------------------------------------------------- */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
+ /* ----------------------------------------------------------------- */
+ 
+ # include <openssl/objects.h>
+diff -ur ntp-4.2.8p10.orig/libntp/a_md5encrypt.c ntp-4.2.8p10/libntp/a_md5encrypt.c
+--- ntp-4.2.8p10.orig/libntp/a_md5encrypt.c	2017-02-01 01:47:13.000000000 -0800
++++ ntp-4.2.8p10/libntp/a_md5encrypt.c	2017-03-30 16:55:49.830229507 -0700
+@@ -11,6 +11,7 @@
+ #include "ntp.h"
+ #include "ntp_md5.h"	/* provides OpenSSL digest API */
+ #include "isc/string.h"
++#include "libssl_compat.h"
+ /*
+  * MD5authencrypt - generate message digest
+  *
+diff -ur ntp-4.2.8p10.orig/libntp/libssl_compat.c ntp-4.2.8p10/libntp/libssl_compat.c
+--- ntp-4.2.8p10.orig/libntp/libssl_compat.c	2017-02-01 01:47:13.000000000 -0800
++++ ntp-4.2.8p10/libntp/libssl_compat.c	2017-03-30 16:52:17.287543795 -0700
+@@ -26,7 +26,7 @@
+ /* ----------------------------------------------------------------- */
+ 
+ /* ----------------------------------------------------------------- */
+-#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
+ /* ----------------------------------------------------------------- */
+ 
+ #include "libssl_compat.h"
diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-ntpq-fpic.patch b/net-misc/ntp/files/ntp-4.2.8_p10-ntpq-fpic.patch
new file mode 100644
index 000000000000..dcf75d25bf94
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p10-ntpq-fpic.patch
@@ -0,0 +1,11 @@
+--- ntp-4.2.8p10.orig/ntpq/Makefile.am	2017-03-21 06:04:21.000000000 -0700
++++ ntp-4.2.8p10/ntpq/Makefile.am	2017-03-22 11:45:48.946630492 -0700
+@@ -23,7 +23,7 @@
+ ntpq_LDADD += $(LDADD_NTP)
+ noinst_HEADERS=	ntpq.h
+ noinst_LIBRARIES=	libntpq.a
+-libntpq_a_CFLAGS=	-DNO_MAIN_ALLOWED -DBUILD_AS_LIB
++libntpq_a_CFLAGS=	$(NTP_HARD_CFLAGS) -DNO_MAIN_ALLOWED -DBUILD_AS_LIB
+ CLEANFILES=
+ DISTCLEANFILES=	.version version.c config.log $(man_MANS)
+ ETAGS_ARGS=	Makefile.am
diff --git a/net-misc/ntp/files/ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch
new file mode 100644
index 000000000000..5166e5f9a1d0
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch
@@ -0,0 +1,236 @@
+Fix building with libressl or without SSL.
+
+Origin: http://bugs.ntp.org/attachment.cgi?id=1481
+
+LibreSSL fix from Joe Kappus (https://bugs.gentoo.org/show_bug.cgi?id=600668#c2)
+
+diff -Nru a/include/ntp_md5.h b/include/ntp_md5.h
+--- a/include/ntp_md5.h	2016-11-23 08:35:18.248130387 +0100
++++ b/include/ntp_md5.h	2016-11-23 08:35:18.248130387 +0100
+@@ -8,6 +8,7 @@
+ 
+ #ifdef OPENSSL
+ # include "openssl/evp.h"
++# include "libssl_compat.h"
+ #else	/* !OPENSSL follows */
+ /*
+  * Provide OpenSSL-alike MD5 API if we're not using OpenSSL
+@@ -23,6 +24,9 @@
+ # endif
+ 
+   typedef MD5_CTX			EVP_MD_CTX;
++
++# define EVP_MD_CTX_free(c)		free(c)
++# define EVP_MD_CTX_new()		calloc(1, sizeof(MD5_CTX))
+ # define EVP_get_digestbynid(t)		NULL
+ # define EVP_md5()			NULL
+ # define EVP_MD_CTX_init(c)
+diff -Nru a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c
+--- a/libntp/a_md5encrypt.c	2016-11-23 08:35:18.248130387 +0100
++++ b/libntp/a_md5encrypt.c	2016-11-23 08:35:18.248130387 +0100
+@@ -11,7 +11,6 @@
+ #include "ntp.h"
+ #include "ntp_md5.h"	/* provides OpenSSL digest API */
+ #include "isc/string.h"
+-#include "libssl_compat.h"
+ /*
+  * MD5authencrypt - generate message digest
+  *
+diff -Nru a/libntp/libssl_compat.c b/libntp/libssl_compat.c
+--- a/libntp/libssl_compat.c	2016-11-23 08:35:18.248130387 +0100
++++ b/libntp/libssl_compat.c	2016-11-23 08:35:18.248130387 +0100
+@@ -15,15 +15,18 @@
+  * ---------------------------------------------------------------------
+  */
+ #include "config.h"
+-
+-#include <string.h>
+-#include <openssl/bn.h>
+-#include <openssl/evp.h>
+-
+ #include "ntp_types.h"
+ 
+ /* ----------------------------------------------------------------- */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#ifdef OPENSSL
++# include <string.h>
++# include <openssl/bn.h>
++# include <openssl/evp.h>
++#endif
++/* ----------------------------------------------------------------- */
++
++/* ----------------------------------------------------------------- */
++#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
+ /* ----------------------------------------------------------------- */
+ 
+ #include "libssl_compat.h"
+@@ -325,7 +328,7 @@
+ }
+ 
+ /* ----------------------------------------------------------------- */
+-#else /* OPENSSL_VERSION_NUMBER >= v1.1.0 */
++#else /* OPENSSL && OPENSSL_VERSION_NUMBER >= v1.1.0 */
+ /* ----------------------------------------------------------------- */
+ 
+ NONEMPTY_TRANSLATION_UNIT
+diff -Nru a/ntpd/ntp_control.c b/ntpd/ntp_control.c
+--- a/ntpd/ntp_control.c	2016-11-23 08:35:18.256130015 +0100
++++ b/ntpd/ntp_control.c	2016-11-23 08:35:18.260129828 +0100
+@@ -33,8 +33,6 @@
+ # include "ntp_syscall.h"
+ #endif
+ 
+-#include "libssl_compat.h"
+-
+ /*
+  * Structure to hold request procedure information
+  */
+@@ -1653,8 +1651,10 @@
+ }
+ 
+ /*
+- * ctl_putcal - write a decoded calendar data into the response
++ * ctl_putcal - write a decoded calendar data into the response.
++ * only used with AUTOKEY currently, so compiled conditional
+  */
++#ifdef AUTOKEY
+ static void
+ ctl_putcal(
+ 	const char *tag,
+@@ -1678,6 +1678,7 @@
+ 
+ 	return;
+ }
++#endif
+ 
+ /*
+  * ctl_putfs - write a decoded filestamp into the response
+@@ -1838,7 +1839,7 @@
+ 	char *	oplim;
+ 	char *	iptr;
+ 	char *	iplim;
+-	char *	past_eq;
++	char *	past_eq = NULL;
+ 
+ 	optr = output;
+ 	oplim = output + sizeof(output);
+diff -Nru a/ntpd/ntp_io.c b/ntpd/ntp_io.c
+--- a/ntpd/ntp_io.c	2016-11-23 08:35:18.268129456 +0100
++++ b/ntpd/ntp_io.c	2016-11-23 08:35:18.272129269 +0100
+@@ -516,13 +516,17 @@
+ /*
+  * function to dump the contents of the interface structure
+  * for debugging use only.
++ * We face a dilemma here -- sockets are FDs under POSIX and
++ * actually HANDLES under Windows. So we use '%lld' as format
++ * and cast the value to 'long long'; this should not hurt
++ * with UNIX-like systems and does not truncate values on Win64.
+  */
+ void
+ interface_dump(const endpt *itf)
+ {
+ 	printf("Dumping interface: %p\n", itf);
+-	printf("fd = %d\n", itf->fd);
+-	printf("bfd = %d\n", itf->bfd);
++	printf("fd = %lld\n", (long long)itf->fd);
++	printf("bfd = %lld\n", (long long)itf->bfd);
+ 	printf("sin = %s,\n", stoa(&itf->sin));
+ 	sockaddr_dump(&itf->sin);
+ 	printf("bcast = %s,\n", stoa(&itf->bcast));
+@@ -570,11 +574,11 @@
+ static void
+ print_interface(const endpt *iface, const char *pfx, const char *sfx)
+ {
+-	printf("%sinterface #%d: fd=%d, bfd=%d, name=%s, flags=0x%x, ifindex=%u, sin=%s",
++	printf("%sinterface #%d: fd=%lld, bfd=%lld, name=%s, flags=0x%x, ifindex=%u, sin=%s",
+ 	       pfx,
+ 	       iface->ifnum,
+-	       iface->fd,
+-	       iface->bfd,
++	       (long long)iface->fd,
++	       (long long)iface->bfd,
+ 	       iface->name,
+ 	       iface->flags,
+ 	       iface->ifindex,
+diff -Nru a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
+--- a/ntpd/ntp_proto.c	2016-11-23 08:35:18.280128897 +0100
++++ b/ntpd/ntp_proto.c	2016-11-23 08:35:18.284128711 +0100
+@@ -4054,7 +4054,7 @@
+ 		    ntoa(&peer->srcadr), peer->hmode, xkeyid, sendlen,
+ 		    peer->keynumber));
+ #else	/* !AUTOKEY follows */
+-	DPRINTF(1, ("peer_xmit: at %ld %s->%s mode %d keyid %08x len %d\n",
++	DPRINTF(1, ("peer_xmit: at %ld %s->%s mode %d keyid %08x len %zu\n",
+ 		    current_time, peer->dstadr ?
+ 		    ntoa(&peer->dstadr->sin) : "-",
+ 		    ntoa(&peer->srcadr), peer->hmode, xkeyid, sendlen));
+diff -Nru a/ports/winnt/ntpd/ntp_iocompletionport.c b/ports/winnt/ntpd/ntp_iocompletionport.c
+--- a/ports/winnt/ntpd/ntp_iocompletionport.c	2016-11-23 08:35:18.288128524 +0100
++++ b/ports/winnt/ntpd/ntp_iocompletionport.c	2016-11-23 08:35:18.288128524 +0100
+@@ -1391,8 +1391,7 @@
+ 		goto fail;
+ 	}
+ 
+-	;
+-	if ( ! (rio->ioreg_ctx = iopad = iohpCreate(rio))) {
++	if (NULL == (rio->ioreg_ctx = iopad = iohpCreate(rio))) {
+ 		msyslog(LOG_ERR, "%s: Failed to create shared lock",
+ 			msgh);
+ 		goto fail;
+@@ -1401,13 +1400,13 @@
+ 	iopad->riofd      = rio->fd;
+ 	iopad->rsrc.rio   = rio;
+ 
+-	if (!(rio->device_ctx = DevCtxAttach(serial_devctx(h)))) {
++	if (NULL == (rio->device_ctx = DevCtxAttach(serial_devctx(h)))) {
+ 		msyslog(LOG_ERR, "%s: Failed to allocate device context",
+ 			msgh);
+ 		goto fail;
+ 	}
+ 
+-	if ( ! (lpo = IoCtxAlloc(iopad, rio->device_ctx))) {
++	if (NULL == (lpo = IoCtxAlloc(iopad, rio->device_ctx))) {
+ 		msyslog(LOG_ERR, "%: Failed to allocate IO context",
+ 			msgh);
+ 		goto fail;
+@@ -1594,7 +1593,6 @@
+ 	static const char * const msg =
+ 		"OnSocketSend: send to socket failed";
+ 
+-	IoHndPad_T *	iopad	= NULL;
+ 	endpt *		ep	= NULL;
+ 	int		rc;
+ 
+@@ -1662,7 +1660,7 @@
+ 
+ 	INSIST(hndIOCPLPort && hMainRpcDone);
+ 	if (iopad)
+-		iocpl_notify(iopad, OnInterfaceDetach, -1);
++		iocpl_notify(iopad, OnInterfaceDetach, (UINT_PTR)-1);
+ }
+ 
+ /* --------------------------------------------------------------------
+diff -Nru a/sntp/crypto.c b/sntp/crypto.c
+--- a/sntp/crypto.c	2016-11-23 08:35:18.288128524 +0100
++++ b/sntp/crypto.c	2016-11-23 08:35:18.288128524 +0100
+@@ -2,7 +2,7 @@
+ #include "crypto.h"
+ #include <ctype.h>
+ #include "isc/string.h"
+-#include "libssl_compat.h"
++#include "ntp_md5.h"
+ 
+ struct key *key_ptr;
+ size_t key_cnt = 0;
+diff -urN ntp-4.2.8p9/include/libssl_compat.h ntp-4.2.8p9_fixed/include/libssl_compat.h
+--- a/include/libssl_compat.h	2016-11-21 07:28:40.000000000 -0500
++++ b/include/libssl_compat.h	2016-11-23 12:10:33.014148604 -0500
+@@ -25,7 +25,7 @@
+ #include "openssl/rsa.h"
+ 
+ /* ----------------------------------------------------------------- */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
+ /* ----------------------------------------------------------------- */
+ 
+ # include <openssl/objects.h>
diff --git a/net-misc/ntp/files/ntp-client.confd b/net-misc/ntp/files/ntp-client.confd
new file mode 100644
index 000000000000..786004da83b7
--- /dev/null
+++ b/net-misc/ntp/files/ntp-client.confd
@@ -0,0 +1,21 @@
+# /etc/conf.d/ntp-client
+
+# Command to run to set the clock initially
+# Most people should just leave this line alone ...
+# however, if you know what you're doing, and you
+# want to use ntpd to set the clock, change this to 'ntpd'
+NTPCLIENT_CMD="ntpdate"
+
+# Options to pass to the above command
+# This default setting should work fine but you should
+# change the default 'pool.ntp.org' to something closer
+# to your machine.  See http://www.pool.ntp.org/ or
+# try running `netselect -s 3 pool.ntp.org`.
+NTPCLIENT_OPTS="-s -b -u \
+	0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org \
+	2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+
+# If you use hostnames above, then you should depend on dns
+# being up & running before we try to run.  Otherwise, you
+# can disable this.
+rc_use="dns"
diff --git a/net-misc/ntp/files/ntp-client.rc b/net-misc/ntp/files/ntp-client.rc
new file mode 100644
index 000000000000..5b5d59447395
--- /dev/null
+++ b/net-misc/ntp/files/ntp-client.rc
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	before cron portmap
+	after net
+	use dns logger
+}
+
+checkconfig() {
+	if ! type "${NTPCLIENT_CMD}" >/dev/null 2>&1 ; then
+		eerror "Please edit /etc/conf.d/ntp-client"
+		eerror "Unable to locate the client command ${NTPCLIENT_CMD}!"
+		return 1
+	fi
+	if [ -z "${NTPCLIENT_OPTS}" ] ; then
+		eerror "Please edit /etc/conf.d/ntp-client"
+		eerror "I need to know what server/options to use!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	ebegin "Setting clock via the NTP client '${NTPCLIENT_CMD}'"
+	"${NTPCLIENT_CMD}" ${NTPCLIENT_OPTS}
+	eend $? "Failed to set clock"
+}
diff --git a/net-misc/ntp/files/ntp.conf b/net-misc/ntp/files/ntp.conf
new file mode 100644
index 000000000000..97bed8dd13cd
--- /dev/null
+++ b/net-misc/ntp/files/ntp.conf
@@ -0,0 +1,54 @@
+# NOTES:
+# DHCP clients can append or replace NTP configuration files.
+# You should consult your DHCP client documentation about its
+# default behaviour and how to change it.
+
+# Name of the servers ntpd should sync with
+# Please respect the access policy as stated by the responsible person.
+#server		ntp.example.tld		iburst
+
+# Common pool for random people
+#server pool.ntp.org
+
+# Pools for Gentoo users
+server 0.gentoo.pool.ntp.org
+server 1.gentoo.pool.ntp.org
+server 2.gentoo.pool.ntp.org
+server 3.gentoo.pool.ntp.org
+
+##
+# A list of available servers can be found here:
+# http://www.pool.ntp.org/
+# http://www.pool.ntp.org/#use
+# A good way to get servers for your machine is:
+# netselect -s 3 pool.ntp.org
+##
+
+# you should not need to modify the following paths
+driftfile	/var/lib/ntp/ntp.drift
+
+#server ntplocal.example.com prefer 
+#server timeserver.example.org 
+
+# Warning: Using default NTP settings will leave your NTP
+# server accessible to all hosts on the Internet.
+
+# If you want to deny all machines (including your own)
+# from accessing the NTP server, uncomment:
+#restrict default ignore
+
+
+# Default configuration:
+# - Allow only time queries, at a limited rate, sending KoD when in excess.
+# - Allow all local queries (IPv4, IPv6)
+restrict default nomodify nopeer noquery limited kod
+restrict 127.0.0.1
+restrict [::1]
+
+
+# To allow machines within your network to synchronize
+# their clocks with your server, but ensure they are
+# not allowed to configure the server or used as peers
+# to synchronize against, uncomment this line.
+#
+#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap
diff --git a/net-misc/ntp/files/ntpd.confd b/net-misc/ntp/files/ntpd.confd
new file mode 100644
index 000000000000..2b74282c5775
--- /dev/null
+++ b/net-misc/ntp/files/ntpd.confd
@@ -0,0 +1,6 @@
+# /etc/conf.d/ntpd
+
+# Options to pass to the ntpd process
+# Most people should leave this line alone ...
+# however, if you know what you're doing, feel free to tweak
+NTPD_OPTS="-g -u ntp:ntp"
diff --git a/net-misc/ntp/files/ntpd.rc-r1 b/net-misc/ntp/files/ntpd.rc-r1
new file mode 100644
index 000000000000..7573411c9986
--- /dev/null
+++ b/net-misc/ntp/files/ntpd.rc-r1
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="ntpd - the network time protocol daemon"
+pidfile="/var/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="-p ${pidfile} ${NTPD_OPTS}"
+start_stop_daemon_args="--pidfile ${pidfile}"
+
+depend() {
+	use net dns logger
+	after ntp-client
+}
+
+start_pre() {
+	if [ ! -f /etc/ntp.conf ] ; then
+		eerror "Please create /etc/ntp.conf"
+		return 1
+	fi
+	return 0
+}
diff --git a/net-misc/ntp/files/ntpd.service-r2 b/net-misc/ntp/files/ntpd.service-r2
new file mode 100644
index 000000000000..5f11b27e9232
--- /dev/null
+++ b/net-misc/ntp/files/ntpd.service-r2
@@ -0,0 +1,11 @@
+[Unit]
+Description=Network Time Service
+After=ntpdate.service sntp.service
+Conflicts=systemd-timesyncd.service
+
+[Service]
+ExecStart=/usr/sbin/ntpd -g -n
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntp/files/ntpdate.service-r1 b/net-misc/ntp/files/ntpdate.service-r1
new file mode 100644
index 000000000000..f9bc9ddefc90
--- /dev/null
+++ b/net-misc/ntp/files/ntpdate.service-r1
@@ -0,0 +1,14 @@
+[Unit]
+Description=Set time via NTP using ntpdate
+After=network-online.target nss-lookup.target
+Before=time-sync.target
+Wants=time-sync.target
+Conflicts=systemd-timesyncd.service             
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/ntpdate -b -u $SERVER
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntp/files/ntpdate.service.conf b/net-misc/ntp/files/ntpdate.service.conf
new file mode 100644
index 000000000000..75e4f41b4162
--- /dev/null
+++ b/net-misc/ntp/files/ntpdate.service.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="SERVER=0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
diff --git a/net-misc/ntp/files/sntp.confd b/net-misc/ntp/files/sntp.confd
new file mode 100644
index 000000000000..d11983a3fb7c
--- /dev/null
+++ b/net-misc/ntp/files/sntp.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/sntp
+
+# Options to pass to sntp
+SNTP_OPTS="-s 0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
diff --git a/net-misc/ntp/files/sntp.rc b/net-misc/ntp/files/sntp.rc
new file mode 100644
index 000000000000..4ed56ae2bf1a
--- /dev/null
+++ b/net-misc/ntp/files/sntp.rc
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/sntp"
+
+depend() {
+	before cron portmap
+	after net
+	use dns logger
+}
+
+start_pre() {
+	if [ -z "${SNTP_OPTS}" ] ; then
+		eerror "Please edit /etc/conf.d/sntp"
+		eerror "I need to know what server/options to use!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	ebegin "Setting clock via SNTP"
+	${command} ${SNTP_OPTS}
+	eend $? "Failed to set clock"
+}
diff --git a/net-misc/ntp/files/sntp.service-r2 b/net-misc/ntp/files/sntp.service-r2
new file mode 100644
index 000000000000..9bdd578ffbc7
--- /dev/null
+++ b/net-misc/ntp/files/sntp.service-r2
@@ -0,0 +1,14 @@
+[Unit]
+Description=Set time via SNTP
+After=network.target NetworkManager-wait-online.service nss-lookup.target
+Before=time-sync.target
+Wants=time-sync.target
+Conflicts=systemd-timesyncd.service             
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/sntp -s $SERVER
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntp/files/sntp.service.conf b/net-misc/ntp/files/sntp.service.conf
new file mode 100644
index 000000000000..75e4f41b4162
--- /dev/null
+++ b/net-misc/ntp/files/sntp.service.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="SERVER=0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
diff --git a/net-misc/ntp/metadata.xml b/net-misc/ntp/metadata.xml
new file mode 100644
index 000000000000..88e81f1ab224
--- /dev/null
+++ b/net-misc/ntp/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <longdescription>
+NTP is a protocol designed to synchronize the clocks of computers over a network. NTP 
+version 3 is an internet draft standard, formalized in RFC 1305. NTP version 4 is a 
+significant revision of the NTP standard, and is the current development version, but 
+has not been formalized in an RFC. Simple NTP (SNTP) version 4 is described in RFC 
+2030.
+</longdescription>
+  <use>
+    <flag name="openntpd">Allow ntp to be installed alongside openntpd</flag>
+    <flag name="parse-clocks">Add support for PARSE clocks</flag>
+    <flag name="samba">Provide support for Samba's signing daemon (needed for Active Directory domain controllers)</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:ntp:ntp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild
new file mode 100644
index 000000000000..5b4ea67e919d
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils toolchain-funcs flag-o-matic user systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9:=[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	!openntpd? ( !net-misc/openntpd )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	parse-clocks? ( net-misc/pps-tools )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${PN}-4.2.8_p10-ntpq-fpic.patch
+	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+)
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	eautoreconf #622754
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Increase the default memlimit from 32MiB to 128MiB.  #533232
+	local myeconfargs=(
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-memlock=256
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable ipv6)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}"
+		rm usr/sbin/ntpd || die
+		rm -r var/lib
+		rm etc/{conf,init}.d/ntpd
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/ntp/ntp-4.2.8_p9.ebuild b/net-misc/ntp/ntp-4.2.8_p9.ebuild
new file mode 100644
index 000000000000..4ff1b7a2eb34
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p9.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs flag-o-matic user systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9:=[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	!openntpd? ( !net-misc/openntpd )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	parse-clocks? ( net-misc/pps-tools )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${P}-fix-build-wo-ssl-or-libressl.patch
+)
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Increase the default memlimit from 32MiB to 128MiB.  #533232
+	econf \
+		--with-lineeditlibs=readline,edit,editline \
+		--with-yielding-select \
+		--disable-local-libevent \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		--htmldir='$(docdir)/html' \
+		--with-memlock=256 \
+		$(use_enable caps linuxcaps) \
+		$(use_enable parse-clocks) \
+		$(use_enable ipv6) \
+		$(use_enable debug debugging) \
+		$(use_with readline lineeditlibs readline) \
+		$(use_enable samba ntp-signd) \
+		$(use_with snmp ntpsnmpd) \
+		$(use_with ssl crypto) \
+		$(use_enable threads thread-support)
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}"
+		rm usr/sbin/ntpd || die
+		rm -r var/lib
+		rm etc/{conf,init}.d/ntpd
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
new file mode 100644
index 000000000000..587eee3cb44e
--- /dev/null
+++ b/net-misc/ntpclient/Manifest
@@ -0,0 +1,9 @@
+DIST ntpclient-2015.365.tar.gz 31023 SHA256 95c3646919a9a2278fa384aa8e37117b250577ff8b09b8c93ba53e04e729b54b SHA512 ca3d7b8ac6cb0626ac1017e4baee2faa833aab4fb449881e890b686f785b2fe30ded77a0a831f40126ded71abae0f2a944227d530859222eabfffe03f89d8a80 WHIRLPOOL da96a96d9af031cfc62594d94192416be01d2bdfc96b26e9bb71dbd9ab1a89a78183e5bd8c22791eac75006375542892807fb44ff6f2c9c6602a1171e1dc4590
+DIST ntpclient-2017_217.tar.xz 108136 SHA256 6e0a7f4443cd4822f39b9cc3364485feb2540cf2929133592cf4172cf079f5df SHA512 a1dc7ef7b966bd49ffc2e63e2c850ba4eef76e5a313a00642074112e13adccf80a4a9211264850dda3052c948f85040e1a668846ddd0be9310c701df40282be0 WHIRLPOOL fc27cfd22fc4b686dc6396c50645e2228f2a32d4e701834a896abaf411ba7a6b1c7a6ac02da99f28e771d12663ddda713a5cb86704c2f9ee67a45e6460ec4bc3
+DIST ntpclient_2010_365.tar.gz 30423 SHA256 9ad9b028385082fb804167f464e2db0a0b3d33780acd399327e64898b8fcfddd SHA512 74fd5e80dcf36c4e7aca6d97c5979b0dc4c51fed592279adfd04c0d329c117bfed819ee40d6400436c0d066f73ed3403e9fba8cb05846df55c991422ce434132 WHIRLPOOL 0eb27687cb9f90317e126be3830a9c812af216dd4be60a9d11bfcfcbf4fb16572de1bbbcf0207b47290e452172126bd2be38ab7ee49e097890bdcea6a63b259b
+EBUILD ntpclient-2010.365.ebuild 704 SHA256 09f8565a5f8d7d260d0b8db6ca9997e3103f800dfe3a9e5bb902edeb0c9a047a SHA512 5c4ef158e7bb7d2b003d45e40fa29d994596d2a657ca6359573730b4a30594bb0b6603c5647c4f97a9b7aca679c485bf3155a9a853d10f8e293d93fa3f1f38bb WHIRLPOOL 33ee6e548e11cb2bac8b1d456d2b0a4d8ffb9628ebac5181a64e54322c2a8ab1892080d814901cbcd71f7988eae0ce3a87ff8e4ed79f9398e3fd6be4b58287c7
+EBUILD ntpclient-2015.365.ebuild 700 SHA256 efe53b23fbad265503f6cb3b5367433ed50129dafac98bdd1aff9ac3a209c4a7 SHA512 0220d85794028d9daa151ad2cc1c2e6e707938ebe5076c5bcb5f0ef2d954855c81f140ce845c6b6737fd8293e3510d53d26a4184179bd2fdfc76c91e6e181d74 WHIRLPOOL 8fbdb1c63fbcb29563f02da489715db8489c0b92030de1b3f383906d1946108d258b5306cc37fc37bdad08164c14976af9b049d7ac10e4c8b93c95ef50a02464
+EBUILD ntpclient-2017.217.ebuild 655 SHA256 257aeca3ea5cab5ac751e4b8d7dee04cbdd5aa340c6e7d3ab4b917fd264e10ef SHA512 b3e1d7211c99d2659ae925ff8123b49d10f1cc66057b0db2d51935829b49b5da04153b8fc3102386699fc0a9e1801df4afb12103c8f42728e0992bc6598b724e WHIRLPOOL a32b1ba78baf0e1d1efdefd8174cc349e481808d70499eaa54934e88439a9049851a94b5ed209e1d20a9202e89f7795661c13f0ae3d3c4fb9a6fe279f2f87712
+MISC ChangeLog 2468 SHA256 01f174db2811321745254883b200726d2c6784fe4823b772686e86aba64a0056 SHA512 b4648fffbc14a76ebdafab54274cf58c4b7b3408478c259bb8e26bad66f0f94ba1667de4a0061bb9db25a0b3fa16c4adfaf189d7695460947b9fe533a386f75d WHIRLPOOL a182099330f4e761f250a03c9a7de9c5b7d77fd26ffa82c46a51450a096a90ccd1867bc4b1418385e0b6112a1aa5ea16dba479ef5a1b0dd4039ba64349272131
+MISC ChangeLog-2015 1340 SHA256 b4e524a20332431577edfc7dbd9938ee04057e7e0f386e77ba948c0184019409 SHA512 403c08adfc4014d5bd7ce07537f8a001bb4fc9bba388696482f03a0229fddd936e5a12580c528afcad1a97219f7614b9efc07b19627fd8748f8c56a485e05003 WHIRLPOOL ad5c306d3c8471ed917c76b23c6a6119b1bf868e11a3fff868cb0415a6863c45646d1f84e82138baab2414331de378f63d1ef9ee6efefb0712248d297db66cdf
+MISC metadata.xml 217 SHA256 88e43306dd0a723c576ed2e57b072ef2b64ad25602a1a8ecbf64c134c6551a59 SHA512 00ede86236950f74e074c7e76857386e743fff35bae5123d06a4ef36bd95e73b82a492a66e2e3cf336d6e60e9aefcec64799651ac9e39ffe327e84270772cae6 WHIRLPOOL 43c98158ad809012a5b346b79ba041afe8f3e190888049de1e7284356747e73d9c5496227e5f55ac5b51b6b02034eb574f032ab20341906b73f76e521bcac9a6
diff --git a/net-misc/ntpclient/metadata.xml b/net-misc/ntpclient/metadata.xml
new file mode 100644
index 000000000000..3f576f05f291
--- /dev/null
+++ b/net-misc/ntpclient/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 type="person">
+	<email>monsieurp@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/ntpclient/ntpclient-2010.365.ebuild b/net-misc/ntpclient/ntpclient-2010.365.ebuild
new file mode 100644
index 000000000000..3f0eb828012d
--- /dev/null
+++ b/net-misc/ntpclient/ntpclient-2010.365.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A NTP (RFC-1305) client for unix-alike computers"
+HOMEPAGE="http://doolittle.icarus.com/ntpclient/"
+SRC_URI="http://doolittle.icarus.com/${PN}/${PN}_${PV/./_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+#S="${WORKDIR}/${PN}-2010"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/${PN}* ${P} || die
+}
+
+src_prepare() {
+	sed -i -e 's/-O2//;s/LDFLAGS +=/LDLIBS +=/' Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin ntpclient
+	dodoc README HOWTO rate.awk rate2.awk
+}
diff --git a/net-misc/ntpclient/ntpclient-2015.365.ebuild b/net-misc/ntpclient/ntpclient-2015.365.ebuild
new file mode 100644
index 000000000000..6b1b65b208b4
--- /dev/null
+++ b/net-misc/ntpclient/ntpclient-2015.365.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A NTP (RFC-1305) client for unix-alike computers"
+HOMEPAGE="http://doolittle.icarus.com/ntpclient/"
+SRC_URI="http://doolittle.icarus.com/${PN}/${PN}_${PV/./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/${PN}* ${P} || die
+}
+
+src_prepare() {
+	default
+	sed -i -e 's/-O2//;s/LDFLAGS +=/LDLIBS +=/' Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin "${PN}"
+	dodoc README HOWTO rate.awk rate2.awk
+}
diff --git a/net-misc/ntpclient/ntpclient-2017.217.ebuild b/net-misc/ntpclient/ntpclient-2017.217.ebuild
new file mode 100644
index 000000000000..462dc406de39
--- /dev/null
+++ b/net-misc/ntpclient/ntpclient-2017.217.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A NTP (RFC-1305) client for unix-alike computers"
+HOMEPAGE="https://github.com/troglobit/ntpclient"
+SRC_URI="https://github.com/troglobit/ntpclient/releases/download/2017_217/ntpclient-2017_217.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DOCS=( README.md "doc/HOWTO.md" "doc/rate.awk" "doc/rate2.awk" )
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/${PN}* ${P} || die
+}
+
+src_install() {
+	einstalldocs
+	dobin "src/${PN}"
+}
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
new file mode 100644
index 000000000000..cd90cb8fb9c2
--- /dev/null
+++ b/net-misc/nx/Manifest
@@ -0,0 +1,11 @@
+AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 SHA256 d4fb814d5ee3bd13c39e535b731caab0acb9e552cea471c602c8ff9c8e6d535e SHA512 14e5dc5ea280704d867af971bced585adfd805f49ed70162c4b1691b81926b144720e5df1fc1257e0b3a9e5841fed0deea3a7096d92a210476c1bfd89112c52f WHIRLPOOL b4341346200fb951342535f566d5849183655a6f014be6f9f985e1da087222491b9503f9548506927ec240eaece7829828e1a8690aaf8bcb0d5d402c6c207d34
+AUX nx-3.2.0-nxproxy_read_from_stdin.patch 1382 SHA256 7674e887e1be1134110e2219a96b413efa2b32d9be50de77d15b9dcbad8a4d76 SHA512 d7ae8eb5e43371b913ebb182436284c3a7526b1485bd2e4a969e0e02299315d6a4f036f54f477ebb4299138ba23d830aea46ef2ff6e90ada2a74ef6e95948924 WHIRLPOOL 940299b85e79c6e2e23d2255acf8d37d3f38606d084dd51347dbf67e00283ad8993b6281095d499d4a78e9de11bbf866120ab42ca0d1dcf65590eb53f71f61db
+AUX nx-3.5.0.17-cflags_ar_ranlib.patch 3518 SHA256 a129ea9d774997d946babe09d431e21ee4eaf5538b52a6a8a4fe2f9ff7c78f25 SHA512 df036cafc3526526e6768976f6ddca97584dbea2f7008c9c6a977922389e0e12901fd399794a10e2050380e5ad4066f364c2ebd5bd6e94e65143ccb100000400 WHIRLPOOL 6a6c909699ff9be60ecba4990b131cdd68d44959d35f95bd166846517065ee044784a48b2eec0fad6c80ecef0b821e75953a7189275a3e69bb88eaa573de61b2
+AUX nx-3.5.0.30-fix_X11_underlinking.patch 538 SHA256 3c726b2ecd3e1277b5c7f5863b1f662a50ed435d817e4e4743d05fe0f4d79c35 SHA512 dcaa0da2e6e4dea2a35586f74c4f67a331072de280e98e9fdae3cdc0c8b477b4256b57c6925fe6949084acd655b1edfc55b66eea08b2ae5090a84dce65db3d18 WHIRLPOOL 63473edc9ea2dab3928473f6b3f74cf6da80465ce7ecb17800cf55beba7d46364cac047b42d4793b2dc7968bce334312f09b352c16594b6dcac1ef7228641071
+DIST nx-libs-3.5.0.30-full.tar.gz 6639925 SHA256 60bf86a41f6e7a04a17d5fb471f77a37045c11e06e5e0786b3dc959bb6a3fc5a SHA512 223c73de1b8988d17a555a7dd56c14ddc27855b7c1d9a9b28c053161a707520c1fcef697c3d9148222dae23e1465e72821455271477ac835d5cc63498b45e005 WHIRLPOOL eebd82ff2e7b434840c1f2a451edfdf454903a28b4d9861d1c568308443bff6a05082cd73a446049c840d75bb9b107aab16c6c85fa48529b445ee3b3ac77eb24
+DIST nx-libs-3.5.0.32-full.tar.gz 6801696 SHA256 be166390ed7c08b96bd62f1e93910d720d105c679481bc389e833003da2a226d SHA512 8b4a042993d45e1aee3e13e8b86f68cd5b2a8b52e9299de6129abd8e3bb89d73cf2b44b03d3c7fabbd8329abc06dc912ac95bbf936b6478b05fc202cc29a090f WHIRLPOOL 5d97b83ad66ee51b676e15102f0fade974a619840b1e180607062e6694e7eebddf3bceb85324bc59c976d468b283eaa4e99c0a609b707cdae03096d92fab81e5
+EBUILD nx-3.5.0.30.ebuild 2743 SHA256 8fd0bfd0090c448868288bf1f20c30cddbb4c005dabb88c5d18e711e353699a7 SHA512 0ab1df3ca4443ceca485e63b1eaabb0773a861503d8c6bcf669f3a0d36e6c3bd9113a77c1cc06bd56ec78be05b58d5bfe7b972ac08e519d2c61c9ebc9e02679d WHIRLPOOL 1b79c3ef3a825cf86bc1e30933dca506742a1c8ae41e1298991633c9466c2b6adb547a7bb02824546f4fdd4da58d9f0e98b6d48dd76e4d3d06ca7a1c2c3d9d27
+EBUILD nx-3.5.0.32.ebuild 2655 SHA256 7007b026a026b38745088c86ef09d343bddb00af1de5bc0d8062a8b4d98c7ab7 SHA512 bf5638e1f600a64549cbd5651ad052593043b91d957ba064a03ffa63088780c10991d2fe0526241571aca6be8c307c5e8a6d5e338bd9b811e9dc97bf8ede4a0d WHIRLPOOL 6b814fa4bbd9f10285bba966a9f262c392c7aa8f08f52734dca9a959afce7929d80c3ca984ef6727933f3ade014f3d3f83006739fd593958afb69a9ea6225061
+MISC ChangeLog 3054 SHA256 6d83ca953b0c058a12554a687e71f63b1e5f75886cd8f1787e23947a13e5f1e6 SHA512 9adbab0fbf6b814322b950e67bd78d6247915ea4ba31ed461b655b5b66d12b6aa41756dac6a367547a9ce36ab6dab50377f0cc5b34f71d773d636feba00bbaaf WHIRLPOOL 99d4a91bd718b12b79b31ffb03b47daee3003faa069fe09fd257f443edf8766d19795aaeb61e9979d66f98c5ec911e377ccf30d3b8e2c4021efc669aeff691ec
+MISC ChangeLog-2015 15379 SHA256 c0603e91cc03a40f606e6cddc42f0f08c985cea72c3172d908069f57fcbaa930 SHA512 2ea4211a731623006c6045d71ba5d4cddc6be4f51edc1163c384bde0a1b4b440c1e6d22efe15b637e7c4be34ed1ea8ff52097a359acafcd76b4ada55cf8d4b51 WHIRLPOOL 204db5809e1f55b8fc402a7603e5b4530acbdbafaa6949d42fb0e7e0422c1dc2f009fdc8c3e47c174fd4b9fbe464d38c3457bcd6b805e8c5abc7c0506bf86e7f
+MISC metadata.xml 347 SHA256 92091863a3f87a915ab56c35c84ec69b4a7c4ff56b06b84910efdc2acd7ecfce SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4 WHIRLPOOL 8579fc93b88063c4a7eb0753cd18105dc8603b85e10bff89ee5366c675104746c0232a05550e2a9d961f022ebbf35c24ca0febed3244b7995a3d98cf9e517208
diff --git a/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch
new file mode 100644
index 000000000000..2ccaf978dd09
--- /dev/null
+++ b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch
@@ -0,0 +1,20 @@
+--- nxcomp/Makefile.in.agriffis	2005-11-12 12:48:42.000000000 -0500
++++ nxcomp/Makefile.in	2005-12-15 12:24:46.000000000 -0500
+@@ -32,7 +32,7 @@
+ 
+ CXX         = @CXX@
+ CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
+-              -Wall -Wpointer-arith
++              -Wall -Wpointer-arith -fPIC
+ CXXINCLUDES =
+ CXXDEFINES  =
+ 
+@@ -42,7 +42,7 @@
+ 
+ CC          = @CC@
+ CCFLAGS     = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
+-              -Wall -Wpointer-arith
++              -Wall -Wpointer-arith -fPIC
+ CCINCLUDES  =
+ CCDEFINES   =
+ 
diff --git a/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch b/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch
new file mode 100644
index 000000000000..bce692d10a7a
--- /dev/null
+++ b/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch
@@ -0,0 +1,68 @@
+--- Main.c.old	2007-07-18 17:39:13.000000000 +0200
++++ Main.c	2008-03-12 04:40:30.000000000 +0100
+@@ -36,28 +36,48 @@
+   int result = -1;
+ 
+   char *options = NULL;
+-
++  
++  char *nx_commfd_str = NULL;
++  
+   options = getenv("NX_DISPLAY");
+-
+-  if (NXTransParseCommandLine(argc, argv) < 0)
++  
++  if ((nx_commfd_str = getenv("NX_COMMFD")) != NULL)
+   {
+-    NXTransCleanup();
+-  }
++  	int nx_commfd = atoi(nx_commfd_str);
+ 
+-  if (NXTransParseEnvironment(options, 0) < 0)
+-  {
+-    NXTransCleanup();
++	if (result)
++		result = NXTransCreate(nx_commfd, NX_MODE_SERVER, options);
++ 
++	// go into endless loop
++
++	if (result)
++	{
++		while (NXTransRunning(NX_FD_ANY))
++			result = NXTransContinue(NULL);
++	}
+   }
++  else
++  {
++    if (NXTransParseCommandLine(argc, argv) < 0)
++    {
++      NXTransCleanup();
++    }
++
++    if (NXTransParseEnvironment(options, 0) < 0)
++    {
++      NXTransCleanup();
++    }
++
++   /*
++    * This should not return...
++    */
++
++    #ifdef TEST
++    fprintf(stderr, "Main: Yielding control to NX entry point.\n");
++    #endif
+ 
+-  /*
+-   * This should not return...
+-   */
+-
+-  #ifdef TEST
+-  fprintf(stderr, "Main: Yielding control to NX entry point.\n");
+-  #endif
+-
+-  result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
++    result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
++  }
+ 
+   /*
+    * ...So these should not be called.
diff --git a/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch b/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch
new file mode 100644
index 000000000000..668a6bf4c310
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch
@@ -0,0 +1,100 @@
+diff -Naur nx-libs-3.5.0.17.orig/nxcomp/Makefile.in nx-libs-3.5.0.17/nxcomp/Makefile.in
+--- nx-libs-3.5.0.17.orig/nxcomp/Makefile.in	2013-01-09 15:03:33.152952758 +0100
++++ nx-libs-3.5.0.17/nxcomp/Makefile.in	2013-01-09 15:05:39.771898159 +0100
+@@ -243,8 +243,8 @@
+ 
+ $(LIBARCHIVE):	 $(CXXOBJ) $(COBJ)
+ 		 rm -f  $(LIBARCHIVE)
+-		 ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
+-		 ranlib $(LIBARCHIVE)
++		 $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
++		 $(RANLIB) $(LIBARCHIVE)
+ 
+ $(LIBCYGSHARED): $(LIBARCHIVE)
+ 		 $(CC) -shared -o $(LIBCYGSHARED) \
+diff -Naur nx-libs-3.5.0.17.orig/nxcomp/configure.in nx-libs-3.5.0.17/nxcomp/configure.in
+--- nx-libs-3.5.0.17.orig/nxcomp/configure.in	2013-01-09 15:03:33.151952758 +0100
++++ nx-libs-3.5.0.17/nxcomp/configure.in	2013-01-09 15:04:03.312940892 +0100
+@@ -7,8 +7,7 @@
+ 
+ dnl Set our default compilation flags.
+ 
+-CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
+-CFLAGS="$CFLAGS -O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+ 
+ dnl Reset default linking directives.
+ 
+diff -Naur nx-libs-3.5.0.17.orig/nxcompext/Makefile.in nx-libs-3.5.0.17/nxcompext/Makefile.in
+--- nx-libs-3.5.0.17.orig/nxcompext/Makefile.in	2013-01-09 15:03:33.164952753 +0100
++++ nx-libs-3.5.0.17/nxcompext/Makefile.in	2013-01-09 15:06:08.747879052 +0100
+@@ -125,8 +125,8 @@
+ 
+ $(LIBARCHIVE):	 $(CXXOBJ) $(COBJ)
+ 		 rm -f  $(LIBARCHIVE)
+-		 ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
+-		 ranlib $(LIBARCHIVE)
++		 $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
++		 $(RANLIB) $(LIBARCHIVE)
+ 
+ $(LIBCYGSHARED): $(LIBARCHIVE)
+ 		 $(CC) -shared -o $(LIBCYGSHARED) \
+diff -Naur nx-libs-3.5.0.17.orig/nxcompext/configure.in nx-libs-3.5.0.17/nxcompext/configure.in
+--- nx-libs-3.5.0.17.orig/nxcompext/configure.in	2013-01-09 15:03:33.164952753 +0100
++++ nx-libs-3.5.0.17/nxcompext/configure.in	2013-01-09 15:04:16.247935801 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="$CXXFLAGS -O3"
+-CFLAGS="$CFLAGS -O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+diff -Naur nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in nx-libs-3.5.0.17/nxcompshad/Makefile.in
+--- nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in	2013-01-09 15:03:33.163952754 +0100
++++ nx-libs-3.5.0.17/nxcompshad/Makefile.in	2013-01-09 15:06:16.933873660 +0100
+@@ -158,8 +158,8 @@
+ 
+ $(LIBARCHIVE):	$(CXXOBJ) $(COBJ)
+ 		rm -f  $(LIBARCHIVE)
+-		ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
+-		ranlib $(LIBARCHIVE)
++		$(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
++		$(RANLIB) $(LIBARCHIVE)
+ 
+ $(LIBDLL): $(LIBARCHIVE)
+ 		$(CC) -o $@ \
+diff -Naur nx-libs-3.5.0.17.orig/nxcompshad/configure.in nx-libs-3.5.0.17/nxcompshad/configure.in
+--- nx-libs-3.5.0.17.orig/nxcompshad/configure.in	2013-01-09 15:03:33.163952754 +0100
++++ nx-libs-3.5.0.17/nxcompshad/configure.in	2013-01-09 15:04:20.073934295 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="$CXXFLAGS -O3"
+-CPPFLAGS="$CPPFLAGS -O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+diff -Naur nx-libs-3.5.0.17.orig/nxproxy/configure.in nx-libs-3.5.0.17/nxproxy/configure.in
+--- nx-libs-3.5.0.17.orig/nxproxy/configure.in	2013-01-09 15:03:33.163952754 +0100
++++ nx-libs-3.5.0.17/nxproxy/configure.in	2013-01-09 15:04:24.842932418 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="$CXXFLAGS -O3"
+-CPPFLAGS="$CPPFLAGS -O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+ 
+ if test -d "../nx-X11/exports/include" ; then
diff --git a/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch b/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch
new file mode 100644
index 000000000000..87d73c5a8d37
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch
@@ -0,0 +1,11 @@
+--- nx-X11/lib/X11/Imakefile.orig	2015-04-24 15:24:36.171666957 +0200
++++ nx-X11/lib/X11/Imakefile	2015-04-24 15:25:17.516179627 +0200
+@@ -107,7 +107,7 @@
+ EXCLUDE_SYMBOL = -Wl,--exclude-symbol,XdmcpWrap:_XdmcpWrapperToOddParity
+ #endif
+ 
+-REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) $(NX_REQUIREDLIBS)
++REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) $(NX_REQUIREDLIBS) -ldl
+ 
+ #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
+ XBSDLIB = /**/
diff --git a/net-misc/nx/metadata.xml b/net-misc/nx/metadata.xml
new file mode 100644
index 000000000000..1b5df39c0204
--- /dev/null
+++ b/net-misc/nx/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+<longdescription>Special versions of the X11 libraries to support NX compression</longdescription>
+</pkgmetadata>
diff --git a/net-misc/nx/nx-3.5.0.30.ebuild b/net-misc/nx/nx-3.5.0.30.ebuild
new file mode 100644
index 000000000000..36d736fb7a3b
--- /dev/null
+++ b/net-misc/nx/nx-3.5.0.30.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils multilib readme.gentoo
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
+
+SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="elibc_glibc"
+
+RDEPEND="media-libs/freetype:2
+	>=media-libs/libpng-1.2.8:*
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:*"
+
+DEPEND="${RDEPEND}
+		x11-libs/libfontenc
+		x11-misc/gccmakedep
+		x11-misc/imake
+		x11-proto/inputproto"
+
+S=${WORKDIR}/nx-libs-${PV}
+
+DOC_CONTENTS="If you get problems with rendering gtk+ apps, enable the xlib-xcb
+useflag on x11-libs/cairo."
+
+src_prepare() {
+	# For nxcl/qtnx
+	cd "${S}"/nxproxy
+	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
+
+	cd "${S}"
+	# -fPIC
+	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
+	# Drop force -O3, set AR/RANLIB
+	epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
+	# Fix libX11 underlinking, #546868
+	epatch "${FILESDIR}"/${P}-fix_X11_underlinking.patch
+
+	# run autoreconf in all neeed folders
+	for i in nxcomp nxcompext nxcompshad nxproxy; do
+		cd "${S}"/${i}
+		eautoreconf ${i}
+		cd "${S}"
+	done
+
+	# From xorg-x11-6.9.0-r3.ebuild
+	cd "${S}/nx-X11"
+	HOSTCONF="config/cf/host.def"
+	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	# Respect LDFLAGS
+	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+}
+
+src_configure() {
+	cd "${S}"/nxproxy
+	econf
+}
+
+src_compile() {
+	cd "${S}/nx-X11"
+	FAST=1 emake World WORLDOPTS="" MAKE="make" \
+		AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+	cd "${S}"/nxproxy
+	emake
+}
+
+src_install() {
+	NX_ROOT=/usr/$(get_libdir)/NX
+
+	for x in nxagent nxauth nxproxy; do
+		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
+			die " $x wrapper creation failed"
+	done
+
+	into ${NX_ROOT}
+	dobin "${S}"/nx-X11/programs/Xserver/nxagent
+	dobin "${S}"/nx-X11/programs/nxauth/nxauth
+	dobin "${S}"/nxproxy/nxproxy
+
+	for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
+	do
+		dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
+	done
+
+	dolib.so "${S}"/nxcomp/libXcomp.so*
+	dolib.so "${S}"/nxcompext/libXcompext.so*
+	dolib.so "${S}"/nxcompshad/libXcompshad.so*
+
+	insinto /etc/nxagent
+	newins etc/keystrokes.cfg keystroke.cfg
+	doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
+
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/nx/nx-3.5.0.32.ebuild b/net-misc/nx/nx-3.5.0.32.ebuild
new file mode 100644
index 000000000000..d992d5fb33da
--- /dev/null
+++ b/net-misc/nx/nx-3.5.0.32.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils multilib readme.gentoo
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
+
+SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="media-libs/freetype:2
+	>=media-libs/libpng-1.2.8:*
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:*"
+
+DEPEND="${RDEPEND}
+		x11-libs/libfontenc
+		x11-misc/gccmakedep
+		x11-misc/imake
+		x11-proto/inputproto"
+
+S=${WORKDIR}/nx-libs-${PV}
+
+DOC_CONTENTS="If you get problems with rendering gtk+ apps, enable the xlib-xcb
+useflag on x11-libs/cairo."
+
+src_prepare() {
+	# For nxcl/qtnx
+	cd "${S}"/nxproxy
+	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
+
+	cd "${S}"
+	# -fPIC
+	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
+	# Drop force -O3, set AR/RANLIB
+	epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
+
+	# run autoreconf in all neeed folders
+	for i in nxcomp nxcompext nxcompshad nxproxy; do
+		cd "${S}"/${i}
+		eautoreconf ${i}
+		cd "${S}"
+	done
+
+	# From xorg-x11-6.9.0-r3.ebuild
+	cd "${S}/nx-X11"
+	HOSTCONF="config/cf/host.def"
+	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	# Respect LDFLAGS
+	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+}
+
+src_configure() {
+	cd "${S}"/nxproxy
+	econf
+}
+
+src_compile() {
+	cd "${S}/nx-X11"
+	FAST=1 emake World WORLDOPTS="" MAKE="make" \
+		AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+	cd "${S}"/nxproxy
+	emake
+}
+
+src_install() {
+	NX_ROOT=/usr/$(get_libdir)/NX
+
+	for x in nxagent nxauth nxproxy; do
+		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
+			die " $x wrapper creation failed"
+	done
+
+	into ${NX_ROOT}
+	dobin "${S}"/nx-X11/programs/Xserver/nxagent
+	dobin "${S}"/nx-X11/programs/nxauth/nxauth
+	dobin "${S}"/nxproxy/nxproxy
+
+	for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
+	do
+		dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
+	done
+
+	dolib.so "${S}"/nxcomp/libXcomp.so*
+	dolib.so "${S}"/nxcompext/libXcompext.so*
+	dolib.so "${S}"/nxcompshad/libXcompshad.so*
+
+	insinto /etc/nxagent
+	newins etc/keystrokes.cfg keystroke.cfg
+	doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
+
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest
new file mode 100644
index 000000000000..42137f21f3b2
--- /dev/null
+++ b/net-misc/nxplayer/Manifest
@@ -0,0 +1,12 @@
+DIST nomachine-enterprise-client_5.0.63_3_i686.tar.gz 28334138 SHA256 02566c89c4af790f93ea8b19598948b5fa2cd99a88fa1f5980bb3b968ebc1b83 SHA512 27cde31a8805862617e898bf27eec99c9d848d455aea5e021e99da5cf920baf45d487bbeef75cd98142c6e65fa299ce6fc8c40ce8370f69698db6e0d6f00d937 WHIRLPOOL fce14d52e83322e3ee0199bfb8e7d985ddf9ba3221f757e54ec8b5f4fdac9c67fd223e6c445d54567ce530ca5d8227fe809ed02b950f76bb566e17926a25d846
+DIST nomachine-enterprise-client_5.0.63_3_x86_64.tar.gz 29300554 SHA256 c91965df38ae370142b17bdcd73fae87e88d88e5310e7dea3c89006cb8fa1938 SHA512 aa9e37b4a9b52e534289f4879be2c98ee7db6aa0379270a1a757bfc6bc3550a258987c365329732f162ebd26d0b442649756c33426e28bb2c84c041d88f3eea0 WHIRLPOOL df50c1f6aa0e89612a956289db686b358bfcdb73fe835f5c73345166448fcecdfe23958384ba9da79a05bac4ec92743e4bdaf86b819bf869334eb5551dae8144
+DIST nomachine-enterprise-client_5.1.24_1_i686.tar.gz 28378074 SHA256 04a38fa2b841b05357523eb10cd551e53d04b83df7087519b5d3c0ef831fcf96 SHA512 9ac3ee63a2c9dd7d6a110924a92718c7a9738e5bfbc7a3a30b2060a64c5eaeab3597e0d0532890e0e463869e47781528b6c7006d96634bf819cdd2415e35015c WHIRLPOOL 26152988ce59e9814b2feaf287aa5c2a69789d31091d680c3baf48f45f9e8d9fcd56af3e692693be367ccbdb47ab0c9420936396b255a783cacbb451545fabff
+DIST nomachine-enterprise-client_5.1.24_1_x86_64.tar.gz 29381273 SHA256 63700184c5650c2dd8ed0162102c451e16ba8e8726070c36d53050f6bf9c3641 SHA512 18bbba7d729fd1ade04ad2d4812bd4b1bbe806036b44cbb8f9648e8bfa32008d72bc85d380fe1fc352ce92de50104fc43da030d56349502ac46a7ed6fa6afc42 WHIRLPOOL 7315cbb5009da8b35c435b6049c3041e41ac8d036522f3001ece7d3c92be732678d8b19948215840948ecfe4458b928bcbd3a6d1f07b716cded09108a3ee09b4
+DIST nomachine-enterprise-client_5.1.7_6_i686.tar.gz 46115 SHA256 7d9c3cbb96315a63b6a2e5a317d301ef0ceddff21ddc229f642de73b872cba3c SHA512 97cc898063a4c27ec0eb6924fa0b778b4a7844b7bb9884477fc42c7407ada16182b2e48e0d45c5e21405afaf092a7fd9934446e7d15d63b35ff59e476d90c79e WHIRLPOOL 0ef513f412da0f30f0d3d150d615ec1278b26fc82faee09532a8816584abdb677c5322bf67e2f58eca2338043838e58d77c155671ce7e62088897d685fd73b06
+DIST nomachine-enterprise-client_5.1.7_6_x86_64.tar.gz 29373847 SHA256 7a2d43bae7bfdc6e47980f827cfe764bb767601520fcd6a5e78c40b7aa4ab4cd SHA512 a297fae2a81ce0add4042caba05e2f5d0779f312a91ad9bc71e6498363fad2ec45f40a638b9b6dc1daea986f30dd6bff27896b74ae7ebf3a4cb37abeda126b2e WHIRLPOOL b5a72d7905a7431855f188b718f1ad5da7be3c350f6979bc50df609cc8458315ec5f2cac65f037444d90f20f50a2daaa0e0062a53295e5cf6bee707181b3f231
+EBUILD nxplayer-5.0.63.3.ebuild 1074 SHA256 6bcbdcfef79eeefd8b1730ebb9024624de3e817dff252937d237743aff21e823 SHA512 c5a9cb9f6d12b8d9e944402fb69d9678581191d13a19d5730fc4c467a8e09c8f05f7b61f475e2694c2d92752e3ef33d9e94907ab491079fc9904dcbb416c6f43 WHIRLPOOL bfb7a28fb87cfc6d87c886c03fe4c483e4ceb644eabfda91e307e5d4bed59ae1c088fa3459612dae42c7c401b1219952d9825dd4b19fc2e66604b52b8ef3ca49
+EBUILD nxplayer-5.1.24.1.ebuild 1074 SHA256 f7a3b39a995808f21ccaa1d9c081faee8e8a62f6ec82eff4a71095265e2bd100 SHA512 086d01ce301b2fc2152bc6f0e4b429bab7858457a5f8b51f6278a22d0ed33be458e1cd02f617b9429ab08bcaec46eaff664f6647e927b2992892aee6901d6c1b WHIRLPOOL 4796b9f90eb4b1f9311451f5b01c72fc263ee990d2ff157b17558edd8e793349b13a588ca240bbfd0e8b9741dde922ed715784c259b6717f4652ec7fd7e0b0f5
+EBUILD nxplayer-5.1.7.6.ebuild 1074 SHA256 f7a3b39a995808f21ccaa1d9c081faee8e8a62f6ec82eff4a71095265e2bd100 SHA512 086d01ce301b2fc2152bc6f0e4b429bab7858457a5f8b51f6278a22d0ed33be458e1cd02f617b9429ab08bcaec46eaff664f6647e927b2992892aee6901d6c1b WHIRLPOOL 4796b9f90eb4b1f9311451f5b01c72fc263ee990d2ff157b17558edd8e793349b13a588ca240bbfd0e8b9741dde922ed715784c259b6717f4652ec7fd7e0b0f5
+MISC ChangeLog 3812 SHA256 a3778cf4bef72c31fe13c31d55ad5459be795104fe9701f4573a0b6a1017a122 SHA512 7eedb275537af9235dba7c3aee023eae27da340ba0e6fb011620dfa755211eeb2db02e556b7970b226dceb070bde1b9517f9969a3aa9f2b6ddbbd3112301d507 WHIRLPOOL b645653563f650050cd6fa46db1ce64cac7c80adf532437eb0a996ae0c78597c1a86be8ef6d64ef39433222cc3c309d01cc36b8c1e749954ba82c6c2292653a3
+MISC ChangeLog-2015 986 SHA256 bdf5e5ed649e41a80b6a2ddd5fc20246cad1532d0176eb20705e717db633ff02 SHA512 db97280f43d0b7142938780a2b538320323ef30d2b6de31d1c9926430ec014daa85add16358c4eb9cc59bf2801281e52c5d9c9626c8fa31236ac634c2d1824ee WHIRLPOOL 19c21c688e5076ac78dfcac14f08ad2ad8844da6ba4701696b36a25ec764767a1465868cd3dafd5b3d0167dc6b7775a23afeebe60b24c57ac2fbd5a341120545
+MISC metadata.xml 751 SHA256 4feb77dcd231d94c21ba9ad1dec8afbc5e2a10e0d22c2088b6f90d5430d09b1c SHA512 c18127e49c950729e5ee665f10c700d2bc08714e6ffcfe7224e6962ed5bb484e824220127148f27ad5f7790fdee80b2d7b7e7703f7ca263917b8b14887bea1a4 WHIRLPOOL f9aa5a006daa15033e54b755ea8687f21653af3ddbcebdcbf2c65a994d60d4cd75f31c04dba134d65b9b6cc3b38d7309c50bf56515104dc68e8532109c5e2c8c
diff --git a/net-misc/nxplayer/metadata.xml b/net-misc/nxplayer/metadata.xml
new file mode 100644
index 000000000000..657a3a3df937
--- /dev/null
+++ b/net-misc/nxplayer/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>Enterprise Client is a free easy-to-use connection interface to allow quick access to your remote host where you have installed one of the NoMachine products. It's available for those who prefer just a standalone client application, rather than the NoMachine server/client app, either because regulatory requirements dictate that thin clients must install \“client-side\” software only, or simply because a scaled-down client app is your personal preference.</longdescription>
+</pkgmetadata>
diff --git a/net-misc/nxplayer/nxplayer-5.0.63.3.ebuild b/net-misc/nxplayer/nxplayer-5.0.63.3.ebuild
new file mode 100644
index 000000000000..96e12b3bd869
--- /dev/null
+++ b/net-misc/nxplayer/nxplayer-5.0.63.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils versionator
+
+MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)"
+
+DESCRIPTION="Client for NoMachine remote servers"
+HOMEPAGE="http://www.nomachine.com"
+SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz )
+	x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )"
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+DEPEND=""
+RDEPEND="dev-libs/glib:2
+	dev-libs/openssl:0"
+
+S=${WORKDIR}/NX/etc/NX/player/packages
+
+QA_PREBUILT="*"
+
+src_install()
+{
+	local NXROOT=/opt/NX
+
+#	dodir /etc/NX/localhost
+#	echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg
+
+	dodir /opt
+	tar xozf nxclient.tar.gz -C "${D}"/opt
+	tar xozf nxplayer.tar.gz -C "${D}"/opt
+
+	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
+}
diff --git a/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild b/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild
new file mode 100644
index 000000000000..0974496982d9
--- /dev/null
+++ b/net-misc/nxplayer/nxplayer-5.1.24.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils versionator
+
+MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)"
+
+DESCRIPTION="Client for NoMachine remote servers"
+HOMEPAGE="http://www.nomachine.com"
+SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz )
+	x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )"
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+DEPEND=""
+RDEPEND="dev-libs/glib:2
+	dev-libs/openssl:0"
+
+S=${WORKDIR}/NX/etc/NX/player/packages
+
+QA_PREBUILT="*"
+
+src_install()
+{
+	local NXROOT=/opt/NX
+
+#	dodir /etc/NX/localhost
+#	echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg
+
+	dodir /opt
+	tar xozf nxclient.tar.gz -C "${D}"/opt
+	tar xozf nxplayer.tar.gz -C "${D}"/opt
+
+	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
+}
diff --git a/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild b/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild
new file mode 100644
index 000000000000..0974496982d9
--- /dev/null
+++ b/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils versionator
+
+MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)"
+
+DESCRIPTION="Client for NoMachine remote servers"
+HOMEPAGE="http://www.nomachine.com"
+SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz )
+	x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )"
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+DEPEND=""
+RDEPEND="dev-libs/glib:2
+	dev-libs/openssl:0"
+
+S=${WORKDIR}/NX/etc/NX/player/packages
+
+QA_PREBUILT="*"
+
+src_install()
+{
+	local NXROOT=/opt/NX
+
+#	dodir /etc/NX/localhost
+#	echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg
+
+	dodir /opt
+	tar xozf nxclient.tar.gz -C "${D}"/opt
+	tar xozf nxplayer.tar.gz -C "${D}"/opt
+
+	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
+}
diff --git a/net-misc/ocsync/Manifest b/net-misc/ocsync/Manifest
new file mode 100644
index 000000000000..9ce3735b9261
--- /dev/null
+++ b/net-misc/ocsync/Manifest
@@ -0,0 +1,5 @@
+DIST ocsync-0.90.4.tar.bz2 4630698 SHA256 f2146577c977dc82a24e0baf84f3970efc3b004f2730669aae3816f48ff15728 SHA512 74bf6b083ae4d4c09e3915d777d916a04ebb19aefb21a5a14a49e2079e02c5c60f1f274aa0cab5c227147883eaf1a5f91b6c0546b818c960cc3575cdcdd93d57 WHIRLPOOL d71ed0a1f6483be579225d577482795e4773d32ed8b5eee441125f0d34cd77a9a72664cb40a6fdc9e4674bb6e6327da0b4bf7fd8cea0d935c21151ba937661a1
+EBUILD ocsync-0.90.4.ebuild 1345 SHA256 b3f6f411cacf25c7bc941dbc1423906b93795bbd51740f27758108866dc31e60 SHA512 2de3aa36abd8b7108bfeac67508b2f757b488e5d7ec9725271f05e49ab9f3364a6c1b59ea605cbafd0ef5fd29eb18ae2f9a8f4d59a480c515a2eefb70d9c3a96 WHIRLPOOL cfe6fd0e114234875fd8222416ff3abe8cb711ca16f73bb47e5c074c39fe4868a23489824e4cdfda1e0dee6432d7f53e47765e35cae50cea34e16f7ecd5c6455
+MISC ChangeLog 2879 SHA256 ec503f473663f273e34b43f9c18c2a597597f98f15a33f97427585a861fd43f0 SHA512 1d16526a2cf998f13ecc30329a2879ce08561697939374e35a150e1d267b7d74559b407013aad2ccb4db2e16a85bcc42c12abed5dc836f4d3a39cd6269fa1099 WHIRLPOOL 743ebbddec8e4f6b5aee5595314d5c575737e6068f55e17b99b72a60851ba0e56ce91154726f46cd27f7be2d2786be299751ae46b8498e414ae5f36251f43ed7
+MISC ChangeLog-2015 945 SHA256 ab0d2bbfcc2110700264aea0a20741c49ad3d731e4514a39792f4781f8ca629e SHA512 1a1dc3f24b8350ced40ba9a10132b163a4e525c286f89b6af918b09a4c68bfc1c400318f0bea14fc7fc0ee242224b1384cc9e3bcb0e0657c433b3a19b0ceecaf WHIRLPOOL 834c7c49a8158e01e510ae5c5d4eb05045c1316775a7c61524eb83d1f871988928a6515e37426d4aa096d0a1e5f6030cb8e6d9c65ceb5ead77217c1bbf225990
+MISC metadata.xml 354 SHA256 c342fa5fe8dd1da0a9fe79f8016aac15c7a9fc8d145af9647346da0e2659180e SHA512 513b19184444fb46882523fc160043d7d530d202aa253f44ace9fc97fad8dda7748083bd992921d93ebd62a12397e69a086932818e317f75fb7dfa478ab3f1ba WHIRLPOOL 23f78df92693c38a084c749999d5a23f7d85748b74f94454e2231171a5748f3a5b38e085b49ca1d969abd61f9a18283ad684cf9e9a735e53d812028536d53a89
diff --git a/net-misc/ocsync/metadata.xml b/net-misc/ocsync/metadata.xml
new file mode 100644
index 000000000000..4ce4054df697
--- /dev/null
+++ b/net-misc/ocsync/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<use>
+		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/ocsync/ocsync-0.90.4.ebuild b/net-misc/ocsync/ocsync-0.90.4.ebuild
new file mode 100644
index 000000000000..37369a8f2f4a
--- /dev/null
+++ b/net-misc/ocsync/ocsync-0.90.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A file synchronizer especially designed for you, the normal user"
+HOMEPAGE="http://csync.org/"
+SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc iconv samba +sftp test"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/iniparser-3.1:0
+	net-libs/neon[ssl]
+	iconv? ( virtual/libiconv )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh )
+	!net-misc/csync
+	!>=net-misc/owncloud-client-1.5.1
+"
+DEPEND="${DEPEND}
+	app-text/asciidoc
+	doc? ( app-doc/doxygen )
+	test? ( dev-libs/check dev-util/cmocka )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s/__FUNCTION__/__func__/" -i \
+		src/csync_log.h src/httpbf/src/httpbf.c \
+		tests/csync_tests/check_csync_log.c || die
+	# proper docdir
+	sed -e "s:/doc/ocsync:/doc/${PF}:" \
+		-i doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use test UNIT_TESTING)
+		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake-utils_use_find_package samba Libsmbclient)
+		$(cmake-utils_use_find_package sftp LibSSH)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}/usr/etc/ocsync" "${D}/etc/"
+	rm -r "${D}/usr/etc/"
+}
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
new file mode 100644
index 000000000000..34e6a78eb9e1
--- /dev/null
+++ b/net-misc/ofono/Manifest
@@ -0,0 +1,14 @@
+AUX ofono.initd 419 SHA256 aa4e5a4fb467da8384145f879808b5aea97d4299fccf7176b0559563e3fb46f9 SHA512 227cfc3d439fd3845c3950e941725f896e1f661f33c935050ca3ee13179abd610f139bc7ac675d46fcd816dc09cf717f2d37c75df139f3f9d9a449b467f7a9bc WHIRLPOOL d14164be6f12fc35238ddb2f81fc08d677dacafb7cfb2330d54d8cdaa71fe0fecee6396eba2870261ec7d454ec033710ea1f3103531e31f127202d94f022d373
+DIST ofono-1.16.tar.xz 854296 SHA256 403b98dadece8bc804c0bd16b96d3db5a3bb0f84af64b3d67924da2d1a754b07 SHA512 21887e1bc3b8af18881f9456f950b97885b567164e28ebe2ab6fc5a3042c439891a20b5034a8fa0c7a78567286ac53c1b8a72122f428fbcf5da8bf139423b913 WHIRLPOOL b13aec1b3548b4959e68bd742efc239a0c6d928be2a0d70352d5bdcca3c551b6d2f4c09dd3eef4afcf3547547c47c488bbd49ebac1e468c2519846de3fe8e81a
+DIST ofono-1.17.tar.xz 860460 SHA256 cbf20f07fd15253c682b23c1786d517f505c3688f7c4ea93da777e1523b89635 SHA512 d945c87b9c759b459926fcc002d4fb6938c5359a0070a0c623da9f98e342fd2bd92a5f4f22a14e4aa66b5cb3467c3d8f09a95d991ced0b774c066a6406d0746c WHIRLPOOL d509c69030c63d62f158c96a2b39764f803b68435bcf9ff561e910b80372a98659b9563976995bc83c6b2aaed9c27ad787357a67717e3c4d1ce06339c246870a
+DIST ofono-1.18.tar.xz 919948 SHA256 53cdbf342913f46bce4827241c60e24255a3d43a94945edf77482ae5b312d51f SHA512 f15d971ea501cda19aa80cb7cb65a008a70eb433931d2b8c80025ab0a424cf35991131d0267e14cb5161eaff46f25dd65fe28a1c5e21cef02c94baa1efa83d6a WHIRLPOOL 9f2c7af752b5cdcd1385b56e8d8b2bd68691a0a75fffafec37bb8e3592e3b8e55488933a3306f3383c5036479ff79485f3654dcc1f76eaa72c14cbae532c0311
+DIST ofono-1.19.tar.xz 924556 SHA256 a0e09bdd8b53b8d2e4b54f1863ecd9aebe4786477a6cbf8f655496e8edb31c81 SHA512 795b55d43e8704f26af7396b3195bb5bdc7b5e0cafe53a14e58975225411880be65aa247a6413774770e521d64997a82afa34627c13753a2b3878b3eda0428a9 WHIRLPOOL 426a513e72696ad1948f4a855c321ad612f6f6022b46aaf2e4cd89fb37f523f91caf126c3443dbdcebd79802e1dd2eaead344a29e08372b1503c659fe3efbe2f
+DIST ofono-1.20.tar.xz 935448 SHA256 5d7ba8f481a7715d013a79f8d6477eb89d8aaae399395d5d008a1317c34a31d5 SHA512 8dc86654ae8a1dc1761c95df5f0de55566db20012e523f11bcd5ab5e1540f4cd9fc7bd6bf1665dcbeb31f2925f9322c21fd05fb00034e408b5d85b265e2fe840 WHIRLPOOL b3bcf225cc4927eb3b81ff8d2de23e5fa6cbdff51a228ffbe58cb0cb0363232c6469a7dcd3a496bcc76a37805e003c26b2ea700f1e8f401b4a9f8935b96bbb60
+EBUILD ofono-1.16.ebuild 1607 SHA256 5ebdd8b58a0ed6c81469d0f5f160613f8bd629f043dbfc3e8cb8e30f7d2cf099 SHA512 e98b1fe329d482fe1dcae0355abd987d1a25ea0b0ea1758bf9ae13dda7eeb59bbf7cc60c5be703a03fecdcda160997d90820162c2c51390fbfe5c8751ec27b0d WHIRLPOOL 6284713f58b44c86e3946db3826107a353788453d16a444e59afdb9fbcde44d78c087eee85f95d5c5c14e462596723136771696ac9bc3e7c2f92fd2dbd46ace2
+EBUILD ofono-1.17.ebuild 1614 SHA256 af0b874b1fd800fb4d45151597bf55116af7771087b8680ebd6800a47ff6a85c SHA512 abb970658c3c01dadf957dd6109cbdfcc7257b1773d84855d8789c73f521f5bc998e7b8ccea9bde98ad8043c14cb480337a3d0588068badf1839af184e5cb637 WHIRLPOOL 6eb395d2e9d7c3b13fa5c2e9197832613d569247c9e4cfd0a4f22b0ddeb07f8b74fc041367877192d524889f99bfc5126fb01679119118d25d88a201434f0cb6
+EBUILD ofono-1.18.ebuild 1673 SHA256 6eacb379eb21a1c84be44f3672ac950679c4176c53f65b771d2043962c715589 SHA512 94870a0cd00e57fe92c92cc21c2d07fc6f144c5aa65874c7013cdc75358500ef0dea37f6456d5b07e35810de97229e472db22523cb4b2d6f0ae10e8d51b64b97 WHIRLPOOL 5d17a95aec6a2415965706b04d2048d8b2a9453f6e29ed60c9935aa545c69452f41b41657c07eae15929ff94bbc0ada2d7fc791002339cc5e87e1789d8d704b5
+EBUILD ofono-1.19.ebuild 1673 SHA256 6eacb379eb21a1c84be44f3672ac950679c4176c53f65b771d2043962c715589 SHA512 94870a0cd00e57fe92c92cc21c2d07fc6f144c5aa65874c7013cdc75358500ef0dea37f6456d5b07e35810de97229e472db22523cb4b2d6f0ae10e8d51b64b97 WHIRLPOOL 5d17a95aec6a2415965706b04d2048d8b2a9453f6e29ed60c9935aa545c69452f41b41657c07eae15929ff94bbc0ada2d7fc791002339cc5e87e1789d8d704b5
+EBUILD ofono-1.20.ebuild 1665 SHA256 c9111dfbeb36ffca257b5599627208d7071d01bc9e3e9c94fa822e5e159e8d16 SHA512 8aea4eada37ea600048ec83e1ddb52ed00aefd1d19661ee65f4e6fc896d73cdbad32888a7295f45aac745d527a21f601966f2fea8a385a8d6a737430ad664bb8 WHIRLPOOL e30f2a4bb044bba69f47dadc44ad69627935df6c899ecbab1907b0009984436eeb177859f7de389774d2f03c776081b77aaa219c2cfe7ee71a6f0b7e61ce2478
+MISC ChangeLog 3357 SHA256 122410ce810ed3cf90776efca9285b5f09612e5f02bbf9e925b47a14e66e451d SHA512 d6ea985b3bda376bbe3cfd9d936b81afd3a219099d2f4b3235146dfcfc0adca1c05891b1eee5f62e4f0a34a77f90ed438bb5ae46ccb55bab7cf21366d6a63c0a WHIRLPOOL 99837f4751e219243ac70e0d7ccc575d17e4294059c5687aad936ec0f0a1f149d39fd18856aaa6c063d62ce967bfb31e3bc7bc1dec9320714adbfd72839f3c43
+MISC ChangeLog-2015 9841 SHA256 ba5e220b05fe4380cfe4925f38896f833f703207b8bb9293b0595ec42d3007af SHA512 d49f8eb8362455d5d4c2c479e6106210ceefaa31608e4fa9dcd62799af62f5edb1237b8710f8102570b7d31ad4b628a91a78e6f21e85c0e963ab8f092d8f1efa WHIRLPOOL 941c00d3e6070f342aa18b6192777b90f247e0b9d496cf08ac2609011a3efd1844a65e43afcf278026f463082cd18f59c0b282595300e14251fc0817b8ef9055
+MISC metadata.xml 951 SHA256 18921a469b84d7cfcfae6c4911ffe51a40a74d417a7e39a7ecf7035c330a6472 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e WHIRLPOOL be1d43fb04d2abdfd3158b7c45b54404f70e575239bbbc398524e734469487b9ebe40bb5cda025a1893511223a3fa7e0d1d24eea2d230e3fd80b99f8fdd33fc3
diff --git a/net-misc/ofono/files/ofono.initd b/net-misc/ofono/files/ofono.initd
new file mode 100644
index 000000000000..7500edc2291f
--- /dev/null
+++ b/net-misc/ofono/files/ofono.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Purpose License v2
+
+depend() {
+   need dbus
+}
+
+start() {
+   ebegin "Starting oFono"
+   start-stop-daemon --start --quiet --exec /usr/sbin/ofonod
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping oFono"
+   start-stop-daemon --stop --quiet --exec /usr/sbin/ofonod
+   eend $?
+}
+
+# vim: set ft=gentoo-init-d ts=3 sw=3 et:
diff --git a/net-misc/ofono/metadata.xml b/net-misc/ofono/metadata.xml
new file mode 100644
index 000000000000..084e8d5b0864
--- /dev/null
+++ b/net-misc/ofono/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+  <use>
+    <flag name="atmodem">ETSI AT modem support.</flag>
+    <flag name="isimodem">Enable PhoNet/ISI modem support.</flag>
+    <flag name="cdmamodem">Enable CDMA modem support.</flag>
+    <flag name="datafiles">Enable install configuration and data files.</flag>
+    <flag name="dundee">Enable BlueTooth DUN deamon support.</flag>
+    <flag name="bluetooth">Enable Bluetooth modem support using <pkg>net-wireless/bluez</pkg>.</flag>
+    <flag name="phonesim">Enable phone Simulator support</flag>
+    <flag name="provision">Enable GPRS provisioning support</flag>
+    <flag name="qmimodem">Enable Qualcomm QMI modem support</flag>
+    <flag name="tools">Enable testing tools</flag>
+  </use>        
+</pkgmetadata>
diff --git a/net-misc/ofono/ofono-1.16.ebuild b/net-misc/ofono/ofono-1.16.ebuild
new file mode 100644
index 000000000000..c774dbf0c999
--- /dev/null
+++ b/net-misc/ofono/ofono-1.16.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="http://ofono.org/"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.4
+	>=dev-libs/glib-2.28
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
+	udev? ( virtual/udev )
+	examples? ( dev-python/dbus-python )
+	tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable udev) \
+		$(use_enable isimodem) \
+		$(use_enable atmodem) \
+		$(use_enable cdmamodem) \
+		$(use_enable datafiles) \
+		$(use_enable dundee) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable provision) \
+		$(use_enable qmimodem) \
+		$(use_enable tools) \
+		$(use_enable examples test) \
+		--disable-maintainer-mode \
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_unitdir)"
+}
+
+src_install() {
+	default
+
+	if use tools ; then
+		dobin tools/auto-enable \
+			tools/huawei-audio \
+			tools/lookup-provider-name \
+			tools/lookup-apn \
+			tools/get-location \
+			tools/qmi \
+			tools/tty-redirector
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use doc && dodoc doc/*.txt
+}
diff --git a/net-misc/ofono/ofono-1.17.ebuild b/net-misc/ofono/ofono-1.17.ebuild
new file mode 100644
index 000000000000..a44a2b1ae43e
--- /dev/null
+++ b/net-misc/ofono/ofono-1.17.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="http://ofono.org/"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.4
+	>=dev-libs/glib-2.28
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
+	udev? ( virtual/udev )
+	examples? ( dev-python/dbus-python )
+	tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable udev) \
+		$(use_enable isimodem) \
+		$(use_enable atmodem) \
+		$(use_enable cdmamodem) \
+		$(use_enable datafiles) \
+		$(use_enable dundee) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable provision) \
+		$(use_enable qmimodem) \
+		$(use_enable tools) \
+		$(use_enable examples test) \
+		--disable-maintainer-mode \
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_unitdir)"
+}
+
+src_install() {
+	default
+
+	if use tools ; then
+		dobin tools/auto-enable \
+			tools/huawei-audio \
+			tools/lookup-provider-name \
+			tools/lookup-apn \
+			tools/get-location \
+			tools/qmi \
+			tools/tty-redirector
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use doc && dodoc doc/*.txt
+}
diff --git a/net-misc/ofono/ofono-1.18.ebuild b/net-misc/ofono/ofono-1.18.ebuild
new file mode 100644
index 000000000000..2eef75dcb1ab
--- /dev/null
+++ b/net-misc/ofono/ofono-1.18.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="http://ofono.org/"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev upower"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.4
+	>=dev-libs/glib-2.32
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
+	udev? ( virtual/udev )
+	examples? ( dev-python/dbus-python )
+	tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable udev) \
+		$(use_enable isimodem) \
+		$(use_enable atmodem) \
+		$(use_enable cdmamodem) \
+		$(use_enable datafiles) \
+		$(use_enable dundee) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable provision) \
+		$(use_enable qmimodem) \
+		$(use_enable tools) \
+		$(use_enable examples test) \
+		$(use_enable upower) \
+		--disable-maintainer-mode \
+		--disable-rilmodem
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+
+	if use tools ; then
+		dobin tools/auto-enable \
+			tools/huawei-audio \
+			tools/lookup-provider-name \
+			tools/lookup-apn \
+			tools/get-location \
+			tools/qmi \
+			tools/tty-redirector
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use doc && dodoc doc/*.txt
+}
diff --git a/net-misc/ofono/ofono-1.19.ebuild b/net-misc/ofono/ofono-1.19.ebuild
new file mode 100644
index 000000000000..2eef75dcb1ab
--- /dev/null
+++ b/net-misc/ofono/ofono-1.19.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="http://ofono.org/"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev upower"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.4
+	>=dev-libs/glib-2.32
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
+	udev? ( virtual/udev )
+	examples? ( dev-python/dbus-python )
+	tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable udev) \
+		$(use_enable isimodem) \
+		$(use_enable atmodem) \
+		$(use_enable cdmamodem) \
+		$(use_enable datafiles) \
+		$(use_enable dundee) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable provision) \
+		$(use_enable qmimodem) \
+		$(use_enable tools) \
+		$(use_enable examples test) \
+		$(use_enable upower) \
+		--disable-maintainer-mode \
+		--disable-rilmodem
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+
+	if use tools ; then
+		dobin tools/auto-enable \
+			tools/huawei-audio \
+			tools/lookup-provider-name \
+			tools/lookup-apn \
+			tools/get-location \
+			tools/qmi \
+			tools/tty-redirector
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use doc && dodoc doc/*.txt
+}
diff --git a/net-misc/ofono/ofono-1.20.ebuild b/net-misc/ofono/ofono-1.20.ebuild
new file mode 100644
index 000000000000..8341f7b8b2cc
--- /dev/null
+++ b/net-misc/ofono/ofono-1.20.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="http://ofono.org/"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev upower"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.4
+	>=dev-libs/glib-2.32
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
+	udev? ( virtual/udev )
+	examples? ( dev-python/dbus-python )
+	tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable udev) \
+		$(use_enable isimodem) \
+		$(use_enable atmodem) \
+		$(use_enable cdmamodem) \
+		$(use_enable datafiles) \
+		$(use_enable dundee) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable provision) \
+		$(use_enable qmimodem) \
+		$(use_enable tools) \
+		$(use_enable examples test) \
+		$(use_enable upower) \
+		--disable-maintainer-mode \
+		--disable-rilmodem
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+
+	if use tools ; then
+		dobin tools/auto-enable \
+			tools/huawei-audio \
+			tools/lookup-provider-name \
+			tools/lookup-apn \
+			tools/get-location \
+			tools/tty-redirector
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use doc && dodoc doc/*.txt
+}
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
new file mode 100644
index 000000000000..24065340bb98
--- /dev/null
+++ b/net-misc/oidentd/Manifest
@@ -0,0 +1,18 @@
+AUX oidentd-2.0.7-confd 67 SHA256 acdd88d817474e392e8f07b0f00579007a71340d00a5520d7a2661ecf4a7e5f4 SHA512 d3aba90970df7cf9869934380267b3f5c687a86ad532fa854728e2f7506551254ae4bda0a1edece24d26c4da6c29d7e9c44923a29fd67016b88a7766c6e6a050 WHIRLPOOL ce8a6c4b1893d83313c16070461fcc50ea39970d7bace72df961bb655734f78e3861fe4abd2389b8cf09e813e6ac0ac4b8d45709dd47820c20cf24da77511ffe
+AUX oidentd-2.0.7-init 837 SHA256 695b4b3388549552e56ffe9d0b1b77c244700726e67fb35b5401ceaf7018e1a3 SHA512 ebd072d86fa879017bb43f8f9cdd0ea563f337b558552ebdc27c980376889dfd22f2d6bdeb424ca3e2dbe62a78ceb80208ee26398aed0c38c4f973646d6d80d3 WHIRLPOOL 6b4b8dc8d80bd739ae2a0cfd62a3df9375b26e88afed2ff71e9a26dc68d54d24d3347ee0ffd494766735ec0111d92ccacd52876619d88a0529ebdce640ed3a50
+AUX oidentd-2.0.8-bind-to-ipv6-too.patch 557 SHA256 96b135b30ca3ef810b9fa08e140ad5be21e0a05f559c726d7dcf284868fa95ae SHA512 a643d487efd819219dfd85c27d710a8dd41a1583260b662690c7ffb411e44a96eeeefb1a513f892dfba7fd82bea8be1013a8ef41a18651ee2a137789d6c108e5 WHIRLPOOL 4dcebb2ef55ab4ebbc2ec1950995c5d8934ffc69be9521e95f179ac298f8d12082f79cb041954eab429b2cea2f103be6bdd68523cbae64cc86a39e77c79075a4
+AUX oidentd-2.0.8-gcc5.patch 855 SHA256 80fbccaef5372e7169b7cd0917bf1440a9f8962c04204239a1d126f24a01fff7 SHA512 3bb470bc8096096d6cebcdeef142cf9f05076f33371c8a8ce4f2aa192758441392ccce090494979345e590d159422b7ab5e435a453081fffd27cf9a887549acf WHIRLPOOL 731f09fdec031fe72ac7f7469a1db98e8afcfabfe17182e09a5c3bdc385eaf984c66252412d88ab2d7efe4be7b2f3c978ef1608dbad8785ed04f0f87c7619fc9
+AUX oidentd-2.0.8-log-conntrack-fails.patch 1686 SHA256 f6f42c7bac9846e3a72d6817c4d2982db54d80c0468061893d96f972a481d84d SHA512 210dcf4ee04d61ee07f7a38cb5b943343526677242d2e284929a7ae83e6940ad2806eef6271f2eb8fc13ee5ad2f2366aff4d4ad3ba9c244277f41bcf8daca9a0 WHIRLPOOL d55e47f772ab6fb00486188d669bbb401a7566f8ce6081dfae27a51797c9acf2d509e76b56fdc90a18ee2327578bfe8c6ca677e42ecb2ea53561daa41b93e8dc
+AUX oidentd-2.0.8-masquerading.patch 1288 SHA256 a256909b3a608ff224f8eea413313990778f70fc9f7d269c5939e51b9ec2a082 SHA512 453787b4ef00a7578b65e04cc4fa36bc233d737294171e807b6d9711cbd2be9cd4fc461863ea8ddbd39901433a007d32403252e701604d13ddbb442a363439fc WHIRLPOOL c8d34baa22ecf6a196424323c44fa3a6c49eb2ab0b1441af8e07d8de726ea4d31765ae0d9738c611da4cf4ec1162f35ef67b0a78c28d2df20331aba35d092170
+AUX oidentd-2.0.8-no-conntrack-masquerading.patch 1141 SHA256 3748e32b23299658d8eedd5dcd96d576fb0c7638c43cf51fc8e0c1edb0fab70d SHA512 8d0c44f16cab0331c52362671790360f47de7568b81622971a33865464a85342c956447164b516ed0fd90bbef72eab2bdec5fff0b0b7e23d554abaf109329b3b WHIRLPOOL 0a17638e336625063f6af0abdf535e28960a364a184031f313f0d622af26005fba7182df804a3926a63857265219e13193dc9029ecdd4c419204175eafdf1ee1
+AUX oidentd.conf 298 SHA256 fe91a7af10e55c90a8468ba529012f8359507353035d72c669b535c8b84eb9dc SHA512 a05de9b08f87a200309c39d3bc3aba0aa2c6461c3c43a9d851299e6083f0ca9a362409b0db93ca069c7a50d3a14169a308aea51b3d42ebf0180a4b4c99bf5126 WHIRLPOOL 7a46a30d087775075017914dcf0fc25d49e289d839e4828c668179a31cde6694f945c9a0d996e5137a08e7964fafa74cdae00a916f5bbe51e017aa2a5ddd84d5
+AUX oidentd.service 186 SHA256 3b57903f1a4198cb6590b50a2023b0ead54a9fcac9de9b63fd94ac9ffc9464e2 SHA512 dd89471b232c0cce1113ea8550a3cb0ad55bd0791b7c916ea13b533051fe10271cd8e41aff13bf4071b507251ab6b14de20c8b63a525074a728f007fe0d647e8 WHIRLPOOL 8bcb761ca8898cb2bf79df79a163dd2e05705f1f0acdbfa7c6c75b5dea9a9bbb598ea98ea2919f169c535c70036e85d81aabd9df7b016139b261c64c2666e59a
+AUX oidentd.socket 142 SHA256 520dcb6b208d39206bc74cc8f54c97a9c814c847239dc7097071791343e0d28f SHA512 151f846a889968084f4b6900e42806ea2c16f184fe65fe67b77bd9176318faeb3db3f7a43d6eec8d70bca7c2919952ad9059301ba396ec56a9da1ab0371b44d4 WHIRLPOOL ad5aac4cc0ce4a97dde0f16db66355bc5a879a304efd57918959bd8b8d16383cd25405ca001b49353432bd89339c60d5670052c4d6798bfbfc20a62e2f751941
+AUX oidentd_at.service 179 SHA256 fc1b73fa67aa149a008c73aec4b90d47e8cd6147fcfe336bb6bb4e2c992cdd04 SHA512 513e49d74c25ea0392a4b9541df0b275fa497bf2cb1d55a3c1c31a9cfe207ec2de69e76d7813531c90b5b378d1dd55b3ee21371ad281ff5f2a89ab70f59a25b4 WHIRLPOOL 285a0ca3dae15dd0c8808ef67525c6b2384f5ce9a369f079ba1d1de7ddc6e857b358bf619be23b2d4c94f8ba70a14957df6db366237519e7cca4720fe6b16533
+AUX oidentd_masq.conf 429 SHA256 16b94239221e63abdf38ce59e4b9231622f81bfeca643c8ac8be3a57b01ced28 SHA512 72e48e1923adf594d53ae325b0ba5a6ab406ac934985a699f6f3b2a88010f312ddac279a752bba6b237aa87451348a0933ee4166aa267a0b08919c37eaaac40a WHIRLPOOL 3fbd8c0f1e18fcd64c635081f0cef1b25ee02f107e241db14954506f66095c440e4384b3da88bc22dc8cdc87c27e8126f9769f24b7cc383bac5be2dac953e72b
+DIST oidentd-2.0.8.tar.gz 212354 SHA256 a54cbed187281f8d5a301d1d8fd5cb0f30bfb13a5a8e9ab752ace76c1010fb6f SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288 WHIRLPOOL ac36130273ec6a4fc7f715a9518f99445c3f4af50b03e647846b152800940fd8f83222b78b7a12385a0c722a8d89b6bdbc557812d0b64e3253aa3231f95215cb
+EBUILD oidentd-2.0.8-r5.ebuild 1203 SHA256 f658cd8e6c78a332ebc2dc0ebdcca2fa194078dc1e23bfae68a08aa423c8d2d4 SHA512 53a4113831796de47144d3bcf0c26528a2567ee3b3473cb53d455f0b51bfeacc2b18ee7d1a5b0d9d71fcc91fd88fe0101f332193a1fab6bdf95bc0509a93ca17 WHIRLPOOL fc1188a06e08d18b09f1839a3d933e0019d7aef11882def4d53fdd218baa7af943e6489d1b7e4c9270e5b24abd982f3679309eadcf5280e6af260d7321c5e84d
+EBUILD oidentd-2.0.8-r6.ebuild 1453 SHA256 3e19d709210e730dd1fff9e3d7fd57233e9d566c2e441252f71d6b8c71c896c2 SHA512 be493a35547cd8fdee20fd1de217e0a26594aa81a8b0e6f20b80d1827d20122be137e9e1ca45925890d3d89de408d39b6b532a446b6dae4dad043f1b8cc549e3 WHIRLPOOL e7b6d7d81debd4d7873bcda4458ca2658dabe624fe8dac3d096c7aea992c545c5c33d2d26952edc5ee962a90547c2267c5d83bb7c921faf1a84e0f844b63eab4
+MISC ChangeLog 2900 SHA256 1f14d92b40d60b5f3b1017accf60af4ad3c88a2f0b50cef8b1a30b5d62ff0654 SHA512 c26c0039d7a2d3724342da8d5540cfa770e51ddeec1a7ea389eb2e81aed2e531714aeea1212f490f1ae309b3e637bcd4feb96bdbfaf2d740ef5d21a2c31b2f09 WHIRLPOOL b44c4bb04305377a8aeb37027db6bb344fdb3f2c9fbe1400d07e47ef392f0910678b2941d98ea4c3713a058a5fb9282b86a1cfdb6f28e6a6db0db0aa0bc30815
+MISC ChangeLog-2015 8297 SHA256 754014d897e04563fe85b4bc5d88270c23cf25842ec6aab471350b4a8057aaf7 SHA512 9be7c930ce0de6a8791757077623f0d46662e38246e2225c5c0d5f5c38211fdb0b4b42f85851a64d19df98628969ddc744ce333f33f424c727ad895b77efcf77 WHIRLPOOL fbe06cb1f0904b252f4bf6534aad0942e2ce33f44e2a9561f229964ef18924318e31c1b62e4213ae656b28bd45eef79ef6a1dcebb5e529a383b07852791e5766
+MISC metadata.xml 531 SHA256 3ea3fbb0bb568a6ab28de047411678621f7e1c9b68e70d8ef7be2362c9b74651 SHA512 f6c11a386380db0197ab45fd6169028063e432e014a18f92b40bc1350cfd1b2dc517b95b55da93f22a58cb5fa00856215f9673d59fd12d27c92075ad93e42215 WHIRLPOOL 17d79e45af14026dd9082cb05b25fe0b889c42b932ff5cd842f0f36e7a7ad20c604e6312f4ca96a4c5dfbb059db98818e7038948c25e6e8cfe76491bae8286f5
diff --git a/net-misc/oidentd/files/oidentd-2.0.7-confd b/net-misc/oidentd/files/oidentd-2.0.7-confd
new file mode 100644
index 000000000000..3116889e67e2
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.7-confd
@@ -0,0 +1,4 @@
+# oidentd start-up options
+USER="nobody"
+GROUP="nobody"
+OPTIONS=""
diff --git a/net-misc/oidentd/files/oidentd-2.0.7-init b/net-misc/oidentd/files/oidentd-2.0.7-init
new file mode 100644
index 000000000000..5b1ae44089d0
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.7-init
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    need net
+}
+
+check_config() {
+	if [ -z "${USER}" ]
+	then
+		eerror "Please set \$USER in /etc/conf.d/oidentd!"
+		return 1
+	fi
+	if [ -z "${GROUP}" ]
+	then
+		eerror "Please set \$GROUP in /etc/conf.d/oidentd!"
+		return 1
+	fi
+
+	if [ "$(sysctl -n security.bsd.see_other_uids 2>/dev/null)" = "0" ]; then
+		eerror "${SVCNAME} cannot work if the sysctl security.bsd.see_other_uids is 0"
+		return 1
+	fi
+}
+
+
+start() {
+	check_config || return 1
+	ebegin "Starting oidentd"
+	OPTIONS="${OPTIONS} -u ${USER} -g ${GROUP}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/oidentd -- $OPTIONS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping oidentd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/oidentd
+	eend $?
+}
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch b/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch
new file mode 100644
index 000000000000..2652622cdd4f
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch
@@ -0,0 +1,17 @@
+Patch to bind to ipv6 socket as well
+Patch supplied by Fabian Knittel <fabian.knittel@avona.com>
+--- oidentd-2.0.8/src/oidentd_inet_util.c	2006-05-22 02:31:19.000000000 +0200
++++ oidentd-2.0.8.new/src/oidentd_inet_util.c	2010-03-01 20:26:11.000000000 +0100
+@@ -60,6 +60,12 @@
+ #ifdef WANT_IPV6
+ 		case AF_INET6:
+ 			SIN6(ai->ai_addr)->sin6_port = listen_port;
++
++			if (setsockopt(listenfd, IPPROTO_IPV6, IPV6_V6ONLY, &one,
++							sizeof(one)) != 0) {
++				debug("setsockopt IPV6_V6ONLY: %s", strerror(errno));
++				return (-1);
++			}
+ 			break;
+ #endif
+ 
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
new file mode 100644
index 000000000000..a401a65d9bc6
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
@@ -0,0 +1,25 @@
+Description: Fix a failure to build with gcc5.
+Bug: http://bugs.debian.org/778035
+
+--- a/src/oidentd_util.c	2015-07-03 05:56:24.000000000 -0400
++++ b/src/oidentd_util.c	2015-07-03 05:56:47.671378000 -0400
+@@ -75,7 +75,7 @@
+ ** PRNG functions on systems whose libraries provide them.)
+ */
+ 
+-inline int randval(int i) {
++extern __attribute__ ((gnu_inline)) int randval(int i) {
+ 	/* Per _Numerical Recipes in C_: */
+ 	return ((double) i * rand() / (RAND_MAX+1.0));
+ }
+--- a/src/oidentd_util.h	2015-07-03 05:56:32.000000000 -0400
++++ b/src/oidentd_util.h	2015-07-03 05:56:53.835378000 -0400
+@@ -58,7 +58,7 @@
+ int find_group(const char *temp_group, gid_t *gid);
+ 
+ int random_seed(void);
+-inline int randval(int i);
++extern __attribute__ ((gnu_inline)) int randval(int i);
+ 
+ #ifndef HAVE_SNPRINTF
+ 	int snprintf(char *str, size_t n, char const *fmt, ...);
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch b/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch
new file mode 100644
index 000000000000..d29479ec0284
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch
@@ -0,0 +1,52 @@
+From 612f1d85dd59fc39b124392df38586769ebc8add Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 11 Mar 2016 10:00:59 +0100
+Subject: [PATCH] Log Linux core_init failures as normal error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Opening Linux conntracking table file failure for different reason than
+missing the file is fatal for deamon initizalization. But the failure
+was logged inly in debugging build.
+
+This patch makes the fatal error visible in normal log.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1316308
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ src/kernel/linux.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/kernel/linux.c b/src/kernel/linux.c
+index 8bf265f..9103dbf 100644
+--- a/src/kernel/linux.c
++++ b/src/kernel/linux.c
+@@ -73,21 +73,21 @@ bool core_init(void) {
+ 	masq_fp = fopen(MASQFILE, "r");
+ 	if (masq_fp == NULL) {
+ 		if (errno != ENOENT) {
+-			debug("fopen: %s: %s", MASQFILE, strerror(errno));
++			o_log(NORMAL, "fopen: %s: %s", MASQFILE, strerror(errno));
+ 			return false;
+ 		}
+ 
+ 		masq_fp = fopen(CONNTRACK, "r");
+ 		if (masq_fp == NULL) {
+ 			if (errno != ENOENT) {
+-				debug("fopen: %s: %s", CONNTRACK, strerror(errno));
++				o_log(NORMAL, "fopen: %s: %s", CONNTRACK, strerror(errno));
+ 				return false;
+ 			}
+ 
+ 			masq_fp = fopen(NFCONNTRACK, "r");
+ 			if (masq_fp == NULL) {
+ 				if (errno != ENOENT) {
+-					debug("fopen: %s: %s", NFCONNTRACK, strerror(errno));
++					o_log(NORMAL, "fopen: %s: %s", NFCONNTRACK, strerror(errno));
+ 					return false;
+ 				}
+ 				masq_fp = fopen("/dev/null", "r");
+-- 
+2.5.0
+
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-masquerading.patch b/net-misc/oidentd/files/oidentd-2.0.8-masquerading.patch
new file mode 100644
index 000000000000..191e9b95e64d
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.8-masquerading.patch
@@ -0,0 +1,43 @@
+--- oidentd.orig/src/kernel/linux.c	2006-05-22 06:58:53.000000000 +0300
++++ oidentd-2.0.8/src/kernel/linux.c	2007-07-11 21:28:56.000000000 +0300
+@@ -48,6 +48,7 @@
+ #define CFILE6		"/proc/net/tcp6"
+ #define MASQFILE	"/proc/net/ip_masquerade"
+ #define CONNTRACK	"/proc/net/ip_conntrack"
++#define NFCONNTRACK	"/proc/net/nf_conntrack"
+ 
+ static int netlink_sock;
+ extern struct sockaddr_storage proxy;
+@@ -82,7 +83,15 @@
+ 				debug("fopen: %s: %s", CONNTRACK, strerror(errno));
+ 				return false;
+ 			}
+-			masq_fp = fopen("/dev/null", "r");
++
++			masq_fp = fopen(NFCONNTRACK, "r");
++			if (masq_fp == NULL) {
++				if (errno != ENOENT) {
++					debug("fopen: %s: %s", NFCONNTRACK, strerror(errno));
++					return false;
++				}
++				masq_fp = fopen("/dev/null", "r");
++			}
+ 		}
+ 
+ 		netfilter = true;
+@@ -367,6 +376,15 @@
+ 				&nport_temp, &mport_temp);
+ 			}
+ 
++			if (ret != 21) {
++				ret = sscanf(buf,
++					"%*15s %*d %15s %*d %*d ESTABLISHED src=%d.%d.%d.%d dst=%d.%d.%d.%d sport=%d dport=%d packets=%*d bytes=%*d src=%d.%d.%d.%d dst=%d.%d.%d.%d sport=%d dport=%d",
++				proto, &l1, &l2, &l3, &l4, &r1, &r2, &r3, &r4,
++				&masq_lport_temp, &masq_fport_temp,
++				&nl1, &nl2, &nl3, &nl4, &nr1, &nr2, &nr3, &nr4,
++				&nport_temp, &mport_temp);
++			}
++
+ 			if (ret != 21)
+ 				continue;
+ 
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch b/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch
new file mode 100644
index 000000000000..92ef02523160
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch
@@ -0,0 +1,41 @@
+From 20a63ad8a90c36397cceedd34887298890dbafa3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 11 Mar 2016 10:38:10 +0100
+Subject: [PATCH] Linux: Do not open conntracking table if masquerading is not
+ enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The contracking table was always opened. This is unnecessary because
+the table is used only when masquerading feature is requested on run
+time.
+
+This patch skips opening the conntracking table on Linux if
+masquerading is not requested.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1316308
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ src/kernel/linux.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/kernel/linux.c b/src/kernel/linux.c
+index 9103dbf..859f554 100644
+--- a/src/kernel/linux.c
++++ b/src/kernel/linux.c
+@@ -70,6 +70,11 @@ bool netfilter;
+ */
+ bool core_init(void) {
+ #ifdef MASQ_SUPPORT
++	if (!opt_enabled(MASQ)) {
++	    masq_fp = NULL;
++	    return true;
++	}
++
+ 	masq_fp = fopen(MASQFILE, "r");
+ 	if (masq_fp == NULL) {
+ 		if (errno != ENOENT) {
+-- 
+2.5.0
+
diff --git a/net-misc/oidentd/files/oidentd.conf b/net-misc/oidentd/files/oidentd.conf
new file mode 100644
index 000000000000..03b28d827802
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd.conf
@@ -0,0 +1,22 @@
+# Configuration for oidentd
+# see oidentd.conf(5)
+# 
+default {
+	default {
+		deny spoof
+		deny spoof_all
+		deny spoof_privport
+		allow random
+		allow random_numeric
+		allow numeric
+		deny hide
+	}
+}
+
+# you may want to hide root connections
+#user "root" {
+#	default {
+#		force reply "UNKNOWN"
+#	}
+#}
+
diff --git a/net-misc/oidentd/files/oidentd.service b/net-misc/oidentd/files/oidentd.service
new file mode 100644
index 000000000000..bf159d855b8d
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=TCP/IP IDENT protocol server
+
+[Service]
+ExecStart=/usr/sbin/oidentd -i -S -u nobody -g nobody
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/oidentd/files/oidentd.socket b/net-misc/oidentd/files/oidentd.socket
new file mode 100644
index 000000000000..63df7036e543
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Ident (RFC 1413) socket
+Conflicts=oidentd.service
+
+[Socket]
+ListenStream=113
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/net-misc/oidentd/files/oidentd_at.service b/net-misc/oidentd/files/oidentd_at.service
new file mode 100644
index 000000000000..ac03a94d6c8a
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd_at.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Ident (RFC 1413) per-connection server
+
+[Service]
+ExecStart=/usr/sbin/oidentd -I -S -u nobody -g nobody
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
diff --git a/net-misc/oidentd/files/oidentd_masq.conf b/net-misc/oidentd/files/oidentd_masq.conf
new file mode 100644
index 000000000000..6811288ff4cf
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd_masq.conf
@@ -0,0 +1,10 @@
+# oident masquarded connections configuration
+
+# use this file if your host is masquarading connections for several
+# hosts and you want to return a reply based on the hostname of
+# the originating machine
+# add "-f" to OIDENT_OPTIONS in /etc/conf.d/oidentd if you want
+# to forward ident requests to the real host
+
+# add hosts in the following format, see oidentd_masq.conf(5) for details:
+# <ip or host>[/mask] <username> <os>
diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
new file mode 100644
index 000000000000..3be9f1f5f13d
--- /dev/null
+++ b/net-misc/oidentd/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>Dessa@gmake.de</email>
+		<name>Robert Förster</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="masquerade">Enable support for masqueraded/NAT connections</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">ojnk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
new file mode 100644
index 000000000000..1a328a04f7ab
--- /dev/null
+++ b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd
+
+DESCRIPTION="Another (RFC1413 compliant) ident daemon"
+HOMEPAGE="http://ojnk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="debug ipv6 masquerade"
+
+PATCHES=(
+	"${FILESDIR}/${P}-masquerading.patch"
+	"${FILESDIR}/${P}-bind-to-ipv6-too.patch"
+	"${FILESDIR}/${P}-gcc5.patch"
+)
+
+src_prepare() {
+	epatch -p1 "${PATCHES[@]}"
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable masquerade masq) \
+		$(use_enable masquerade nat)
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog README TODO NEWS \
+		"${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf
+
+	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
+	newconfd "${FILESDIR}"/${PN}-2.0.7-confd ${PN}
+
+	systemd_newunit "${FILESDIR}"/${PN}_at.service ${PN}@.service
+	systemd_dounit "${FILESDIR}"/${PN}.socket
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files are in /usr/share/doc/${PF}"
+	echo
+}
diff --git a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
new file mode 100644
index 000000000000..5330a191234e
--- /dev/null
+++ b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd
+
+DESCRIPTION="Another (RFC1413 compliant) ident daemon"
+HOMEPAGE="http://ojnk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug ipv6 masquerade selinux"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-oident )"
+
+DOCS=( AUTHORS ChangeLog README TODO NEWS "${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf )
+
+PATCHES=(
+	"${FILESDIR}/${P}-masquerading.patch"
+	"${FILESDIR}/${P}-bind-to-ipv6-too.patch"
+	"${FILESDIR}/${P}-gcc5.patch"
+	"${FILESDIR}/${P}-log-conntrack-fails.patch"
+	"${FILESDIR}/${P}-no-conntrack-masquerading.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~INET_TCP_DIAG"
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable masquerade masq) \
+		$(use_enable masquerade nat)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
+	newconfd "${FILESDIR}"/${PN}-2.0.7-confd ${PN}
+
+	systemd_newunit "${FILESDIR}"/${PN}_at.service ${PN}@.service
+	systemd_dounit "${FILESDIR}"/${PN}.socket
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files are in /usr/share/doc/${PF}"
+	echo
+}
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
new file mode 100644
index 000000000000..799ab0335f88
--- /dev/null
+++ b/net-misc/olsrd/Manifest
@@ -0,0 +1,8 @@
+AUX olsrd 479 SHA256 6cf3645e95183e4352b65487bf99cbc53ec6c31334ad53b80d8d53ebd5d94e0e SHA512 8fab5fc2fda925a346d8f61f5be31bce666a2922c66bfb8c6a48a9943673b5be713cd5a93dd96b3d06d470793dc6136d624efb52ff1c58c8f5e6887336bffe38 WHIRLPOOL 38ac3b15bfa1803882378f9d1da3655685d6cd85a1b27576ab0b8aecd3ab14b14c8e907c5954313d8f9d04e58621f3a805284eb3f57f8433e3f56863aaea387a
+AUX olsrd-0.9.0.2-gtk.patch 926 SHA256 199cc3f0aa5bb88ad5040d2c4b7a74afc22ba4dfbd98acc36d0e861346e6c553 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791 WHIRLPOOL d3afefe493fa4b09fc97c34fc616cf1ef321ef7579b31455fdf854334ebb8f8d5b1c6d509bc1a134e126be7961d55b6a3c8136f42cdf2036578d57a3fd2a30f0
+AUX olsrd-0.9.6-gpsd.patch 537 SHA256 d34d4603094d0f7cfab0561a16f478bc21a2c393a815952627dd2788c80d18b0 SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88 WHIRLPOOL b5849224adc3ed5ffaa974cc3cb760c145028596a8eea2fc658a3167b4b19c026b60f32c0b2143ec72a79af6e1488f1ced0d2e8384f5507a7e54a3f08eab8c91
+DIST olsrd-0.9.6.1.tar.bz2 908871 SHA256 9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a WHIRLPOOL 527cea2116dd390942fbada09946f8c4fcc5bb70977fb8073ecf1bda6eb95a14c37bff1e637d2031803cacce3dc3c7c0bb505273e0bbe1b847a60cbfb1d583f7
+EBUILD olsrd-0.9.6.1.ebuild 2237 SHA256 b2b13fc3e584e13b3af5ec257c385b3669007aee41d0922eff030a2e766827fa SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68 WHIRLPOOL 8aecc5ed392f63648fb6b96e74c0627f02796d11b3ef38abd94d85fe58738fafb3293989da98a4f9a195fa3d30f7fdd6189b2737154f177a615f8e9ffcc4a257
+MISC ChangeLog 2694 SHA256 3a19583699e6573e0e7723e6004dc66974fc5d344c46b3f536af86d7235cbf2b SHA512 1b7dd70a0a3ba31134931aa75db7c336a95594b11b9745040e1fb100a600072f1f4e79e98979b36489eb08e49db245826d51fd1569236fb210a0d18d4b6ca51f WHIRLPOOL 69e48a3a7997031eb74f94744d2bcb9fd07fc7678234994d4839963a873e5a63cda219533b66b99e1777c094ac727dfdacaef01e38782a20f6f74b38d5d93eb9
+MISC ChangeLog-2015 5678 SHA256 2ed75d3c016de0a3768c25859cdd7c89f014e926457c73dafdc437bbb5c4e536 SHA512 f03acb7c3fc716a2b940dc0c0fd62a9fb4d1e8420fdefa7e5b0fbbb9997f8f5ed64e539f88ecf9eeed37b4752ea01e47ce6780520403f906e2e3aeb95da870fa WHIRLPOOL 72e740d4c55cb8a86a5dd8c4846b845e5ff3016d9d823dfa458bbad6c2012b464439375fe2e0fa9099e1c9d92fc55ee97855c226dbb35bf2ca60c068a34b5692
+MISC metadata.xml 289 SHA256 66f2d1080adf1f3133cdff87f7689220928f0e04edd13c051050e30b82cba355 SHA512 11297ae766f53af46dd2eb5ddc9458cb3b7c4d6edb6f47030373e3e251a282ca7f0ceaa9e99bb2847c15ccba9cbd5ace0313c248a69ad6975c3bc6dbc6056520 WHIRLPOOL a671fe64656aa127c583f4eb7c544d31f807bc27557a5425dedb64515ea6c57ca8fbb86c0d74b4b221b976760e3f7c9c832ccd526b6f46916eb1d43abcf6bf67
diff --git a/net-misc/olsrd/files/olsrd b/net-misc/olsrd/files/olsrd
new file mode 100644
index 000000000000..aca79b9d428d
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/olsrd.conf ]; then
+		eerror "You need a /etc/olsrd.conf file to run olsrd"
+		eerror "There is sample file in /usr/share/doc/olsrd-version/"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting olsrd"
+	start-stop-daemon --start --quiet --background --exec /usr/sbin/olsrd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping olsrd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/olsrd
+	eend $?
+}
diff --git a/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch b/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch
new file mode 100644
index 000000000000..0571340e4d03
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch
@@ -0,0 +1,29 @@
+--- a/gui/linux-gtk/Makefile
++++ b/gui/linux-gtk/Makefile
+@@ -2,14 +2,14 @@
+ include $(TOPDIR)/Makefile.inc
+ 
+ # hardening flags: -fPIE -Wl,-z,now -pie
+-CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -fPIE -Wno-strict-prototypes \
++CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 gdk-pixbuf-2.0 gtk+-2.0) -fPIE -Wno-strict-prototypes \
+           -Wno-cast-qual
+-CPPFLAGS += $(shell pkg-config --cflags gtk+-2.0)
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 gdk-pixbuf-2.0 gtk+-2.0)
+ LDFLAGS += -pie
+ #LDFLAGS +=	-Wl,--warn-common
+ 
+ 
+-LIBS := $(shell pkg-config --libs gtk+-2.0) -lm
++LIBS := $(shell $(PKG_CONFIG) --libs glib-2.0 gdk-pixbuf-2.0 gtk+-2.0) -lm
+ 
+ # 32/64 cross compilation
+ ifdef M32
+@@ -30,7 +30,7 @@
+ ifeq ($(VERBOSE),0)
+ 	@echo "[LD] $@"
+ endif
+-	$(MAKECMDPREFIX)$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++	$(MAKECMDPREFIX)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ .PHONY: clean install
+ 
diff --git a/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch b/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch
new file mode 100644
index 000000000000..a70115f1675c
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch
@@ -0,0 +1,21 @@
+--- a/lib/pud/src/gpsdclient.c
++++ b/lib/pud/src/gpsdclient.c
+@@ -343,7 +343,6 @@
+           | POLICY_SET //
+ #ifdef GPSD_JESSIE
+           | TIMEDRIFT_SET //
+-          | EOF_SET //
+ #endif
+ #ifdef GPSD_NEW
+           | TOFF_SET //
+--- a/lib/pud/Makefile
++++ b/lib/pud/Makefile
+@@ -108,7 +108,7 @@
+ 
+ default_target: nmealib library $(PLUGIN_FULLNAME)
+ 
+-$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
++$(PLUGIN_FULLNAME): nmealib library $(OBJS) version-script.txt
+ ifeq ($(PUD_NMEALIB_STATICALLY_LINKED),)
+ ifeq ($(VERBOSE),0)
+ endif
diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml
new file mode 100644
index 000000000000..05b0733a9e78
--- /dev/null
+++ b/net-misc/olsrd/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 type="person">
+  <email>jer@gentoo.org</email>
+</maintainer>
+<use>
+<flag name='pud'>Install the Node Position Update plugin</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
new file mode 100644
index 000000000000..1379675e09a0
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib toolchain-funcs versionator
+
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/"
+SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD LGPL-2.1"
+KEYWORDS="amd64 x86"
+IUSE="gtk pud"
+DEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	pud? ( sci-geosciences/gpsd )
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+	"${FILESDIR}"/${PN}-0.9.6-gpsd.patch
+)
+src_prepare() {
+	default
+
+	# fix parallel make
+	# respect AR
+	# verbose build
+	# fix default prefix, bug #453440
+	sed -i \
+		-e '/@echo "\[/d' \
+		-e 's|$(MAKECMD)|$(MAKE)|g' \
+		-e 's|@$(CC)|$(CC)|g' \
+		-e 's|@ar |$(AR) |g' \
+		-e '/^prefix/s:/usr/local:/usr:' \
+		$( find . -name 'Makefile*' ) || die
+
+	# respect LDFLAGS
+	sed -i \
+		-e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
+		lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
+}
+
+src_configure() {
+	if ! use pud; then
+		sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
+	fi
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake \
+		CC="$(tc-getCC)" \
+		VERBOSE=1 \
+		LIBDIR="/usr/$(get_libdir)/${PN}" \
+		OLSRD_LDFLAGS="${LDFLAGS}" \
+		OS=linux \
+		build_all
+	if use gtk; then
+		emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
+	fi
+}
+
+src_install() {
+	emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+		DESTDIR="${D}" STRIP=true install_all
+	if use gtk; then
+		emake -C gui/linux-gtk \
+			LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install
+	fi
+
+	doinitd "${FILESDIR}/${PN}"
+
+	dodoc CHANGELOG \
+		valgrind-howto.txt files/olsrd.conf.default.rfc \
+		files/olsrd.conf.default.lq \
+		lib/arprefresh/README_ARPREFRESH \
+		lib/bmf/README_BMF \
+		lib/dot_draw/README_DOT_DRAW \
+		lib/dyn_gw/README_DYN_GW \
+		lib/dyn_gw_plain/README_DYN_GW_PLAIN \
+		lib/httpinfo/README_HTTPINFO \
+		lib/mini/README_MINI \
+		lib/nameservice/README_NAMESERVICE \
+		lib/pgraph/README_PGRAPH \
+		lib/quagga/README_QUAGGA \
+		lib/secure/README_SECURE \
+		lib/txtinfo/README_TXTINFO \
+		lib/watchdog/README_WATCHDOG
+}
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
new file mode 100644
index 000000000000..9d7fd610f468
--- /dev/null
+++ b/net-misc/omniORB/Manifest
@@ -0,0 +1,12 @@
+AUX change-umask-from-002-to-022-in-CreateDir-macro.patch 1985 SHA256 40a18fdb24d0b20b113db3a73386dbb0b09183bf82c83aeba6b8a942a49bb408 SHA512 cc2fb4c3bc9e10aea73b65623b679f930a668ef758392e0d67a0a0a7e46b15df788fa7668b788d0b356fe367399f70f0012e1ca99b0a9e7452608d07d8db9e05 WHIRLPOOL e76f518cd2bbd2c0d17b128bef378eb25495a642328706f7a740b8ecd9b1a357a3d5f7f26978be83def6c92c05bbd84e0c7812c46b8ce0aef21aa172a59a04dd
+AUX ldflags.patch 452 SHA256 d02d4ba72a5995b07a4189e28deaba25c3733e8639b682d5cee4b36180fc9bee SHA512 472d66b3071de94d4753773092c4781f5b4419041dc23b777bc13e8e4f4a1a40f245931479fc294c43a9e73f322e93b2055fb52a1070423d58dd32f23b0f61ca WHIRLPOOL ab8e25bab496c7c4e5408135500e1cae0366ed0a2698310040071ea27c94020df77b92e21907ea5637b6716093f6108eed594e36dc36bc6d71a99d1b7557a21a
+AUX omniNames 571 SHA256 f723be6ac217df446d33e1b45f5726e5789d73d534df8a1d187464512ea996b0 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044 WHIRLPOOL fe7e0b27767bfef3d495f32a91bcb9b433f25bf14a5f388f70232bd5d5d106d02d5f3e8342c0dbdd4693e095d214a155e49806af30eeb0d46f77027447c0b34d
+AUX omniORB-4.1.4-format-security.patch 557 SHA256 a3169304c555b99591c576e745ad5b4717afaf20e02643fef0336578048e000b SHA512 f2d9ca53f9dcdac7fc0224e435ee7d4eecaf5c948d406f94e81a9ae7770d192b18e846ddd245c5b74e77efb7030902b9f2817b13349f2a685caadb05633e14ee WHIRLPOOL ae7232efd23340f47d12de69ebc4249e5b7b61d7cbc6e248e6dce327b6e524393eeb7a6577d4ccada85a6e5c06ff44ff2991bb5b55c59198ead80e6876d0c670
+AUX omniORB-4.1.4-openssl-1.patch 770 SHA256 0a27f1476347939ba24fce9d0f2e02461644187a8b72ff727d96b3f9a817f623 SHA512 b43adc69ec30a3a1cf6581e050ca93927b267c67623aafdb53db0135a8d4164c779a9d54249c8672e5d8f1c761681092be3c2908cb772820d019db1e2b1ba396 WHIRLPOOL 21d0a2bbe5c8b9ac2aea24e201e7d3090211f45880d5696c61aefe8ccffb68bf2dd168cfbe0c67c7a310ab8a24b3202e112003b2bdd35bba070f2d90b8939e21
+DIST omniORB-4.1.4.tar.gz 3093814 SHA256 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c WHIRLPOOL 16b12ade124e62b57d8401c73975a4a0861166f080b0f735e7ad363dca1a7387d807e5c8bf4ae9b90b70f41a03e9811109bcb917e78b833578e891b78c9da55f
+DIST omniORB-4.2.1-2.tar.bz2 2663504 SHA256 9b638c7047a05551c42fe13901194e63b58750d4124654bfa26203d09cb5072d SHA512 574bbc66f9eee87f06500c798e034a289e6104b3a921c8e956231c5c042a3306016b2aa69699eadef25edb97bed7580f7f27beec3893582a1ba16bb01f934fd6 WHIRLPOOL fc85c5e9a328ce64bcf97c66a7710b272196659360d60d575bc89af308f96de7fec490bf52e6e6d7b221e5ce6577b77caef8b333fef31b000dba4dd7833e00ec
+EBUILD omniORB-4.1.4-r2.ebuild 2184 SHA256 70f5a9ae85ff501e3f6b7d2a9ba9cd056050bd5104195a3f278b47650bef608c SHA512 a4d08d26cdf8b7fbee13bed2a92eee52190ccdba863a46f8b87cd210fb212ef2eb85a0a84ec1e6895f360d3b1ae76d91c2f15a322bf85e0e35759d4c659185af WHIRLPOOL bd5f3f2a1df6693c2930a0290c7c6ffd8c399c5126204dffcda848cbf64f53335d3b5f23393156af15b1a1f8e2089342840c68b412f65993cc67dc0fffc6335c
+EBUILD omniORB-4.2.1_p2.ebuild 2868 SHA256 c8f2eeaef2e61c80d5f98f2ff7dfb0feaaf79864993e60505f8eacf5b7afc88b SHA512 cd5b8534d4a9c6a745e2c6d3d51c69b7c9521ff8d46a93461f09cc5b113645357496ab42f597bc3de45c642c523bb512a70150a336c33c499127864c4f4bda60 WHIRLPOOL 370073fd94bfcca7790fb20e54fdb5c3113b911b4abbe2d72905d110735c2aac215b26d79b702de5c8a917f6f6f7c45eb07e6ef64800a92c2868885ec3d1fd06
+MISC ChangeLog 3628 SHA256 da8b91948d0251c1779b229d94e7e34768e40aceeabdb662e3a01c6dde412630 SHA512 09f8b32190cfe37060f7f2ada06bb7b796ba60af3cb2f07dedd5dd403cbb21ddbb175c838afc12fd7b9f9c1c6ba8702ed5097f86149beca29dee611c03f2faa8 WHIRLPOOL 51790ff648cd93a2822c1853d6352f36bdd68c2d6481c06183d6304050deefe8df26aa727163fe437dc32e5318818a0a2ce5164006fbf1f2e6f918dddeecf0bf
+MISC ChangeLog-2015 11791 SHA256 e3aebbf94416d2b2da1a40fae1993cafa19ecec2538bcbf15eb1c0ca9095ef3a SHA512 f0981e39ac1f2e4c61022f3c53ac9ab83d2d4828ca34c87048816f51bfe48b0de744aec3b35f3ede29f24e2290d8c6d8b9daed212a51431fe13742fcdfabf487 WHIRLPOOL 270d919bd2a0ad6ada2bd170bf24f6ec0fbf4620a0f7af404c91c0b11613cb28985d047f340187b80ed2e18341bf19ba253eb79f8259fb6fc98afff5550f5a5d
+MISC metadata.xml 220 SHA256 5b5521cb5b54e374fd706caa578dbdb03aca4a8664017bb2aade3f6204b47f8b SHA512 a8201f66fb2504f83b9b89adf3e3b23b1b78410cbcfa740e49ea0c984e164aa430eadfe01fe05b1ad4d9c6cd1206e8ef614fc31a1aad86f3e4af183781cea563 WHIRLPOOL ee9a294cda5658d8b0e39b54d6b1e1cf03905449a4576bf48e96928f082bf47a10c35192f1f87a79ef29ccd04bbd51efb0012977b71aa7970ed0709aaf6c6b02
diff --git a/net-misc/omniORB/files/change-umask-from-002-to-022-in-CreateDir-macro.patch b/net-misc/omniORB/files/change-umask-from-002-to-022-in-CreateDir-macro.patch
new file mode 100644
index 000000000000..2aaab59ef201
--- /dev/null
+++ b/net-misc/omniORB/files/change-umask-from-002-to-022-in-CreateDir-macro.patch
@@ -0,0 +1,58 @@
+From 2a0ea5621ef7cd9303e49657166dfd04ffa624d7 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 16 Aug 2016 13:55:08 -0400
+Subject: [PATCH 1/1] mk: Change umask from 002 to 022 in the CreateDir macro.
+
+The build system has a macro called CreateDir that does more or less
+what you'd expect. But before it creates the directory given to it, it
+sets the umask to 002. This can be a vulnerability, since we don't
+know who the end user will be building the software as; there may be
+untrusted people in his default group. In that case, one of those
+people can overwrite the scripts in the directory created by CreateDir
+before the user executes them.
+
+There is a kernel-level workaround for these types of vulnerabilities
+in the Grsecurity project called Trusted Path Execution (TPE). When
+enabled, users are not allowed to execute files in directories not
+owned by themselves or root. When that restriction is enabled, omniORB
+fails to build (due to the aforementioned umask).
+
+This commit changes the umask to 022 in CreateDir. This should not
+cause any problems (ha ha), and is safer than the previous umask of
+002. It also fixes the build on systems where TPE is enabled.
+
+Gentoo-Bug: 576040
+---
+ mk/beforeauto.mk.in | 2 +-
+ mk/beforedir.mk     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mk/beforeauto.mk.in b/mk/beforeauto.mk.in
+index 83d544c..9f65c69 100644
+--- a/mk/beforeauto.mk.in
++++ b/mk/beforeauto.mk.in
+@@ -167,7 +167,7 @@ unexport SUBDIRS
+ 
+ define CreateDir
+ if [ ! -d $$dir ]; then \
+-   (umask 002; set -x; $(MKDIRHIER) $$dir); \
++   (umask 022; set -x; $(MKDIRHIER) $$dir); \
+ fi
+ endef
+ 
+diff --git a/mk/beforedir.mk b/mk/beforedir.mk
+index f804ed3..855bc4d 100644
+--- a/mk/beforedir.mk
++++ b/mk/beforedir.mk
+@@ -187,7 +187,7 @@ unexport SUBDIRS
+ 
+ define CreateDir
+ if [ ! -d $$dir ]; then \
+-   (umask 002; set -x; $(MKDIRHIER) $$dir); \
++   (umask 022; set -x; $(MKDIRHIER) $$dir); \
+ fi
+ endef
+ 
+-- 
+2.7.3
+
diff --git a/net-misc/omniORB/files/ldflags.patch b/net-misc/omniORB/files/ldflags.patch
new file mode 100644
index 000000000000..471df27ae7f4
--- /dev/null
+++ b/net-misc/omniORB/files/ldflags.patch
@@ -0,0 +1,11 @@
+--- mk/beforeauto.mk.in.orig	2010-04-24 21:13:17.000000000 +0200
++++ mk/beforeauto.mk.in	2010-04-24 21:14:24.000000000 +0200
+@@ -541,7 +541,7 @@
+ SharedLibraryLibNameTemplate  	= lib$$1$$2.$(SHAREDLIB_SUFFIX)
+ SharedLibraryImplibNameTemplate = lib$$1$$2.a
+ 
+-SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-soname,$$soname
++SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-soname,$$soname @LDFLAGS@
+ 
+ define SharedLibraryFullName
+ fn() { \
diff --git a/net-misc/omniORB/files/omniNames b/net-misc/omniORB/files/omniNames
new file mode 100644
index 000000000000..e2e7851fd3a2
--- /dev/null
+++ b/net-misc/omniORB/files/omniNames
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting omniNames"
+	start-stop-daemon --start --background --make-pidfile --pidfile /var/run/omniNames.pid \
+		--exec /usr/bin/omniNames -- -start -always -logdir /var/log/omniORB \
+		-errlog /var/log/omniORB/omniORB.errors
+	eend $? "Error starting omniNames."
+}
+
+stop() {
+	ebegin "Stopping omniNames"
+	start-stop-daemon --stop --pidfile /var/run/omniNames.pid
+	eend $? "Error stopping omniNames."
+}
diff --git a/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch b/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch
new file mode 100644
index 000000000000..2af8d21d308d
--- /dev/null
+++ b/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch
@@ -0,0 +1,16 @@
+ src/tool/omniidl/cxx/cccp/cccp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tool/omniidl/cxx/cccp/cccp.c b/src/tool/omniidl/cxx/cccp/cccp.c
+index 0198b1a..64d80ae 100644
+--- a/src/tool/omniidl/cxx/cccp/cccp.c
++++ b/src/tool/omniidl/cxx/cccp/cccp.c
+@@ -8034,7 +8034,7 @@ macroexpand (hp, op)
+       else
+ 	parse_error = macarg (NULL_PTR, 0);
+       if (parse_error) {
+-	error_with_line (line_for_error (start_line), parse_error);
++	error_with_line (line_for_error (start_line), "%s", parse_error);
+ 	break;
+       }
+       i++;
diff --git a/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch b/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch
new file mode 100644
index 000000000000..968013a25781
--- /dev/null
+++ b/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch
@@ -0,0 +1,31 @@
+http://bugs.gentoo.org/326791
+
+--- include/omniORB4/sslContext.h
++++ include/omniORB4/sslContext.h
+@@ -111,7 +111,11 @@
+   virtual ~sslContext();
+ 
+  protected:
+-  virtual SSL_METHOD* set_method(); 
++  #if OPENSSL_VERSION_NUMBER >= 0x10000000L
++  virtual const SSL_METHOD* set_method();
++  #else
++  virtual SSL_METHOD* set_method();
++  #endif
+   // Default to return SSLv23_method().
+ 
+   virtual void set_supported_versions(); 
+--- src/lib/omniORB/orbcore/ssl/sslContext.cc
++++ src/lib/omniORB/orbcore/ssl/sslContext.cc
+@@ -197,7 +197,11 @@
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++const SSL_METHOD*
++#else
+ SSL_METHOD*
++#endif
+ sslContext::set_method() {
+   return SSLv23_method();
+ }
diff --git a/net-misc/omniORB/metadata.xml b/net-misc/omniORB/metadata.xml
new file mode 100644
index 000000000000..000f9330f8c4
--- /dev/null
+++ b/net-misc/omniORB/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="sourceforge">omniorb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/omniORB/omniORB-4.1.4-r2.ebuild b/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
new file mode 100644
index 000000000000..183a5713a85a
--- /dev/null
+++ b/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1
+
+DESCRIPTION="A robust, high-performance CORBA 2 ORB"
+HOMEPAGE="http://omniorb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/omniorb/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE="doc ssl static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	ssl? ( >=dev-libs/openssl-0.9.6b:0= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# respect ldflags, bug #284191
+	epatch \
+		"${FILESDIR}"/ldflags.patch \
+		"${FILESDIR}"/${P}-openssl-1.patch \
+		"${FILESDIR}"/${P}-format-security.patch
+
+	sed \
+		-e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
+		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
+		-i mk/beforeauto.mk.in mk/platforms/i586_linux_2.0*.mk || \
+		die "sed failed"
+}
+
+src_configure() {
+	mkdir build && cd build || die
+
+	local MY_CONF="--prefix=/usr --with-omniORB-config=/etc/omniorb/omniORB.cfg \
+		--with-omniNames-logdir=/var/log/omniORB --libdir=/usr/$(get_libdir)"
+
+	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
+
+	ECONF_SOURCE=".." econf ${MY_CONF} $(use_enable static-libs static)
+}
+
+src_compile() {
+	cd build || die
+	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	cd build || die
+	default
+	# this looks redundant
+	rm "${ED}/usr/bin/omniidlrun.py" || die
+
+	cd "${S}" || die
+
+	if use doc; then
+		dohtml doc/*.html
+		dohtml -r doc/omniORB
+		docinto print
+		dodoc doc/*.pdf
+	fi
+
+	cat <<- EOF > "${T}/90omniORB"
+		PATH="/usr/share/omniORB/bin/scripts"
+		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
+	EOF
+	doenvd "${T}/90omniORB"
+	doinitd "${FILESDIR}"/omniNames
+
+	cp "sample.cfg" "${T}/omniORB.cfg" || die
+	cat <<- EOF >> "${T}/omniORB.cfg"
+		# resolve the omniNames running on localhost
+		InitRef = NameService=corbaname::localhost
+	EOF
+	insinto /etc/omniorb
+	doins "${T}"/omniORB.cfg
+
+	keepdir /var/log/omniORB
+
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/omniidl
+}
+
+pkg_postinst() {
+	elog "Since 4.1.2, the omniORB init script has been renamed to omniNames for clarity."
+}
diff --git a/net-misc/omniORB/omniORB-4.2.1_p2.ebuild b/net-misc/omniORB/omniORB-4.2.1_p2.ebuild
new file mode 100644
index 000000000000..46b2de01bec8
--- /dev/null
+++ b/net-misc/omniORB/omniORB-4.2.1_p2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# The build system picks one version of python and sticks with it. It
+# tries to guess your version (based on /usr/bin/python), but for
+# consistency we have to force it to use one that we specify. The
+# highest version the configure script will accept is python-3.3, but
+# that's on it's way out, so we prefer to stick with python-2.7 for now.
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+MY_P="${P/_p/-}"
+DESCRIPTION="A robust, high-performance CORBA 2 ORB"
+HOMEPAGE="http://omniorb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6 ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${PV/_p2/}"
+
+PATCHES=(
+	"${FILESDIR}/omniORB-4.1.4-format-security.patch"
+	"${FILESDIR}/change-umask-from-002-to-022-in-CreateDir-macro.patch"
+)
+
+src_prepare() {
+	default
+
+	# The OPTC(XX)FLAGS variables aren't present in these files, but we
+	# will set them when we call emake.
+	sed \
+		-e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
+		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
+		-i mk/beforeauto.mk.in mk/platforms/i586_linux_2.0*.mk || \
+		die 'failed to switch CFLAGS variables in the makefile includes'
+
+	# The out-of-source build is suggested by upstream.
+	mkdir build || die 'failed to create build directory'
+}
+
+src_configure() {
+	cd build || die 'failed to change into the build directory'
+
+	ECONF_SOURCE=".." econf \
+				--disable-static \
+				--with-omniORB-config=/etc/omniorb/omniORB.cfg \
+				--with-omniNames-logdir=/var/log/omniORB \
+				--libdir="/usr/$(get_libdir)" \
+				$(use_enable ipv6) \
+				$(use_with ssl openssl "/usr")
+}
+
+src_compile() {
+	cd build || die 'failed to change into the build directory'
+	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	cd build || die 'failed to change into the build directory'
+	default
+
+	rm "${ED}/usr/bin/omniidlrun.py" || \
+		die 'failed to remove redundant omniidlrun.py'
+
+	cd "${S}" || die "failed to change into the ${S} directory"
+
+	dodoc CREDITS doc/*.html ReleaseNotes.txt update.log
+	dodoc -r doc/omniORB
+
+	if use doc; then
+		dodoc doc/*.pdf
+	fi
+
+	cat <<- EOF > "${T}/90omniORB"
+		PATH="/usr/share/omniORB/bin/scripts"
+		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
+	EOF
+	doenvd "${T}/90omniORB"
+	doinitd "${FILESDIR}"/omniNames
+
+	cp "sample.cfg" "${T}/omniORB.cfg" || die
+	cat <<- EOF >> "${T}/omniORB.cfg"
+		# resolve the omniNames running on localhost
+		InitRef = NameService=corbaname::localhost
+	EOF
+	insinto /etc/omniorb
+	doins "${T}"/omniORB.cfg
+
+	keepdir /var/log/omniORB
+
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/omniidl
+}
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
new file mode 100644
index 000000000000..f6dc3c3b4b47
--- /dev/null
+++ b/net-misc/openntpd/Manifest
@@ -0,0 +1,10 @@
+AUX openntpd.conf.d-20080406-r6 255 SHA256 91fb1497b3a6ef0bb3a3d5baefdff801d8ff1cba27aaf742303415550814a09b SHA512 016094e0ac80817c8c1eb8a52a527c8a673b3ee904f2c04bef0304b5dfe1c778a34a2d5321cc5540a1dfe2e14dc878c44a1e54fd0263aca3917600827c6d9059 WHIRLPOOL 9fa127624f50b01ba1b5872262d26b18362d3784a73021e608bd8a6cead2499cabf0fe5eafeaa315548e97285228a6e70689a3cadbdb7031ac00e23bf064e3b9
+AUX openntpd.init.d-20080406-r6 292 SHA256 e3ddd2620be927f66e9fb325ad3dbe89e7845b5a30de09fbe25fad2d13df641b SHA512 eff7820dea7f79420ddc78fc744a34f6f5cedbf167d7ce98ed35d4ae0b1dab6cae026d5255a6cc428cdbc8f51784ed149c5ec8011ab72c31c65a5bfc6664b94f WHIRLPOOL 8705dc537459ac8e2464e530fc7ddc131ae7d04ebc487a6b8fd039b12a14ef402797d978da2c9987c31c936bd32088973a8b8ffd5d9fcb1e1cc014bb119b31f0
+AUX openntpd.service-20080406-r4 196 SHA256 1171f2aff396842fee94cd3f85a7929601fffb788840aaf9f9abb6f2b0d17016 SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e WHIRLPOOL 5f33f400d045352f5e7f5fad718920d71c6f70526988ef87e02cf73ee98c4fb70afd928a770657b1f8d41aff46664a43dc21f3fd7bbcc6c6b95f4ad1788a52cf
+DIST openntpd-6.0p1.tar.gz 432696 SHA256 b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8 SHA512 a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d WHIRLPOOL 75b82a07920eb7c3825a37725a81615871b728e9543ec43cb20c9e61a64f523293aa7e1fbbb92ebb8d6417d13f377213ffbcba1c77c7b3c68b64e26e30222a0b
+DIST openntpd-6.2p1.tar.gz 437376 SHA256 05e1668f89969a6ae064f411cb1d864ca3acb27ebd8fac963e6443ea0788d0bc SHA512 99ad2c8e42de159b1122fe30385eff2f6311202b8526828dacd52db6ec36ce14785131b0576ac5b08d3ed9cadffc142c9146e395da29409b3227c4a77187d31e WHIRLPOOL 4b1d9bc09deda1550182876f36a251c0a07fd5967db6256f420c9933c4bb275108ebf65031f6e8452aa80fed8b31ac490d7b076db47ca110df4f73d54475243f
+EBUILD openntpd-6.0_p1.ebuild 2981 SHA256 810f0abc0f76fa9e93cedee90b7413ca8c27c31123acd83e96cce9cd076b96e3 SHA512 0789da0c8ff2f0a4dc721f9fb524565680c21ef5f1a3678977d304dfdf324f630171d0e959229157382ab921c8128004637bc46c9a7f25b18d688f2e0192ad79 WHIRLPOOL dfa3553517af2584f5b3de0c1cb6def9987c8144d9f119ea122b787bcc443e41f7f9e7e812ea482a2113de2cb9be9a92449066d9c03b85addb58336d5d29de6f
+EBUILD openntpd-6.2_p1.ebuild 3024 SHA256 e03c2229830409e81965a4d847d2ed063ee240f6c0107452e8c5bb4d9e63a93e SHA512 49b4ea7c20238d7a378cf836b8cf820417e805f498a6082544682e690c8d7e0e12cd44d7cd92fe874c89577a27b7cf76d1a78d5fd5ff6006ace78d243ad7354d WHIRLPOOL 1f677c7d51dd0c17fe4f1af71418fb541e3d20f841677c16ed714b57aa0f3fefb5423bb42e4cb5d88e648fe475a146d5656e23429d34efc0a447f822400182b9
+MISC ChangeLog 7733 SHA256 2bf6b87532b5485342c8b2b8b18bda5d0a8b77e0e7604855d085f31fd5f05ff9 SHA512 01d6ecd7bef495bc96e5b7e115f1ed055493cd3abccb47a32ae579804db42f7ef13954dbd64117d55c03df23be170455972c8e1f6f5a8bf112926542950d282c WHIRLPOOL fb5058ff89fdabb59f5ae1dafea1fc006a27574fd9dcf81e83b4d74e99ef9e4ca76ff7bfcd3fbaca37cf0f27cefcf116219eb4578cdd84dbee9c1bb4ae5abdaf
+MISC ChangeLog-2015 19875 SHA256 19226d83ba8bc1ae71b04ea1aa530259cf3e941f9101cb887e8627c5063b6265 SHA512 bd46f313f7e5c788d03ef2e8bdc35d7d8d374c19d1eeaf1c34eff584b3be45ac4458cb406e6c53c8304cec5f540c2ef7178b868fd1237ff3d98ccd52e46c35e2 WHIRLPOOL 9cb0788331a523bb9a359ab73ff7bbbde233fa125e063bfcbe099ddb531669bd164bb18f19506e04780e5e794d0335d12fa74706df1ef9f1706363aa92a0de65
+MISC metadata.xml 890 SHA256 b0b865b4904f7a0a5e2692705fe414fc1a3ef3613bb89e0704eb4933a93810eb SHA512 ab39595387465d950c9895f04aa0a1bf4868e31416c4c3b907cb05b4cd767908480cfa6f5305cf30130e07f4f4ed6253013931e480d68d059a8c0670674d4da0 WHIRLPOOL 0db9bf5831cf3b2c8e9c942b7c00f7e637a576d4553ac916db410711fdd971531ecc346fe849a8a4c3b4d05ccab778407a1a8d3a567c378e0d8cbb3dde0aea50
diff --git a/net-misc/openntpd/files/openntpd.conf.d-20080406-r6 b/net-misc/openntpd/files/openntpd.conf.d-20080406-r6
new file mode 100644
index 000000000000..ccd45459664c
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd.conf.d-20080406-r6
@@ -0,0 +1,7 @@
+# /etc/conf.d/ntpd: config file for openntpd's ntpd
+
+# See ntpd(8) man page ... some popular options:
+#  -s   Set the time immediately at startup
+#       (Note: may cause up to a 15 second startup delay
+#        if ntp servers not reachable)
+NTPD_OPTS=""
diff --git a/net-misc/openntpd/files/openntpd.init.d-20080406-r6 b/net-misc/openntpd/files/openntpd.init.d-20080406-r6
new file mode 100644
index 000000000000..193483f1c17e
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd.init.d-20080406-r6
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+name="OpenNTPD"
+command="/usr/sbin/ntpd"
+pidfile="/run/ntpd.pid"
+command_args="-p ${pidfile} ${NTPD_OPTS}"
+
+depend() {
+	need net
+	after ntp-client
+	use dns logger
+}
diff --git a/net-misc/openntpd/files/openntpd.service-20080406-r4 b/net-misc/openntpd/files/openntpd.service-20080406-r4
new file mode 100644
index 000000000000..2e1bbff8ff7f
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd.service-20080406-r4
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenNTP Daemon
+After=network.target
+Conflicts=systemd-timesyncd.service             
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/ntpd -s -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
new file mode 100644
index 000000000000..1354e55c3647
--- /dev/null
+++ b/net-misc/openntpd/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>henson@acm.org</email>
+		<name>Paul B. Henson</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>junghans@gentoo.org</email>
+		<name>Christoph Junghans (proxy)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		OpenNTPD is a FREE, easy to use implementation of the Network Time
+		Protocol. It provides the ability to sync the local clock to remote
+		NTP servers and can act as NTP server itself, redistributing the
+		local clock.
+	</longdescription>
+	<use>
+	    <flag name="libressl">Enable HTTPS TLS time constraint support using
+		    <pkg>dev-libs/libressl</pkg>
+	    </flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/openntpd/openntpd-6.0_p1.ebuild b/net-misc/openntpd/openntpd-6.0_p1.ebuild
new file mode 100644
index 000000000000..ce9fa7008955
--- /dev/null
+++ b/net-misc/openntpd/openntpd-6.0_p1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd user
+
+MY_P="${P/_p/p}"
+DESCRIPTION="Lightweight NTP server ported from OpenBSD"
+HOMEPAGE="http://www.openntpd.org/"
+SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="libressl selinux"
+
+DEPEND="!<=net-misc/ntp-4.2.0-r2
+	!net-misc/ntp[-openntpd]
+	libressl? ( >=dev-libs/libressl-2.3.2 )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ntp )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	export NTP_HOME="${NTP_HOME:=/var/lib/openntpd/chroot}"
+	enewgroup ntp
+	enewuser ntp -1 -1 "${NTP_HOME}" ntp
+
+	# make sure user has correct HOME as flipping between the standard ntp pkg
+	# and this one was possible in the past
+	if [[ $(egethome ntp) != ${NTP_HOME} ]]; then
+		ewarn "From this version on, the homedir of the ntp user cannot be changed"
+		ewarn "dynamically after the installation. For homedir different from"
+		ewarn "/var/lib/openntpd/chroot set NTP_HOME in your make.conf and re-emerge."
+		esethome ntp "${NTP_HOME}"
+	fi
+}
+
+src_prepare() {
+	# fix /run path
+	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
+	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
+	# fix ntpd.drift path
+	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8 || die
+	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
+	# fix default config to use gentoo pool
+	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
+	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
+}
+
+src_configure() {
+	econf --with-privsep-user=ntp --with-privsep-path=${NTP_HOME} $(use_enable libressl https-constraint)
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/var
+
+	newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
+	newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
+	keepdir "${NTP_HOME}"
+
+	systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
+}
+
+pkg_postinst() {
+	# Clean up chroot localtime copy from older versions
+	if [ -d "${EROOT%/}${NTP_HOME}"/etc ] ; then
+		if [ -f "${EROOT%/}${NTP_HOME}"/etc/localtime ] ; then
+			rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
+		fi
+
+		rmdir "${EROOT%/}${NTP_HOME}"/etc ||
+			ewarn "Unable to remove legacy ${EROOT%/}${NTP_HOME}/etc directory"
+	fi
+
+	# Fix permissions on home directory
+	chown root:root "${EROOT%/}${NTP_HOME}" || die
+
+	[[ -f ${EROOT}var/log/ntpd.log ]] && \
+		ewarn "Logfile '${EROOT}var/log/ntpd.log' might be orphaned, please remove it if not in use via syslog."
+
+	if [[ -f ${EROOT}var/lib/ntpd.drift ]] ; then
+		einfo "Moving ntpd.drift file to new location."
+		mv "${EROOT}var/lib/ntpd.drift" "${EROOT}var/lib/openntpd/ntpd.drift"
+	fi
+}
diff --git a/net-misc/openntpd/openntpd-6.2_p1.ebuild b/net-misc/openntpd/openntpd-6.2_p1.ebuild
new file mode 100644
index 000000000000..ccf131fee0d1
--- /dev/null
+++ b/net-misc/openntpd/openntpd-6.2_p1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+NTP_HOME="${NTP_HOME:=/var/lib/openntpd/chroot}"
+MY_P="${P/_p/p}"
+
+DESCRIPTION="Lightweight NTP server ported from OpenBSD"
+HOMEPAGE="http://www.openntpd.org/"
+SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="libressl selinux"
+
+DEPEND="
+	!<=net-misc/ntp-4.2.0-r2
+	!net-misc/ntp[-openntpd]
+	libressl? ( dev-libs/libressl:0= )"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-ntp )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup ntp
+	enewuser ntp -1 -1 "${NTP_HOME}" ntp
+
+	# make sure user has correct HOME as flipping between the standard ntp pkg
+	# and this one was possible in the past
+	if [[ $(egethome ntp) != ${NTP_HOME} ]]; then
+		ewarn "From this version on, the homedir of the ntp user cannot be changed"
+		ewarn "dynamically after the installation. For homedir different from"
+		ewarn "/var/lib/openntpd/chroot set NTP_HOME in your make.conf and re-emerge."
+		esethome ntp "${NTP_HOME}"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix /run path
+	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
+	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
+
+	# fix ntpd.drift path
+	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8 || die
+	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
+
+	# fix default config to use gentoo pool
+	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
+	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
+}
+
+src_configure() {
+	econf \
+		--with-privsep-user=ntp \
+		--with-privsep-path=${NTP_HOME} \
+		$(use_enable libressl https-constraint)
+}
+
+src_install() {
+	default
+
+	rm -r "${ED}"/var || die
+
+	newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
+	newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
+	keepdir "${NTP_HOME}"
+
+	systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
+}
+
+pkg_postinst() {
+	# Clean up chroot localtime copy from older versions
+	if [[ -d "${EROOT%/}${NTP_HOME}"/etc ]]; then
+		if [[ -f "${EROOT%/}${NTP_HOME}"/etc/localtime ]]; then
+			rm -v "${EROOT%/}${NTP_HOME}"/etc/localtime || die
+		fi
+
+		rmdir "${EROOT%/}${NTP_HOME}"/etc ||
+			ewarn "Unable to remove legacy ${EROOT%/}${NTP_HOME}/etc directory"
+	fi
+
+	# Fix permissions on home directory
+	chown root:root "${EROOT%/}${NTP_HOME}" || die
+
+	[[ -f ${EROOT}var/log/ntpd.log ]] && \
+		ewarn "Logfile '${EROOT}var/log/ntpd.log' might be orphaned, please remove it if not in use via syslog."
+
+	if [[ -f ${EROOT}var/lib/ntpd.drift ]]; then
+		einfo "Moving ntpd.drift file to new location."
+		mv "${EROOT}var/lib/ntpd.drift" "${EROOT}var/lib/openntpd/ntpd.drift" || die
+	fi
+}
diff --git a/net-misc/openr2/Manifest b/net-misc/openr2/Manifest
new file mode 100644
index 000000000000..ad40c3694497
--- /dev/null
+++ b/net-misc/openr2/Manifest
@@ -0,0 +1,6 @@
+AUX 1.3.0-respect-user-cflags.patch 460 SHA256 fd0ea0e6da47dbfcf6d007484c895c3d54627209707fc8fe3ea8122e9397c781 SHA512 b644bb2ce9d789c6bb5c87914482203576165a0d0f59fb2b7c15662c5ff15c6a8e664bdbd1130bcfd1ef2244f8a55a4d5afacdccfde2e15b8b2a0219d65d564d WHIRLPOOL 63dbfdee4877ea0cd00036e38c0829dc7d7e413867c4528815c98bc433519b0223294f1c8a85f201877708173b5505df46dd890d23d93e2df2c339b855451363
+DIST openr2-1.3.0.tar.gz 650048 SHA256 667b535bdee6d1ce5555821b58667d7d76a473325672c49a4f6bf9073df0a688 SHA512 2cee4534eeebb91a2cf0f74c9fcd2a16db3966db01a4bae7e3406416546fdc1c5e20bb9172375f55e5dcc30cfcc2c8f7182ef7476253b4fcce9421f74b8d125e WHIRLPOOL fc78da9701a05b28c949af6b3ff27a0635b262ecec1797f2adb39b4df6c88169e60f1a176fd07af4522f54176856950c962caa6208589f01c5bca42776b55402
+EBUILD openr2-1.3.0.ebuild 551 SHA256 6ee5a0f6e5d283cc224dd23e881f56695a832b8fff40ffa6673d4e70c6bd142c SHA512 8108ee5d0c04d4951349b714d345ae3f9a94da14974fcf7e51d4437b5d0570847ea451f95a1623cc926a5465cc28e504b3cef95e28698e19a045ff396b0aa8db WHIRLPOOL 85efff58f97bc204f429a953d1e738d97959a9c4e092e81bb5a416ac0ef390482481d457068ec576a01f4d61fe1604f224c6e499a9c0ec93e44fb97a0b7fe1a4
+MISC ChangeLog 2375 SHA256 757cac30efc961e4632f6c3baeeee85f1fd79296d927ec798852edb7bc520798 SHA512 7ba1e959d63d9d80bc96eaa87af13635677dd867847391fe13754cbe9426062bdd4578434c144406b89eb4fc2131cca3b372229783f6a8806408b363d2a6f9f3 WHIRLPOOL f65ce15ac6a94be4b43a987c17b673ce7c93fd705ef57a9aef4b3a60e8a14065c5e84c1c7158ec9a23398b2f9e62a8270b9f0b393b8a870d9e0b8079f119f721
+MISC ChangeLog-2015 703 SHA256 d07c3e1a108df561cf583c7dd248ef57fdb1a6aa671210c6715b9f101e76d8a5 SHA512 5e8df117059db49d954b8b4499dbe6484a02daaef69eb5d6f38b14b99d99edf7e1ebd7bd41859f6ef3d21a8a02022da4a8d55c800a41fe6c868ebfe6a9955a9d WHIRLPOOL fdc9ba00a11da088955c53e36c9c786b6f6b2ed6a6ff0f5c05105c738ace206b3a6bac6a14a19565c2ad479333c7da2653fb6ef85c094016c907ac1a5eb83178
+MISC metadata.xml 321 SHA256 c82926dc9b9536e53286c999a3ab2aedcb2c611b69597b7c21b77afbfedd4070 SHA512 9c0374655261ecff333a0e004ad2fe9e0ddb79b0064f45e4ed03121caae7acb136b5ca10d8e86d74cde50ed62695aabbf80b47d493570c328f9d46956e4c2305 WHIRLPOOL 4c5076cd86a9c5bea987df4e52f527ec7e0d0c2aab7a5705348128938f25c7098f0247fe8a22d488edf70e58a23016a3169081d97bd55040ab3c9fc26961e872
diff --git a/net-misc/openr2/files/1.3.0-respect-user-cflags.patch b/net-misc/openr2/files/1.3.0-respect-user-cflags.patch
new file mode 100644
index 000000000000..7a8f23f3f29c
--- /dev/null
+++ b/net-misc/openr2/files/1.3.0-respect-user-cflags.patch
@@ -0,0 +1,15 @@
+diff -uNr openr2-1.3.0.ORIG//configure.in openr2-1.3.0/configure.in
+--- openr2-1.3.0.ORIG//configure.in	2010-05-13 11:59:14.000000000 +0100
++++ openr2-1.3.0/configure.in	2010-05-13 11:59:35.000000000 +0100
+@@ -25,11 +25,6 @@
+ AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE
+ 
+-# let's default to compile with debugging information
+-# most users will not even care about it
+-CFLAGS='-ggdb3 -O0'
+-CXXFLAGS='-ggdb3 -O0'
+-
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ AC_LANG([C])
diff --git a/net-misc/openr2/metadata.xml b/net-misc/openr2/metadata.xml
new file mode 100644
index 000000000000..6d1856e9c241
--- /dev/null
+++ b/net-misc/openr2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">openr2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/openr2/openr2-1.3.0.ebuild b/net-misc/openr2/openr2-1.3.0.ebuild
new file mode 100644
index 000000000000..d00d14389463
--- /dev/null
+++ b/net-misc/openr2/openr2-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+inherit autotools base
+
+DESCRIPTION="An open implementation of the MFC/R2 telephony signaling protocol"
+HOMEPAGE="http://libopenr2.org/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="net-misc/dahdi"
+PATCHES=( "${FILESDIR}/${PV}-respect-user-cflags.patch" )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/net-misc/openrdate/Manifest b/net-misc/openrdate/Manifest
new file mode 100644
index 000000000000..dc9d0f71c1de
--- /dev/null
+++ b/net-misc/openrdate/Manifest
@@ -0,0 +1,8 @@
+AUX openrdate-1.1.3-rename.patch 670 SHA256 4e3647ca891ff78a4f1ef479ff330684589167a29a53a95dd6a2a1fcf8ee12bf SHA512 5f370bd4b053fb822e946fd3fadd797a4f13ce6bb3f2b47085060e7262a35d453b5562ccae68818ca061f7842d462d62a30fa5d926cc67ddc5fb7332c23415cd WHIRLPOOL d7acfe6a28262d422783a7d01bfa5b09cf32912898e7b4bba274b1dc63c1eef117128da423ad4339a7483272c730aeab86af9a48f2c8d4910c7473a0a0290106
+AUX openrdate-confd 467 SHA256 c33efc58d4fe169a43fbbc05b92bedb88eac0420906161e86d7dd58790ee43d5 SHA512 eb215a4a4c6dbf94525c0415027210aa9fc2b3e7e45570054c1b1daeb1e9774a3905cbe5fadb792d6c5cb0c6e90a9e2beff05d73ff479dde5fd1eefd42997036 WHIRLPOOL d9f7696917e2f7559b538e45015ea020a5f8625033bb6844744cbe16094e89396883c7c0aa49a0b649b90b9df8c5e88b3c200bd364a77482fdc8a0b69dec4c7f
+AUX openrdate-initd 535 SHA256 df4374beb405d51d06afeaf6d0ddd22c1982568a43d0c6c71d913199d66da8da SHA512 f7303c873773ae453c7e7c2bc31dacb629a76496b0901554afa0159778dc2bb9b34daac5ed2a269fa57fffec5a969dd88749e566f0745c7d5289317ce81417c1 WHIRLPOOL 56b9095231e9d585aa330d6ee1d162c4a7d3b008310442db405dddf72bd5a6c809fa49b27a79eb6bcb8809f5ccb2608444170896f8a7fec1416d2354d1a8efc8
+DIST openrdate-1.2.tar.gz 118030 SHA256 2921fc96d4ca676190d6ffd45fa80e107c1fe12291c0c4f64827c29639863332 SHA512 5469352c26883863442641b47cc76512590af1524ecaa51fb829ae027d413889626b5b8098de0bea177a3c0ac411986518380e9400f20ddd3d4ac0bffb042e11 WHIRLPOOL 34eaa46d049c5661152d0dcc67e1aac44a6283ec267e08eb088d7716a9cb1a65477b7b538957aef625407ed642bf9c67333883bae238376ae95cee063311658c
+EBUILD openrdate-1.2.ebuild 729 SHA256 c8469279b82bcbebcd91776f4d103c0a590b68c3c7c2123bbbf2a54e10d1b0ca SHA512 22246441052c8a14564594c9b5a43f4d7b34521e0b71587284d6e5e53cc8a666c324bea31cbc152561223a22ee50496b381c3c59c0cb139d8b44e66bbb34bef7 WHIRLPOOL fe0106e13e5a15dc222339c6a1798fda5213fb8d551f756b800b70c8c06b81a25bf25bd4e9c6ed6b5c1d43facc8dfa21b235b80400343b6442e3a245c2533fd0
+MISC ChangeLog 2509 SHA256 211907078d7bcb08f329f289012a88e5deb74018ea339f76898e8f108481baf1 SHA512 52dcd0183e2295542843e16d4aa45d870fae78086200f13026ad5e52b420e85cdaf8090a78f5712fa6e769e1275c145ba0a51b20070f505265a85138376dd46b WHIRLPOOL 6b666f1a9b0ad9f73bd13a38ffa91bb34d59e378ce7df9ea1f956ccdd8aeaaa9b8775fee210673e951247ea276a577832fca70af00754a38ff1cb313d7003e29
+MISC ChangeLog-2015 1396 SHA256 e52ddbda8bbfc3948ab642b439bb99c93826694c9386bc86cd1f21e47f32a6f6 SHA512 e7e50a722e476fd5c8006f6e5280d94aecdca7984f623fee8bffb99205bdb1971cdf45c4f0bcb2062ec76a4c82d80b9af421f8658c54c8f24902567b2f595e13 WHIRLPOOL 85759dd0bb4844a325ad55eb4e605dc1fe2475f42d5e776c01ccf59f6ca7dcc5f700f31d402fc68850523f17e0971b9157043e9a222076a9985bd80f1e64109c
+MISC metadata.xml 305 SHA256 10d7409c55173c6cf42d65076e27a9dc674ad00372579a33fce582e5c001267d SHA512 1453b01adcb9b82c01603d34703eaa816164e3132dd542cb4f338c8a07e5efbb4f23bd16e634dc90f0b89b8441bbe94af64d36bc1ba182907e6058a558f5bb70 WHIRLPOOL f25a5558ed96d4bfe474b9831070779943c75e154f838ca9ceb0658a8443c5e4e72b6d8ff899668366f2ef0e63ee5985be234cf96454cbf6a344588b45799182
diff --git a/net-misc/openrdate/files/openrdate-1.1.3-rename.patch b/net-misc/openrdate/files/openrdate-1.1.3-rename.patch
new file mode 100644
index 000000000000..5f4774c3be4e
--- /dev/null
+++ b/net-misc/openrdate/files/openrdate-1.1.3-rename.patch
@@ -0,0 +1,29 @@
+Name the binary 'openrdate' as so not to conflict with the pre-existing ancient
+rdate.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar openrdate-1.1.3.orig/Makefile.am openrdate-1.1.3/Makefile.am
+--- openrdate-1.1.3.orig/Makefile.am	2007-11-10 21:15:31.000000000 -0800
++++ openrdate-1.1.3/Makefile.am	2008-06-18 14:27:40.001963783 -0700
+@@ -1,15 +1,15 @@
+ SUBDIRS = src
+ 
+-bin_PROGRAMS = rdate
++bin_PROGRAMS = openrdate
+ 
+-rdate_SOURCES= \
++openrdate_SOURCES= \
+         src/rdate.c
+ 
+-rdate_LDADD= \
++openrdate_LDADD= \
+         src/librdate.a
+ 
+ man_MANS= \
+-    docs/rdate.8
++    docs/openrdate.8
+ 
+ EXTRA_DIST= \
+-    docs/rdate.8
++    $(man_MANS)
diff --git a/net-misc/openrdate/files/openrdate-confd b/net-misc/openrdate/files/openrdate-confd
new file mode 100644
index 000000000000..fb4ee4caa746
--- /dev/null
+++ b/net-misc/openrdate/files/openrdate-confd
@@ -0,0 +1,12 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# the NTP or RFC868/time server to get the date from
+RDATE_SERVER="pool.ntp.org"
+
+# Options to pass to rdate
+# "-s" is mandatory to set the system time, and 
+# is passed regardless of this variable.
+# "-n" says that we are using an NTP server instead of a RFC868/time server.
+# "-c" is for leap seconds, which is needed on NTP servers.
+OPENRDATE_OPTS="-n -c"
diff --git a/net-misc/openrdate/files/openrdate-initd b/net-misc/openrdate/files/openrdate-initd
new file mode 100644
index 000000000000..92210cce3c89
--- /dev/null
+++ b/net-misc/openrdate/files/openrdate-initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	before cron
+	need net
+	use dns
+}
+
+checkconfig() {
+	if [ -z "${RDATE_SERVER}" ] ; then
+		eerror "Please edit /etc/conf.d/openrdate"
+		eerror "I need to know what server to use!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	ebegin "Setting clock via openrdate"
+	/usr/bin/openrdate -s ${OPENRDATE_OPTS} ${RDATE_SERVER} > /dev/null
+	eend $? "Failed to set clock via openrdate"
+}
diff --git a/net-misc/openrdate/metadata.xml b/net-misc/openrdate/metadata.xml
new file mode 100644
index 000000000000..bbbc68551751
--- /dev/null
+++ b/net-misc/openrdate/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 type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">openrdate</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/openrdate/openrdate-1.2.ebuild b/net-misc/openrdate/openrdate-1.2.ebuild
new file mode 100644
index 000000000000..eccde40413fa
--- /dev/null
+++ b/net-misc/openrdate/openrdate-1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+WANT_AUTOMAKE=1.9
+
+inherit autotools eutils
+
+DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
+HOMEPAGE="https://sourceforge.net/projects/openrdate/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.1.3-rename.patch
+	eautomake
+	mv docs/{,open}rdate.8
+}
+
+src_install(){
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+	newinitd "${FILESDIR}"/openrdate-initd openrdate
+	newconfd "${FILESDIR}"/openrdate-confd openrdate
+}
diff --git a/net-misc/openssh-blacklist/Manifest b/net-misc/openssh-blacklist/Manifest
new file mode 100644
index 000000000000..d15b5ebbb644
--- /dev/null
+++ b/net-misc/openssh-blacklist/Manifest
@@ -0,0 +1,6 @@
+AUX blacklist-encode.c 6532 SHA256 a16b03ad275150116e88c31bcc0b119cbe5705c50af8c140b14c2aefadf0a185 SHA512 e2f4bf86c5524244542674c7d670f49c51cfa0db8e2eeba9534a53074bd31d8e71a94def56631421bd0439a43f153e1314b3bd3d8d37ee0a2228d8dc747d4dac WHIRLPOOL 678d10eec1cb7ead1036aabbbfce30ac8ca9956d976d530db480447320fc8ee31a25518efdb9bcda663b5fe23bb7631f1cdeaa82758560a5517e7fc04c7c7420
+DIST openssh-blacklist_0.4.1.tar.gz 7519666 SHA256 5add49d4d2118a224c04c3b0c72c20b216e3d2035c1acc4cec39de2a804c2c09 SHA512 1633319757470fe15a9b5f98d301db9850485eaeef894711596ec929e22655301e9b454c02db4a7c7515d64063e6f122c6ede392343eb8227a98ce68bbceb0b8 WHIRLPOOL 3da0c8550dc794ba546a3bc8c033fb01a5fac5afdab36b38a76d34a359ebff32c99986b947a56e41bd94b9e68769ebfdbb9e1e044a14da442b404a5be6260922
+EBUILD openssh-blacklist-0.4.1.ebuild 920 SHA256 9b776749ae7fb32744e3cb2f39927c5ca130d05e2e1a97b0c71b8608744c1d32 SHA512 fff65f51cf2ef9b7a026067e0a5f7bf4df5ec611f76509b1c2bf27074c1dc4491a6da3950ffe9dbf85b6d7a9d969ef99375d6c5c64375252b8217ec3c559efe6 WHIRLPOOL 841078064a9293d5da4d89b14cb5f32135e139fc99e41be10640f333791f361a375bff98f0cb08241d4e28f47c1c187edcffad888d50972c309c14fcc1bb189a
+MISC ChangeLog 2484 SHA256 0cffb5eb93516df8ccfee9b28aa360361688bf9c83148b2544dae0596a53944d SHA512 c03a6f3f23249f1ba6bafdb5787ba4e42a6479c8e5ccef96d2fd04c4abed4e9e811b8ce141f043025bdd43f5db9a9aeaecd45a21beb307a1cd217cfaf35eab8c WHIRLPOOL 21e71c8a82de2de4a630942be61476c7655d3598f49ce48276ac88aa0748f39a18476883a4413128cee3b556a3ce7859cc24b4191c1428d5cefa9e73a07a6675
+MISC ChangeLog-2015 874 SHA256 e45ab4612fa04988c3d73e7a4874c726b89818349f268cdaaaa2f2cfcebc5377 SHA512 737d5eccc0ccad37cf2b74a468aee9f23defd538878c051a2777de65743e332a042a55e33ac7ab741e3e7d462de50b14148c8aa7462ebe9670989bc03bdb2543 WHIRLPOOL 931a2e35bbbd443f96d6452a8a3e30658bdfa6bede3215db380b345dd6127a4e5b8cf61530498c9355d3f21317af1e6f921cb223200da6acd83d8fa3d2008459
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/net-misc/openssh-blacklist/files/blacklist-encode.c b/net-misc/openssh-blacklist/files/blacklist-encode.c
new file mode 100644
index 000000000000..717c3e6575ff
--- /dev/null
+++ b/net-misc/openssh-blacklist/files/blacklist-encode.c
@@ -0,0 +1,249 @@
+/*
+ * The blacklist encoder for RSA/DSA key blacklisting based on partial
+ * fingerprints,
+ * developed under Openwall Project for Owl - http://www.openwall.com/Owl/
+ *
+ * Copyright (c) 2008 Dmitry V. Levin <ldv at cvs.openwall.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * The blacklist encoding was designed by Solar Designer and Dmitry V. Levin.
+ * No intellectual property rights to the encoding scheme are claimed.
+ *
+ * This effort was supported by CivicActions - http://www.civicactions.com
+ *
+ * The file size to encode 294,903 of 48-bit fingerprints is just 1.3 MB,
+ * which corresponds to less than 4.5 bytes per fingerprint.
+ */
+
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <errno.h>
+#include <error.h>
+#include <limits.h>
+
+static void *
+xmalloc(size_t size)
+{
+	void   *r = malloc(size);
+
+	if (!r)
+		error(EXIT_FAILURE, errno, "malloc: allocating %lu bytes",
+		      (unsigned long) size);
+	return r;
+}
+
+static void *
+xcalloc(size_t nmemb, size_t size)
+{
+	void   *r = calloc(nmemb, size);
+
+	if (!r)
+		error(EXIT_FAILURE, errno, "calloc: allocating %lu*%lu bytes",
+		      (unsigned long) nmemb, (unsigned long) size);
+	return r;
+}
+
+static void *
+xrealloc(void *ptr, size_t nmemb, size_t elem_size)
+{
+	if (nmemb && ULONG_MAX / nmemb < elem_size)
+		error(EXIT_FAILURE, 0, "realloc: nmemb*size > ULONG_MAX");
+
+	size_t  size = nmemb * elem_size;
+	void   *r = realloc(ptr, size);
+
+	if (!r)
+		error(EXIT_FAILURE, errno,
+		      "realloc: allocating %lu*%lu bytes",
+		      (unsigned long) nmemb, (unsigned long) elem_size);
+	return r;
+}
+
+static char *
+xstrdup(const char *s)
+{
+	size_t  len = strlen(s);
+	char   *r = xmalloc(len + 1);
+
+	memcpy(r, s, len + 1);
+	return r;
+}
+
+static unsigned
+c2u(uint8_t c)
+{
+	return (c >= 'a') ? (c - 'a' + 10) : (c - '0');
+}
+
+static char **records = NULL;
+static unsigned records_count = 0;
+
+static int
+comparator(const void *p1, const void *p2)
+{
+	return strcmp(*(char *const *) p1, *(char *const *) p2);
+}
+
+static void
+read_stream(FILE *fp, unsigned bytes)
+{
+	char   *line = NULL;
+	unsigned size = 0, allocated = 0, len = bytes * 2;
+	int     n;
+
+	while ((n = getline(&line, &size, fp)) >= 0)
+	{
+		if (n > 0 && line[n - 1] == '\n')
+			line[--n] = '\0';
+		if (n < len || strspn(line, "0123456789abcdef") < n)
+			continue;	/* ignore short or invalid lines */
+		line[len] = '\0';
+
+		if (!records)
+			records = xcalloc(allocated = 1024, sizeof(*records));
+		if (records_count >= allocated)
+			records = xrealloc(records, allocated *= 2,
+					   sizeof(*records));
+		records[records_count++] = xstrdup(line);
+	}
+	free(line);
+	records = xrealloc(records, records_count, sizeof(*records));
+	if (records_count >= (1U << 24))
+		error(EXIT_FAILURE, 0, "too many records: %u", records_count);
+
+	qsort(records, records_count, sizeof(*records), comparator);
+}
+
+static void
+print_uint8(FILE *fp, uint8_t v)
+{
+	fprintf(fp, "%c", v);
+}
+
+static void
+print_uint16(FILE *fp, uint16_t v)
+{
+	fprintf(fp, "%c%c", v >> 8, v & 0xff);
+}
+
+static void
+print_uint24(FILE *fp, uint32_t v)
+{
+	fprintf(fp, "%c%c%c", (v >> 16) & 0xff, (v >> 8) & 0xff, v & 0xff);
+}
+
+int
+main(int ac, const char **av)
+{
+	unsigned count, i, record_bytes, first_index = 0, prev_index = 0;
+	int     min_offset, max_offset;
+	int    *offsets;
+
+	if (ac < 2)
+		error(EXIT_FAILURE, 0, "insufficient arguments");
+	if (ac > 2)
+		error(EXIT_FAILURE, 0, "too many arguments");
+	record_bytes = atoi(av[1]);
+	if (record_bytes < 6 || record_bytes > 16)
+		error(EXIT_FAILURE, 0, "fingerprint size out of bounds");
+
+	read_stream(stdin, record_bytes);
+
+	/* initialize global records offset table */
+	offsets = xcalloc(65536, sizeof(*offsets));
+	for (count = 0; count < records_count; ++count, prev_index = i)
+	{
+		const char *r = records[count];
+
+		i = (((((c2u(r[0]) << 4) + c2u(r[1])) << 4) +
+		      c2u(r[2])) << 4) + c2u(r[3]);
+		if (count == 0)
+			first_index = i;
+		else if (i == prev_index)
+			continue;
+		offsets[i] = count;
+	}
+
+	/* set offsets for indices without records */
+	if (offsets[65536 - 1] == 0)
+		offsets[65536 - 1] = records_count;
+	for (i = 65536 - 2; i > first_index; --i)
+		if (offsets[i] == 0)
+			offsets[i] = offsets[i + 1];
+
+	/* make global records offset table relative to
+	   expected position assuming uniform distribution. */
+	for (i = 0, min_offset = 0, max_offset = 0; i < 65536; ++i)
+	{
+		offsets[i] -= (i * (unsigned long long) records_count) >> 16;
+		if (offsets[i] < min_offset)
+			min_offset = offsets[i];
+		if (offsets[i] > max_offset)
+			max_offset = offsets[i];
+	}
+	min_offset = -min_offset;
+	if (min_offset < 0)
+		error(EXIT_FAILURE, 0,
+		      "invalid offset shift: %d", min_offset);
+	for (i = 0; i < 65536; ++i)
+	{
+		offsets[i] += min_offset;
+		if (offsets[i] < 0 || offsets[i] >= 65536)
+			error(EXIT_FAILURE, 0,
+			      "offset overflow for index %#x: %d",
+			      i, offsets[i]);
+	}
+	max_offset += min_offset;
+
+	/* Header, 16 bytes */
+
+	/* format version identifier */
+	printf("SSH-FP00");
+	/* index size, in bits */
+	print_uint8(stdout, 16);
+	/* offset size, in bits */
+	print_uint8(stdout, 16);
+	/* record size, in bits */
+	print_uint8(stdout, record_bytes * 8);
+	/* records count */
+	print_uint24(stdout, records_count);
+	/* offset shift */
+	print_uint16(stdout, min_offset);
+	fprintf(stderr, "records=%u, offset shift=%d, max offset=%d\n",
+		records_count, min_offset, max_offset);
+
+	/* Index, 65536 * 2 bytes */
+	for (i = 0; i < 65536; ++i)
+		print_uint16(stdout, offsets[i]);
+
+	/* Fingerprints, records_count * (record_bytes-2) bytes */
+	for (count = 0; count < records_count; ++count)
+	{
+		const char *r = records[count] + 4;
+
+		for (i = 0; i < record_bytes - 2; ++i)
+			print_uint8(stdout,
+				    c2u(r[i * 2]) * 16 + c2u(r[i * 2 + 1]));
+	}
+
+	if (fclose(stdout))
+		error(EXIT_FAILURE, errno, "stdout");
+	return 0;
+}
diff --git a/net-misc/openssh-blacklist/metadata.xml b/net-misc/openssh-blacklist/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/net-misc/openssh-blacklist/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/openssh-blacklist/openssh-blacklist-0.4.1.ebuild b/net-misc/openssh-blacklist/openssh-blacklist-0.4.1.ebuild
new file mode 100644
index 000000000000..083797b64e91
--- /dev/null
+++ b/net-misc/openssh-blacklist/openssh-blacklist-0.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="Source files of vuln Debian keys"
+HOMEPAGE="https://packages.qa.debian.org/o/openssh-blacklist.html"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+
+DEPEND=""
+
+maint_pkg_create() {
+	wget http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/openssh/blacklist-encode.c -O "${FILESDIR}"/blacklist-encode.c
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp "${FILESDIR}"/blacklist-encode.c . || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getBUILD_CC)" \
+		CFLAGS="${BUILD_CFLAGS}" \
+		CPPFLAGS="${BUILD_CPPFLAGS}" \
+		LDFLAGS="${BUILD_LDFLAGS}" \
+		blacklist-encode || die
+	cat [DR]SA-* | ./blacklist-encode 6 > blacklist
+}
+
+src_install() {
+	insinto /etc/ssh
+	doins blacklist || die
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
new file mode 100644
index 000000000000..5f0612756b89
--- /dev/null
+++ b/net-misc/openssh/Manifest
@@ -0,0 +1,49 @@
+AUX openssh-6.7_p1-openssl-ignore-status.patch 765 SHA256 b068cc30d4bce5c457cea78233396c9793864ec909f810dd0be87d913673433a SHA512 ab15d6dfdb8d59946684501f6f30ac0eb82676855b7b57f19f2027a7ada072f9062fcb96911111a50cfc3838492faddd282db381ec83d22462644ccddccf0ae7 WHIRLPOOL c0a4ff69d65eeb40c1ace8d5be6f8e59044a8f16dc6b37e87393e79ab80935abf30a9d2a6babc043aba0477f5f79412e1ae5d373daba580178fd85ca1f60e60b
+AUX openssh-7.3-mips-seccomp-n32.patch 634 SHA256 a3d63f394e9ea692a5a515983f1ce85d2ba79ea6e6b0fd5659e05a18b753316a SHA512 eba3e843d3714501a1df3161d02134c54c8ce584db3af698b87d303fc17c16635bd06db4d7c2d9bb47f461c3b211d870b480fd927f4563207e11c9ed2c446770 WHIRLPOOL d1f87fbfd24694617ef1a03a55ba8f32ac6ac8c62541208f754df41bb30065a9f1bba640a645d9ef184aae2f7b35759b84d2564f38f9ab130cc2d282be203f75
+AUX openssh-7.3_p1-GSSAPI-dns.patch 11137 SHA256 081c1cee62b43aae1d84ee67e3b510f0775081c9901c971a6f60a35bb92046f1 SHA512 70db76a409d5a11513f57c67671131b95c83164af2ecafa423986def42a1a2a31c4653d06f510b8c440a974e03f0acad8cbe20d5a17cfb2ed4598a9b8ae60b91 WHIRLPOOL bd3f32d7b795d9d5948d1a2d38a3e9fc6380369378988da095e096a54bf8c41209bfa7955c04b68b3966a30ca10fd522778d76a0621d0858639f3e09f075b708
+AUX openssh-7.3_p1-NEWKEYS_null_deref.patch 857 SHA256 0d612c16c7b1b3b45fbe1c1507c4e80cfe001ab4fd7fbcfc80fb9cecc893d94a SHA512 2230ddd7473feaa22544eae5c1074981e5ade322a22016f245ec3a6b3bf260104909021497a728fbfaf5dbd6e81269b9b815a3a3de2bf8104f7b3d1bdacbcc06 WHIRLPOOL b927971ec7c07a8d350690280d9766f71ebeb03fc6ffefa2457801abf160ee331ec3bafca02acc3697899d9e2a56ce7b01e68b745cb6f5b491d8b30aea0b9366
+AUX openssh-7.3_p1-Unregister-the-KEXINIT-handler-after-receive.patch 953 SHA256 76059e75ba5f5d00c6ac74aa12017e98d1b401efb9f1c6073fa8013e5fc4204a SHA512 c705b08fa269d21da261cc9fce2ebcc409e252064d789b63ba14685495e46cb472a81fa563a74c80e4bf76e4982fba98ff5329a037f1fa4f28c75b4db18e7691 WHIRLPOOL 826f2e520742f65e0e7a2f183917483f4dd96c2fc52360d3307c41cc307eddb434e8205c7665a65eadde2e20a7a4b71020d2925ea59518234da2cbda6afb2b3b
+AUX openssh-7.3_p1-fix-ssh1-with-no-ssh1-host-key.patch 1088 SHA256 5841cc4a42238202d6fa3ee5fbccacbfad7156eb9d9b361d251f693443a0b672 SHA512 967da12f9d15e8347d9832a7fc90e378e42a49c6fb63c8ff3a28e66601c9dab64d5d43c8da34aa3fb08466088eb725abebb4efcef95b1aa0ada86cab27584106 WHIRLPOOL 50bb4bd2ff23d9aff94fa12755aebd91d0088691fb9899169e3018d91679f014f012d3b2d9c5b87a8c3edcaa2b8a19f9ec49c6803d95731f8020442840d26bbf
+AUX openssh-7.3_p1-hpn-12-x509-9.2-glue.patch 1608 SHA256 9a85d7cd56be8276e6407fe70ea22554323143d57209e0881f6ec0cc16705765 SHA512 bbbeca5d683427347e9db8cdaa5c96bfdbae901245e508dec8927110e199798127b7c4df8ef2455c1fec53263d600c7957d5b55e1b78263776a45808b4c0b86a WHIRLPOOL 928a2603737c36a23d76145b0e11108645d13263ad955ad30de5a8ee7a008774cdb63ad144d141f7ed6f16f885ee427a7827ba7397a1cec465db3a32fd0ac215
+AUX openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch 7005 SHA256 44ae73966a98e0d7cf36f35b64472b62128040c86720a915b6e72ca269b72f13 SHA512 35cb90a5ebf85b31db902155a8d48a65d2734943cf46e2ac1fcbcb8a19e31d9bf6057ec3c0001a4cb14eac572e5d400087c3218c81df40146731472e406499d8 WHIRLPOOL ba47e8f157ecf448becef9f1c9dfb5bea9f6bd39b461c13cb265a7dc9fde31634a583db3849429ed27129e8c5e797eebe7141c310674126a9a0e2f232c92d8e1
+AUX openssh-7.3_p1-hpn-x509-9.2-glue.patch 1611 SHA256 7d04d19e62e688c9c12c25fd479933dd2c707f838ac810263dd1dc79a5ff55f1 SHA512 3604f0f1ea6c74b8418ac158df47910dfb2d54c7ce77f78f1a6c072acd20dc5751e24156acd9dda02aecaac250f43c8d968382f2f4b15b4706e4c4bde8ebde9a WHIRLPOOL b327a94c5b37da296caaa925bf13adf81ab3a53dffe691b33010b89b07366445613e553b4f486bacab658e2dcec143971001b4158f493e9b7e5bd427f0e072fb
+AUX openssh-7.3_p1-sctp-x509-glue.patch 2447 SHA256 a6758b9bff99022b1aa1bc729fcdcc8e4e91d0a617c903d72964cc1fca1ea061 SHA512 f48c2bba7707542741e52f5d794aaafe4468d088e28bc02878c0eb9aa76d31b57dca69b85705f7a9a2d745272df3fdc39a1d13ba337cab34dd0e9d545cee7d41 WHIRLPOOL 77e2574065a78a0f7014213f5e5d64651d41f24c7652542589f1106a6a114cf27d9922ef2cddee9e62c0f0f118691d91ebe9dc4a0ae04654843f18bdd20e2cef
+AUX openssh-7.3_p1-x509-9.2-warnings.patch 3060 SHA256 e7963f4946db01390831ee07a49c3a2291518b06144e95cfc47326c7209fa2e3 SHA512 f029d6f922e1632b32ac6e7b627378854f78c9d9b828dde37273b1b1a09167273fc6934bcb0653209b9e5ffd06c95d564d1bf5f1ea745993e19b062a4532f1c0 WHIRLPOOL cd4eb68bf861a50e9452c453c903946b8d067fd00171d39c6bad797d20c07631cda2379d9e41246bc93b22252a8d1bd55186e13ba492c7b8cf94048910f3a8a9
+AUX openssh-7.4_p1-GSSAPI-dns.patch 11137 SHA256 1bf065d8a8896df00d985edb232521f771e6ab0a95c6f25ceb66d23fe535a615 SHA512 6253a00644b68033f5cdba0b8a6abf5e9a6b82994a24acfd138e949ccfb0e3c5c2d58c5a94fa389d1e98ec30b07bcef048d0fb6665811376050b294986c4026a WHIRLPOOL a47626f3771494127fd5ebb1aca8d94af063d7397140f349825f4ccc7f4a5fc7ddd7f802741f0826e481f18c424d2da5763ced3b2ffcfe5c5cdb5eb41662d3a4
+AUX openssh-7.4_p1-test-bashism.patch 876 SHA256 b38f47e93db0bf6a06bb457356ce9d780e51566676d7f53e7c752e27b042c8c8 SHA512 52dda6053fe46ee42ea4ef7dad652ddfdd009ce4d165140115f965be2a8c4486652ad12b8653520f17ea7446508c08ce259eb0b906f7f5f558a3df1061e96de9 WHIRLPOOL 321cc39844460c088b3f29629d1f1439b5b323a38bcad042c010a66d14629c1d41ef6b7f8c54ab0b917b0683659c7a7fe7224d2627ecf4797ab570157535b934
+AUX openssh-7.5_p1-GSSAPI-dns.patch 11137 SHA256 e0b256646651edd7a4bf60ebe4cf2021d85a5f8f3d30393bd499655c0b0c64c1 SHA512 f84e1d3fdda7a534d9351884caaefc136be7599e735200f0393db0acad03a57abe6585f9402018b50e3454e6842c3281d630120d479ff819f591c4693252dd0e WHIRLPOOL 000276fe1e0cc9ac33da8974cc6e24803a69b3d63c20096a92d6d10206c6e27110bdcaa26c0dbd2e0d0feb501681a738d5adb9d57ae21c7c55f67396f8b26c0e
+AUX openssh-7.5_p1-cross-cache.patch 1220 SHA256 693c6e28d4c1da71c67b64ef25d286f0d5128f9aebb3450283fa9ce6887186a7 SHA512 03cf3b5556fcf43c7053d1550c8aa35189759a0a2274a67427b28176ba7938b8d0019992de25fb614dc556c5f45a67649bb5d2d82889ac2c37edd986fc632550 WHIRLPOOL f7a04e19816cadce138a0beec4f1ad5f975773a1802fd1db245846ce8d5d6ec5ddfdcfa099e391172457a29eedb30c416dfa7bf4a56e99cfe507be00d2e1e718
+AUX openssh-7.5_p1-hpn-x509-10.1-glue.patch 2741 SHA256 77901da67a2bfdffbe426074bbb0416c82e99a8693103cd0e7738ed8e46c6aed SHA512 940dd448f6768bb3e94987eb86b6002d17d918310ad5c1f38f1b3fd9df263439e0fecb9c8f09c05649bfd03cb507c31ef9320522e946850e954ffdd44fdd4b73 WHIRLPOOL fcd828f9f8b1dee78308b663bbacf17ca4741c94df5e469cdd529dddc3ba266713413e035bb81c8a49d6df4ab67a865634e466b0b4e1fbad766833dbf2776e80
+AUX openssh-7.5_p1-hpn-x509-10.2-glue.patch 2847 SHA256 bddb645e4ffe6f710c10fae9bbebad33fab3bf3533d401ec54d7b8a26113f6a5 SHA512 bc23fdf5995ae38ff166f12f64082f79a2135ca28f2240e89bee42b1e3ba39ce94467ece9ddea99173f1829b09b069dbf56a0bce7dfd1ae5f63c12f73b5ffba7 WHIRLPOOL e80f6ece056cb77768e24585549a601076e57d8c143afb0c6fecd31176bccbdcc552fb98a28c6b2f68180c26c4855f2e99dd48b38d6753071b6b868d071b5e96
+AUX openssh-7.5_p1-x32-typo.patch 772 SHA256 17f2baad36e5b6d270d7377db4ebdf157f2eb3bc99d596c32a47d584a1040307 SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e WHIRLPOOL 5141fd3a19575593f84890aaa84123373ffb81aa3e860cda2468c7578754acf0a5d8ce0ea9c5ab25a83574ad5b272b9240cdcb29724c3b7cbdc059518da8c609
+AUX openssh-7.5p1-x509-libressl.patch 7027 SHA256 8e9a7f0c891ae2324d756dc4fb93943eb39f3799d2dedccdcfdff0ad1c0067d6 SHA512 0b5fcb58ee55de7ce61bf2bcad23e4a5cdc941d81121bbf8f0dadf5e1e158c055f45a2ef1aebe8fcb1856a33e079282f4c9f21d9da6892808d7e3c172dca3365 WHIRLPOOL f5d43a4de22c70f75607f2d22251072f88d4715d207e74052f2009e6073706da2978ecb183e6c4c10cebd328ac924f33cc8cd149c7072cda3c2f084ec8ef9948
+AUX sshd.confd 396 SHA256 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41 SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81 WHIRLPOOL 69f43e6192e009a4663d130f7e40ee8b13c6eb9cc7d960b5e0e22f5d477649c88806a9d219efef211f4346582c2bb51e40d230a8191e5953dbe08bfff976ae53
+AUX sshd.pam_include.2 156 SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c WHIRLPOOL ba7a0a8c3bb39c5fda69de34b822a19696398e0a8789211ac1faae787ee34f9639eb35efe29c67f874b5f9fe674742503e570f441c005974f4a0c93468b8970b
+AUX sshd.rc6.4 2108 SHA256 43a483014bf177f9238e54a7b8210d5a76830beb67c18999409e543fd744c9e4 SHA512 fe58e950514743a72467233ff2f2a63112c50e5db843d61e141a5ca3dd8ef8f42a616cd9de7748ae582054c47c2cc38ce48b638e2d88be39c1387f77e79c83e1 WHIRLPOOL ef30b1e3a118b40617e3c1de6b4ebb360f466e90e18157a08d0ed50a4acb488eb7f6159120525e2b7e85393cd19b062c97188460ea51959467eb6ab52632d064
+AUX sshd.service 242 SHA256 1351c43fe8287f61255ace9fa20790f770d69296b4dd31b0c583983d4cc59843 SHA512 77f50c85a2c944995a39819916eb860cfdc1aff90986e93282e669a0de73c287ecb92d550fd118cfcc8ab538eab677e0d103b23cd959b7e8d9801bc37250c39c WHIRLPOOL 0f5c48d709274c526ceee4f26e35dcb00816ffa9d6661acc1e4e462acb38c3c6108b0e87783eff9da1b1868127c5550c57a5a0a9d7270b927ac4b92191876989
+AUX sshd.socket 136 SHA256 c055abcd10c5d372119cbc3708661ddffccdee7a1de1282559c54d03e2f109d9 SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42 WHIRLPOOL 102d87b708c31e5994e8005437c78b1aa756c6def4ee9ae2fa9be1438f328fc28c9152a4ff2528941be18f1311594490ecd98b66716ec74e970aa3725a98e2e5
+AUX sshd_at.service 176 SHA256 332f5ffc30456fe2494095c2aabd1e6e02075ce224e2d49708ac7ccf6d341998 SHA512 662a9c2668902633e6dbcb9435ac35bec3e224afdb2ab6a1df908618536ae9fc1958ba1d611e146c01fddb0c8f41eefdc26de78f45b7f165b1d6b2ee2f23be2a WHIRLPOOL aeb32351380dd674ef7a2e7b537f43116c189f7fddb8bdb8b2c109e9f62b0a73cc0f29f2d46270e658ab6409b8d3671ce9e0d0ba7c0d3674c2f85291a73e6df1
+DIST openssh-7.3_p1-hpn-14.10-r1.patch.xz 20584 SHA256 0bbbfeb1f9f975ad591ed4ec74927172c5299ec1a76210197c14575204efa85d SHA512 f0a1c84af85f7cfc7cb58b5117b3d0f57fc25ae0dd608e38b48ef42da43780fd5cf243d26ff9b3fbd6f4cb1567852b87bcb75f98791cf3ad1892e8579a7834d3 WHIRLPOOL b1a8bae14c8189745056c15c9ed45207aa06af1f4c598a1af7dc3cc56e47bd0211a63989a920727e20311a148bbcf3202c202eae94cd1512c7d87816a9f44bcb
+DIST openssh-7.3_p1-sctp.patch.xz 9968 SHA256 18c3db45ed1e5495db29626938d8432aee509e88057494f052cfc09d40824c7f SHA512 f249b76898af0c6f1f65f2a1cfb422648aa712818d0dc051b85a171f26bdddf7980fff5de7761161aa41c309e528b3801b4234f5cdd9f79f8eef173ae83f1e3c WHIRLPOOL 1d92b969154b77d8ce9e3a6d0302aa17ec95e2d5ea4de72c0fb5680a8ee12f518ee5b1c47f22ad5d1a923a74c43829ed36cf478fe75fe400de967ab48d93dc99
+DIST openssh-7.3p1+x509-9.2.diff.gz 588078 SHA256 45f054cbb2b77ac8cc7ab01439e34083382137d47b840ca274555b7e2cf7098b SHA512 fab0da148b0833a651e8a7c36f344aacecef6fa92f8f1cb6302272d98c1ab018831f5850dcaa8f54a39f9ada9b7d5b0a0ea01defc3c6f603bbe211f6bff6a841 WHIRLPOOL 53f63d879f563909c57d23ced273e23eda1eace2a2ddfd54edf5f2ef15218cc7e5d927e54714b6850db541f361c459de50d79b0a4516b43ce4cba8eb66b49485
+DIST openssh-7.3p1-hpnssh14v12.tar.xz 23448 SHA256 45b8e10f731f160ea44126bf64314d850048d98059dc22f89b3f14f46f0dcc67 SHA512 f1ee37dfd1b717963ae519b725d481de2486c9c94fd80ccd12da2ac00d13be7b6e0284a1e9239a4704014810c086eaaa81cd02344372c65d0122a3eb1c2be83c WHIRLPOOL 1fdb4e99f9d6450af73a1202c2f80d4be454fbeab723a1cf833a37fc040dc8ede592129d4e4087cf247095dbf5fa782286ab0338fe8a55675efb4ea9bfaf651c
+DIST openssh-7.3p1.tar.gz 1522617 SHA256 3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc SHA512 7ba2d6140f38bd359ebf32ef17626e0ae1c00c3a38c01877b7c6b0317d030f10a8f82a0a51fc3b6273619de9ed73e24b8cf107b1e968f927053a3bedf97ff801 WHIRLPOOL f852026638d173d455f74e3fce16673fc4b10f32d954d5bb8c7c65df8d1ca7efd0938177dd9fb6e1f7354383f21c7bca8a2f01e89793e32f8ca68c30456a611c
+DIST openssh-7.4_p1-sctp.patch.xz 8220 SHA256 18fa77f79ccae8b9a76bc877e9602113d91953bd487b6cc8284bfd1217438a23 SHA512 0c199e3b26949482125aeaa88216b2458292589e3eac8908d9134d13a1cae891094fcb0f752ed3009b3126cc72277b460205f39140c251792eb1b545271c3bd4 WHIRLPOOL 0f0ea1d36523b35d3be33d22fb84daa05fd14c464d69c19695235f81d26326bc53d6804bf34d0cc0c2584f412bfdac361d2b018032447d1033a4ff4fd9458a09
+DIST openssh-7.4p1+x509-9.3.diff.gz 446572 SHA256 1d3fd23b3d02a3baad50890bf5498ef01af6dab6375da0aeb00a0d59fd3ac9ee SHA512 7ebc8d1f6ec36d652bbb6fb13d6d86f7db1abf8710af7b56c52fad9a18d73c9028a3307daabfdda26483a3bd9196120f6d18b6fb2c89b597b0a9ad0554161dfc WHIRLPOOL f878346a3154b7dbb01de41830d5857064af96d3a709aed40a112fe9aaadbe4801e5c3a22a1d2c8437b74a890596211be37e26d691ff611981d7375d262598c1
+DIST openssh-7.4p1.tar.gz 1511780 SHA256 1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1 SHA512 4f3256f461f01366c5d5e0e45285eec65016e2643b3284b407f48f53d81087bf2c1caf7d5f7530d307a15c91c64de91446e1cba948e8fc68f82098290fe3b292 WHIRLPOOL 4ed9a277287d1f5c2fd371b53394d6dde36b25adf92d4b6b5b486a9d448648f2ecfbb721ae39ba8a129913c1148aa4db1e99f7960a7c69fa215dfa7b3b126029
+DIST openssh-7.5p1+x509-10.1.diff.gz 460721 SHA256 e7abe401e7f651779c680491cfefbfcf4f26743202641b2bda934f80bb4464d2 SHA512 d3b5a8f5e3a88eda7989b002236811867b7e2c39bf7cd29a6dbbce277fca3fbedbfdbeaf1fba7d8c19f3dea32a17790e90604765f18576bcc5627a9c1d39109c WHIRLPOOL 2d4f96b47bcde9eabd19cad2fdc4da01a3d207f6ad5f4f1ea5a7dbd708d61783ae6a53e4cb622feed838106f57dbe6a7ecd1b41426325870378caf44803ff9ef
+DIST openssh-7.5p1+x509-10.2.diff.gz 467040 SHA256 24d5c1949d245b432abf2db6c28554a09bcffdcb4f4247826c0a33bdbee8b92c SHA512 ec760d38771749d09afc8d720120ea2aa065c1c7983898b45dba74a4411f7e61e7705da226864e1e8e62e2261eecc3a4ab654b528c71512a07798824d9fb1a9a WHIRLPOOL 3291a3e39b1a47efe149cdf805de11217fd55c4260477f2a6c6cc0bfa376b98a5dc7f56a49ae184fb57bae6226c73d1794db7b2285e3ea26a8fea4bc9304655b
+DIST openssh-7.5p1-hpnssh14v12.tar.xz 23068 SHA256 8a1ed99c121a4ad21d7a26cd32627a8dd51595fd3ee9f95dc70e6b50fe779ce2 SHA512 45c42090a212b9ce898fbaa8284ddf0f0d17236af13c4a780e00bf265b0c7a4286027e90a7ce9ad70066309db722709dd2f0a7914f57e5364ffbaf7c4859cdf9 WHIRLPOOL 6089ad8ae16c112a6f15d168c092e7f057b9e6d815724346b5a6a1cd0de932f779d5f410d48c904d935fcb3bad3f597fa4de075ab1f49cadc9842ce7bd8fdf42
+DIST openssh-7.5p1.tar.gz 1510857 SHA256 9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 SHA512 58c542e8a110fb4316a68db94abb663fa1c810becd0638d45281df8aeca62c1f705090437a80e788e6c29121769b72a505feced537d3118c933fde01b5285c81 WHIRLPOOL 1a42c68d8e350bc4790dd4c1a98dd6571bfa353ad6871b1462c53b6412f752719daabd1a13bb4434d294de966a00428ac66334bab45f371420029b5e34a6914c
+DIST openssh-lpk-7.3p1-0.3.14.patch.xz 17800 SHA256 cf1f60235cb8b0e561cd36cbf9e4f437e16fd748c2616d3f511c128c02deb76c SHA512 e9a73c5f13e41f6e11c744fdbcdb2e399c394479f79249e901cb3c101efb06f23d51d3ba4869db872184fa034a5910fc93a730fe906266c8d7409e39ad5b1ecd WHIRLPOOL bbdeadbed8f901148713bd9e4a082a4be2992c3151f995febd8be89bbb85d91185e1f0413b5a94a9340f2f404d18c9cee2aa6e032adaee0306aa1c624f6cc09c
+DIST openssh-lpk-7.4p1-0.3.14.patch.xz 17076 SHA256 3a5e4104507d259ad15391136322ea5d067d7932199bbafde5cb478daf3595ad SHA512 1c91de291816ee0bb29ed3a2ffc42fb6fb4ba27a8616f8bd50accdf31d1fecc9b4fb3de6fb1ea6e722b69eb8cab68030ade87e126a4112667d14f3c2ef07d6cd WHIRLPOOL ea27224da952c6fe46b974a0e73d01e872a963e7e7cc7e9887a423357fb4ff82f4513ce48b6bbf7136afa8447bc6d93daa817cf5b2e24cb39dba15cbcff6d2cc
+DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 SHA256 11060be996b291b8d78de698c68a92428430e4ff440553f5045c6de5c0e1dab3 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b WHIRLPOOL 58526777475786bb5efa193f3a3ec0500c4d48b18fef67698f8b1999cb07f04fbca7b7d3ece469f3a1e1ceca5152cdd08d3dbe7cfa4e7494740dc2c233101b93
+EBUILD openssh-7.3_p1-r7.ebuild 11515 SHA256 7c6f3448a9b16c77c6a2f7acc86f59795b7f92a20c1067c2af99eea0c9ac2afb SHA512 4fa3c73930343d65bdfbf670b226ecd66f594b0f583ce358d7b95f5f471e695c31c0bff6935509634da5d1519ec343bf5c1b394fdb62ae024cb9173a752fe14d WHIRLPOOL 5d4ed15dc34f81930b02f0853674feb03cd82ae3bd2e30e7908d9a37ddab4e3e4f8b9fbd4adeec477ae5dd48cbcb9b2c6dec9c05d023638864209162e0bdfc14
+EBUILD openssh-7.3_p1-r8.ebuild 11180 SHA256 1c80b551a6d623356be07e915f5c0b91dbb0b10c28ce8549d3f2c2f742efc11c SHA512 b0b4f48d66c64ee4cbb9f759aae82d9d01ff7c6d135b42dcd9c6538345033bd9ae05ec25eaaf6301fe8f95aef9cb9728932187e25c5f4fe07f57f932bbfeb3ec WHIRLPOOL 71028fa8ceb091ca99984a998c69018cf955ec3bd3bdc7fd503decf81d18cf2ced0b88ea69b1b22ff1ce7f6cf0cd001fdba5550924045cd9fc33feeadb715de3
+EBUILD openssh-7.4_p1.ebuild 10816 SHA256 982d991c9f2ab8d22dade9ba907dde422cd101f623cdeeae0c46144a6da47e08 SHA512 9989e23b6889ab4141aa88510abf41b0da4f49bb5be8e8b4e3474e317d42df5d953e7d0bab7ce282b2db87ff4053a5d21cb859fa63cd702f945052a8b7f056bf WHIRLPOOL 7ccccf459cfef4be505f7bdaf2f4674f5a51395394f23050b8c8e0c2699b9c5068e4e8d4c25af407330ce201a620d945d5d051751af13485f37b85463049f83f
+EBUILD openssh-7.5_p1-r1.ebuild 11026 SHA256 4454081691292f2bc218292e09724693fb1b9fc54e65d31042a93bf329728a96 SHA512 2441bff83bba61ead49ce69f7682d6ff9e6629eebc7dd9208da86043c07519a4ee1b9639b5ab22b04298b214ef8ccf94149269d3980d5d48ed01bfde409e015d WHIRLPOOL a0e20cbbe1899a18697e64f33c2bf8d4f9ae51c777032d2f994eda31dc70ac6c0a66c65a9fc46783419656554ac6098b32bb27132becb284c8ccfbdc36e44aff
+EBUILD openssh-7.5_p1-r2.ebuild 10966 SHA256 9aa4c233f5832ae36ea3c793828d240577f37ae96b28d3cf60c62df51623e15d SHA512 a461598a75ecb04c04c1c7e7bac216bb8a0e47ea493e8ce95d1545e96f9d0109cfd63b8be3845f31ba53b6d54e2ca99a9416c94ac9428c51666475a0ae65d3ef WHIRLPOOL a97c29508e3359d1d26d7c6f470fd96194e55fa4564e6692153385d839c5f64d37788026ba6123d8350615a515246404ef691ab6bcf079fe1e3ac8d6b05bfde3
+EBUILD openssh-7.5_p1.ebuild 10806 SHA256 cfbe54b70f9b7bf4d32a98e4acd0d44e273082b398b3e0fb5e1015e1254ce692 SHA512 a7f06a2e84bc82558be72df76f94bb08dae445a9ed83cf8641894e1727b5c8e4f3d43a1f68d28d8b8dd8faa4ec8a34174ca7adb15509bb181e92eb3dd6f6a53b WHIRLPOOL 97a3625286cddda0045e1609f5054ed21faa168f7f19afd582cd85aa7d7baf6cb15c22ecdbbf9c54aa1ae16793bd719d314cf9b7d5753b7a3f6f455ed6e938b2
+MISC ChangeLog 25370 SHA256 ad091426a190d89906e9f866e3f9545599b156b39e4b0feeb4f862997faab147 SHA512 cff2020279e7738e82fd0202b0e6de74c837d64a95f931c5ba159a8cc557f596d4b750c1527b96b9a74a8ec16bdaf0ed51457d074046f8049fdf262599394644 WHIRLPOOL ddb4f6ea4aa8051dac3da94bd4ffd94168d4e2cf2030de7841f10384c17f2e803847ccb6777c92ea5e48ce9b65d0bb5d9c77d04aa8e34fcc8fd5cfce04d8e304
+MISC ChangeLog-2015 95783 SHA256 53b51ee42a1faf42d80733382986e4fd606366b7bb6350c76f44df851e071890 SHA512 95a4f4243cb8cd8901208adc3632e191ab27a5ea2ce947e832264833262d8bd1e74a7e4f3545d6f2da8d2b473a59cfc7014aa88d5b0ea30e348c4f5d9323c8e5 WHIRLPOOL 5b56a38ddcf0308b681fc1c1fe8107c37ea1385e30ebc435d22f73c38947f9afdbb37ffb1c22bc48c83117cb91b946831cd83bab2807c248292fd2822002f828
+MISC metadata.xml 2212 SHA256 50f6e3651c8aeb86cfe90d92cef6a2b55640c400584f5fdbb6418cef7ac16f25 SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5 WHIRLPOOL 6d1080bc5c3b10a63836b5286d0d66b925a9d27d35e9855c9f966445458c1d6a752854d019c1740420ea78aef6f60105bef4c771fe61a95aae898034cf100705
diff --git a/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch b/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch
new file mode 100644
index 000000000000..fa33af39b6f8
--- /dev/null
+++ b/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch
@@ -0,0 +1,17 @@
+the last nibble of the openssl version represents the status.  that is,
+whether it is a beta or release.  when it comes to version checks in
+openssh, this component does not matter, so ignore it.
+
+https://bugzilla.mindrot.org/show_bug.cgi?id=2212
+
+--- a/openbsd-compat/openssl-compat.c
++++ b/openbsd-compat/openssl-compat.c
+@@ -58,7 +58,7 @@ ssh_compatible_openssl(long headerver, long libver)
+ 	 * For versions >= 1.0.0, major,minor,status must match and library
+ 	 * fix version must be equal to or newer than the header.
+ 	 */
+-	mask = 0xfff0000fL; /* major,minor,status */
++	mask = 0xfff00000L; /* major,minor,status */
+ 	hfix = (headerver & 0x000ff000) >> 12;
+ 	lfix = (libver & 0x000ff000) >> 12;
+ 	if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
diff --git a/net-misc/openssh/files/openssh-7.3-mips-seccomp-n32.patch b/net-misc/openssh/files/openssh-7.3-mips-seccomp-n32.patch
new file mode 100644
index 000000000000..7eaadaf11cda
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.3-mips-seccomp-n32.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/591392
+https://bugzilla.mindrot.org/show_bug.cgi?id=2590
+
+7.3 added seccomp support to MIPS, but failed to handled the N32
+case.  This patch is temporary until upstream fixes.
+
+--- openssh-7.3p1/configure.ac
++++ openssh-7.3p1/configure.ac
+@@ -816,10 +816,10 @@ main() { if (NSVersionOfRunTimeLibrary("
+ 		seccomp_audit_arch=AUDIT_ARCH_MIPSEL
+ 		;;
+ 	mips64-*)
+-		seccomp_audit_arch=AUDIT_ARCH_MIPS64
++		seccomp_audit_arch=AUDIT_ARCH_MIPS64N32
+ 		;;
+ 	mips64el-*)
+-		seccomp_audit_arch=AUDIT_ARCH_MIPSEL64
++		seccomp_audit_arch=AUDIT_ARCH_MIPSEL64N32
+ 		;;
+ 	esac
+ 	if test "x$seccomp_audit_arch" != "x" ; then
diff --git a/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch
new file mode 100644
index 000000000000..806b36d0ca94
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch
@@ -0,0 +1,351 @@
+http://bugs.gentoo.org/165444
+https://bugzilla.mindrot.org/show_bug.cgi?id=1008
+
+--- a/readconf.c
++++ b/readconf.c
+@@ -148,6 +148,7 @@
+ 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
+ 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
+ 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
++	oGssTrustDns,
+ 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
+ 	oSendEnv, oControlPath, oControlMaster, oControlPersist,
+ 	oHashKnownHosts,
+@@ -194,9 +195,11 @@
+ #if defined(GSSAPI)
+ 	{ "gssapiauthentication", oGssAuthentication },
+ 	{ "gssapidelegatecredentials", oGssDelegateCreds },
++	{ "gssapitrustdns", oGssTrustDns },
+ #else
+ 	{ "gssapiauthentication", oUnsupported },
+ 	{ "gssapidelegatecredentials", oUnsupported },
++	{ "gssapitrustdns", oUnsupported },
+ #endif
+ 	{ "fallbacktorsh", oDeprecated },
+ 	{ "usersh", oDeprecated },
+@@ -930,6 +933,10 @@
+ 		intptr = &options->gss_deleg_creds;
+ 		goto parse_flag;
+ 
++	case oGssTrustDns:
++		intptr = &options->gss_trust_dns;
++		goto parse_flag;
++
+ 	case oBatchMode:
+ 		intptr = &options->batch_mode;
+ 		goto parse_flag;
+@@ -1649,6 +1656,7 @@
+ 	options->challenge_response_authentication = -1;
+ 	options->gss_authentication = -1;
+ 	options->gss_deleg_creds = -1;
++	options->gss_trust_dns = -1;
+ 	options->password_authentication = -1;
+ 	options->kbd_interactive_authentication = -1;
+ 	options->kbd_interactive_devices = NULL;
+@@ -1779,6 +1787,8 @@
+ 		options->gss_authentication = 0;
+ 	if (options->gss_deleg_creds == -1)
+ 		options->gss_deleg_creds = 0;
++	if (options->gss_trust_dns == -1)
++		options->gss_trust_dns = 0;
+ 	if (options->password_authentication == -1)
+ 		options->password_authentication = 1;
+ 	if (options->kbd_interactive_authentication == -1)
+--- a/readconf.h
++++ b/readconf.h
+@@ -46,6 +46,7 @@
+ 					/* Try S/Key or TIS, authentication. */
+ 	int     gss_authentication;	/* Try GSS authentication */
+ 	int     gss_deleg_creds;	/* Delegate GSS credentials */
++	int	gss_trust_dns;		/* Trust DNS for GSS canonicalization */
+ 	int     password_authentication;	/* Try password
+ 						 * authentication. */
+ 	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
+--- a/ssh_config.5
++++ b/ssh_config.5
+@@ -830,6 +830,16 @@
+ Forward (delegate) credentials to the server.
+ The default is
+ .Dq no .
++Note that this option applies to protocol version 2 connections using GSSAPI.
++.It Cm GSSAPITrustDns
++Set to
++.Dq yes to indicate that the DNS is trusted to securely canonicalize
++the name of the host being connected to. If
++.Dq no, the hostname entered on the
++command line will be passed untouched to the GSSAPI library.
++The default is
++.Dq no .
++This option only applies to protocol version 2 connections using GSSAPI.
+ .It Cm HashKnownHosts
+ Indicates that
+ .Xr ssh 1
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -656,6 +656,13 @@
+ 	static u_int mech = 0;
+ 	OM_uint32 min;
+ 	int ok = 0;
++	const char *gss_host;
++
++	if (options.gss_trust_dns) {
++		extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns);
++		gss_host = auth_get_canonical_hostname(active_state, 1);
++	} else
++		gss_host = authctxt->host;
+ 
+ 	/* Try one GSSAPI method at a time, rather than sending them all at
+ 	 * once. */
+@@ -668,7 +674,7 @@
+ 		/* My DER encoding requires length<128 */
+ 		if (gss_supported->elements[mech].length < 128 &&
+ 		    ssh_gssapi_check_mechanism(&gssctxt, 
+-		    &gss_supported->elements[mech], authctxt->host)) {
++		    &gss_supported->elements[mech], gss_host)) {
+ 			ok = 1; /* Mechanism works */
+ 		} else {
+ 			mech++;
+
+need to move these two funcs back to canohost so they're available to clients
+and the server.  auth.c is only used in the server.
+
+--- a/auth.c
++++ b/auth.c
+@@ -784,117 +784,3 @@ fakepw(void)
+ 
+ 	return (&fake);
+ }
+-
+-/*
+- * Returns the remote DNS hostname as a string. The returned string must not
+- * be freed. NB. this will usually trigger a DNS query the first time it is
+- * called.
+- * This function does additional checks on the hostname to mitigate some
+- * attacks on legacy rhosts-style authentication.
+- * XXX is RhostsRSAAuthentication vulnerable to these?
+- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
+- */
+-
+-static char *
+-remote_hostname(struct ssh *ssh)
+-{
+-	struct sockaddr_storage from;
+-	socklen_t fromlen;
+-	struct addrinfo hints, *ai, *aitop;
+-	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
+-	const char *ntop = ssh_remote_ipaddr(ssh);
+-
+-	/* Get IP address of client. */
+-	fromlen = sizeof(from);
+-	memset(&from, 0, sizeof(from));
+-	if (getpeername(ssh_packet_get_connection_in(ssh),
+-	    (struct sockaddr *)&from, &fromlen) < 0) {
+-		debug("getpeername failed: %.100s", strerror(errno));
+-		return strdup(ntop);
+-	}
+-
+-	ipv64_normalise_mapped(&from, &fromlen);
+-	if (from.ss_family == AF_INET6)
+-		fromlen = sizeof(struct sockaddr_in6);
+-
+-	debug3("Trying to reverse map address %.100s.", ntop);
+-	/* Map the IP address to a host name. */
+-	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
+-	    NULL, 0, NI_NAMEREQD) != 0) {
+-		/* Host name not found.  Use ip address. */
+-		return strdup(ntop);
+-	}
+-
+-	/*
+-	 * if reverse lookup result looks like a numeric hostname,
+-	 * someone is trying to trick us by PTR record like following:
+-	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
+-	hints.ai_flags = AI_NUMERICHOST;
+-	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
+-		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
+-		    name, ntop);
+-		freeaddrinfo(ai);
+-		return strdup(ntop);
+-	}
+-
+-	/* Names are stored in lowercase. */
+-	lowercase(name);
+-
+-	/*
+-	 * Map it back to an IP address and check that the given
+-	 * address actually is an address of this host.  This is
+-	 * necessary because anyone with access to a name server can
+-	 * define arbitrary names for an IP address. Mapping from
+-	 * name to IP address can be trusted better (but can still be
+-	 * fooled if the intruder has access to the name server of
+-	 * the domain).
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_family = from.ss_family;
+-	hints.ai_socktype = SOCK_STREAM;
+-	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
+-		logit("reverse mapping checking getaddrinfo for %.700s "
+-		    "[%s] failed.", name, ntop);
+-		return strdup(ntop);
+-	}
+-	/* Look for the address from the list of addresses. */
+-	for (ai = aitop; ai; ai = ai->ai_next) {
+-		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
+-		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
+-		    (strcmp(ntop, ntop2) == 0))
+-				break;
+-	}
+-	freeaddrinfo(aitop);
+-	/* If we reached the end of the list, the address was not there. */
+-	if (ai == NULL) {
+-		/* Address not found for the host name. */
+-		logit("Address %.100s maps to %.600s, but this does not "
+-		    "map back to the address.", ntop, name);
+-		return strdup(ntop);
+-	}
+-	return strdup(name);
+-}
+-
+-/*
+- * Return the canonical name of the host in the other side of the current
+- * connection.  The host name is cached, so it is efficient to call this
+- * several times.
+- */
+-
+-const char *
+-auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
+-{
+-	static char *dnsname;
+-
+-	if (!use_dns)
+-		return ssh_remote_ipaddr(ssh);
+-	else if (dnsname != NULL)
+-		return dnsname;
+-	else {
+-		dnsname = remote_hostname(ssh);
+-		return dnsname;
+-	}
+-}
+--- a/canohost.c
++++ b/canohost.c
+@@ -202,3 +202,117 @@ get_local_port(int sock)
+ {
+ 	return get_sock_port(sock, 1);
+ }
++
++/*
++ * Returns the remote DNS hostname as a string. The returned string must not
++ * be freed. NB. this will usually trigger a DNS query the first time it is
++ * called.
++ * This function does additional checks on the hostname to mitigate some
++ * attacks on legacy rhosts-style authentication.
++ * XXX is RhostsRSAAuthentication vulnerable to these?
++ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
++ */
++
++static char *
++remote_hostname(struct ssh *ssh)
++{
++	struct sockaddr_storage from;
++	socklen_t fromlen;
++	struct addrinfo hints, *ai, *aitop;
++	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
++	const char *ntop = ssh_remote_ipaddr(ssh);
++
++	/* Get IP address of client. */
++	fromlen = sizeof(from);
++	memset(&from, 0, sizeof(from));
++	if (getpeername(ssh_packet_get_connection_in(ssh),
++	    (struct sockaddr *)&from, &fromlen) < 0) {
++		debug("getpeername failed: %.100s", strerror(errno));
++		return strdup(ntop);
++	}
++
++	ipv64_normalise_mapped(&from, &fromlen);
++	if (from.ss_family == AF_INET6)
++		fromlen = sizeof(struct sockaddr_in6);
++
++	debug3("Trying to reverse map address %.100s.", ntop);
++	/* Map the IP address to a host name. */
++	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
++	    NULL, 0, NI_NAMEREQD) != 0) {
++		/* Host name not found.  Use ip address. */
++		return strdup(ntop);
++	}
++
++	/*
++	 * if reverse lookup result looks like a numeric hostname,
++	 * someone is trying to trick us by PTR record like following:
++	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
++	hints.ai_flags = AI_NUMERICHOST;
++	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
++		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
++		    name, ntop);
++		freeaddrinfo(ai);
++		return strdup(ntop);
++	}
++
++	/* Names are stored in lowercase. */
++	lowercase(name);
++
++	/*
++	 * Map it back to an IP address and check that the given
++	 * address actually is an address of this host.  This is
++	 * necessary because anyone with access to a name server can
++	 * define arbitrary names for an IP address. Mapping from
++	 * name to IP address can be trusted better (but can still be
++	 * fooled if the intruder has access to the name server of
++	 * the domain).
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_family = from.ss_family;
++	hints.ai_socktype = SOCK_STREAM;
++	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
++		logit("reverse mapping checking getaddrinfo for %.700s "
++		    "[%s] failed.", name, ntop);
++		return strdup(ntop);
++	}
++	/* Look for the address from the list of addresses. */
++	for (ai = aitop; ai; ai = ai->ai_next) {
++		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
++		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
++		    (strcmp(ntop, ntop2) == 0))
++				break;
++	}
++	freeaddrinfo(aitop);
++	/* If we reached the end of the list, the address was not there. */
++	if (ai == NULL) {
++		/* Address not found for the host name. */
++		logit("Address %.100s maps to %.600s, but this does not "
++		    "map back to the address.", ntop, name);
++		return strdup(ntop);
++	}
++	return strdup(name);
++}
++
++/*
++ * Return the canonical name of the host in the other side of the current
++ * connection.  The host name is cached, so it is efficient to call this
++ * several times.
++ */
++
++const char *
++auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
++{
++	static char *dnsname;
++
++	if (!use_dns)
++		return ssh_remote_ipaddr(ssh);
++	else if (dnsname != NULL)
++		return dnsname;
++	else {
++		dnsname = remote_hostname(ssh);
++		return dnsname;
++	}
++}
diff --git a/net-misc/openssh/files/openssh-7.3_p1-NEWKEYS_null_deref.patch b/net-misc/openssh/files/openssh-7.3_p1-NEWKEYS_null_deref.patch
new file mode 100644
index 000000000000..784cd2aa7efb
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.3_p1-NEWKEYS_null_deref.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/595342
+
+Backport of
+https://anongit.mindrot.org/openssh.git/patch/?id=28652bca29046f62c7045e933e6b931de1d16737
+
+--- openssh-7.3p1/kex.c
++++ openssh-7.3p1/kex.c
+@@ -419,6 +419,8 @@
+ 	ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error);
+ 	if ((r = sshpkt_get_end(ssh)) != 0)
+ 		return r;
++	if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)
++		return r;
+ 	kex->done = 1;
+ 	sshbuf_reset(kex->peer);
+ 	/* sshbuf_reset(kex->my); */
+--- openssh-7.3p1/packet.c
++++ openssh-7.3p1/packet.c
+@@ -1919,9 +1919,7 @@
+ 			return r;
+ 		return SSH_ERR_PROTOCOL_ERROR;
+ 	}
+-	if (*typep == SSH2_MSG_NEWKEYS)
+-		r = ssh_set_newkeys(ssh, MODE_IN);
+-	else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
++	if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
+ 		r = ssh_packet_enable_delayed_compress(ssh);
+ 	else
+ 		r = 0;
diff --git a/net-misc/openssh/files/openssh-7.3_p1-Unregister-the-KEXINIT-handler-after-receive.patch b/net-misc/openssh/files/openssh-7.3_p1-Unregister-the-KEXINIT-handler-after-receive.patch
new file mode 100644
index 000000000000..8603601ca7b6
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.3_p1-Unregister-the-KEXINIT-handler-after-receive.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/597360
+
+From ec165c392ca54317dbe3064a8c200de6531e89ad Mon Sep 17 00:00:00 2001
+From: "markus@openbsd.org" <markus@openbsd.org>
+Date: Mon, 10 Oct 2016 19:28:48 +0000
+Subject: [PATCH] upstream commit
+
+Unregister the KEXINIT handler after message has been
+received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause
+allocation of up to 128MB -- until the connection is closed. Reported by
+shilei-c at 360.cn
+
+Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05
+---
+ kex.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kex.c b/kex.c
+index 3f97f8c00919..6a94bc535bd7 100644
+--- a/kex.c
++++ b/kex.c
+@@ -481,6 +481,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt)
+ 	if (kex == NULL)
+ 		return SSH_ERR_INVALID_ARGUMENT;
+ 
++	ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
+ 	ptr = sshpkt_ptr(ssh, &dlen);
+ 	if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
+ 		return r;
+-- 
+2.11.0.rc2
+
diff --git a/net-misc/openssh/files/openssh-7.3_p1-fix-ssh1-with-no-ssh1-host-key.patch b/net-misc/openssh/files/openssh-7.3_p1-fix-ssh1-with-no-ssh1-host-key.patch
new file mode 100644
index 000000000000..7fb0d8069b94
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.3_p1-fix-ssh1-with-no-ssh1-host-key.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/592122
+
+From e600348a7afd6325cc5cd783cb424065cbc20434 Mon Sep 17 00:00:00 2001
+From: "dtucker@openbsd.org" <dtucker@openbsd.org>
+Date: Wed, 3 Aug 2016 04:23:55 +0000
+Subject: [PATCH] upstream commit
+
+Fix bug introduced in rev 1.467 which causes
+"buffer_get_bignum_ret: incomplete message" errors when built with WITH_SSH1
+and run such that no Protocol 1 ephemeral host key is generated (eg "Protocol
+2", no SSH1 host key supplied).  Reported by rainer.laatsch at t-online.de,
+ok deraadt@
+
+Upstream-ID: aa6b132da5c325523aed7989cc5a320497c919dc
+---
+ sshd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sshd.c b/sshd.c
+index 799c7711f49c..9fc829a91bc8 100644
+--- a/sshd.c
++++ b/sshd.c
+@@ -1071,7 +1071,7 @@ send_rexec_state(int fd, struct sshbuf *conf)
+ 			fatal("%s: buffer error: %s", __func__, ssh_err(r));
+ 	} else
+ #endif
+-		if ((r = sshbuf_put_u32(m, 1)) != 0)
++		if ((r = sshbuf_put_u32(m, 0)) != 0)
+ 			fatal("%s: buffer error: %s", __func__, ssh_err(r));
+ 
+ #if defined(WITH_OPENSSL) && !defined(OPENSSL_PRNG_ONLY)
+-- 
+2.11.0.rc2
+
diff --git a/net-misc/openssh/files/openssh-7.3_p1-hpn-12-x509-9.2-glue.patch b/net-misc/openssh/files/openssh-7.3_p1-hpn-12-x509-9.2-glue.patch
new file mode 100644
index 000000000000..0602307128f0
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.3_p1-hpn-12-x509-9.2-glue.patch
@@ -0,0 +1,39 @@
+--- a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch
++++ b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch
+@@ -1155,7 +1155,7 @@
+ @@ -44,7 +44,7 @@
+  LD=@LD@
+  CFLAGS=@CFLAGS@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+--- a/0004-support-dynamically-sized-receive-buffers.patch
++++ b/0004-support-dynamically-sized-receive-buffers.patch
+@@ -2144,9 +2144,9 @@
+ @@ -527,10 +555,10 @@ send_client_banner(int connection_out, int minor1)
+  	/* Send our own protocol version identification. */
+  	if (compat20) {
+- 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
+--		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+-+		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
++ 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
++-		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, SSH_X509);
+++		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, SSH_X509);
+  	} else {
+  		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
+ -		    PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
+@@ -2163,9 +2163,9 @@
+ @@ -432,7 +432,7 @@
+  	}
+  
+- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
+--	    major, minor, SSH_VERSION,
+-+	    major, minor, SSH_RELEASE,
++ 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
++-	    major, minor, SSH_VERSION, comment,
+++	    major, minor, SSH_RELEASE, comment,
+  	    *options.version_addendum == '\0' ? "" : " ",
+  	    options.version_addendum, newline);
+  
diff --git a/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch b/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch
new file mode 100644
index 000000000000..9cc7b61a6ab5
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch
@@ -0,0 +1,245 @@
+diff --git a/cipher-ctr-mt.c b/cipher-ctr-mt.c
+index fdc9b2f..300cd90 100644
+--- a/cipher-ctr-mt.c
++++ b/cipher-ctr-mt.c
+@@ -127,7 +127,7 @@ struct kq {
+ 	u_char		keys[KQLEN][AES_BLOCK_SIZE];
+ 	u_char		ctr[AES_BLOCK_SIZE];
+ 	u_char		pad0[CACHELINE_LEN];
+-	volatile int	qstate;
++	int		qstate;
+ 	pthread_mutex_t	lock;
+ 	pthread_cond_t	cond;
+ 	u_char		pad1[CACHELINE_LEN];
+@@ -141,6 +141,11 @@ struct ssh_aes_ctr_ctx
+ 	STATS_STRUCT(stats);
+ 	u_char		aes_counter[AES_BLOCK_SIZE];
+ 	pthread_t	tid[CIPHER_THREADS];
++	pthread_rwlock_t tid_lock;
++#ifdef __APPLE__
++	pthread_rwlock_t stop_lock;
++	int		exit_flag;
++#endif /* __APPLE__ */
+ 	int		state;
+ 	int		qidx;
+ 	int		ridx;
+@@ -187,6 +192,57 @@ thread_loop_cleanup(void *x)
+ 	pthread_mutex_unlock((pthread_mutex_t *)x);
+ }
+ 
++#ifdef __APPLE__
++/* Check if we should exit, we are doing both cancel and exit condition
++ * since on OSX threads seem to occasionally fail to notice when they have
++ * been cancelled. We want to have a backup to make sure that we won't hang
++ * when the main process join()-s the cancelled thread.
++ */
++static void
++thread_loop_check_exit(struct ssh_aes_ctr_ctx *c)
++{
++	int exit_flag;
++
++	pthread_rwlock_rdlock(&c->stop_lock);
++	exit_flag = c->exit_flag;
++	pthread_rwlock_unlock(&c->stop_lock);
++
++	if (exit_flag)
++		pthread_exit(NULL);
++}
++#else
++# define thread_loop_check_exit(s)
++#endif /* __APPLE__ */
++
++/*
++ * Helper function to terminate the helper threads
++ */
++static void
++stop_and_join_pregen_threads(struct ssh_aes_ctr_ctx *c)
++{
++	int i;
++
++#ifdef __APPLE__
++	/* notify threads that they should exit */
++	pthread_rwlock_wrlock(&c->stop_lock);
++	c->exit_flag = TRUE;
++	pthread_rwlock_unlock(&c->stop_lock);
++#endif /* __APPLE__ */
++
++	/* Cancel pregen threads */
++	for (i = 0; i < CIPHER_THREADS; i++) {
++		pthread_cancel(c->tid[i]);
++	}
++	for (i = 0; i < NUMKQ; i++) {
++		pthread_mutex_lock(&c->q[i].lock);
++		pthread_cond_broadcast(&c->q[i].cond);
++		pthread_mutex_unlock(&c->q[i].lock);
++	}
++	for (i = 0; i < CIPHER_THREADS; i++) {
++		pthread_join(c->tid[i], NULL);
++	}
++}
++
+ /*
+  * The life of a pregen thread:
+  *    Find empty keystream queues and fill them using their counter.
+@@ -201,6 +257,7 @@ thread_loop(void *x)
+ 	struct kq *q;
+ 	int i;
+ 	int qidx;
++	pthread_t first_tid;
+ 
+ 	/* Threads stats on cancellation */
+ 	STATS_INIT(stats);
+@@ -211,11 +268,15 @@ thread_loop(void *x)
+ 	/* Thread local copy of AES key */
+ 	memcpy(&key, &c->aes_ctx, sizeof(key));
+ 
++	pthread_rwlock_rdlock(&c->tid_lock);
++	first_tid = c->tid[0];
++	pthread_rwlock_unlock(&c->tid_lock);
++
+ 	/*
+ 	 * Handle the special case of startup, one thread must fill
+ 	 * the first KQ then mark it as draining. Lock held throughout.
+ 	 */
+-	if (pthread_equal(pthread_self(), c->tid[0])) {
++	if (pthread_equal(pthread_self(), first_tid)) {
+ 		q = &c->q[0];
+ 		pthread_mutex_lock(&q->lock);
+ 		if (q->qstate == KQINIT) {
+@@ -245,12 +306,16 @@ thread_loop(void *x)
+ 		/* Check if I was cancelled, also checked in cond_wait */
+ 		pthread_testcancel();
+ 
++		/* Check if we should exit as well */
++		thread_loop_check_exit(c);
++
+ 		/* Lock queue and block if its draining */
+ 		q = &c->q[qidx];
+ 		pthread_mutex_lock(&q->lock);
+ 		pthread_cleanup_push(thread_loop_cleanup, &q->lock);
+ 		while (q->qstate == KQDRAINING || q->qstate == KQINIT) {
+ 			STATS_WAIT(stats);
++			thread_loop_check_exit(c);
+ 			pthread_cond_wait(&q->cond, &q->lock);
+ 		}
+ 		pthread_cleanup_pop(0);
+@@ -268,6 +333,7 @@ thread_loop(void *x)
+ 		 * can see that it's being filled.
+ 		 */
+ 		q->qstate = KQFILLING;
++		pthread_cond_broadcast(&q->cond);
+ 		pthread_mutex_unlock(&q->lock);
+ 		for (i = 0; i < KQLEN; i++) {
+ 			AES_encrypt(q->ctr, q->keys[i], &key);
+@@ -279,7 +345,7 @@ thread_loop(void *x)
+ 		ssh_ctr_add(q->ctr, KQLEN * (NUMKQ - 1), AES_BLOCK_SIZE);
+ 		q->qstate = KQFULL;
+ 		STATS_FILL(stats);
+-		pthread_cond_signal(&q->cond);
++		pthread_cond_broadcast(&q->cond);
+ 		pthread_mutex_unlock(&q->lock);
+ 	}
+ 
+@@ -371,6 +437,7 @@ ssh_aes_ctr(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src,
+ 				pthread_cond_wait(&q->cond, &q->lock);
+ 			}
+ 			q->qstate = KQDRAINING;
++			pthread_cond_broadcast(&q->cond);
+ 			pthread_mutex_unlock(&q->lock);
+ 
+ 			/* Mark consumed queue empty and signal producers */
+@@ -397,6 +464,11 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
+ 
+ 	if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) {
+ 		c = xmalloc(sizeof(*c));
++		pthread_rwlock_init(&c->tid_lock, NULL);
++#ifdef __APPLE__
++		pthread_rwlock_init(&c->stop_lock, NULL);
++		c->exit_flag = FALSE;
++#endif /* __APPLE__ */
+ 
+ 		c->state = HAVE_NONE;
+ 		for (i = 0; i < NUMKQ; i++) {
+@@ -409,11 +481,14 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
+ 	}
+ 
+ 	if (c->state == (HAVE_KEY | HAVE_IV)) {
+-		/* Cancel pregen threads */
+-		for (i = 0; i < CIPHER_THREADS; i++)
+-			pthread_cancel(c->tid[i]);
+-		for (i = 0; i < CIPHER_THREADS; i++)
+-			pthread_join(c->tid[i], NULL);
++		/* tell the pregen threads to exit */
++		stop_and_join_pregen_threads(c);
++
++#ifdef __APPLE__
++		/* reset the exit flag */
++		c->exit_flag = FALSE;
++#endif /* __APPLE__ */
++
+ 		/* Start over getting key & iv */
+ 		c->state = HAVE_NONE;
+ 	}
+@@ -444,10 +519,12 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
+ 		/* Start threads */
+ 		for (i = 0; i < CIPHER_THREADS; i++) {
+ 			debug("spawned a thread");
++			pthread_rwlock_wrlock(&c->tid_lock);
+ 			pthread_create(&c->tid[i], NULL, thread_loop, c);
++			pthread_rwlock_unlock(&c->tid_lock);
+ 		}
+ 		pthread_mutex_lock(&c->q[0].lock);
+-		while (c->q[0].qstate != KQDRAINING)
++		while (c->q[0].qstate == KQINIT)
+ 			pthread_cond_wait(&c->q[0].cond, &c->q[0].lock);
+ 		pthread_mutex_unlock(&c->q[0].lock);
+ 	}
+@@ -461,15 +538,10 @@ void
+ ssh_aes_ctr_thread_destroy(EVP_CIPHER_CTX *ctx)
+ {
+ 	struct ssh_aes_ctr_ctx *c;
+-	int i;
++
+ 	c = EVP_CIPHER_CTX_get_app_data(ctx);
+-	/* destroy threads */
+-	for (i = 0; i < CIPHER_THREADS; i++) {
+-		pthread_cancel(c->tid[i]);
+-	}
+-	for (i = 0; i < CIPHER_THREADS; i++) {
+-		pthread_join(c->tid[i], NULL);
+-	}
++
++	stop_and_join_pregen_threads(c);
+ }
+ 
+ void
+@@ -481,7 +553,9 @@ ssh_aes_ctr_thread_reconstruction(EVP_CIPHER_CTX *ctx)
+ 	/* reconstruct threads */
+ 	for (i = 0; i < CIPHER_THREADS; i++) {
+ 		debug("spawned a thread");
++		pthread_rwlock_wrlock(&c->tid_lock);
+ 		pthread_create(&c->tid[i], NULL, thread_loop, c);
++		pthread_rwlock_unlock(&c->tid_lock);
+ 	}
+ }
+ 
+@@ -489,18 +563,13 @@ static int
+ ssh_aes_ctr_cleanup(EVP_CIPHER_CTX *ctx)
+ {
+ 	struct ssh_aes_ctr_ctx *c;
+-	int i;
+ 
+ 	if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) {
+ #ifdef CIPHER_THREAD_STATS
+ 		debug("main thread: %u drains, %u waits", c->stats.drains,
+ 				c->stats.waits);
+ #endif
+-		/* Cancel pregen threads */
+-		for (i = 0; i < CIPHER_THREADS; i++)
+-			pthread_cancel(c->tid[i]);
+-		for (i = 0; i < CIPHER_THREADS; i++)
+-			pthread_join(c->tid[i], NULL);
++		stop_and_join_pregen_threads(c);
+ 
+ 		memset(c, 0, sizeof(*c));
+ 		free(c);
diff --git a/net-misc/openssh/files/openssh-7.3_p1-hpn-x509-9.2-glue.patch b/net-misc/openssh/files/openssh-7.3_p1-hpn-x509-9.2-glue.patch
new file mode 100644
index 000000000000..f077c0517fa2
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.3_p1-hpn-x509-9.2-glue.patch
@@ -0,0 +1,41 @@
+--- a/openssh-7.3_p1-hpn-14.10-r1.patch	2016-09-19 15:00:21.561121417 -0700
++++ b/openssh-7.3_p1-hpn-14.10-r1.patch	2016-09-19 15:22:51.337118439 -0700
+@@ -1155,7 +1155,7 @@
+ @@ -44,7 +44,7 @@
+  LD=@LD@
+  CFLAGS=@CFLAGS@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -2144,12 +2144,12 @@
+  	/* Bind the socket to an alternative local IP address */
+  	if (options.bind_address == NULL && !privileged)
+  		return sock;
+-@@ -527,10 +555,10 @@
++@@ -555,10 +583,10 @@
+  	/* Send our own protocol version identification. */
+  	if (compat20) {
+- 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
+--		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+-+		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
++ 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
++-		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, SSH_X509);
+++		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, SSH_X509);
+  	} else {
+  		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
+ -		    PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
+@@ -2163,9 +2163,9 @@
+ @@ -432,7 +432,7 @@
+  	}
+  
+- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
+--	    major, minor, SSH_VERSION,
+-+	    major, minor, SSH_RELEASE,
++ 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
++-	    major, minor, SSH_VERSION, comment,
+++	    major, minor, SSH_RELEASE, comment,
+  	    *options.version_addendum == '\0' ? "" : " ",
+  	    options.version_addendum, newline);
+  
diff --git a/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.patch b/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.patch
new file mode 100644
index 000000000000..2def6993e6c3
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.patch
@@ -0,0 +1,67 @@
+--- a/openssh-7.3_p1-sctp.patch	2016-08-03 13:10:15.733228732 -0700
++++ b/openssh-7.3_p1-sctp.patch	2016-08-03 13:25:53.274630002 -0700
+@@ -226,14 +226,6 @@
+  .Op Fl c Ar cipher
+  .Op Fl F Ar ssh_config
+  .Op Fl i Ar identity_file
+-@@ -183,6 +183,7 @@ For full details of the options listed below, and their possible values, see
+- .It ServerAliveCountMax
+- .It StrictHostKeyChecking
+- .It TCPKeepAlive
+-+.It Transport
+- .It UpdateHostKeys
+- .It UsePrivilegedPort
+- .It User
+ @@ -224,6 +225,8 @@ and
+  to print debugging messages about their progress.
+  This is helpful in
+@@ -493,19 +485,11 @@
+  .Sh SYNOPSIS
+  .Nm ssh
+  .Bk -words
+--.Op Fl 1246AaCfGgKkMNnqsTtVvXxYy
+-+.Op Fl 1246AaCfGgKkMNnqsTtVvXxYyz
++-.Op Fl 1246AaCdfgKkMNnqsTtVvXxYy
+++.Op Fl 1246AaCdfgKkMNnqsTtVvXxYyz
+  .Op Fl b Ar bind_address
+  .Op Fl c Ar cipher_spec
+  .Op Fl D Oo Ar bind_address : Oc Ns Ar port
+-@@ -558,6 +558,7 @@ For full details of the options listed below, and their possible values, see
+- .It StreamLocalBindUnlink
+- .It StrictHostKeyChecking
+- .It TCPKeepAlive
+-+.It Transport
+- .It Tunnel
+- .It TunnelDevice
+- .It UpdateHostKeys
+ @@ -795,6 +796,8 @@ controls.
+  .Pp
+  .It Fl y
+@@ -533,18 +517,18 @@
+  usage(void)
+  {
+  	fprintf(stderr,
+--"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
+-+"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy" SCTP_OPT "] [-b bind_address] [-c cipher_spec]\n"
++-"usage: ssh [-1246AaCdfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
+++"usage: ssh [-1246AaCdfgKkMNnqsTtVvXxYy" SCTP_OPT "] [-b bind_address] [-c cipher_spec]\n"
+  "           [-D [bind_address:]port] [-E log_file] [-e escape_char]\n"
+- "           [-F configfile] [-I pkcs11] [-i identity_file]\n"
+- "           [-J [user@]host[:port]] [-L address] [-l login_name] [-m mac_spec]\n"
++ "           [-F configfile]\n"
++ #ifdef USE_OPENSSL_ENGINE
+ @@ -608,7 +613,7 @@ main(int ac, char **av)
+- 	argv0 = av[0];
++ #  define ENGCONFIG ""
++ #endif
+  
+-  again:
+--	while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
+-+	while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" SCTP_OPT
+- 	    "ACD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
++-	while ((opt = getopt(ac, av, "1246ab:c:de:fgi:kl:m:no:p:qstvx"
+++	while ((opt = getopt(ac, av, "1246ab:c:de:fgi:kl:m:no:p:qstvx" SCTP_OPT
++ 	    "ACD:E:F:" ENGCONFIG "I:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
+  		switch (opt) {
+  		case '1':
+ @@ -857,6 +862,11 @@ main(int ac, char **av)
diff --git a/net-misc/openssh/files/openssh-7.3_p1-x509-9.2-warnings.patch b/net-misc/openssh/files/openssh-7.3_p1-x509-9.2-warnings.patch
new file mode 100644
index 000000000000..528dc6f22a94
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.3_p1-x509-9.2-warnings.patch
@@ -0,0 +1,109 @@
+diff --git a/kex.c b/kex.c
+index 143227a..c9b84c2 100644
+--- a/kex.c
++++ b/kex.c
+@@ -345,9 +345,9 @@ kex_reset_dispatch(struct ssh *ssh)
+ static int
+ kex_send_ext_info(struct ssh *ssh)
+ {
++#ifdef EXPERIMENTAL_RSA_SHA2_256
+ 	int r;
+ 
+-#ifdef EXPERIMENTAL_RSA_SHA2_256
+ /* IMPORTANT NOTE:
+  * Do not offer rsa-sha2-* until is resolved misconfiguration issue
+  * with allowed public key algorithms!
+diff --git a/key-eng.c b/key-eng.c
+index 9bc50fd..bc0d03d 100644
+--- a/key-eng.c
++++ b/key-eng.c
+@@ -786,7 +786,6 @@ ssh_engines_shutdown() {
+ 	while (buffer_len(&eng_list) > 0) {
+ 		u_int   k = 0;
+ 		char    *s;
+-		ENGINE  *e;
+ 
+ 		s = buffer_get_cstring_ret(&eng_list, &k);
+ 		ssh_engine_reset(s);
+diff --git a/monitor.c b/monitor.c
+index 345d3df..0de30ad 100644
+--- a/monitor.c
++++ b/monitor.c
+@@ -707,7 +707,7 @@ mm_answer_sign(int sock, Buffer *m)
+ 	    (r = sshbuf_get_string(m, &p, &datlen)) != 0 ||
+ 	    (r = sshbuf_get_cstring(m, &alg, &alglen)) != 0)
+ 		fatal("%s: buffer error: %s", __func__, ssh_err(r));
+-	if (keyid > INT_MAX)
++	if (keyid32 > INT_MAX)
+ 		fatal("%s: invalid key ID", __func__);
+ 
+ 	keyid = keyid32; /*save cast*/
+diff --git a/readconf.c b/readconf.c
+index beb38a0..1cbda7e 100644
+--- a/readconf.c
++++ b/readconf.c
+@@ -1459,7 +1459,9 @@ parse_int:
+ 
+ 	case oHostKeyAlgorithms:
+ 		charptr = &options->hostkeyalgorithms;
++# if 0
+ parse_keytypes:
++# endif
+ 		arg = strdelim(&s);
+ 		if (!arg || *arg == '\0')
+ 			fatal("%.200s line %d: Missing argument.",
+diff --git a/servconf.c b/servconf.c
+index a540138..e77a344 100644
+--- a/servconf.c
++++ b/servconf.c
+@@ -1574,7 +1573,9 @@ parse_string:
+ 
+ 	case sHostKeyAlgorithms:
+ 		charptr = &options->hostkeyalgorithms;
++# if 0
+  parse_keytypes:
++#endif
+ 		arg = strdelim(&cp);
+ 		if (!arg || *arg == '\0')
+ 			fatal("%s line %d: Missing argument.",
+diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
+index 50f04b7..3f9a7bf 100644
+--- a/ssh-pkcs11.c
++++ b/ssh-pkcs11.c
+@@ -273,21 +273,18 @@ pkcs11_dsa_finish(DSA *dsa)
+ }
+ 
+ #ifdef OPENSSL_HAS_ECC
++#ifdef HAVE_EC_KEY_METHOD_NEW
+ /* openssl callback for freeing an EC key */
+ static void
+ pkcs11_ec_finish(EC_KEY *ec)
+ {
+ 	struct pkcs11_key	*k11;
+ 
+-#ifdef HAVE_EC_KEY_METHOD_NEW
+ 	k11 = EC_KEY_get_ex_data(ec, ssh_pkcs11_ec_ctx_index);
+ 	EC_KEY_set_ex_data(ec, ssh_pkcs11_ec_ctx_index, NULL);
+-#else
+-	k11 = ECDSA_get_ex_data(ec, ssh_pkcs11_ec_ctx_index);
+-	ECDSA_set_ex_data(ec, ssh_pkcs11_ec_ctx_index, NULL);
+-#endif
+ 	pkcs11_key_free(k11);
+ }
++#endif /*def HAVE_EC_KEY_METHOD_NEW*/
+ #endif /*def OPENSSL_HAS_ECC*/
+ 
+ 
+diff --git a/sshconnect.c b/sshconnect.c
+index fd2a70e..0960be1 100644
+--- a/sshconnect.c
++++ b/sshconnect.c
+@@ -605,7 +605,7 @@ send_client_banner(int connection_out, int minor1)
+ {
+ 	/* Send our own protocol version identification. */
+ 	if (compat20) {
+-		xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%d]\r\n",
++		xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
+ 		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, SSH_X509);
+ 	} else {
+ 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
diff --git a/net-misc/openssh/files/openssh-7.4_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-7.4_p1-GSSAPI-dns.patch
new file mode 100644
index 000000000000..ec2a6d894938
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.4_p1-GSSAPI-dns.patch
@@ -0,0 +1,351 @@
+http://bugs.gentoo.org/165444
+https://bugzilla.mindrot.org/show_bug.cgi?id=1008
+
+--- a/readconf.c
++++ b/readconf.c
+@@ -148,6 +148,7 @@
+ 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
+ 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
+ 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
++	oGssTrustDns,
+ 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
+ 	oSendEnv, oControlPath, oControlMaster, oControlPersist,
+ 	oHashKnownHosts,
+@@ -194,9 +195,11 @@
+ #if defined(GSSAPI)
+ 	{ "gssapiauthentication", oGssAuthentication },
+ 	{ "gssapidelegatecredentials", oGssDelegateCreds },
++	{ "gssapitrustdns", oGssTrustDns },
+ #else
+ 	{ "gssapiauthentication", oUnsupported },
+ 	{ "gssapidelegatecredentials", oUnsupported },
++	{ "gssapitrustdns", oUnsupported },
+ #endif
+ 	{ "fallbacktorsh", oDeprecated },
+ 	{ "usersh", oDeprecated },
+@@ -930,6 +933,10 @@
+ 		intptr = &options->gss_deleg_creds;
+ 		goto parse_flag;
+ 
++	case oGssTrustDns:
++		intptr = &options->gss_trust_dns;
++		goto parse_flag;
++
+ 	case oBatchMode:
+ 		intptr = &options->batch_mode;
+ 		goto parse_flag;
+@@ -1649,6 +1656,7 @@
+ 	options->challenge_response_authentication = -1;
+ 	options->gss_authentication = -1;
+ 	options->gss_deleg_creds = -1;
++	options->gss_trust_dns = -1;
+ 	options->password_authentication = -1;
+ 	options->kbd_interactive_authentication = -1;
+ 	options->kbd_interactive_devices = NULL;
+@@ -1779,6 +1787,8 @@
+ 		options->gss_authentication = 0;
+ 	if (options->gss_deleg_creds == -1)
+ 		options->gss_deleg_creds = 0;
++	if (options->gss_trust_dns == -1)
++		options->gss_trust_dns = 0;
+ 	if (options->password_authentication == -1)
+ 		options->password_authentication = 1;
+ 	if (options->kbd_interactive_authentication == -1)
+--- a/readconf.h
++++ b/readconf.h
+@@ -46,6 +46,7 @@
+ 					/* Try S/Key or TIS, authentication. */
+ 	int     gss_authentication;	/* Try GSS authentication */
+ 	int     gss_deleg_creds;	/* Delegate GSS credentials */
++	int	gss_trust_dns;		/* Trust DNS for GSS canonicalization */
+ 	int     password_authentication;	/* Try password
+ 						 * authentication. */
+ 	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
+--- a/ssh_config.5
++++ b/ssh_config.5
+@@ -830,6 +830,16 @@
+ Forward (delegate) credentials to the server.
+ The default is
+ .Cm no .
++Note that this option applies to protocol version 2 connections using GSSAPI.
++.It Cm GSSAPITrustDns
++Set to
++.Dq yes to indicate that the DNS is trusted to securely canonicalize
++the name of the host being connected to. If
++.Dq no, the hostname entered on the
++command line will be passed untouched to the GSSAPI library.
++The default is
++.Dq no .
++This option only applies to protocol version 2 connections using GSSAPI.
+ .It Cm HashKnownHosts
+ Indicates that
+ .Xr ssh 1
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -656,6 +656,13 @@
+ 	static u_int mech = 0;
+ 	OM_uint32 min;
+ 	int ok = 0;
++	const char *gss_host;
++
++	if (options.gss_trust_dns) {
++		extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns);
++		gss_host = auth_get_canonical_hostname(active_state, 1);
++	} else
++		gss_host = authctxt->host;
+ 
+ 	/* Try one GSSAPI method at a time, rather than sending them all at
+ 	 * once. */
+@@ -668,7 +674,7 @@
+ 		/* My DER encoding requires length<128 */
+ 		if (gss_supported->elements[mech].length < 128 &&
+ 		    ssh_gssapi_check_mechanism(&gssctxt, 
+-		    &gss_supported->elements[mech], authctxt->host)) {
++		    &gss_supported->elements[mech], gss_host)) {
+ 			ok = 1; /* Mechanism works */
+ 		} else {
+ 			mech++;
+
+need to move these two funcs back to canohost so they're available to clients
+and the server.  auth.c is only used in the server.
+
+--- a/auth.c
++++ b/auth.c
+@@ -784,117 +784,3 @@ fakepw(void)
+ 
+ 	return (&fake);
+ }
+-
+-/*
+- * Returns the remote DNS hostname as a string. The returned string must not
+- * be freed. NB. this will usually trigger a DNS query the first time it is
+- * called.
+- * This function does additional checks on the hostname to mitigate some
+- * attacks on legacy rhosts-style authentication.
+- * XXX is RhostsRSAAuthentication vulnerable to these?
+- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
+- */
+-
+-static char *
+-remote_hostname(struct ssh *ssh)
+-{
+-	struct sockaddr_storage from;
+-	socklen_t fromlen;
+-	struct addrinfo hints, *ai, *aitop;
+-	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
+-	const char *ntop = ssh_remote_ipaddr(ssh);
+-
+-	/* Get IP address of client. */
+-	fromlen = sizeof(from);
+-	memset(&from, 0, sizeof(from));
+-	if (getpeername(ssh_packet_get_connection_in(ssh),
+-	    (struct sockaddr *)&from, &fromlen) < 0) {
+-		debug("getpeername failed: %.100s", strerror(errno));
+-		return strdup(ntop);
+-	}
+-
+-	ipv64_normalise_mapped(&from, &fromlen);
+-	if (from.ss_family == AF_INET6)
+-		fromlen = sizeof(struct sockaddr_in6);
+-
+-	debug3("Trying to reverse map address %.100s.", ntop);
+-	/* Map the IP address to a host name. */
+-	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
+-	    NULL, 0, NI_NAMEREQD) != 0) {
+-		/* Host name not found.  Use ip address. */
+-		return strdup(ntop);
+-	}
+-
+-	/*
+-	 * if reverse lookup result looks like a numeric hostname,
+-	 * someone is trying to trick us by PTR record like following:
+-	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
+-	hints.ai_flags = AI_NUMERICHOST;
+-	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
+-		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
+-		    name, ntop);
+-		freeaddrinfo(ai);
+-		return strdup(ntop);
+-	}
+-
+-	/* Names are stored in lowercase. */
+-	lowercase(name);
+-
+-	/*
+-	 * Map it back to an IP address and check that the given
+-	 * address actually is an address of this host.  This is
+-	 * necessary because anyone with access to a name server can
+-	 * define arbitrary names for an IP address. Mapping from
+-	 * name to IP address can be trusted better (but can still be
+-	 * fooled if the intruder has access to the name server of
+-	 * the domain).
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_family = from.ss_family;
+-	hints.ai_socktype = SOCK_STREAM;
+-	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
+-		logit("reverse mapping checking getaddrinfo for %.700s "
+-		    "[%s] failed.", name, ntop);
+-		return strdup(ntop);
+-	}
+-	/* Look for the address from the list of addresses. */
+-	for (ai = aitop; ai; ai = ai->ai_next) {
+-		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
+-		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
+-		    (strcmp(ntop, ntop2) == 0))
+-				break;
+-	}
+-	freeaddrinfo(aitop);
+-	/* If we reached the end of the list, the address was not there. */
+-	if (ai == NULL) {
+-		/* Address not found for the host name. */
+-		logit("Address %.100s maps to %.600s, but this does not "
+-		    "map back to the address.", ntop, name);
+-		return strdup(ntop);
+-	}
+-	return strdup(name);
+-}
+-
+-/*
+- * Return the canonical name of the host in the other side of the current
+- * connection.  The host name is cached, so it is efficient to call this
+- * several times.
+- */
+-
+-const char *
+-auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
+-{
+-	static char *dnsname;
+-
+-	if (!use_dns)
+-		return ssh_remote_ipaddr(ssh);
+-	else if (dnsname != NULL)
+-		return dnsname;
+-	else {
+-		dnsname = remote_hostname(ssh);
+-		return dnsname;
+-	}
+-}
+--- a/canohost.c
++++ b/canohost.c
+@@ -202,3 +202,117 @@ get_local_port(int sock)
+ {
+ 	return get_sock_port(sock, 1);
+ }
++
++/*
++ * Returns the remote DNS hostname as a string. The returned string must not
++ * be freed. NB. this will usually trigger a DNS query the first time it is
++ * called.
++ * This function does additional checks on the hostname to mitigate some
++ * attacks on legacy rhosts-style authentication.
++ * XXX is RhostsRSAAuthentication vulnerable to these?
++ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
++ */
++
++static char *
++remote_hostname(struct ssh *ssh)
++{
++	struct sockaddr_storage from;
++	socklen_t fromlen;
++	struct addrinfo hints, *ai, *aitop;
++	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
++	const char *ntop = ssh_remote_ipaddr(ssh);
++
++	/* Get IP address of client. */
++	fromlen = sizeof(from);
++	memset(&from, 0, sizeof(from));
++	if (getpeername(ssh_packet_get_connection_in(ssh),
++	    (struct sockaddr *)&from, &fromlen) < 0) {
++		debug("getpeername failed: %.100s", strerror(errno));
++		return strdup(ntop);
++	}
++
++	ipv64_normalise_mapped(&from, &fromlen);
++	if (from.ss_family == AF_INET6)
++		fromlen = sizeof(struct sockaddr_in6);
++
++	debug3("Trying to reverse map address %.100s.", ntop);
++	/* Map the IP address to a host name. */
++	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
++	    NULL, 0, NI_NAMEREQD) != 0) {
++		/* Host name not found.  Use ip address. */
++		return strdup(ntop);
++	}
++
++	/*
++	 * if reverse lookup result looks like a numeric hostname,
++	 * someone is trying to trick us by PTR record like following:
++	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
++	hints.ai_flags = AI_NUMERICHOST;
++	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
++		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
++		    name, ntop);
++		freeaddrinfo(ai);
++		return strdup(ntop);
++	}
++
++	/* Names are stored in lowercase. */
++	lowercase(name);
++
++	/*
++	 * Map it back to an IP address and check that the given
++	 * address actually is an address of this host.  This is
++	 * necessary because anyone with access to a name server can
++	 * define arbitrary names for an IP address. Mapping from
++	 * name to IP address can be trusted better (but can still be
++	 * fooled if the intruder has access to the name server of
++	 * the domain).
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_family = from.ss_family;
++	hints.ai_socktype = SOCK_STREAM;
++	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
++		logit("reverse mapping checking getaddrinfo for %.700s "
++		    "[%s] failed.", name, ntop);
++		return strdup(ntop);
++	}
++	/* Look for the address from the list of addresses. */
++	for (ai = aitop; ai; ai = ai->ai_next) {
++		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
++		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
++		    (strcmp(ntop, ntop2) == 0))
++				break;
++	}
++	freeaddrinfo(aitop);
++	/* If we reached the end of the list, the address was not there. */
++	if (ai == NULL) {
++		/* Address not found for the host name. */
++		logit("Address %.100s maps to %.600s, but this does not "
++		    "map back to the address.", ntop, name);
++		return strdup(ntop);
++	}
++	return strdup(name);
++}
++
++/*
++ * Return the canonical name of the host in the other side of the current
++ * connection.  The host name is cached, so it is efficient to call this
++ * several times.
++ */
++
++const char *
++auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
++{
++	static char *dnsname;
++
++	if (!use_dns)
++		return ssh_remote_ipaddr(ssh);
++	else if (dnsname != NULL)
++		return dnsname;
++	else {
++		dnsname = remote_hostname(ssh);
++		return dnsname;
++	}
++}
diff --git a/net-misc/openssh/files/openssh-7.4_p1-test-bashism.patch b/net-misc/openssh/files/openssh-7.4_p1-test-bashism.patch
new file mode 100644
index 000000000000..3e02b6f8ccc0
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.4_p1-test-bashism.patch
@@ -0,0 +1,29 @@
+https://lists.mindrot.org/pipermail/openssh-unix-dev/2016-December/035604.html
+
+From dca2985bff146f756b0019b17f08c35f28841a04 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 19 Dec 2016 15:59:00 -0500
+Subject: [PATCH] regress/allow-deny-users.sh: fix bashism in test
+
+The test command uses = for string compares, not ==.  Using some POSIX
+shells will reject this statement with an error about an unknown operator.
+---
+ regress/allow-deny-users.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/regress/allow-deny-users.sh b/regress/allow-deny-users.sh
+index 32a269afa97c..86805e19322b 100644
+--- a/regress/allow-deny-users.sh
++++ b/regress/allow-deny-users.sh
+@@ -4,7 +4,7 @@
+ tid="AllowUsers/DenyUsers"
+ 
+ me="$LOGNAME"
+-if [ "x$me" == "x" ]; then
++if [ "x$me" = "x" ]; then
+ 	me=`whoami`
+ fi
+ other="nobody"
+-- 
+2.11.0.rc2
+
diff --git a/net-misc/openssh/files/openssh-7.5_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-7.5_p1-GSSAPI-dns.patch
new file mode 100644
index 000000000000..6b1e6dd35a41
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5_p1-GSSAPI-dns.patch
@@ -0,0 +1,351 @@
+http://bugs.gentoo.org/165444
+https://bugzilla.mindrot.org/show_bug.cgi?id=1008
+
+--- a/readconf.c
++++ b/readconf.c
+@@ -148,6 +148,7 @@
+ 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
+ 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
+ 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
++	oGssTrustDns,
+ 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
+ 	oSendEnv, oControlPath, oControlMaster, oControlPersist,
+ 	oHashKnownHosts,
+@@ -194,9 +195,11 @@
+ #if defined(GSSAPI)
+ 	{ "gssapiauthentication", oGssAuthentication },
+ 	{ "gssapidelegatecredentials", oGssDelegateCreds },
++	{ "gssapitrustdns", oGssTrustDns },
+ # else
+ 	{ "gssapiauthentication", oUnsupported },
+ 	{ "gssapidelegatecredentials", oUnsupported },
++	{ "gssapitrustdns", oUnsupported },
+ #endif
+ #ifdef ENABLE_PKCS11
+ 	{ "smartcarddevice", oPKCS11Provider },
+@@ -930,6 +933,10 @@
+ 		intptr = &options->gss_deleg_creds;
+ 		goto parse_flag;
+ 
++	case oGssTrustDns:
++		intptr = &options->gss_trust_dns;
++		goto parse_flag;
++
+ 	case oBatchMode:
+ 		intptr = &options->batch_mode;
+ 		goto parse_flag;
+@@ -1649,6 +1656,7 @@
+ 	options->challenge_response_authentication = -1;
+ 	options->gss_authentication = -1;
+ 	options->gss_deleg_creds = -1;
++	options->gss_trust_dns = -1;
+ 	options->password_authentication = -1;
+ 	options->kbd_interactive_authentication = -1;
+ 	options->kbd_interactive_devices = NULL;
+@@ -1779,6 +1787,8 @@
+ 		options->gss_authentication = 0;
+ 	if (options->gss_deleg_creds == -1)
+ 		options->gss_deleg_creds = 0;
++	if (options->gss_trust_dns == -1)
++		options->gss_trust_dns = 0;
+ 	if (options->password_authentication == -1)
+ 		options->password_authentication = 1;
+ 	if (options->kbd_interactive_authentication == -1)
+--- a/readconf.h
++++ b/readconf.h
+@@ -46,6 +46,7 @@
+ 					/* Try S/Key or TIS, authentication. */
+ 	int     gss_authentication;	/* Try GSS authentication */
+ 	int     gss_deleg_creds;	/* Delegate GSS credentials */
++	int	gss_trust_dns;		/* Trust DNS for GSS canonicalization */
+ 	int     password_authentication;	/* Try password
+ 						 * authentication. */
+ 	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
+--- a/ssh_config.5
++++ b/ssh_config.5
+@@ -830,6 +830,16 @@
+ Forward (delegate) credentials to the server.
+ The default is
+ .Cm no .
++Note that this option applies to protocol version 2 connections using GSSAPI.
++.It Cm GSSAPITrustDns
++Set to
++.Dq yes to indicate that the DNS is trusted to securely canonicalize
++the name of the host being connected to. If
++.Dq no, the hostname entered on the
++command line will be passed untouched to the GSSAPI library.
++The default is
++.Dq no .
++This option only applies to protocol version 2 connections using GSSAPI.
+ .It Cm HashKnownHosts
+ Indicates that
+ .Xr ssh 1
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -656,6 +656,13 @@
+ 	static u_int mech = 0;
+ 	OM_uint32 min;
+ 	int ok = 0;
++	const char *gss_host;
++
++	if (options.gss_trust_dns) {
++		extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns);
++		gss_host = auth_get_canonical_hostname(active_state, 1);
++	} else
++		gss_host = authctxt->host;
+ 
+ 	/* Try one GSSAPI method at a time, rather than sending them all at
+ 	 * once. */
+@@ -668,7 +674,7 @@
+ 		/* My DER encoding requires length<128 */
+ 		if (gss_supported->elements[mech].length < 128 &&
+ 		    ssh_gssapi_check_mechanism(&gssctxt, 
+-		    &gss_supported->elements[mech], authctxt->host)) {
++		    &gss_supported->elements[mech], gss_host)) {
+ 			ok = 1; /* Mechanism works */
+ 		} else {
+ 			mech++;
+
+need to move these two funcs back to canohost so they're available to clients
+and the server.  auth.c is only used in the server.
+
+--- a/auth.c
++++ b/auth.c
+@@ -784,117 +784,3 @@ fakepw(void)
+ 
+ 	return (&fake);
+ }
+-
+-/*
+- * Returns the remote DNS hostname as a string. The returned string must not
+- * be freed. NB. this will usually trigger a DNS query the first time it is
+- * called.
+- * This function does additional checks on the hostname to mitigate some
+- * attacks on legacy rhosts-style authentication.
+- * XXX is RhostsRSAAuthentication vulnerable to these?
+- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
+- */
+-
+-static char *
+-remote_hostname(struct ssh *ssh)
+-{
+-	struct sockaddr_storage from;
+-	socklen_t fromlen;
+-	struct addrinfo hints, *ai, *aitop;
+-	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
+-	const char *ntop = ssh_remote_ipaddr(ssh);
+-
+-	/* Get IP address of client. */
+-	fromlen = sizeof(from);
+-	memset(&from, 0, sizeof(from));
+-	if (getpeername(ssh_packet_get_connection_in(ssh),
+-	    (struct sockaddr *)&from, &fromlen) < 0) {
+-		debug("getpeername failed: %.100s", strerror(errno));
+-		return strdup(ntop);
+-	}
+-
+-	ipv64_normalise_mapped(&from, &fromlen);
+-	if (from.ss_family == AF_INET6)
+-		fromlen = sizeof(struct sockaddr_in6);
+-
+-	debug3("Trying to reverse map address %.100s.", ntop);
+-	/* Map the IP address to a host name. */
+-	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
+-	    NULL, 0, NI_NAMEREQD) != 0) {
+-		/* Host name not found.  Use ip address. */
+-		return strdup(ntop);
+-	}
+-
+-	/*
+-	 * if reverse lookup result looks like a numeric hostname,
+-	 * someone is trying to trick us by PTR record like following:
+-	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
+-	hints.ai_flags = AI_NUMERICHOST;
+-	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
+-		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
+-		    name, ntop);
+-		freeaddrinfo(ai);
+-		return strdup(ntop);
+-	}
+-
+-	/* Names are stored in lowercase. */
+-	lowercase(name);
+-
+-	/*
+-	 * Map it back to an IP address and check that the given
+-	 * address actually is an address of this host.  This is
+-	 * necessary because anyone with access to a name server can
+-	 * define arbitrary names for an IP address. Mapping from
+-	 * name to IP address can be trusted better (but can still be
+-	 * fooled if the intruder has access to the name server of
+-	 * the domain).
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_family = from.ss_family;
+-	hints.ai_socktype = SOCK_STREAM;
+-	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
+-		logit("reverse mapping checking getaddrinfo for %.700s "
+-		    "[%s] failed.", name, ntop);
+-		return strdup(ntop);
+-	}
+-	/* Look for the address from the list of addresses. */
+-	for (ai = aitop; ai; ai = ai->ai_next) {
+-		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
+-		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
+-		    (strcmp(ntop, ntop2) == 0))
+-				break;
+-	}
+-	freeaddrinfo(aitop);
+-	/* If we reached the end of the list, the address was not there. */
+-	if (ai == NULL) {
+-		/* Address not found for the host name. */
+-		logit("Address %.100s maps to %.600s, but this does not "
+-		    "map back to the address.", ntop, name);
+-		return strdup(ntop);
+-	}
+-	return strdup(name);
+-}
+-
+-/*
+- * Return the canonical name of the host in the other side of the current
+- * connection.  The host name is cached, so it is efficient to call this
+- * several times.
+- */
+-
+-const char *
+-auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
+-{
+-	static char *dnsname;
+-
+-	if (!use_dns)
+-		return ssh_remote_ipaddr(ssh);
+-	else if (dnsname != NULL)
+-		return dnsname;
+-	else {
+-		dnsname = remote_hostname(ssh);
+-		return dnsname;
+-	}
+-}
+--- a/canohost.c
++++ b/canohost.c
+@@ -202,3 +202,117 @@ get_local_port(int sock)
+ {
+ 	return get_sock_port(sock, 1);
+ }
++
++/*
++ * Returns the remote DNS hostname as a string. The returned string must not
++ * be freed. NB. this will usually trigger a DNS query the first time it is
++ * called.
++ * This function does additional checks on the hostname to mitigate some
++ * attacks on legacy rhosts-style authentication.
++ * XXX is RhostsRSAAuthentication vulnerable to these?
++ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
++ */
++
++static char *
++remote_hostname(struct ssh *ssh)
++{
++	struct sockaddr_storage from;
++	socklen_t fromlen;
++	struct addrinfo hints, *ai, *aitop;
++	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
++	const char *ntop = ssh_remote_ipaddr(ssh);
++
++	/* Get IP address of client. */
++	fromlen = sizeof(from);
++	memset(&from, 0, sizeof(from));
++	if (getpeername(ssh_packet_get_connection_in(ssh),
++	    (struct sockaddr *)&from, &fromlen) < 0) {
++		debug("getpeername failed: %.100s", strerror(errno));
++		return strdup(ntop);
++	}
++
++	ipv64_normalise_mapped(&from, &fromlen);
++	if (from.ss_family == AF_INET6)
++		fromlen = sizeof(struct sockaddr_in6);
++
++	debug3("Trying to reverse map address %.100s.", ntop);
++	/* Map the IP address to a host name. */
++	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
++	    NULL, 0, NI_NAMEREQD) != 0) {
++		/* Host name not found.  Use ip address. */
++		return strdup(ntop);
++	}
++
++	/*
++	 * if reverse lookup result looks like a numeric hostname,
++	 * someone is trying to trick us by PTR record like following:
++	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
++	hints.ai_flags = AI_NUMERICHOST;
++	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
++		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
++		    name, ntop);
++		freeaddrinfo(ai);
++		return strdup(ntop);
++	}
++
++	/* Names are stored in lowercase. */
++	lowercase(name);
++
++	/*
++	 * Map it back to an IP address and check that the given
++	 * address actually is an address of this host.  This is
++	 * necessary because anyone with access to a name server can
++	 * define arbitrary names for an IP address. Mapping from
++	 * name to IP address can be trusted better (but can still be
++	 * fooled if the intruder has access to the name server of
++	 * the domain).
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_family = from.ss_family;
++	hints.ai_socktype = SOCK_STREAM;
++	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
++		logit("reverse mapping checking getaddrinfo for %.700s "
++		    "[%s] failed.", name, ntop);
++		return strdup(ntop);
++	}
++	/* Look for the address from the list of addresses. */
++	for (ai = aitop; ai; ai = ai->ai_next) {
++		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
++		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
++		    (strcmp(ntop, ntop2) == 0))
++				break;
++	}
++	freeaddrinfo(aitop);
++	/* If we reached the end of the list, the address was not there. */
++	if (ai == NULL) {
++		/* Address not found for the host name. */
++		logit("Address %.100s maps to %.600s, but this does not "
++		    "map back to the address.", ntop, name);
++		return strdup(ntop);
++	}
++	return strdup(name);
++}
++
++/*
++ * Return the canonical name of the host in the other side of the current
++ * connection.  The host name is cached, so it is efficient to call this
++ * several times.
++ */
++
++const char *
++auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
++{
++	static char *dnsname;
++
++	if (!use_dns)
++		return ssh_remote_ipaddr(ssh);
++	else if (dnsname != NULL)
++		return dnsname;
++	else {
++		dnsname = remote_hostname(ssh);
++		return dnsname;
++	}
++}
diff --git a/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch b/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch
new file mode 100644
index 000000000000..1c2b7b8a091a
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch
@@ -0,0 +1,39 @@
+From d588d6f83e9a3d48286929b4a705b43e74414241 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Wed, 24 May 2017 23:18:41 -0400
+Subject: [PATCH] configure: actually set cache vars when cross-compiling
+
+The cross-compiling fallback message says it's assuming the test
+passed, but it didn't actually set the cache var which causes
+later tests to fail.
+---
+ configure.ac | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5cfea38c0a6c..895c5211ea93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3162,7 +3162,8 @@ AC_RUN_IFELSE(
+ 	 select_works_with_rlimit=yes],
+ 	[AC_MSG_RESULT([no])
+ 	 select_works_with_rlimit=no],
+-	[AC_MSG_WARN([cross compiling: assuming yes])]
++	[AC_MSG_WARN([cross compiling: assuming yes])
++	 select_works_with_rlimit=yes]
+ )
+ 
+ AC_MSG_CHECKING([if setrlimit(RLIMIT_NOFILE,{0,0}) works])
+@@ -3188,7 +3189,8 @@ AC_RUN_IFELSE(
+ 	 rlimit_nofile_zero_works=yes],
+ 	[AC_MSG_RESULT([no])
+ 	 rlimit_nofile_zero_works=no],
+-	[AC_MSG_WARN([cross compiling: assuming yes])]
++	[AC_MSG_WARN([cross compiling: assuming yes])
++	 rlimit_nofile_zero_works=yes]
+ )
+ 
+ AC_MSG_CHECKING([if setrlimit RLIMIT_FSIZE works])
+-- 
+2.12.0
+
diff --git a/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch
new file mode 100644
index 000000000000..e55a8b14c573
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch
@@ -0,0 +1,63 @@
+diff -ur a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch
+--- a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch	2017-03-27 13:31:01.816551100 -0700
++++ b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch	2017-03-27 13:51:03.894805846 -0700
+@@ -40,7 +40,7 @@
+ @@ -44,7 +44,7 @@ CC=@CC@
+  LD=@LD@
+  CFLAGS=@CFLAGS@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -1023,6 +1023,3 @@
+  	do_authenticated(authctxt);
+  
+  	/* The connection has been terminated. */
+--- 
+-2.12.0
+-
+diff -ur a/0004-support-dynamically-sized-receive-buffers.patch b/0004-support-dynamically-sized-receive-buffers.patch
+--- a/0004-support-dynamically-sized-receive-buffers.patch	2017-03-27 13:31:01.816551100 -0700
++++ b/0004-support-dynamically-sized-receive-buffers.patch	2017-03-27 13:49:44.513498976 -0700
+@@ -926,9 +926,9 @@
+ @@ -526,10 +553,10 @@ send_client_banner(int connection_out, int minor1)
+  	/* Send our own protocol version identification. */
+  	if (compat20) {
+- 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
+--		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+-+		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
++		xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
++-		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
+++		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
+  	} else {
+  		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
+ -		    PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
+@@ -943,11 +943,11 @@
+ @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
+  	char remote_version[256];	/* Must be at least as big as buf. */
+  
+- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
+--	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
+-+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
++	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
++-	    major, minor, SSH_VERSION, comment,
+++	    major, minor, SSH_RELEASE, comment,
+  	    *options.version_addendum == '\0' ? "" : " ",
+- 	    options.version_addendum);
++ 	    options.version_addendum, newline);
+  
+ @@ -1020,6 +1020,8 @@ server_listen(void)
+  	int ret, listen_sock, on = 1;
+@@ -1008,10 +1008,6 @@
+ @@ -3,4 +3,5 @@
+  #define SSH_VERSION	"OpenSSH_7.5"
+  
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
++-#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ +#define SSH_HPN		"-hpn14v12"
+ +#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+--- 
+-2.12.0
+-
diff --git a/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.2-glue.patch b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.2-glue.patch
new file mode 100644
index 000000000000..11a5b364be4d
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.2-glue.patch
@@ -0,0 +1,67 @@
+diff -ur a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch
+--- a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch	2017-03-27 13:31:01.816551100 -0700
++++ b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch	2017-03-27 13:51:03.894805846 -0700
+@@ -40,7 +40,7 @@
+ @@ -44,7 +44,7 @@ CC=@CC@
+  LD=@LD@
+  CFLAGS=@CFLAGS@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -1023,6 +1023,3 @@
+  	do_authenticated(authctxt);
+  
+  	/* The connection has been terminated. */
+--- 
+-2.12.0
+-
+diff -ur a/0004-support-dynamically-sized-receive-buffers.patch b/0004-support-dynamically-sized-receive-buffers.patch
+--- a/0004-support-dynamically-sized-receive-buffers.patch	2017-03-27 13:31:01.816551100 -0700
++++ b/0004-support-dynamically-sized-receive-buffers.patch	2017-03-27 13:49:44.513498976 -0700
+@@ -926,9 +926,9 @@
+ @@ -526,10 +553,10 @@ send_client_banner(int connection_out, int minor1)
+  	/* Send our own protocol version identification. */
+  	if (compat20) {
+- 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
+--		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+-+		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
++		xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
++-		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
+++		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
+  	} else {
+  		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
+ -		    PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
+@@ -943,11 +943,11 @@
+ @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
+  	char remote_version[256];	/* Must be at least as big as buf. */
+  
+- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
+--	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
+-+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
++	xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s%s",
++-	    major, minor, SSH_VERSION, pkix_comment,
+++	    major, minor, SSH_RELEASE, pkix_comment,
+  	    *options.version_addendum == '\0' ? "" : " ",
+- 	    options.version_addendum);
++ 	    options.version_addendum, newline);
+  
+ @@ -1020,6 +1020,8 @@ server_listen(void)
+  	int ret, listen_sock, on = 1;
+@@ -1006,12 +1008,9 @@
+ --- a/version.h
+ +++ b/version.h
+-@@ -3,4 +3,5 @@
++@@ -3,4 +3,6 @@
+  #define SSH_VERSION	"OpenSSH_7.5"
+  
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
++-#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+++#define SSH_X509	", PKIX-SSH " PACKAGE_VERSION
+ +#define SSH_HPN		"-hpn14v12"
+ +#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+--- 
+-2.12.0
+-
diff --git a/net-misc/openssh/files/openssh-7.5_p1-x32-typo.patch b/net-misc/openssh/files/openssh-7.5_p1-x32-typo.patch
new file mode 100644
index 000000000000..5dca1b0e4e16
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5_p1-x32-typo.patch
@@ -0,0 +1,25 @@
+From 596c432181e1c4a9da354388394f640afd29f44b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 20 Mar 2017 14:57:40 -0400
+Subject: [PATCH] seccomp sandbox: fix typo w/x32 check
+
+---
+ sandbox-seccomp-filter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index 3a1aedce72c2..a8d472a63ccb 100644
+--- a/sandbox-seccomp-filter.c
++++ b/sandbox-seccomp-filter.c
+@@ -235,7 +235,7 @@ static const struct sock_filter preauth_insns[] = {
+ 	 * x86-64 syscall under some circumstances, e.g.
+ 	 * https://bugs.debian.org/849923
+ 	 */
+-	SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT);
++	SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT),
+ #endif
+ 
+ 	/* Default deny */
+-- 
+2.12.0
+
diff --git a/net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch b/net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch
new file mode 100644
index 000000000000..b4f36a513180
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch
@@ -0,0 +1,202 @@
+diff -urN openssh-7.5p1.orig/a_utf8.c openssh-7.5p1/a_utf8.c
+--- openssh-7.5p1.orig/a_utf8.c	1970-01-01 00:00:00.000000000 +0000
++++ openssh-7.5p1/a_utf8.c	2017-03-30 17:38:25.179532110 +0000
+@@ -0,0 +1,186 @@
++/*
++ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
++ *
++ * Licensed under the OpenSSL license (the "License").  You may not use
++ * this file except in compliance with the License.  You can obtain a copy
++ * in the file LICENSE in the source distribution or at
++ * https://www.openssl.org/source/license.html
++ */
++
++#include <stdio.h>
++
++/* UTF8 utilities */
++
++/*-
++ * This parses a UTF8 string one character at a time. It is passed a pointer
++ * to the string and the length of the string. It sets 'value' to the value of
++ * the current character. It returns the number of characters read or a
++ * negative error code:
++ * -1 = string too short
++ * -2 = illegal character
++ * -3 = subsequent characters not of the form 10xxxxxx
++ * -4 = character encoded incorrectly (not minimal length).
++ */
++
++int UTF8_getc(const unsigned char *str, int len, unsigned long *val)
++{
++    const unsigned char *p;
++    unsigned long value;
++    int ret;
++    if (len <= 0)
++        return 0;
++    p = str;
++
++    /* Check syntax and work out the encoded value (if correct) */
++    if ((*p & 0x80) == 0) {
++        value = *p++ & 0x7f;
++        ret = 1;
++    } else if ((*p & 0xe0) == 0xc0) {
++        if (len < 2)
++            return -1;
++        if ((p[1] & 0xc0) != 0x80)
++            return -3;
++        value = (*p++ & 0x1f) << 6;
++        value |= *p++ & 0x3f;
++        if (value < 0x80)
++            return -4;
++        ret = 2;
++    } else if ((*p & 0xf0) == 0xe0) {
++        if (len < 3)
++            return -1;
++        if (((p[1] & 0xc0) != 0x80)
++            || ((p[2] & 0xc0) != 0x80))
++            return -3;
++        value = (*p++ & 0xf) << 12;
++        value |= (*p++ & 0x3f) << 6;
++        value |= *p++ & 0x3f;
++        if (value < 0x800)
++            return -4;
++        ret = 3;
++    } else if ((*p & 0xf8) == 0xf0) {
++        if (len < 4)
++            return -1;
++        if (((p[1] & 0xc0) != 0x80)
++            || ((p[2] & 0xc0) != 0x80)
++            || ((p[3] & 0xc0) != 0x80))
++            return -3;
++        value = ((unsigned long)(*p++ & 0x7)) << 18;
++        value |= (*p++ & 0x3f) << 12;
++        value |= (*p++ & 0x3f) << 6;
++        value |= *p++ & 0x3f;
++        if (value < 0x10000)
++            return -4;
++        ret = 4;
++    } else if ((*p & 0xfc) == 0xf8) {
++        if (len < 5)
++            return -1;
++        if (((p[1] & 0xc0) != 0x80)
++            || ((p[2] & 0xc0) != 0x80)
++            || ((p[3] & 0xc0) != 0x80)
++            || ((p[4] & 0xc0) != 0x80))
++            return -3;
++        value = ((unsigned long)(*p++ & 0x3)) << 24;
++        value |= ((unsigned long)(*p++ & 0x3f)) << 18;
++        value |= ((unsigned long)(*p++ & 0x3f)) << 12;
++        value |= (*p++ & 0x3f) << 6;
++        value |= *p++ & 0x3f;
++        if (value < 0x200000)
++            return -4;
++        ret = 5;
++    } else if ((*p & 0xfe) == 0xfc) {
++        if (len < 6)
++            return -1;
++        if (((p[1] & 0xc0) != 0x80)
++            || ((p[2] & 0xc0) != 0x80)
++            || ((p[3] & 0xc0) != 0x80)
++            || ((p[4] & 0xc0) != 0x80)
++            || ((p[5] & 0xc0) != 0x80))
++            return -3;
++        value = ((unsigned long)(*p++ & 0x1)) << 30;
++        value |= ((unsigned long)(*p++ & 0x3f)) << 24;
++        value |= ((unsigned long)(*p++ & 0x3f)) << 18;
++        value |= ((unsigned long)(*p++ & 0x3f)) << 12;
++        value |= (*p++ & 0x3f) << 6;
++        value |= *p++ & 0x3f;
++        if (value < 0x4000000)
++            return -4;
++        ret = 6;
++    } else
++        return -2;
++    *val = value;
++    return ret;
++}
++
++/*
++ * This takes a character 'value' and writes the UTF8 encoded value in 'str'
++ * where 'str' is a buffer containing 'len' characters. Returns the number of
++ * characters written or -1 if 'len' is too small. 'str' can be set to NULL
++ * in which case it just returns the number of characters. It will need at
++ * most 6 characters.
++ */
++
++int UTF8_putc(unsigned char *str, int len, unsigned long value)
++{
++    if (!str)
++        len = 6;                /* Maximum we will need */
++    else if (len <= 0)
++        return -1;
++    if (value < 0x80) {
++        if (str)
++            *str = (unsigned char)value;
++        return 1;
++    }
++    if (value < 0x800) {
++        if (len < 2)
++            return -1;
++        if (str) {
++            *str++ = (unsigned char)(((value >> 6) & 0x1f) | 0xc0);
++            *str = (unsigned char)((value & 0x3f) | 0x80);
++        }
++        return 2;
++    }
++    if (value < 0x10000) {
++        if (len < 3)
++            return -1;
++        if (str) {
++            *str++ = (unsigned char)(((value >> 12) & 0xf) | 0xe0);
++            *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80);
++            *str = (unsigned char)((value & 0x3f) | 0x80);
++        }
++        return 3;
++    }
++    if (value < 0x200000) {
++        if (len < 4)
++            return -1;
++        if (str) {
++            *str++ = (unsigned char)(((value >> 18) & 0x7) | 0xf0);
++            *str++ = (unsigned char)(((value >> 12) & 0x3f) | 0x80);
++            *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80);
++            *str = (unsigned char)((value & 0x3f) | 0x80);
++        }
++        return 4;
++    }
++    if (value < 0x4000000) {
++        if (len < 5)
++            return -1;
++        if (str) {
++            *str++ = (unsigned char)(((value >> 24) & 0x3) | 0xf8);
++            *str++ = (unsigned char)(((value >> 18) & 0x3f) | 0x80);
++            *str++ = (unsigned char)(((value >> 12) & 0x3f) | 0x80);
++            *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80);
++            *str = (unsigned char)((value & 0x3f) | 0x80);
++        }
++        return 5;
++    }
++    if (len < 6)
++        return -1;
++    if (str) {
++        *str++ = (unsigned char)(((value >> 30) & 0x1) | 0xfc);
++        *str++ = (unsigned char)(((value >> 24) & 0x3f) | 0x80);
++        *str++ = (unsigned char)(((value >> 18) & 0x3f) | 0x80);
++        *str++ = (unsigned char)(((value >> 12) & 0x3f) | 0x80);
++        *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80);
++        *str = (unsigned char)((value & 0x3f) | 0x80);
++    }
++    return 6;
++}
+diff -urN openssh-7.5p1.orig/Makefile.in openssh-7.5p1/Makefile.in
+--- openssh-7.5p1.orig/Makefile.in	2017-03-30 17:33:30.983830629 +0000
++++ openssh-7.5p1/Makefile.in	2017-03-30 17:39:28.392905858 +0000
+@@ -74,7 +74,7 @@
+ @OCSP_ON@OCSP_OBJS=ssh-ocsp.o
+ @OCSP_OFF@OCSP_OBJS=
+ 
+-SSHX509_OBJS=ssh-x509.o ssh-xkalg.o x509_nm_cmp.o key-eng.o
++SSHX509_OBJS=ssh-x509.o ssh-xkalg.o x509_nm_cmp.o key-eng.o a_utf8.o
+ X509STORE_OBJS=x509store.o $(LDAP_OBJS)
+ 
+ TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
diff --git a/net-misc/openssh/files/sshd.confd b/net-misc/openssh/files/sshd.confd
new file mode 100644
index 000000000000..28952b4a285a
--- /dev/null
+++ b/net-misc/openssh/files/sshd.confd
@@ -0,0 +1,21 @@
+# /etc/conf.d/sshd: config file for /etc/init.d/sshd
+
+# Where is your sshd_config file stored?
+
+SSHD_CONFDIR="/etc/ssh"
+
+
+# Any random options you want to pass to sshd.
+# See the sshd(8) manpage for more info.
+
+SSHD_OPTS=""
+
+
+# Pid file to use (needs to be absolute path).
+
+#SSHD_PIDFILE="/var/run/sshd.pid"
+
+
+# Path to the sshd binary (needs to be absolute path).
+
+#SSHD_BINARY="/usr/sbin/sshd"
diff --git a/net-misc/openssh/files/sshd.pam_include.2 b/net-misc/openssh/files/sshd.pam_include.2
new file mode 100644
index 000000000000..b801aaafa0f9
--- /dev/null
+++ b/net-misc/openssh/files/sshd.pam_include.2
@@ -0,0 +1,4 @@
+auth       include	system-remote-login
+account    include	system-remote-login
+password   include	system-remote-login
+session	   include	system-remote-login
diff --git a/net-misc/openssh/files/sshd.rc6.4 b/net-misc/openssh/files/sshd.rc6.4
new file mode 100644
index 000000000000..5e301420361f
--- /dev/null
+++ b/net-misc/openssh/files/sshd.rc6.4
@@ -0,0 +1,84 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+: ${SSHD_CONFDIR:=/etc/ssh}
+: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config}
+: ${SSHD_PIDFILE:=/var/run/${SVCNAME}.pid}
+: ${SSHD_BINARY:=/usr/sbin/sshd}
+
+depend() {
+	use logger dns
+	if [ "${rc_need+set}" = "set" ] ; then
+		: # Do nothing, the user has explicitly set rc_need
+	else
+		local x warn_addr
+		for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do
+			case "${x}" in
+				0.0.0.0|0.0.0.0:*) ;;
+				::|\[::\]*) ;;
+				*) warn_addr="${warn_addr} ${x}" ;;
+			esac
+		done
+		if [ -n "${warn_addr}" ] ; then
+			need net
+			ewarn "You are binding an interface in ListenAddress statement in your sshd_config!"
+			ewarn "You must add rc_need=\"net.FOO\" to your /etc/conf.d/sshd"
+			ewarn "where FOO is the interface(s) providing the following address(es):"
+			ewarn "${warn_addr}"
+		fi
+	fi
+}
+
+checkconfig() {
+	if [ ! -d /var/empty ] ; then
+		mkdir -p /var/empty || return 1
+	fi
+
+	if [ ! -e "${SSHD_CONFIG}" ] ; then
+		eerror "You need an ${SSHD_CONFIG} file to run sshd"
+		eerror "There is a sample file in /usr/share/doc/openssh"
+		return 1
+	fi
+
+	ssh-keygen -A || return 1
+
+	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
+		&& SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}"
+	[ "${SSHD_CONFIG}" != "/etc/ssh/sshd_config" ] \
+		&& SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFIG}"
+
+	"${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec "${SSHD_BINARY}" \
+	    --pidfile "${SSHD_PIDFILE}" \
+	    -- ${SSHD_OPTS}
+	eend $?
+}
+
+stop() {
+	if [ "${RC_CMD}" = "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec "${SSHD_BINARY}" \
+	    --pidfile "${SSHD_PIDFILE}" --quiet
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP \
+	    --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}"
+	eend $?
+}
diff --git a/net-misc/openssh/files/sshd.service b/net-misc/openssh/files/sshd.service
new file mode 100644
index 000000000000..b5e96b3a251f
--- /dev/null
+++ b/net-misc/openssh/files/sshd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenSSH server daemon
+After=syslog.target network.target auditd.service
+
+[Service]
+ExecStartPre=/usr/bin/ssh-keygen -A
+ExecStart=/usr/sbin/sshd -D -e
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/openssh/files/sshd.socket b/net-misc/openssh/files/sshd.socket
new file mode 100644
index 000000000000..94b9533180da
--- /dev/null
+++ b/net-misc/openssh/files/sshd.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=OpenSSH Server Socket
+Conflicts=sshd.service
+
+[Socket]
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/net-misc/openssh/files/sshd_at.service b/net-misc/openssh/files/sshd_at.service
new file mode 100644
index 000000000000..2645ad047cc6
--- /dev/null
+++ b/net-misc/openssh/files/sshd_at.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=OpenSSH per-connection server daemon
+After=syslog.target auditd.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i -e
+StandardInput=socket
+StandardError=syslog
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
new file mode 100644
index 000000000000..29134fc060db
--- /dev/null
+++ b/net-misc/openssh/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
+  </maintainer>
+  <longdescription>
+OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that 
+increasing numbers of people on the Internet are coming to rely on. Many users of telnet, 
+rlogin, ftp, and other such programs might not realize that their password is transmitted 
+across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) 
+to effectively eliminate eavesdropping, connection hijacking, and other network-level attacks. 
+Additionally, OpenSSH provides a myriad of secure tunneling capabilities, as well as a variety 
+of authentication methods.
+
+The OpenSSH suite includes the ssh program which replaces rlogin and telnet, scp which 
+replaces rcp, and sftp which replaces ftp. Also included is sshd which is the server side of 
+the package, and the other basic utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, 
+ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and 2.0.
+</longdescription>
+  <use>
+    <flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag>
+    <flag name="hpn">Enable high performance ssh</flag>
+    <flag name="ldap">Add support for storing SSH public keys in LDAP</flag>
+    <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag>
+    <flag name="livecd">Enable root password logins for live-cd environment.</flag>
+    <flag name="ssh1">Support the legacy/weak SSH1 protocol</flag>
+    <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag>
+    <flag name="X509">Adds support for X.509 certificate authentication</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:openssh:openssh</remote-id>
+    <remote-id type="sourceforge">hpnssh</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/openssh/openssh-7.3_p1-r7.ebuild b/net-misc/openssh/openssh-7.3_p1-r7.ebuild
new file mode 100644
index 000000000000..419efd3205b5
--- /dev/null
+++ b/net-misc/openssh/openssh-7.3_p1-r7.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+HPN_PV="${PV}"
+HPN_VER="14.10"
+
+HPN_PATCH="${PN}-${HPN_PV}-hpn-14.10-r1.patch"
+SCTP_PATCH="${PN}-7.3_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.3p1-0.3.14.patch.xz"
+X509_VER="9.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? (
+		mirror://gentoo/${HPN_PATCH}.xz
+		https://dev.gentoo.org/~chutzpah/${HPN_PATCH}.xz
+	)}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !ldap ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-0.9.8f:0[bindist=]
+			dev-libs/openssl:0[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		pushd .. >/dev/null
+		if use hpn ; then
+			pushd "${WORKDIR}" >/dev/null
+			epatch "${FILESDIR}"/${P}-hpn-x509-9.2-glue.patch
+			popd >/dev/null
+		fi
+		epatch "${FILESDIR}"/${PN}-7.3_p1-sctp-x509-glue.patch
+		sed -i 's:PKIX_VERSION:SSH_X509:g' "${WORKDIR}"/${X509_PATCH%.*} || die
+		popd >/dev/null
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		epatch "${FILESDIR}"/${P}-x509-9.2-warnings.patch
+		save_version X509
+	else
+		# bug #592122, fixed by X509 patch
+		epatch "${FILESDIR}"/${P}-fix-ssh1-with-no-ssh1-host-key.patch
+	fi
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	epatch "${FILESDIR}"/${PN}-7.3_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	epatch "${WORKDIR}"/${SCTP_PATCH%.*}
+
+	if use hpn ; then
+		#EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		#	EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+		#	epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		epatch "${WORKDIR}"/${HPN_PATCH}
+		epatch "${FILESDIR}"/${P}-hpn-cipher-ctr-mt-no-deadlocks.patch
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	# 7.3 added seccomp support to MIPS, but failed to handled the N32
+	# case.  This patch is temporary until upstream fixes.  See
+	# Gentoo bug #591392 or upstream #2590.
+	[[ ${CHOST} == mips64*-linux-* && ${ABI} == "n32" ]] \
+		&& epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	epatch "${FILESDIR}"/${P}-NEWKEYS_null_deref.patch # 595342
+	epatch "${FILESDIR}"/${P}-Unregister-the-KEXINIT-handler-after-receive.patch # 597360
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+	keepdir /var/empty
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t tests skipped failed passed shell
+	tests="interop-tests compat-tests"
+	skipped=""
+	shell=$(egetshell ${UID})
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite"
+		elog "requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped="${skipped} tests"
+	else
+		tests="${tests} tests"
+	fi
+	# It will also attempt to write to the homedir .ssh
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in ${tests} ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed="${passed}${t} " \
+			|| failed="${failed}${t} "
+	done
+	einfo "Passed tests: ${passed}"
+	ewarn "Skipped tests: ${skipped}"
+	if [[ -n ${failed} ]] ; then
+		ewarn "Failed tests: ${failed}"
+		die "Some tests failed: ${failed}"
+	else
+		einfo "Failed tests: ${failed}"
+		return 0
+	fi
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/openssh/openssh-7.3_p1-r8.ebuild b/net-misc/openssh/openssh-7.3_p1-r8.ebuild
new file mode 100644
index 000000000000..4f9371ee6a84
--- /dev/null
+++ b/net-misc/openssh/openssh-7.3_p1-r8.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
+SCTP_PATCH="${PN}-7.3_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.3p1-0.3.14.patch.xz"
+X509_VER="9.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !ldap ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-0.9.8f:0[bindist=]
+			dev-libs/openssl:0[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		pushd .. >/dev/null
+		if use hpn ; then
+			pushd ${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${P}-hpn-12-x509-9.2-glue.patch
+			popd >/dev/null
+		fi
+		epatch "${FILESDIR}"/${PN}-7.3_p1-sctp-x509-glue.patch
+		sed -i 's:PKIX_VERSION:SSH_X509:g' "${WORKDIR}"/${X509_PATCH%.*} || die
+		popd >/dev/null
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		epatch "${FILESDIR}"/${P}-x509-9.2-warnings.patch
+		save_version X509
+	else
+		epatch "${FILESDIR}"/${P}-fix-ssh1-with-no-ssh1-host-key.patch #592122 inc in X509 patch
+	fi
+
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	epatch "${FILESDIR}"/${PN}-7.3_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	epatch "${WORKDIR}"/${SCTP_PATCH%.*}
+	epatch "${FILESDIR}"/${P}-NEWKEYS_null_deref.patch #595342
+	epatch "${FILESDIR}"/${P}-Unregister-the-KEXINIT-handler-after-receive.patch #597360
+	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+	keepdir /var/empty
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/openssh/openssh-7.4_p1.ebuild b/net-misc/openssh/openssh-7.4_p1.ebuild
new file mode 100644
index 000000000000..41790fb15b3c
--- /dev/null
+++ b/net-misc/openssh/openssh-7.4_p1.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+#HPN_PATCH= #"${PARCH}-hpnssh14v12.tar.xz"
+SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.4p1-0.3.14.patch.xz"
+X509_VER="9.3" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !hpn !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-0.9.8f:0[bindist=]
+			dev-libs/openssl:0[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		# We no longer allow X509 to be used with anything else.
+		#save_version X509
+	fi
+
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	epatch "${FILESDIR}"/${PN}-7.4_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
+	epatch "${FILESDIR}"/${P}-test-bashism.patch
+	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use X509 || use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+	keepdir /var/empty
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/openssh/openssh-7.5_p1-r1.ebuild b/net-misc/openssh/openssh-7.5_p1-r1.ebuild
new file mode 100644
index 000000000000..553f37b620d9
--- /dev/null
+++ b/net-misc/openssh/openssh-7.5_p1-r1.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
+SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz"
+X509_VER="10.1" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		if use hpn ; then
+			pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
+			popd >/dev/null
+		fi
+		save_version X509
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		use libressl && epatch "${FILESDIR}"/${PN}-7.5p1-x509-libressl.patch
+	fi
+
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
+	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
+	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
+	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509 ; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use X509 || use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/openssh/openssh-7.5_p1-r2.ebuild b/net-misc/openssh/openssh-7.5_p1-r2.ebuild
new file mode 100644
index 000000000000..c5d657ba7c11
--- /dev/null
+++ b/net-misc/openssh/openssh-7.5_p1-r2.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
+SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz"
+X509_VER="10.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		if use hpn ; then
+			pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
+			popd >/dev/null
+		fi
+		save_version X509
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+	fi
+
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
+	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
+	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
+	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use X509 || use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/openssh/openssh-7.5_p1.ebuild b/net-misc/openssh/openssh-7.5_p1.ebuild
new file mode 100644
index 000000000000..220b1ad28983
--- /dev/null
+++ b/net-misc/openssh/openssh-7.5_p1.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
+SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz"
+#X509_VER="9.3" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !hpn !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		# We no longer allow X509 to be used with anything else.
+		#save_version X509
+	fi
+
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
+	epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
+	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use X509 || use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/openvpn-auth-ldap/Manifest b/net-misc/openvpn-auth-ldap/Manifest
new file mode 100644
index 000000000000..b930969b9bee
--- /dev/null
+++ b/net-misc/openvpn-auth-ldap/Manifest
@@ -0,0 +1,7 @@
+AUX 2.0.4_pre20131110-gentoo.patch 1331 SHA256 92a2a3e87359c4a91a08122be966fdc6f69c72af19400e7efeb72b4c7ded61a6 SHA512 6c99d64749bd2488aa4fe40cfdc0b1eb0e4344f1e0b69db1c27d6e7406331a0f7d5eee8c26396ece6c916a502ec004bf3ddd0c96528b61cce414ab3b3062e868 WHIRLPOOL 1d4ee2ea27fe415628800b9d8a817e60c3ec9a2748283ec8ecc40400ac99afe1824b015cd53c8fdc55b51cd26b8471a48102c526f2c5ae322f0fe7755285bd2b
+AUX 2.0.4_pre20131110-objc.patch 1086 SHA256 c2caa2b9ebc0a4df341043533388cdaa59cf7605000d751a60551154cd8c55b9 SHA512 326fd86ca5361d0603f2b3c01be1a3ac184d2bfbde8dc08aedb006d04efecf68444bcec31af106d108c3b6ae6737b4e335216a736deff495829e3a16138a979d WHIRLPOOL fd33728a7692ccf2f7de1aa3a6185eb9a1bd15163ebbe8edb1fcb7c181a06824fae9ead9c0020583dddf670e3f03a0759e70c426ed00d36091e0441f4e89a417
+DIST openvpn-auth-ldap-2.0.4_pre20131110.tar.bz2 170168 SHA256 4631b2a3cf344d188882f4ff9b87d5e27b21b7e24d094a6c5660a81132772dc2 SHA512 116422d9f1bee8f04f848438d4486acef262bc7a34e17c23a6b341b866c2361875092e40c1ac0e29458bca3a098cf6f00b94372d809e657819555badc7acab6c WHIRLPOOL f0aba5f972a02366cfc07c0a25e5104b78dcbbb1c7156b0e6d9d8ddb93b98e2c1734fbae5c187a169dc6ebe727d999e32836d7093df994145a6b878282882294
+EBUILD openvpn-auth-ldap-2.0.4_pre20131110.ebuild 978 SHA256 32dbeb95c6ef9b494238722a460fe08e08829a3c1c3e8b63ac637ff88ac928a9 SHA512 55fc8bc8a10cdc48056f2bf475e554e4dc9ca6cd2f06482dd21f719659f3c1d51aee55b43347f120923045fc77bae27d12aa770bd333a57fddb8df857654cc3f WHIRLPOOL 4326686a3ebdef9e087b2651322e410da3a339bdd14edc411e797e58825950b0d9debf11606847f6bab52810db91ab5b1b655c0e9f03888d73435c78303e640f
+MISC ChangeLog 2691 SHA256 2743541779431a23feb8f14e6d04b4a0da32d4841a05fe58408ef8e5560edca0 SHA512 f181065b4e893f2512e84761c0917ed25c9d2a563b6638f787a1ec86155f2517375e50be76f0441e264148ed6358187e5979cb6580a5b65b543c1c59f0d26ac7 WHIRLPOOL df547d35bec648888b734ab521aeed50fa984c2638b1a61f876251769fb5494994f2e6e28e03e65795e9b59a3b42d4ba22b9bb30854b7aba59f0667cff9a8070
+MISC ChangeLog-2015 557 SHA256 ec6d5e3788ebac2f1887002a4353cc3a6d9aae1ce86d2dfcd524d2f90f39738c SHA512 36f8166b6039b23cc518a20e53cd7a418d7fbb63894bba3a08e6978edb89fd2ebf8162691b703b89aa9452400849bc82fdea48b0a323f6f85d90ede7322f191e WHIRLPOOL 461b1d46323819055236084413ea1825f54be3988ff6c4070d1441cee001c56f4c8fb3a9e1ce2547c7fec2e1e1f11aba8334546c233891937773acda7360b70c
+MISC metadata.xml 409 SHA256 a2f2a412255d127a9ef50b3c2b2d6122148d3b20596460928ca32e42f18623b2 SHA512 14eb1fce6d7f330a873e42f70e3fde9b54aabcd6c3f139be9feebfc6bf23d48a9ca7595998750a22632a0e54a55850b320ddfd57e786fed182d4c1c3884cc0da WHIRLPOOL c7c2ff722a1f1ecc01243fc931106e2df5e392a0ae99d5f5e65b8f8b5fc438309de34d11c4d2ebd0d8d7ba966aac2711725d6ab76bb9c34869079727f407ed64
diff --git a/net-misc/openvpn-auth-ldap/files/2.0.4_pre20131110-gentoo.patch b/net-misc/openvpn-auth-ldap/files/2.0.4_pre20131110-gentoo.patch
new file mode 100644
index 000000000000..dbebe69ea41a
--- /dev/null
+++ b/net-misc/openvpn-auth-ldap/files/2.0.4_pre20131110-gentoo.patch
@@ -0,0 +1,47 @@
+ Mk/autoconf.mk.in | 4 ++--
+ src/Makefile.in   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Mk/autoconf.mk.in b/Mk/autoconf.mk.in
+index fdbbbfc..db04c70 100644
+--- a/Mk/autoconf.mk.in
++++ b/Mk/autoconf.mk.in
+@@ -13,7 +13,7 @@ OBJC_PTHREAD_LIBS	= @OBJC_PTHREAD_LIBS@
+ OBJC_PTHREAD_CFLAGS	= @OBJC_PTHREAD_CFLAGS@
+ 
+ PLUGIN_LD		= @PLUGIN_LD@
+-PLUGIN_LD_FLAGS		= @PLUGIN_LD_FLAGS@
++PLUGIN_LD_FLAGS		= @PLUGIN_LD_FLAGS@ $(LDFLAGS)
+ PLUGIN_CFLAGS		= @PLUGIN_CFLAGS@
+ PLUGIN_SUFFIX		= @PLUGIN_SUFFIX@
+ PLUGIN_FILE		= @PLUGIN_FILE@
+@@ -33,7 +33,7 @@ PTHREAD_CFLAGS		= @PTHREAD_CFLAGS@
+ 
+ OPENVPN_CFLAGS		= @OPENVPN_CFLAGS@
+ 
+-LDFLAGS                 = @LDFLAGS@
++LDFLAGS                 += @LDFLAGS@
+ 
+ AR			= @AR@
+ RANLIB			= @RANLIB@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index b0eac7b..47c467b 100755
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -42,14 +42,14 @@ GEN_SRCS=	TRConfigParser.m \
+ 
+ TEST_OBJS=	testplugin.o
+ 
+-CFLAGS+=	$(LDAP_CFLAGS) $(OPENVPN_CFLAGS)
++CFLAGS+=	$(LDAP_CFLAGS) $(OPENVPN_CFLAGS) -fPIC
+ OBJCFLAGS+=	$(LDAP_CFLAGS) $(OPENVPN_CFLAGS)
+ LIBS+=		-L. -lauth-ldap \
+ 		$(LDAP_LIBS) \
+ 		$(OBJC_LIBS) \
+ 		$(FLEX_LIBS)
+ 
+-INSTALL_LIB=		$(INSTALL) -m 755
++INSTALL_LIB=		$(INSTALL) -m 755 -D
+ PLUGIN_INSTALL_DIR=	$(DESTDIR)$(libdir)
+ 
+ all:: $(PLUGIN_FILE) $(AUTH_LIB) testplugin
diff --git a/net-misc/openvpn-auth-ldap/files/2.0.4_pre20131110-objc.patch b/net-misc/openvpn-auth-ldap/files/2.0.4_pre20131110-objc.patch
new file mode 100644
index 000000000000..0ddcb98167f4
--- /dev/null
+++ b/net-misc/openvpn-auth-ldap/files/2.0.4_pre20131110-objc.patch
@@ -0,0 +1,33 @@
+diff --git a/auth-ldap-2.0.4_pre20131110/aclocal.m4 b/auth-ldap-2.0.4_pre20131110/aclocal.m4
+index e509555..3b73520 100644
+--- a/auth-ldap-2.0.4_pre20131110/aclocal.m4
++++ b/auth-ldap-2.0.4_pre20131110/aclocal.m4
+@@ -130,7 +130,6 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
+ 			AC_LINK_IFELSE([
+ 					AC_LANG_PROGRAM([
+ 							#include <objc/objc.h>
+-							#include <objc/objc-api.h>
+ 						], [
+ 							id class = objc_lookUpClass("Object");
+ 							id obj = @<:@class alloc@:>@;
+@@ -157,7 +156,6 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
+ 			AC_LINK_IFELSE([
+ 					AC_LANG_PROGRAM([
+ 							#include <objc/objc.h>
+-							#include <objc/objc-api.h>
+ 						], [
+ 							id class = objc_lookup_class("Object");
+ 							id obj = @<:@class alloc@:>@;
+diff --git a/auth-ldap-2.0.4_pre20131110/src/TRString.h b/auth-ldap-2.0.4_pre20131110/src/TRString.h
+index 6755c63..77d139b 100644
+--- a/auth-ldap-2.0.4_pre20131110/src/TRString.h
++++ b/auth-ldap-2.0.4_pre20131110/src/TRString.h
+@@ -35,7 +35,7 @@
+ #endif
+ 
+ #import <stdlib.h>
+-
++#include <stdarg.h>
+ #import "TRObject.h"
+ 
+ @interface TRString : TRObject {
diff --git a/net-misc/openvpn-auth-ldap/metadata.xml b/net-misc/openvpn-auth-ldap/metadata.xml
new file mode 100644
index 000000000000..e1e2d9a19494
--- /dev/null
+++ b/net-misc/openvpn-auth-ldap/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ercpe@gentoo.org</email>
+		<name>Johann Schmitz (ercpe)</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">openvpn-auth-ldap</remote-id>
+		<remote-id type="github">threerings/openvpn-auth-ldap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/openvpn-auth-ldap/openvpn-auth-ldap-2.0.4_pre20131110.ebuild b/net-misc/openvpn-auth-ldap/openvpn-auth-ldap-2.0.4_pre20131110.ebuild
new file mode 100644
index 000000000000..1e77248d32e5
--- /dev/null
+++ b/net-misc/openvpn-auth-ldap/openvpn-auth-ldap-2.0.4_pre20131110.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic
+
+DESCRIPTION="LDAP authentication and authorization plugin for OpenVPN 2.x"
+HOMEPAGE="https://github.com/threerings/openvpn-auth-ldap"
+SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="net-vpn/openvpn
+	net-nds/openldap"
+DEPEND="dev-util/re2c
+	sys-devel/gcc[objc]
+	${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+	sed \
+		-e '/test/d' \
+		-i Makefile.in || die
+	epatch \
+		"${FILESDIR}"/${PV}-objc.patch \
+		"${FILESDIR}"/${PV}-gentoo.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-openvpn="${EPREFIX}/usr/include" \
+		--with-openldap="${EPREFIX}/usr/include" \
+		--with-objc-runtime=GNU
+}
+
+src_compile() {
+	emake -C tools
+	emake -C src TRConfigParser.h
+	default
+}
+
+src_install() {
+	default
+	dodoc auth-ldap.conf
+}
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
new file mode 100644
index 000000000000..a2769ec96a7e
--- /dev/null
+++ b/net-misc/openvswitch/Manifest
@@ -0,0 +1,19 @@
+AUX openvswitch.tmpfiles 40 SHA256 34bd2c1b2e3a67fe71922f85d8348737d8c79e498f6aee1f6130d28a6844876c SHA512 020aaa9599b853d75a612f7bbd4ef8ea024908f283afe5c727f5d2a1f3a5a98634f82d840b3ebf886b9a82e9c60c237ced2fb13057bc7bb9ab5c449e11b51997 WHIRLPOOL 8551d8bc62ac8d7a344e756e96ac1f4d0fbfcc6ed8309437d71401a15b1da26277bfa4dcf6964a7fb4673a3eaf327c7911a078601742c225c8b8fab73b282c2f
+AUX ovs-vswitchd-r1 436 SHA256 42d1203da4ea855e111bea0b4faf175b82907ed8af93a4271b46bc4c9003dedb SHA512 7a98f85251a7b60d93a28ade482669537585fc05265cc51eb61e283739537df980230bd5f9dccfdb60772afe3f0bf2493eed9a25b289c7ef37d998e8ca5ec4df WHIRLPOOL 524fd908a191039f816df9315123c9d21ddd8f115bcee31f1b022c0a9c104df97c0f433af40adbaa095f03ba9ac4bed361cdc42f64ef82992d095b0ee414b044
+AUX ovs-vswitchd.service 393 SHA256 87e54341221e22ef86dfbe18e96a125f12046795c8cc03acea2914bf6afef707 SHA512 74d2ba9b76ad29dbb75e9b3321e1e714140a1c9bf9f5176c8418b025ffdb9c14d9f532709835c163c7256b4c81d69b522fcbc12d6bd9399283c8bd45b94cd7f2 WHIRLPOOL cbc92f53a4c23dc89fae73a96fc9203787a2b8828389edcb14d3e5b0e1cd1f5393f960fbab80bbd934011f53b9ff770b2a123b3ca61afc1e3c50985387edf01c
+AUX ovs-vswitchd_conf 164 SHA256 438c58741562af201c816f0a72101b5abb0e75788369bb04ed57be28425e5f81 SHA512 2e65f8658b6120e30849a8b3b0268d7776635c36bdd77920537355fc1883f306d3df5c78d2a5fefffdcf76b093b126f9d315c1595cd0ab643ac5f000c8b4f439 WHIRLPOOL 3cf05adfa5f1bfecdf022442c26b100ae3e63db7a1837b441fcef46e8864103eb3e761735ad1d81ad5d105cbc978d12e96449edf70aef3eb7d310080ce50ce9a
+AUX ovsdb-server-r1 855 SHA256 9c1e14ad81ad8d95a75358a7641d3a3ef4ced6e7d48ca3feb362b76d358de870 SHA512 fa51b2a661c1bdd345adf58c2b0e4c4c68bb4ed4ce78dc6e195ba9fe662fa451753664c72f56d755cfa682d0c9accd283dc501aee3c4ba58238f44df1ddaf5a5 WHIRLPOOL f7aa66e625bff40c3f2968d74b1dce3ec0f6f46bef98c597eaadace9cf743246d0f4d075287e06885f30305cbd611e8f549664fc4491b34d481e265b0547b2af
+AUX ovsdb-server.service 480 SHA256 44049e1b675590bdacf4dc8ba2e9fa1a721c694b730a7951eec9a945f8933b9b SHA512 cb9196ebdb7f16eca4182172a079027dc2c28f366d0a4f9251480b20172758cb581cd91b9a0f2a3dde95742455bec9ef96aa584305f17bdc97b3de7d4c99aa19 WHIRLPOOL e78085be373ae2d31e7d153d95b19728304e94352c88fad33078483951e975343e64137bf44ddff2e18e723e5a9fb6464685a2efad65eaac3c554dad83da60b0
+AUX ovsdb-server_conf 492 SHA256 15c508d134fed8cda13e2d394fc7c20b9868294a30e73a952ebffd31df129251 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa WHIRLPOOL 076bbaf28d36bc6a748ee38c5b574946e938a78de4ac2948894cb41f9b639d04d3427019d227fcd559252869794004c1f467f6dfb23f0ab60450450d2cd7973f
+AUX ovsdb-server_conf2 544 SHA256 d0d8a6a7256f4cc47ab1b9f9f7657202388133bcfff3668e7c1d4adbcc572261 SHA512 b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5 WHIRLPOOL 40ee3ad1cce80c053da80b410209546b427963e06f9713396823f1d97b535e34c9c2c19212a096685cb08d7214751c731c1652f883f7f4b7cdc418d5fd56524d
+AUX xcp-interface-reconfigure-2.3.2.patch 920 SHA256 e7b08bb9370235f1c803c66cbfd9963e98afc26aa136f2b78fd090f766365a02 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7 WHIRLPOOL 5d4b3cf29485039a46f5e368ce59af0c4384f701e122f6fc3928116f1a65855e40be3d7f9e28420df93c75032e50ff0549ea8246d9f93c4f33a79ddc38cee67f
+DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092
+DIST openvswitch-2.7.2.tar.gz 6192414 SHA256 fe36c86ed52f6f7c17b01cdbb7ae37bf521cc5c2e50997b618f3f742485f655b SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470 WHIRLPOOL 6525d475cc10b3e32d5b9c01cbfd909dff3cfad28bbe13bf55b5775471a58fd49e9f9cf484a9e68a0f371c56824910142513c34dc5d2f11a0dcebf5b789e75d4
+DIST openvswitch-2.8.1.tar.gz 6746474 SHA256 8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 WHIRLPOOL 864ac85d1330cf04cf499dcbbbed0e0b09351795a5ecd780e0f94cae3dc744229875181cea05fa39a7108583271319cedc7a0dfc77b7793453c76604e81a7fe1
+EBUILD openvswitch-2.6.1.ebuild 4598 SHA256 f436e9db6e428229e01604db4665165cd62df91dac8566e6443f5b397243ef7d SHA512 9a721804797c2097a9b80685e11be009205cdba66732920bf73b7f86c5cb0d1564965e806e276ddbfb33ed95f61e8a440bca099059cb7e42f7e37e220901f614 WHIRLPOOL 777fc8051def0d208fbdf0572d7c109bd376a22d1f086298023c55da68e28090f6afc7976d54b0d4884e2967b99820bf96a1c6056ad5bf409798eaf8663ef8ff
+EBUILD openvswitch-2.7.2-r1.ebuild 4477 SHA256 6d08777c9fa1dfa66a20323dff93eedb42b0da08e96388d6957217db6c05c22c SHA512 c50955052fc0164de1301d160cca3411f311e4c2f537e86077fc1ec6f63d13c17328677beb085eda01ba857f20af912b56da4beb2ac2a77eb409703ce4a51fda WHIRLPOOL cf6cbb7d02b0f15edf5f51c1ad10d2c90b26f4f9fa5423f90e0894fb4c1936430dab57707e746d27e8e26c3a7e3424c16938d04aa52cd0a280634e2d8eb1b046
+EBUILD openvswitch-2.7.2.ebuild 4424 SHA256 7b20bad4a9114fd6e68365bb3e8cdabab90048ccec6f2105974957c9d675e28d SHA512 b7e20f241c64c3fb02874bae2a2ad57b6d855d5f6c48ba6dc86ffc678a57cf1f129105c3f34d20b8ecc18f31924ad39e78096eba68a78aecaf343c6ccbae78cf WHIRLPOOL a2f837fc968db4b107ce3e14d3544508ac34fae5d3c6d4efbac53dcb0180ba5e205aa1c9290d86335d4bbef12a7f55f40763c6557c70a9724fb3af4f5d44b920
+EBUILD openvswitch-2.8.1.ebuild 4483 SHA256 d42d11464d144e3826490f65ea7e46d1f5b17ce7bd44f472429c7d1f20634362 SHA512 ee99f6b6d488ad725275dfb23055b8732e1a0d441c61c79bb4a9305a9c1c08065c4a181d4bc8e15d8457f7588ceb23595987f239ceb6f723ed5ae8bd972d305a WHIRLPOOL e6fac63860d3deccbf0af61147402fc7e70cd7067df6fb1b91cfa00e485e3452d366c8a567b0885d68d3c67d16719e0e2b76ecd0c9fefe1cf8bfa46b3dff4c7a
+MISC ChangeLog 7223 SHA256 d517f25f2aa4647e87c93cb7a95eb9ed905fc9f2a969cdd73e9bf8e06a408ea9 SHA512 ef53da2138c7f8fac43b850dac72a11a4de37dc0c32813ab9dfed1d6929b82cc139deaf092e2d6e1c1f45039ae9855a64960644121e066578b63e60a03b3d987 WHIRLPOOL 469d54ba28cb540435c7a803f5fabfdc1a2aebc00745df65719a588eb628e5ca94799ae8bbae22a8484956ad8bf80ccf93306c0876ccd6b6920815609e59007c
+MISC ChangeLog-2015 6297 SHA256 cdc094f2be0b8004a39cb8b49c58fff84fcb574ba0a26dfddbf2406f3bc21c62 SHA512 752e17557a57cc42f0e8e0065ce5e4fa0c8b90ae5eb635f987a55fab9d9efa0f8d18f6359bbea096917a7fdf0502660b0b700c3c0e339d57222f178db40aebc6 WHIRLPOOL 1d01028fdd6a83d86d21582a252dfe9e47758fd0f3567e7adf1f3e908cef0c52d9c0bfa910c6bde0f7a8d6010a3f49eb9e4af08456878ab8b2d758beb2a6a6fb
+MISC metadata.xml 538 SHA256 e9f11468f6ead889035a33ddb52b7744715b2588770c8ae6a6803f1e6711349d SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd WHIRLPOOL 15f2515fa82f8f09d8bf908cbbe1e122e93dd299841ce57efec981c494e4f9f22fc71bebb188c2a11c3e2197fc969ce449800f703e2fa81e274ee14058c99c8d
diff --git a/net-misc/openvswitch/files/openvswitch.tmpfiles b/net-misc/openvswitch/files/openvswitch.tmpfiles
new file mode 100644
index 000000000000..58c583ee4747
--- /dev/null
+++ b/net-misc/openvswitch/files/openvswitch.tmpfiles
@@ -0,0 +1 @@
+d /var/run/openvswitch 0770 root root -
diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r1 b/net-misc/openvswitch/files/ovs-vswitchd-r1
new file mode 100644
index 000000000000..bc5602a60030
--- /dev/null
+++ b/net-misc/openvswitch/files/ovs-vswitchd-r1
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Open vSwitch virtual switch"
+
+command="/usr/sbin/ovs-vswitchd"
+command_args="
+    --pidfile
+    --detach
+    --monitor
+    ${OPTIONS} ${DATABASE}"
+pidfile="/var/run/openvswitch/ovs-vswitchd.pid"
+
+depend() {
+	use ovsdb-server logger
+}
+
+start_pre() {
+	checkpath -d "/var/run/openvswitch" -m 0750
+}
diff --git a/net-misc/openvswitch/files/ovs-vswitchd.service b/net-misc/openvswitch/files/ovs-vswitchd.service
new file mode 100644
index 000000000000..a573a503e14c
--- /dev/null
+++ b/net-misc/openvswitch/files/ovs-vswitchd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Open vSwitch Daemon
+Documentation=man:ovs-vswitchd
+Wants=network.target
+Before=network.target
+Requires=ovsdb-server.service
+After=ovsdb-server.service
+
+[Service]
+# --pidfile options is needed for create file used
+# by ovs-appctl command.
+ExecStart=/usr/sbin/ovs-vswitchd --mlockall --monitor unix:/var/run/openvswitch/db.sock --pidfile
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/openvswitch/files/ovs-vswitchd_conf b/net-misc/openvswitch/files/ovs-vswitchd_conf
new file mode 100644
index 000000000000..c9eadb41862b
--- /dev/null
+++ b/net-misc/openvswitch/files/ovs-vswitchd_conf
@@ -0,0 +1,6 @@
+
+# Connection string for the configuration database (usually a unix socket)
+DATABASE="unix:/var/run/openvswitch/db.sock"
+
+# Additional options
+OPTIONS="--mlockall"
diff --git a/net-misc/openvswitch/files/ovsdb-server-r1 b/net-misc/openvswitch/files/ovsdb-server-r1
new file mode 100644
index 000000000000..f7360adbb4c8
--- /dev/null
+++ b/net-misc/openvswitch/files/ovsdb-server-r1
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Open vSwitch database server"
+
+remote_punix=${DB_SOCKET:+"--remote=punix:${DB_SOCKET}"}
+remote_db=${REMOTE_DB:+"--remote=${REMOTE_DB}"}
+private_key=${PRIVATE_KEY:+"--private-key=${PRIVATE_KEY}"}
+certificate=${CERTIFICATE:+"--certificate=${CERTIFICATE}"}
+bootstrap_ca_cert=${BOOTSTRAP_CA_CERT:+"--bootstrap-ca-cert=${BOOTSTRAP_CA_CERT}"}
+
+command="/usr/sbin/ovsdb-server"
+command_args="
+    --pidfile
+    --detach
+    --monitor
+    ${remote_punix}
+    ${remote_db}
+    ${private_key}
+    ${certificate}
+    ${bootstrap_ca_cert}
+    ${DATABASE}
+    ${OPTIONS}"
+pidfile="/var/run/openvswitch/ovsdb-server.pid"
+
+depend() {
+	need localmount
+    use logger
+}
+
+start_pre() {
+	checkpath -d "/var/run/openvswitch" -m 0750
+}
diff --git a/net-misc/openvswitch/files/ovsdb-server.service b/net-misc/openvswitch/files/ovsdb-server.service
new file mode 100644
index 000000000000..9493c40755d8
--- /dev/null
+++ b/net-misc/openvswitch/files/ovsdb-server.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Open vSwitch Database Server
+Documentation=man:ovsdb-server
+
+[Service]
+# The file can be shared for this as this values are prone to change
+# and that way we don't need to update them in two different places
+EnvironmentFile=/etc/conf.d/ovsdb-server
+ExecStart=/usr/sbin/ovsdb-server --monitor \
+		--remote=punix:${DB_SOCKET} \
+		--remote=${REMOTE_DB} \
+		--private-key=${PRIVATE_KEY} \
+		--certificate=${CERTIFICATE} \
+		--bootstrap-ca-cert=${BOOTSTRAP_CA_CERT}
diff --git a/net-misc/openvswitch/files/ovsdb-server_conf b/net-misc/openvswitch/files/ovsdb-server_conf
new file mode 100644
index 000000000000..1299b820640c
--- /dev/null
+++ b/net-misc/openvswitch/files/ovsdb-server_conf
@@ -0,0 +1,16 @@
+# Socket for bringing the server up
+DB_SOCKET="/var/run/openvswitch/db.sock"
+
+# Remote sockets are defined in the database by default
+REMOTE_DB="db:Open_vSwitch,manager_options"
+
+# All certificates and keys are stored in the database (if any)
+PRIVATE_KEY="db:SSL,private_key"
+CERTIFICATE="db:SSL,certificate"
+BOOTSTRAP_CA_CERT="db:SSL,ca_cert"
+
+# Alternative path for the database (default is /etc/openvswitch/conf.db)
+# DATABASE="/etc/openvswitch/conf.db"
+
+# Additional options
+# OPTIONS=""
diff --git a/net-misc/openvswitch/files/ovsdb-server_conf2 b/net-misc/openvswitch/files/ovsdb-server_conf2
new file mode 100644
index 000000000000..97367b9717e7
--- /dev/null
+++ b/net-misc/openvswitch/files/ovsdb-server_conf2
@@ -0,0 +1,16 @@
+# Socket for bringing the server up
+DB_SOCKET="/var/run/openvswitch/db.sock"
+
+# Remote sockets are defined in the database by default
+REMOTE_DB="db:Open_vSwitch,Open_vSwitch,manager_options"
+
+# All certificates and keys are stored in the database (if any)
+PRIVATE_KEY="db:Open_vSwitch,SSL,private_key"
+CERTIFICATE="db:Open_vSwitch,SSL,certificate"
+BOOTSTRAP_CA_CERT="db:Open_vSwitch,SSL,ca_cert"
+
+# Alternative path for the database (default is /etc/openvswitch/conf.db)
+# DATABASE="/etc/openvswitch/conf.db"
+
+# Additional options
+# OPTIONS=""
diff --git a/net-misc/openvswitch/files/xcp-interface-reconfigure-2.3.2.patch b/net-misc/openvswitch/files/xcp-interface-reconfigure-2.3.2.patch
new file mode 100644
index 000000000000..e5f813b6755a
--- /dev/null
+++ b/net-misc/openvswitch/files/xcp-interface-reconfigure-2.3.2.patch
@@ -0,0 +1,20 @@
+Description: Use xcp-xapi interface-reconfigure if found
+ Ubuntu/Debian provide the XCP interface-reconfigure hook in
+ a FHS compliant location; use this if found.
+Author: James Page <james.page@ubuntu.com>
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/openvswitch/+bug/1195053
+Forwarded: no
+
+--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
++++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
+@@ -43,6 +43,10 @@ def delete_cacert():
+ def update(session, args):
+     # Refresh bridge network UUIDs in case this host joined or left a pool.
+     script = '/opt/xensource/libexec/interface-reconfigure'
++    # NOTE(jamespage): Override with distro xcp xapi locations
++    # if present
++    if os.path.exists('/usr/lib/xcp/lib/interface-reconfigure'):
++        script = '/usr/lib/xcp/lib/interface-reconfigure'
+     try:
+         retval = subprocess.call([script, 'rewrite'])
+         if retval != 0:
diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml
new file mode 100644
index 000000000000..cd4755d9fd44
--- /dev/null
+++ b/net-misc/openvswitch/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
+	<use>
+		<flag name="monitor">Build the Python and GUI dependent monitor applications</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild
new file mode 100644
index 000000000000..9d7d5282fc39
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.6.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="http://openvswitch.org"
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	|| (
+		>=sys-apps/openrc-0.10.5
+		sys-apps/systemd
+	)
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-${PV}
+	dev-python/twisted-core
+	dev-python/twisted-conch
+	dev-python/twisted-web
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		kernel_is le 4 7 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	#monitor ist statically enabled for bug 596206
+	#use monitor || export ovs_cv_python="no"
+	#pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+		sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" || die
+		python_foreach_impl python_doscript utilities/"${SCRIPT}"
+	done
+
+	python_foreach_impl python_optimize "${ED%/}"/usr/share/ovsdbmonitor
+
+	rm -r "${ED%/}"/usr/share/openvswitch/python || die
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED%/}"/var/run || die
+	# monitor is statically enabled for bug 596206
+	#if ! use monitor ; then
+	#	rm -r "${ED%/}"/usr/share/ovsdbmonitor || die
+	#fi
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_dounit "${FILESDIR}/ovsdb-server.service"
+	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.9.0 ${pv} ; then
+			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+			ewarn "    /etc/openvswitch"
+			ewarn "to"
+			ewarn "    /var/lib/openvswitch"
+			ewarn "Please copy/move the database manually before running the schema upgrade."
+			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+		fi
+	done
+
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild
new file mode 100644
index 000000000000..d8f19c8e8535
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="http://openvswitch.org"
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	|| (
+		>=sys-apps/openrc-0.10.5
+		sys-apps/systemd
+	)
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
+	|| (
+		dev-python/twisted[conch,${PYTHON_USEDEP}]
+		dev-python/twisted-web[${PYTHON_USEDEP}]
+	)
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	# monitor is statically enabled for bug 596206
+	use monitor || export ovs_cv_python="no"
+	# pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	if use monitor; then
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+			python_foreach_impl python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED%/}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED%/}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_dounit "${FILESDIR}/ovsdb-server.service"
+	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.9.0 ${pv} ; then
+			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+			ewarn "    /etc/openvswitch"
+			ewarn "to"
+			ewarn "    /var/lib/openvswitch"
+			ewarn "Please copy/move the database manually before running the schema upgrade."
+			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+		fi
+	done
+
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/openvswitch/openvswitch-2.7.2.ebuild b/net-misc/openvswitch/openvswitch-2.7.2.ebuild
new file mode 100644
index 000000000000..596a2985f9c7
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.7.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="http://openvswitch.org"
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	|| (
+		>=sys-apps/openrc-0.10.5
+		sys-apps/systemd
+	)
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
+	dev-python/twisted[conch,${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	# monitor is statically enabled for bug 596206
+	use monitor || export ovs_cv_python="no"
+	# pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	if use monitor; then
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+			python_foreach_impl python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED%/}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED%/}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_dounit "${FILESDIR}/ovsdb-server.service"
+	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.9.0 ${pv} ; then
+			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+			ewarn "    /etc/openvswitch"
+			ewarn "to"
+			ewarn "    /var/lib/openvswitch"
+			ewarn "Please copy/move the database manually before running the schema upgrade."
+			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+		fi
+	done
+
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild
new file mode 100644
index 000000000000..99125f9190fe
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.8.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="http://openvswitch.org"
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	|| (
+		>=sys-apps/openrc-0.10.5
+		sys-apps/systemd
+	)
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-2.7.2[${PYTHON_USEDEP}]
+	|| (
+		dev-python/twisted[conch,${PYTHON_USEDEP}]
+		dev-python/twisted-web[${PYTHON_USEDEP}]
+	)
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		kernel_is le 4 12 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	# monitor is statically enabled for bug 596206
+	# use monitor || export ovs_cv_python="no"
+	# pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	if use monitor; then
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+			python_foreach_impl python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED%/}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED%/}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_dounit "${FILESDIR}/ovsdb-server.service"
+	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.9.0 ${pv} ; then
+			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+			ewarn "    /etc/openvswitch"
+			ewarn "to"
+			ewarn "    /var/lib/openvswitch"
+			ewarn "Please copy/move the database manually before running the schema upgrade."
+			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+		fi
+	done
+
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
new file mode 100644
index 000000000000..0ed63ee9ef93
--- /dev/null
+++ b/net-misc/owncloud-client/Manifest
@@ -0,0 +1,9 @@
+DIST owncloudclient-2.3.1.tar.xz 12260696 SHA256 93143752234a0bc4c9798b69d8239996d92130eecdc1d93b75e3d49b899f3914 SHA512 2dec3d4b452faca32e15c1a461d3fec97fc1c2e85bbfe2cb02035371a5426b8458be1382ed6b4a1102a4f38241580c3d49980ea388344365297a4a84f8dc9add WHIRLPOOL 49abeb9b9843a024338cd2d7c3a87625f7cd4f832db03513dc4d7b0d5d1908a5691d6f1e7b7437175084c30a5e3e18d837785afa5647971fdcb8e963db2d54b5
+DIST owncloudclient-2.3.2.tar.xz 12266008 SHA256 a1199d2b957a28081aff11a2a7e471ca09c965bbb1b51b1b7b7a8706304f5f09 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c WHIRLPOOL 099c963940b6fec67d5d14b8d3a62eaf378617a7e8a73ca9b82c6f82451a6e80a6da4f0f0ea44e6064d5fceada68f6e1591e499e3ea2f6dfe14c6e0efa01537a
+DIST owncloudclient-2.3.3.tar.xz 33801712 SHA256 aac1bbc16629041795ebb67151abfe109b0c220161e1f7a3f431311e2c6dade4 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2 WHIRLPOOL bbfb895d9724868c941fa178f6d350f0091254aad0552c73f78d30daa199dacfe8068e1a94d07349b1c3f355712eb2c1f12e06877466dc56260180489d8b2ec2
+EBUILD owncloud-client-2.3.1.ebuild 1974 SHA256 d1a250fa572d97a4c8ae4956255453bf395c9b6522887c2728a74cea947e9940 SHA512 7da968c1018e7cda21233f8cbca4accb5f0558745552bbbd31fb0a17500c4277c9b6422846ff10fdb0f870faa0528036771df4b68e4bb5c36d591b9a085049f2 WHIRLPOOL 2b5d4fb5969f7e02a194ece71fadac9ed8503164941058a41e70991ab862aed2cfda8f4a19d86ee531507b9355ed73289b2d62519b6f1c407f8ba701f4fb2505
+EBUILD owncloud-client-2.3.2-r1.ebuild 2059 SHA256 453035b5fc69237c57902564da17bc2572763382aef17199a1982898267eade9 SHA512 13a669882636fe51b729c3eb0d8610b5cfcdc1555bc373cbb52681860d8e28cb9f4469d2fafab52d1e93da48d94ca582dd02f8eeff0bb384ae5c342d3a69287e WHIRLPOOL 5b507107fd2de49784c749cbc7fc4ed3b5ae4ffde44e46075b4cf02de84e8f638aa23d1494fb321af857d423f60f807875ac1ce7433eae98822248b9c3538728
+EBUILD owncloud-client-2.3.3.ebuild 2077 SHA256 daf7b27c35e4af9fa3391bcbeb6e47fbd61d19bb021962e97c3f5d3488075fff SHA512 d3f159f8f909ce8adfa9546fb4a0809f2671b410d246fa47e500607f7736ec194b89c5605129f2b218b73d9130365fad3e9e506ebd4f8f60efc4bb2efad51682 WHIRLPOOL ce8d84c1f96c602c8af802915d1e4caffeeb5a21ddeaad771d0a45eb2ee6f0c2d0759b54853006a77be6debceb4d3e471b85c5892e9c87c159543abc40cba7c3
+MISC ChangeLog 6990 SHA256 3fe0fff70b8b24b3b5321a1720175c42f87de6d5a870329421e3f91838701d51 SHA512 890741b1efe2f672f17541e959be5924b7bf6a82802f6b79db950569bd892ccc65e352a479973322582889aa2829a0e70d9376e466cb594fa2ebc1097dad362e WHIRLPOOL e4b11e5eef0d97edd114407da52a317bc5115000899031bbe7f38ecfc9fd9916b5ae27661b28e597db0679c7aeab6b2a1f026bc0a77369bc5881638dafecc155
+MISC ChangeLog-2015 10097 SHA256 673578e906e89dac0261e0ddf19c7e75826c7279aad31055a31442bfc41b4d97 SHA512 10a22ef76af33e303a040d7b679e5cfc1cf55aaeba44d9af9b0baa6ec5a487c98ee2d1fe9fc3cb9b81573f04e53fb0817205e73891613d03204cf22b13e0aa98 WHIRLPOOL bbaf12ebee36097cb213298ae6602027b0e3a0459e6d6bf943e39c77b40e9d3a6e01f3f0e8a4f2eca7c5385b7cf817b47aa3228b73f2754403aa18bbed84e232
+MISC metadata.xml 595 SHA256 43f756c2fd8954f0dc2fbd6a329254c4c203a897488030153aa31ee94ff18dee SHA512 3c79d7e86cdd5451171bc649488559cb028dfafbda29e260bb92af2db3ae0c60a486c4643bbe8685b8499be07b51424223b57f8da6437eac948ede96dffc12cc WHIRLPOOL c53e446ffb0ee45385187e873a47ea10fd83cdbddba7a07a9d9e5d810a951364eea30cd06f2c63f3373184aef6f496c3634b83959901c508d53a25198e654506
diff --git a/net-misc/owncloud-client/metadata.xml b/net-misc/owncloud-client/metadata.xml
new file mode 100644
index 000000000000..ba2b9becc10a
--- /dev/null
+++ b/net-misc/owncloud-client/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<use>
+		<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
+		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
+		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
+		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild
new file mode 100644
index 000000000000..dc30d73d71a8
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	sys-fs/inotify-tools
+	virtual/libiconv
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DBUILD_WITH_QT4=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..760ab9d1d28e
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	sys-fs/inotify-tools
+	virtual/libiconv
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DBUILD_WITH_QT4=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild
new file mode 100644
index 000000000000..13d14f0cca47
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	sys-fs/inotify-tools
+	virtual/libiconv
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DBUILD_WITH_QT4=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/packETH/Manifest b/net-misc/packETH/Manifest
new file mode 100644
index 000000000000..26ba19d848f4
--- /dev/null
+++ b/net-misc/packETH/Manifest
@@ -0,0 +1,11 @@
+AUX packETH-1.7.3-libs-and-flags.patch 241 SHA256 cf8501dca140d9a99c4aafd7b38f63a570f76c4499fa2ad3c4ad2e19b9e29da5 SHA512 ec4daf8f0b13fe65273ccfa92237f9578fba332516ffba5b55e60b4c2888f8f620b93de28449dbca02da9fe0b106023d5ba2623cd2f73c142680d3e4894443b1 WHIRLPOOL 8a7d367b5c8a84e60cc63dc78dd9e97ba34fab45fb8095acf7632775afb5e655b3d1458181fe83eb63da09b628575e84793e420344b5dd3b4909ccd66e9ce100
+AUX packETH-1.8.1-libs-and-flags.patch 249 SHA256 90e3917ec2bd32494819d8bbadeac5c044c01d78f2d4fb64ef27b42a72f0f6ed SHA512 2db5774cf4a3747a2f06cda925269929fdf6895557206c5bd02356de57d85b8868b850494a544089c3b1334f150e729070f652206ec0bd690cecd7adbc68c570 WHIRLPOOL 1ecba07faf78f5402b71fb9ebb81153acf1df740f33cec43bd6b0366a43b7d414756b3af69ec6f9953fef028c0a86b35caa3a0c99a33b194ba8a56b487a7b788
+DIST packETH-1.7.3.tar.gz 395666 SHA256 47c37918abc6d507aa4599e92ccd913d07cf8d73c44f247b661a1891188c29e6 SHA512 349fd579bbbbbbbe2ca96374c8083ecf047a1c5f51626341bd7f98b4c8a29b74342311e45950a3f2628ba53dba250135c3802556b6aa5c49181e72313a7256d5 WHIRLPOOL 8342cfd373217b400c9f1f59020dfcb4ad9ad3fc34a71d7080847242baeeefa1a77562ad25878c0634956d6a5e7fc76299042d7d18b98f6ab1d1b724ab216a55
+DIST packETH-1.8.1.tar.bz2 321624 SHA256 7b5590779bc5324cfb5d61095642d3820bf915565842c706a0ce70395a14abda SHA512 caca26d3a0e9a175cdcaccc21f8d0038fd4c3dc0939b52ae6e16109d0e42b882b4de95524d35bfe7bafc131203ba23aac5f3baf825b2c55ab18022edadb04a4d WHIRLPOOL c6fbdf38b8c7d9385251bf112d23658299b256eca34e1c0180e737ecb7a3f520f65e3d3ea1cf05b9398f67e766f411c5d413fbce9adc5bf998570059df0a34e8
+DIST packETH-1.8.tar.bz 305580 SHA256 0b9333640bf7c0f31190c6fa348224864bc4603519a441438085177ae4d1116e SHA512 37df839186b7982a34f328256dcc23e100f28cf071586b2b55204c5c6b6e8a3fd3803e230d4e9bc6492f51f45bf17d1ea4716043914f649320f2d37f3280cf52 WHIRLPOOL 56914c1fa7aca1aad1e45743dbc6f09902e0e2636d2c852c8a3d4c2496e34a051f7a8b4b2928d81a31f89dc4f2a693aa5313f7516071723ebec36035c856e517
+EBUILD packETH-1.7.3.ebuild 560 SHA256 375e3b308c3caabc770c1ab3053761589f385aa99dc442483f828d5337cec61b SHA512 c07a137b43016c4b8f7ba290e1e639324bf3e637212ec6a58f2e9c883998eec0a90f92c1532763a0445c90aba79182bef1669cf3d87ea9c97f4651d70e85440e WHIRLPOOL f45bbaec00df98cd0e83f648076290bdc25887e18985a0c779446721061ab22f1f1c87f1a20783f33c487661af40628d8613f32b9b3d555dc6145b9edaac428e
+EBUILD packETH-1.8.1.ebuild 581 SHA256 746b718185c84188e426149382f0cd12e00f5cdaa09a14e175a76a5c32756aae SHA512 729ced9c9c86d7136ff99d2bf3c0f323fc4b16e149dedd35114c52c55036a3a34791e3d6f2ae6be9c51f77f178f86c862d292a279f997038b3d7a51c2e38139f WHIRLPOOL 9580f0e0e04bd09e1628fbbc8efcfe69d3d901f7e6dcc6f62647568cca0630466a4fcf81dde1655f0a2807d56666b34794a10441ec66d923baae810c6c36d62c
+EBUILD packETH-1.8.ebuild 565 SHA256 249fb06c8a1fa28f8e687718a9d9744121b7a223f9499ccac781891d2d028993 SHA512 5b0d26e9ad2217deca92a0ff26ee5b08e3972358aef9a060f0e2dcf1d1e856148bbb8db1b64b843321f7a074853e585bcf42f05b652d058a4bf18e14a0c71edf WHIRLPOOL 27d89c365688aa1e9e5ab393a9e8f8aa7531a859e5c539e2fa933bbd995e7032d4441a52d10e6bde5fe0d7c98247ab8dc4258b2a61bdc999effefcf97ec979cb
+MISC ChangeLog 2572 SHA256 7c78d9bd438e386f30549c29bd20177872a311375b85e6fc1340a4caa6107010 SHA512 0b085260a7c0a6c5284d4a31c86c80e528d5dfecf1cf72a0182537966dac6a908afee3e43728ba033c056be3b6a4dff7d9e94bd84053429b226b90ec9913754c WHIRLPOOL afbd0c98b657a63edba2ad7affc97e3ee35445491423f63652723ef4943f2c5f232dc466449b9cec9cadaa238c5e59363b75801bfbd929b0909897d8e1411e57
+MISC ChangeLog-2015 3763 SHA256 5bb2f25b7ea0e8ae1d8fee8f6450b2822045ee036d6e13ca366e9fd5d00c7b9e SHA512 4db1ac96237a9b75abe5ad7b16a2545823f1bac78e81747642cea01222d115145694b500e723fc88ee2bc8487dcc16a03735ef4c2083bdf974694f23d80cee58 WHIRLPOOL 2c05039979be2b090f9ab3e08c8a90885c85a06e6db82bd4d511810e527438941ff967bb6ed96fc285776a32c2f0fc9419a1973c9a30822a2372f7529cce7550
+MISC metadata.xml 357 SHA256 b0c8d8216303c9d6d5ba2eac1343678ecdd3738ce321ddd40639bc7cc2d7f893 SHA512 ba34ba4c24562a688b3de68e5109666e75436aeac2148113794562ad632ff5a55712f67de8c8f6ace526c66764af2fb130c556692040b8a05088a4c7bf6d77a4 WHIRLPOOL 6089daca4c4eab2f15a0b85cb4de22aca354641b288ac3398453f86b91332277092b7fa0d0e390fd77e3a1c9d7151ab0ac3350e448e80f9827f54d9af78b0688
diff --git a/net-misc/packETH/files/packETH-1.7.3-libs-and-flags.patch b/net-misc/packETH/files/packETH-1.7.3-libs-and-flags.patch
new file mode 100644
index 000000000000..fc0efb7e309a
--- /dev/null
+++ b/net-misc/packETH/files/packETH-1.7.3-libs-and-flags.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -30,11 +30,9 @@
+ DEFS= \
+   -DPKGDATADIR=\"$(pkgdatadir)/\"
+ 
+-LIBS=$(DEPS_LIBS)
++LIBS+=$(DEPS_LIBS)
+ 
+ AM_CPPFLAGS = \
+-  -g \
+-  -O2 \
+   -Wall \
+   -Wmissing-prototypes \
+   -Wmissing-declarations \
diff --git a/net-misc/packETH/files/packETH-1.8.1-libs-and-flags.patch b/net-misc/packETH/files/packETH-1.8.1-libs-and-flags.patch
new file mode 100644
index 000000000000..bfe71bf43885
--- /dev/null
+++ b/net-misc/packETH/files/packETH-1.8.1-libs-and-flags.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -30,11 +30,9 @@
+ DEFS= \
+   -DPKGDATADIR=\"$(pkgdatadir)/\"
+ 
+-LIBS=$(DEPS_LIBS) -lm
++LIBS+=$(DEPS_LIBS) -lm
+ 
+ AM_CPPFLAGS = \
+-  -g \
+-  -O2 \
+   -Wall \
+   -Wmissing-prototypes \
+   -Wmissing-declarations \
diff --git a/net-misc/packETH/metadata.xml b/net-misc/packETH/metadata.xml
new file mode 100644
index 000000000000..25820382f571
--- /dev/null
+++ b/net-misc/packETH/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">packeth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/packETH/packETH-1.7.3.ebuild b/net-misc/packETH/packETH-1.7.3.ebuild
new file mode 100644
index 000000000000..f02957b48ad9
--- /dev/null
+++ b/net-misc/packETH/packETH-1.7.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Packet generator tool for ethernet"
+HOMEPAGE="http://packeth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/packeth/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+DOCS=( AUTHORS CHANGELOG README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libs-and-flags.patch
+	eautoreconf
+}
diff --git a/net-misc/packETH/packETH-1.8.1.ebuild b/net-misc/packETH/packETH-1.8.1.ebuild
new file mode 100644
index 000000000000..e8027e732b99
--- /dev/null
+++ b/net-misc/packETH/packETH-1.8.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="Packet generator tool for ethernet"
+HOMEPAGE="http://packeth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/packeth/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.1-libs-and-flags.patch
+)
+
+DOCS=( AUTHORS CHANGELOG README )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/net-misc/packETH/packETH-1.8.ebuild b/net-misc/packETH/packETH-1.8.ebuild
new file mode 100644
index 000000000000..9605e76c20f5
--- /dev/null
+++ b/net-misc/packETH/packETH-1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Packet generator tool for ethernet"
+HOMEPAGE="http://packeth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/packeth/${P}.tar.bz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.3-libs-and-flags.patch
+	eautoreconf
+}
+
+DOCS=( AUTHORS CHANGELOG README )
diff --git a/net-misc/pavuk/Manifest b/net-misc/pavuk/Manifest
new file mode 100644
index 000000000000..6c508159bb9c
--- /dev/null
+++ b/net-misc/pavuk/Manifest
@@ -0,0 +1,9 @@
+AUX pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch 937 SHA256 a34a474bd2dc1940892e3e86b24a0d43bc9300fc6bd380f385a9f9d6313138b2 SHA512 45a12440d9ad8ee19418d8ef3d0a8cc37bfa118e81ba1d063eef5e4417ba04f8d78bb7bfdb2fddac59d8bc15495af1728c2470ed6ee21d54140d1f82441b333f WHIRLPOOL afefb65f4cb63a178b2835d4d2f56a395969a8b4458fd70fbca48200e86ac1d202eefd8e2da7d6dc7e696d4244d5242f37e277436ffa06d321d801ca03a1eb7b
+AUX pavuk-0.9.36_pre20120215-fix-underlinking.patch 409 SHA256 3cddc688d4e67477e3cf89dd045a7a1c2e6b803f4842cb382f56e49a06b312cf SHA512 c45c7bdc1d9bf87be53438b90e4e7d418b4864fdde80c8a4b2e3f8d6f39d1f5680d327163dbed4007bc44288fe23fee56edd1d99170812380580a301991bf66e WHIRLPOOL 704e009752bb659671242323f826444d00b57838980a5173ad35ec9e4dc271138c9db4143a3a5b824b61e1c82a161a86067580e882a85e68da32dec4a30e3c25
+AUX pavuk-0.9.36_pre20120215-pcre-fix.patch 427 SHA256 0e0b2f439d57561783a212ac76e8e1778bb7156149150994b7e65fc31f17a04e SHA512 786d001779e47b98c01232a885b3eb9c9e85817008647cd7038f0797d87b931489e6f4e7d1526ac6f48da8dc0c77a3a261936ec2a32dbffb2ab5b69b33943a11 WHIRLPOOL 7796fa737b60d427f8b950335bc7280e2635c8c8509468f7ecbded7ee0e9b3035a6dd804629afefdba950a51f6605973db45c666ff12f88a6da16ef9fcf5fbe9
+AUX pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch 437 SHA256 4a4897c0d3aef2d82c7d67500d78132a90acf00ec957daf70d5e2d0173c7bb04 SHA512 117979bf90e5a1ad880918a2707a478381c5197b830f3d944d0c3c4b04a827600aba360b653ebd2c5c1a8d41eb24642dfb36abb6000cf6160c2522b307756183 WHIRLPOOL f4991a522316b8c44d51f1e3895ca7724007a740d5e167ad86178a76d0a72df951d7cce538c17332c3a44163aa3920a3441a382990a9baa8fec1bf0ff7c26a89
+DIST pavuk-0.9.36_pre20120215.tar.xz 810516 SHA256 522e07e3163b835f26157f091ad43bd6fa6e2ddb5d46c2176f10e81c6429ff1e SHA512 d7393abb72e328d3c3e8c005282a8b0ec793eee94e5de00c4518aa1a27403da535372679cf3b803a574e6d0dea8c53ccdbb3aa68d9f0c85da5128dba86b65a4f WHIRLPOOL f04b55a5b6efd634e1ec7b448b9c443d137ae15e0361a45584b72c636aa016a2a95b59b22fee9bb54652a5762eac3e5f524d4c45ad4d226a982960f257ec4afb
+EBUILD pavuk-0.9.36_pre20120215-r2.ebuild 2860 SHA256 386d8ec2f570825351c599838bf57676329f8c81bd9a83509747790875b6fe5f SHA512 4ee860d42309a4e78a0c6f4a041a4aadfb4d74023cce0f4e6a62bf83d0ba1df476ee998251e84f33d17826c1d2662a7c4abf20351fde9e5856e74a150283d166 WHIRLPOOL 230dd264eb50ea90aca6a119ba5d1481f927d54e510f27c1c105034684a4f99354dc367194ec1530abf8f8dc6bb6fe66d28307bf3dc1f5ad24eca92f778a31bf
+MISC ChangeLog 2730 SHA256 4aed880bc1ebebf9751499907e9cfe67db73704b8c265ae2350df8afb65307ea SHA512 ddd52fbc50c47a5d05b4d57e001f47154b58aa7afbf7d99379d50562dac8d190210500ca9043d6b84e660b8e1877853751226fb7061e5219548e49d9e93e5dfd WHIRLPOOL c655c4495e4acf53d7d75fbbcd24ecb349065a353b1123c25798e757caa4af56499c6e5e51d8b154fe25e01d968963fdd7e7c9d0976bba0a89389396dba808e1
+MISC ChangeLog-2015 7553 SHA256 31b55476035695c051eb5b76e2a94cf92c569461ddfd7ccb047d2ae1085dd49d SHA512 939229732ae23edc3593d134c3b484b7db655f75cc35fe7c834206fd4559a3d0affb04c7925d463796a49649ef7860f7cdd6da9e3e6fdc08e080213fe840f966 WHIRLPOOL 958d730d15e9967bc66c908fe0bad7db30cc14c3579d1021b32e8a53e02c960d74cd835089ae264bbe0c4b995b368195b3692fecc51ffd78600e4f37f3ef015b
+MISC metadata.xml 574 SHA256 637787c4062acbe720204857b575e9b4efd852227e3d81ffa343a9c3d43e5c91 SHA512 102c19db3248680b2b917d1e4124d9618f1af443a9634150ece900bf7b01b61d61f2939095744f83bef090b8c09ecd24b91ef59e31fad34572dfdf30d1c8be23 WHIRLPOOL 137b8bb6e4e9a6df7ed9e1c7a3086956d37b9fa77c148c313047fdaa964753dc0e4e789a8effb337d7d14ad2c2353df097d45e82cfd3fbe7ebac15aee55ccd19
diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
new file mode 100644
index 000000000000..6ce18c1ed3e2
--- /dev/null
+++ b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
@@ -0,0 +1,26 @@
+--- src/gtkmulticol.c	2009-01-21 16:37:39.000000000 +0800
++++ src/gtkmulticol.c	2012-02-21 09:47:21.680512626 +0800
+@@ -45,9 +45,9 @@
+ static void gtk_multicol_size_request(GtkWidget *widget, GtkRequisition *requisition);
+ static void gtk_multicol_size_allocate(GtkWidget *widget, GtkAllocation *allocation);
+ 
+-guint gtk_multicol_get_type(void)
++GType gtk_multicol_get_type(void)
+ {
+-    static guint multicol_type = 0;
++    static GType multicol_type = 0;
+ 
+     if (!multicol_type)
+     {
+
+--- src/gtkmulticol.h	2009-01-21 16:37:40.000000000 +0800
++++ src/gtkmulticol.h	2012-02-21 09:47:42.880514545 +0800
+@@ -41,7 +41,7 @@
+     GtkBoxClass parent_class;
+ };
+ 
+-guint gtk_multicol_get_type(void);
++GType gtk_multicol_get_type(void);
+ GtkWidget *gtk_multicol_new(gint nrows);
+ void gtk_multicol_set_number_of_rows(GtkMultiCol *multicol, gint nrows);
+ void gtk_multicol_set_spacing(GtkMultiCol *multicol, gint hspacing, gint vspacing);
diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch
new file mode 100644
index 000000000000..25338460bd4c
--- /dev/null
+++ b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch
@@ -0,0 +1,10 @@
+--- configure.in~	2011-03-02 10:44:45.000000000 +0800
++++ configure.in	2012-02-23 09:55:28.073709216 +0800
+@@ -1749,6 +1749,7 @@
+ 
+     if test -n "$GTK_LIBS" ; then
+       if test -n "$GTK_LIBS"; then
++        AX_ADD_OPTION([LIBS], [$X_LIBS])
+         AX_ADD_OPTION([LIBS], [$GTK_LIBS])
+         AX_ADD_OPTION([CPPFLAGS], [$GTK_CFLAGS])
+         AC_DEFINE_UNQUOTED(GTK_FACE, [$GTK_VERSION], [with GTK+ GUI])
diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-pcre-fix.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-pcre-fix.patch
new file mode 100644
index 000000000000..3d92fdd4b8b6
--- /dev/null
+++ b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-pcre-fix.patch
@@ -0,0 +1,12 @@
+--- src/re.c~	2009-01-21 16:37:40.000000000 +0800
++++ src/re.c	2012-02-18 13:46:30.986959223 +0800
+@@ -193,8 +193,7 @@ int re_subexpr_info(re_entry *ree, int *
+     {
+         if (nr)
+         {
+-            pcre_fullinfo(ree->preg, ree->preg_extra, PCRE_INFO_CAPTURECOUNT, &pmatch_nr);
+-            *nr = pmatch_nr;
++            pcre_fullinfo(ree->preg, ree->preg_extra, PCRE_INFO_CAPTURECOUNT, nr);
+         }
+     }
+ #endif
diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch
new file mode 100644
index 000000000000..ec3655f1468c
--- /dev/null
+++ b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/src/absio.orig.c b/src/absio.c
+index 7be9255..e19d7cd 100644
+--- a/src/absio.orig.c
++++ b/src/absio.c
+@@ -181,7 +181,7 @@ int tl_selectr(int sock, long int timeout)
+             {
+                 if ((rv == 0) && !cfg.stop && !cfg.rbreak && !FD_ISSET(sock, &readfds))
+                 {
+-                    char buf[32];
++                    char buf[64];
+                     int r;
+                     char buf2[64];
+ 
diff --git a/net-misc/pavuk/metadata.xml b/net-misc/pavuk/metadata.xml
new file mode 100644
index 000000000000..e864265476ed
--- /dev/null
+++ b/net-misc/pavuk/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>pyxlcy@gmail.com</email>
+	<description>Please assign bugs</description>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<use>
+<flag name="hammer">Turn on chunky/hammer mode (DoS) in pavuk: when
+	specified, pavuk will include features to stress test web sites using an
+	ultrahigh performancereplay mechanism</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/pavuk/pavuk-0.9.36_pre20120215-r2.ebuild b/net-misc/pavuk/pavuk-0.9.36_pre20120215-r2.ebuild
new file mode 100644
index 000000000000..8f3d5cb6b587
--- /dev/null
+++ b/net-misc/pavuk/pavuk-0.9.36_pre20120215-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+S="${WORKDIR}/${PN}"
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils
+
+DESCRIPTION="Web spider and website mirroring tool"
+HOMEPAGE="http://www.pavuk.org/"
+SRC_URI="https://dev.gentoo.org/~pacho/maintainer-needed/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug gtk hammer ipv6 nls pcre profile ssl"
+
+RDEPEND="virtual/libintl:=
+	gtk? ( x11-libs/gtk+:2 )
+	pcre? ( dev-libs/libpcre:= )
+	ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	sys-devel/gettext"
+
+PATCHES=(
+	# Fixes a bug in re.c for PCRE support
+	"${FILESDIR}/${P}-pcre-fix.patch"
+
+	# Fixes underlinking, bug #405337
+	"${FILESDIR}/${P}-fix-underlinking.patch"
+
+	# Fixes a segfault in the GTK+2 interface on amd64, bug #262504#c40
+	"${FILESDIR}/${P}-fix-gtkmulticol-segfault.patch"
+
+	# Fixed overflow, bug #450990
+	"${FILESDIR}/${P}-tl_selectr-overflow-fix.patch"
+)
+
+DOCS=( README CREDITS NEWS AUTHORS BUGS TODO MAILINGLIST wget-pavuk.HOWTO
+		ChangeLog wget-pavuk.HOWTO pavuk_authinfo.sample pavukrc.sample	)
+
+src_prepare() {
+	# Fixes a bug in Makefile.am that causes aclocal to fail
+	sed -i 's/^\(ACLOCAL_AMFLAGS[[:space:]]*=[[:space:]]*-I[[:space:]]*\)\$(top_srcdir)\//\1/' "${S}/Makefile.am" || die
+
+	# Fixes a bug in configure.in that breaks non-debug builds
+	sed -i 's/\([[:space:]]C\(PP\)*FLAGS=`\)/true; # \1/' "${S}/configure.in" || die
+
+	# Fix for building with ~dev-lang/spidermonkey-1.8.5
+	# sed -i 's/mozjs/mozjs185/g' "${S}/configure.in" || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local regex="auto"
+	use pcre && regex="pcre"
+
+	local myeconfargs=(
+			--enable-threads
+			--enable-socks
+			--enable-utf-8
+			--disable-js
+			"--with-regex=${regex}"
+			$(use_enable gtk)
+			$(use_enable gtk gtk2)
+			$(use_enable gtk gnome)
+			$(use_with gtk x)
+			$(use_enable debug debugging)
+			$(use_enable debug debug-build)
+			# $(use_enable debug debug-features)
+			$(use_enable ssl)
+			$(use_enable nls)
+			$(use_enable ipv6)
+			# $(use_enable javascript js)
+			$(use_enable profile profiling)
+	)
+
+	# JavaScript bindings: Broken!
+	# ============================
+	# Currently could pass configure phase with ~dev-lang/spidermonkey-1.8.5
+	# yet apparently incompatible with recent versions of spidermonkey
+
+	# if use javascript; then
+	# 	local jspkg='mozjs185'
+	# 	local jsinclude=$(pkg-config --cflags "$jspkg")
+	# 	local jslibs='/dev/null '$(pkg-config --libs-only-l "$jspkg")
+	# 	myeconfargs+=(
+	# 			"--with-js-include=${jsinclude}"
+	# 			"--with-js-libraries=${jslibs}"
+	# 			)
+	# fi
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	if use gtk; then
+		newicon src/pavuk_logo.xpm pavuk.xpm
+		domenu pavuk.desktop
+	fi
+
+	doman "${S}/doc/pavuk.1"
+
+	autotools-utils_src_install
+}
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
new file mode 100644
index 000000000000..264183281560
--- /dev/null
+++ b/net-misc/pcapfix/Manifest
@@ -0,0 +1,5 @@
+DIST pcapfix-0.7.tar.gz 25753 SHA256 246f44427c9fb0b82c469c6fc9406ca44520b96cc87f407cc65c90c8c5ee8332 SHA512 254eb5803bbcff4249f20af4cd1afa5b300eefb3448e3650899fa94329f38e298e4e7b1033836aa04434b1eadc67611204e3f67d41917c761d5cba424d789298 WHIRLPOOL 2ef59d5c12a34429818cc8d0e4dc0bf644196ec1ba477f96b5f3358fb32bd1b1b46b780de907ec92523577fb1486eea259c454517c7baef1d9b223ea12bc07e9
+EBUILD pcapfix-0.7.ebuild 471 SHA256 91f0a76f134fda4765fa00c962d06f413baa3ba93faccf1ecee7a7b0adcaa5cd SHA512 15f97ba4b4f1c1cb5e50c3d15a5f340b3a23cb1ed0c505f0c244941b6964c9c891e43a59f8c188273ac0f3b1474d9d1a39e2d3d4d48627c3b28caf923a113b54 WHIRLPOOL e14a34f4590aee1cf70c776025f37234f78b15f85e2d502a1b832c094b7497dad538129dc67c85b9bdcf662500202d9a89249b41b8384cde2c8de4dcd61ed390
+MISC ChangeLog 2172 SHA256 ed5d0076127c2ee38e385a498d8774d4d132087c5fd15d3c28a342da5d9f4669 SHA512 9f97886ee12da2563392c757f677e53619abcf4644c0d0468ad606631fa156e8764f645d942712632e4e239b4a49d2a093feb40465e1f04fffb276f1b0bb2227 WHIRLPOOL 73c5fcb5a2d826c1b0dec75b442e37d31fd001833619e6be9f6f70c1348a005206eac87fb93dcf278f10b4c12060c9a63df858a628e79e21f4f046b62b9f6d63
+MISC ChangeLog-2015 506 SHA256 af14750167893dd5a0cc917efac8ec8290fe51b995bf506015c9b041e8f43c4c SHA512 33fcbc9d621d5d6acaefc9c3129da311baed4d4912aa9e6ad0dd70f48efa3a42787f822a7c683f454b26fb64cd12488948e1535740396cc04cfd18b0e60bda87 WHIRLPOOL 0242c53e0d7cb1ef39e0130b16d0221e369f4e7a01dd299317c4484ed55b533de25b1c83d677752d842e9a1e9e4aa1fed83bd58bd8cd355a5d82135a0fe003bc
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
diff --git a/net-misc/pcapfix/metadata.xml b/net-misc/pcapfix/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/net-misc/pcapfix/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 type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/pcapfix/pcapfix-0.7.ebuild b/net-misc/pcapfix/pcapfix-0.7.ebuild
new file mode 100644
index 000000000000..a0ef34d64263
--- /dev/null
+++ b/net-misc/pcapfix/pcapfix-0.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Repair and fix broken pcap files"
+HOMEPAGE="http://f00l.de/pcapfix/"
+SRC_URI="http://f00l.de/pcapfix/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile
+}
+
+src_install() {
+	doman pcapfix.1
+	dobin pcapfix
+	dodoc README TODO Changelog
+}
diff --git a/net-misc/pedro/Manifest b/net-misc/pedro/Manifest
new file mode 100644
index 000000000000..dcd37c6e835c
--- /dev/null
+++ b/net-misc/pedro/Manifest
@@ -0,0 +1,7 @@
+AUX pedro-1.6-portage.patch 806 SHA256 58219928de451939e4866df7113a7f788a2eb4ef672f3aeca755c7e77618cf57 SHA512 964527b3f480f7e009dd60a4f0e1b1c32a58a50dc358cc3975934db95c9ca34270463d3bc12cec9fd5d93234a1ccf83a5fe4666cce8cd684427c8ec11d34b6cb WHIRLPOOL 0e7e7c01bee8313c34cd645abf8a20229ff6df896a1866ceb846ceda97da15a980f785659e467738b8e513dd41ee59d9e2ede31b88290fd39b316d469be85502
+DIST pedro-1.6.tgz 711856 SHA256 bc13b0d9020e46c2f374d0e3c078fcec5ceafd75894e8b65d2c2985ae356225c SHA512 263f53e447d4b3baab405a1d7313fc397f8a62958957688265c7485a5697b642138636659b5515b9010341655ba8045e5d85f69a86c20baa28edc0dcff0aef42 WHIRLPOOL 37db7a47d3d0741797d5f601c63402c8b83414f8d7cc7c181d43d23ddb6e68be4d73d16b6e6e98a5c013299961604584763bd512b54677dd12fc28e5cce0b2d2
+DIST pedro-manual-1.6.tar.gz 222863 SHA256 2cc10c5c4de00a344a8f2cd58b293bcda9b4629f4fa5567fb6fb507b7e83d5e4 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99 WHIRLPOOL df63276ec28ad3e7c91ab3ddd0ff95a5d7f7beb0917681313eb0383bb647c08b96d426d82fa80ee9f15d4706a24ba5c954121baff10ba07c3b98adc77520452f
+EBUILD pedro-1.6.ebuild 1042 SHA256 2b811445bfea4e23411c06fb27c5125deebd0121cf795408713ef20d94c4cb77 SHA512 f9e21748407d4236403228397ad72bba31df2b98dab22141e887290d66db94fd019f99821b2bd6abd4632269cca39c8b1842ef370a8213a1a5158604c02e5186 WHIRLPOOL 5a4554d684276d42a71ceeef8af826ea89a535933a026982cf749dc60c5997e6bb009fc076092b1220a714884c1e1ed65c88c95903210229b60b0d586bf972db
+MISC ChangeLog 2232 SHA256 6eceb2a145c43bbf2ad4b204c43fbe4f1a1841af96a3899282ff1463cfbd6c4a SHA512 b7a7de1d9f29a2f968dd56d6cd50d17fc0f8da9ce5462d8edd050ef6e9940f296fe7928065ea444a60797eb0d7ef6ed6d9f74f1d37ae09e9ad91b4a376e7e7bc WHIRLPOOL 518709a97bfc9c68268fb00af4af180c96cc1233f51bab21bc4658ebc43c84f58ef916c6eccba9ae90f48bf64900c3df51e1e558b406f4b43b4ee1587a331247
+MISC ChangeLog-2015 1562 SHA256 c4f9fad8cacdc65a542e4dafbeb473d1096b488927715feebc1741fa2b282140 SHA512 0e783ac586e07a056cd6b7503ce6c12122a1a786500ec7629d61b12a2f7fa92087a274e03b5c2a0519c7cc0ceaa01b372c6b18ec4bfa82c40c0f2a95a5575464 WHIRLPOOL cbb929c77c0c74aa788304f9d998d0397f0a86b09f6b9f5886312a1b875113651e56fec78ab94d6dbe1154e462874847a335a10c25b069b7c1b24ee013948034
+MISC metadata.xml 238 SHA256 9c8c450d9d6628a38927f8acea6dd4f6826230d57b96df9e9c700a344374b83e SHA512 98e2109c9261f162840c0123e9f4748fcf3eb0f07f2f4a47c30ea78b84ab1bc41dca829ad2c8b6476df49748a40fc7101e59d4ce150b28cf32415d8232e47fd7 WHIRLPOOL e0aa153828461832f036c58b761c21f5d3e73f161c1ed7f70d934021450214a360872678d1e35dd65a4d56e6135e15f4f925b92785914939436381f54fb682a1
diff --git a/net-misc/pedro/files/pedro-1.6-portage.patch b/net-misc/pedro/files/pedro-1.6-portage.patch
new file mode 100644
index 000000000000..be1f9d3b2136
--- /dev/null
+++ b/net-misc/pedro/files/pedro-1.6-portage.patch
@@ -0,0 +1,20 @@
+--- pedro-1.6.orig/configure	2011-08-23 11:01:21.000000000 +1200
++++ pedro-1.6/configure	2011-11-19 21:28:47.000000000 +1300
+@@ -10478,7 +10478,7 @@
+ ac_config_headers="$ac_config_headers config.h"
+ 
+ #AC_CONFIG_MACRO_DIR([m4])
+-CPPFLAGS="-O2 -g `pkg-config --cflags glib-2.0`"
++CPPFLAGS="`pkg-config --cflags glib-2.0`"
+ case "${host}" in
+         i[3456789]86-*-mingw32*)
+                 WIN32="yes"
+@@ -10486,7 +10486,7 @@
+                 ;;
+         *)
+                 WIN32="no"
+-                LDFLAGS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm"
++                LDFLAGS="$LDFLAGS -L../lib -lpedro `pkg-config --libs glib-2.0` -lm"
+                 ;;
+ esac
+ ac_config_files="$ac_config_files Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile"
diff --git a/net-misc/pedro/metadata.xml b/net-misc/pedro/metadata.xml
new file mode 100644
index 000000000000..84cf23a5f3c1
--- /dev/null
+++ b/net-misc/pedro/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>keri@gentoo.org</email>
+	<name>Keri Harris</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/pedro/pedro-1.6.ebuild b/net-misc/pedro/pedro-1.6.ebuild
new file mode 100644
index 000000000000..00b9a3e6b9af
--- /dev/null
+++ b/net-misc/pedro/pedro-1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Pedro is a subscription/notification communications system"
+HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/PedroHome.html"
+SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/PedroFiles/${P}.tgz
+	doc? ( mirror://gentoo/${PN}-manual-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-portage.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS README || die
+
+	if use doc ; then
+		dodoc "${WORKDIR}"/${PN}.pdf || die
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/*.{c,tcl} || die
+		insinto /usr/share/doc/${PF}/examples/java_api
+		doins src/java_api/*.java || die
+		insinto /usr/share/doc/${PF}/examples/python_api
+		doins src/python_api/*.py || die
+	fi
+}
diff --git a/net-misc/pen/Manifest b/net-misc/pen/Manifest
new file mode 100644
index 000000000000..107c419fe949
--- /dev/null
+++ b/net-misc/pen/Manifest
@@ -0,0 +1,5 @@
+DIST pen-0.25.1.tar.gz 150231 SHA256 2dd9ca3b2f8057b9e59ddf07000a34649835ad23b45e6d34e8b9422d3dcb5270 SHA512 712c5899eb0ab20df1c91653328a63fe1715f0412e434aa08229555ff725bd54eb4732be1176f2cea02761db37a5ae241a4f790ca803fc1002be2bf65bc6269b WHIRLPOOL 22fb7c8c88415e303158e6a3fe203dd9a664be13f9cf8bdafe20502c07e2f06205d12000ed4b65a3fbaf4ee61d0a015b0e4d1b72a592b66814fb8114932f78bd
+EBUILD pen-0.25.1.ebuild 502 SHA256 d3ee94cac74a43bb2b2b1e1e3cca71d9962af16fb0b2a8b6214aebd63a90da25 SHA512 93a89b36776d29b9a4283b093391cfc7a52eff49ac4cc33b5ad164ae51013c91d3a9863154d02286628b00231c950fa456dfd4f6ddec65812fd65971fc5ed570 WHIRLPOOL d10fb3a17504baa33f49260c8257af17444e6089cc59d90431fd100d3b6c11986d4543b6aaa4611080af3c576b848372f7cffffbae9d81915787b0d61b1df769
+MISC ChangeLog 2512 SHA256 400b78244026298467f09092fce3cbff66e278c3cdf8213bb8ee122f89afd1b4 SHA512 92f519698d55d2610a4544d07f818cdf695d3f7b9f10afd69479c7a89ea825a82815310bcfef5297949b004b47afa3bfc3985ea0f652becfbc6d976f7c045366 WHIRLPOOL df2097c0511bd888ed09215734780bb87d51a8f2f20721301c54c380e9ec64c63b14ac0d67723ef84ca9904b649ddf3c337c60b51e72146e16a77e80bd5cf8d1
+MISC ChangeLog-2015 2863 SHA256 27caebababc8b3aa6f6b7352990a6ab75601aa65d8a7490a844f9b8a1ff6b56a SHA512 45bb59ecbf6252f9198d5686b0ef7fb85f5a148649059ca1f4144f291d3051d4505a19978770d82b90896729efb41253ff02874956061fa02a8fb1462f4c0f01 WHIRLPOOL 4a4068ecafeb502657636d0aa1bde845d2e605390b9b500fcb63cf98c4a40efd63b1c7d6bc02df7db320ac59dfa5becd5a82ce96020f3f9b216bea24f54ebec2
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/pen/metadata.xml b/net-misc/pen/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/pen/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/pen/pen-0.25.1.ebuild b/net-misc/pen/pen-0.25.1.ebuild
new file mode 100644
index 000000000000..5a512270b2cc
--- /dev/null
+++ b/net-misc/pen/pen-0.25.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="TCP Load Balancing Port Forwarder"
+HOMEPAGE="http://siag.nu/pen/"
+SRC_URI="http://siag.nu/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="geoip ssl"
+
+DEPEND="geoip? ( dev-libs/geoip )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --with-docdir=/usr/share/doc/${PF} \
+		$(use_with geoip) \
+		$(use_with ssl)
+}
diff --git a/net-misc/pimpd/Manifest b/net-misc/pimpd/Manifest
new file mode 100644
index 000000000000..ddfda4bdaec1
--- /dev/null
+++ b/net-misc/pimpd/Manifest
@@ -0,0 +1,5 @@
+DIST pimpd_0.8.tar.gz 6763 SHA256 a76ec3a7c5344399e5dae89afa352c0efc07788b91e8b9fb606e7dca251bbfec SHA512 cb9a60386d5071e21feacf991bb1b2d3d0cb681561a04dc3b9e830336b9d63b4c7026e0a1e43d5276895c733cc0c7d9e072ce1e13ae4b26e83543c53c8147dbe WHIRLPOOL ddb54d11af5dc5df39dc7dcaba30ddbadde5454e091d0ed3b2c319df796f93797900260df72459fc77bc3d0f2b55c34d1a1e79bce2ee4f159e9cd35b7e026de6
+EBUILD pimpd-0.8.ebuild 483 SHA256 4f8a4867142179866cb87c1463f688e2d6d5fd138b29a644359d546df6b9cf15 SHA512 c12ced7a675c80230a9ea9e571c8674f28bce8c7b654cdf4cc1a73dc904de12546fb7372f47a1096b63e56518efe2f2a384feb4574620f785eec1b5e7f8cfcfc WHIRLPOOL a54c56d22c3686725a4f7e8f966322e98ccd7acf127d5e63cab9be756bfd6bfdd0ca22ad0af50fb713124cf4f20368e24b831708bcf8d65da7e85e0407caec56
+MISC ChangeLog 2651 SHA256 36d58c2e2dbe303a259244be8e65b9b4df3e4eb2c2636a8a20fde51c028587e3 SHA512 e47a07cdbede89ef3ddad89629e7acc05ce5b361e4d18052791abe723993530fdfcd1bd7d3984ad547afb135acdfab17f3e6f4c9d828f50e757d564456543e54 WHIRLPOOL d8825f597948dc4604025b5268c880c7f0b7ff3dc4b206827c4cee4b4ce0d24f6dd7ab18accd7e38224733b7dc26eb1211a1b13936187b21692818d6238bf48d
+MISC ChangeLog-2015 1698 SHA256 aea60b2e14d4ec6f6fc7fc34ead9a379868bbb696a75e91e82f5af5ccbc40056 SHA512 18263feb69039350ad75a4c2e081e2f7a743f0284ea98aff1ab3b7561af267815073fee1ddd4fceab8165ed415c37fddcc937a81036c4ec537b447dd808524d4 WHIRLPOOL 1813595faae422b6a6e91f72da3614abbea719034f0bb662cb259205dcf29e6fb99926fdfe6bfba169456c98cce0e623cafe88ee69d4298a3fc063631a6eaa99
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/pimpd/metadata.xml b/net-misc/pimpd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/pimpd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/pimpd/pimpd-0.8.ebuild b/net-misc/pimpd/pimpd-0.8.ebuild
new file mode 100644
index 000000000000..c2734c71ef6d
--- /dev/null
+++ b/net-misc/pimpd/pimpd-0.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="RFC1413-compliant identd server supporting masqueraded connections"
+HOMEPAGE="https://gentoo.org"
+SRC_URI="http://cats.meow.at/~peter/pimpd_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc sparc x86"
+IUSE=""
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin pimpd
+	dodoc README
+}
diff --git a/net-misc/pipes/Manifest b/net-misc/pipes/Manifest
new file mode 100644
index 000000000000..1e8cba753dc8
--- /dev/null
+++ b/net-misc/pipes/Manifest
@@ -0,0 +1,5 @@
+DIST pipes-1.16.1.tar.bz2 21642 SHA256 d7bb02f7e10ee91174a4d0d74ce61e1328d08be68d1ab3c235e63d2f34ada62c SHA512 ff8f6cf7934149c3d8a6e0443a06840863313acccd31791913fa25b086173e834d8f357212811e5e1ddb62148d3e687858e8956065734f11d7fc729f2a64b0a3 WHIRLPOOL 6ab87a0228451ad98746e5f9346922fcf6246c87b57e09a709781af478a546e49c521bd4b2bc0a7824776cf1dfd230bc7e61b3f1f12c41e19c87f09e2059a831
+EBUILD pipes-1.16.1.ebuild 649 SHA256 ea34bad2b8d03aeda4906a0c00be1dabc2f7544d9fb22fc7d53c9edf9b864cd1 SHA512 1e8aa77ed31a3d7028e57825eee3853c5bfd40e8bd497219f68366574a78fa5c1b9eba34764d957ba370e17f23f0f29dff8aa68e0c28307257dadfd26a30c3d1 WHIRLPOOL 5efa116b22ceb0f1619092e8fc0e2b3a49be6d400209b518eee5b8d2d57dc5a1d9d51706a379f0a2fc3b68932fab7f23e887a8709c2b0aa30f0488f4f35a33a4
+MISC ChangeLog 2607 SHA256 6fd8a40ddedc57bcd097c3978763d8a3b32b0054b69f6d58d5cfa79bb0aad4e8 SHA512 7d5fab88a2353dd9a5a3ae3ba5b85f702249162e3509e10bed85d5818b6a2d02f583d7d856947b6eaf0a1ac1288e4392dbb0d786390b56ba3467eb66bfae0f8a WHIRLPOOL 105088b7301ed4071f9be4050022231be0bb84d633a0b87bfa8c34f92ebd27a549e2ca7b620fdb743eefa6039b78ee6afa2035327c95ad858abe210c29a29c32
+MISC ChangeLog-2015 1650 SHA256 ee84e571e8d59e8ac5411165a9f03c0d25f35ef17b7c2389704ad420fc86a5e4 SHA512 756bd8a0280d5ceabc84b852ca8cec3d9ff7de8e390b31297d12ed30e746c140b5f34892730f575b383c5a0749e4063751c801c499ab7e83e080fe294dedc52a WHIRLPOOL fb855e50927510723834e142b676e2433a5ffb58ea0d83ea4c6d7c7065e844f7a52ad71c4ed0bd035a7a4b4f8c7bffc61893186174c55c091154a7737bdddf9d
+MISC metadata.xml 1243 SHA256 fc5d1235a2089e95e526391614d3366c16c580f58632e7553d87437c78844665 SHA512 bae97cf81ba152b00707b1737908c5a60cef1cae95d2b9c8dcac814a74f6bf587471be8c6bdfa4688d74651c6df53777cfea72ee318b6cefe1ecc36c19e76734 WHIRLPOOL ad2609b1fd1e6acaa7d14e7eaf9e7ea7e7e92f7cd901dba7fcce62a735936aace24999bfdac762fc60525df58f59e6e8fc3b1b5e821bab7848c025de5029a9fd
diff --git a/net-misc/pipes/metadata.xml b/net-misc/pipes/metadata.xml
new file mode 100644
index 000000000000..abddd073acfe
--- /dev/null
+++ b/net-misc/pipes/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+I just noticed that netpipes doesn't support bidirectional pipes.
+So I made my own version.
+Now I can say in computer A that "plis 12345 -io ohjelma" and in computer B that "pcon A 12345 -io ohjelma2",
+and they communicate together then.
+My example utilization was that I can send the picture of SNES-emulator to another
+computer via network, and grab the keyboard input there, so get two consoles to
+the same game.
+My friend wanted to watch when I play FF6, but didn't want to sit next to my monitor,
+and asked if he could get the picture to his monitor.
+And he got it.
+Then he asked if he could play it from his computer at the same time as me...
+And now it works too.
+Other ways of use can everybody invent theirselves.
+It's really easy to make simple server software with this.
+For example, do "plis 79 -io finger" and then you have a finger-service.
+Or "plis 5555 -o 'cat signature'" and then port 5555 gives your signature.
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/pipes/pipes-1.16.1.ebuild b/net-misc/pipes/pipes-1.16.1.ebuild
new file mode 100644
index 000000000000..b27bf4a83e1b
--- /dev/null
+++ b/net-misc/pipes/pipes-1.16.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Very versatile TCP pipes"
+HOMEPAGE="http://bisqwit.iki.fi/source/pipes.html"
+SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc s390 x86"
+
+src_prepare() {
+	# Prevent the build system from looking for dependencies
+	touch .depend || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) OPTIM="${CFLAGS}" LDFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin plis
+	dosym /usr/bin/plis /usr/bin/pcon
+	dodoc Examples ChangeLog
+	dohtml README.html
+}
diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest
new file mode 100644
index 000000000000..9d3590549b88
--- /dev/null
+++ b/net-misc/plowshare/Manifest
@@ -0,0 +1,8 @@
+DIST plowshare-2.1.6.tar.gz 95946 SHA256 2823f4bc82ad9b30c0c122a312125cb923acc55ce448c56a503e03fe0a4d97c4 SHA512 bccc72f1add6389fd7fc41a27f9e169c622e3a4e7c9c1040c01a8a4569accc9b0b6910815a013d5e8aff7103ee26d943665ffeccc02db1879eca580b3892190d WHIRLPOOL 4d4204199b6dc505a2ce231c95c41f5da1e93806fc04f875844566b54da31c41baa0657f6e65fa416baf68aebbaec02a2ead0ed1baf1ac3aa314ccfb7e502226
+DIST plowshare-2.1.7.tar.gz 96282 SHA256 c17d0cc1b3323f72b2c1a5b183a9fcef04e8bfc53c9679a4e1523642310d22ad SHA512 7fe91d3756c55ffc1daf9275bfd2413f2644accd8fa69f2b1064696e1435f9b8be9515907c8249ffde85436dc6966f1d42bad94ccfbde93ae584dcc0d642c215 WHIRLPOOL eea0b0e1298a168677a5431ad84ddd87d45e9d771ddeac968f7a12cd1abd16af1c1b8492b5d92b3bd8558cf1223d5bd3701af14742eea4f0b114156a9a10964c
+EBUILD plowshare-2.1.6.ebuild 1695 SHA256 7445f32d64676cc6ea6d54ddc11a43ea2f6f6602a2732db4a473dfac7da1b6c6 SHA512 40b22f4944da19a23d9c372791c83eb00f8e0ef2ba0a1d820dedb42077796e0e91f858d7e1f38985085621b8d76dbb379938a5041ead37074c90fdd6e9a99fe1 WHIRLPOOL 8906c3a5ad0c433169ce7e787eb97fc446eaaf9efd1a008be13ffeab64b35da5ad52c5363ec4b88e9ceb48f683c35d271ad5d174a4ddbd41e0123aafeb4b9987
+EBUILD plowshare-2.1.7.ebuild 1695 SHA256 7445f32d64676cc6ea6d54ddc11a43ea2f6f6602a2732db4a473dfac7da1b6c6 SHA512 40b22f4944da19a23d9c372791c83eb00f8e0ef2ba0a1d820dedb42077796e0e91f858d7e1f38985085621b8d76dbb379938a5041ead37074c90fdd6e9a99fe1 WHIRLPOOL 8906c3a5ad0c433169ce7e787eb97fc446eaaf9efd1a008be13ffeab64b35da5ad52c5363ec4b88e9ceb48f683c35d271ad5d174a4ddbd41e0123aafeb4b9987
+EBUILD plowshare-9999.ebuild 1657 SHA256 f92b2a48bd35ae1279f4d2980c13431cc854cbddde7a8f8692c3088167297adf SHA512 b718b705c5c53bde6b09adf03cefc601fa2ab006e59daf1d943d3738ce82b5a11e7e9df1201bb7d04f0cc58cdd126bf963202a8bc3c21d101d8e0914bbdb02eb WHIRLPOOL c09e2f5343fa9393254ea4e23ea8aeb34f63afeba58b8669c9f599d12a044cc2ea6ef335bfff50d6b787c74a37b9dd8026878f14bec529fd6b29e52ededc8c64
+MISC ChangeLog 3849 SHA256 37f8c4a41c0c54689ffa8b7c423ecf125ec3de40854db936fcbe882d51328ee8 SHA512 bf7d172e1401762c2141bc34866e19e48fef471d6f0174ac54669a7c29c7f7e0dba038117c2a785dcda904c08f7dc878386c4de6151c08d65aef1b35b7617f32 WHIRLPOOL db450c08149942cf30066542e370f273b75c4e3e8014a5b4f48eae50d58d64c220d99362aa70e7bc6fcacf90867bc141f046fa5f4fab296d1768245578a156ac
+MISC ChangeLog-2015 6459 SHA256 47c751bb46ac6e68b5f649431e48fa736d639e2ede43768b25ddef7cf3aa850c SHA512 3d3e8e1900abf9a7ec8a6ed5bae992dd18ea1122a2c5eba6301f1d987a4adf82f7829bbb9336f79ad92cbb34b5ee201503735ac865e88201f1691fcbd343641c WHIRLPOOL 7e3c369ad8010ab63a350011315a634c2814a3235105df4e9430af1709ce58babf009bf0d76e7d1ff7b507ce47f0d9734371ef93d43294e4655cd239351d27af
+MISC metadata.xml 408 SHA256 be7d274c9ce04a21d753f02fd7f4924c6b30201b403721c7268646be191d239f SHA512 46c5f62d551219c2922af526b34c0b19e948c243f2afb1fe12b1b6ad85e0c5b963d1fbda60e8ad6ff26e3652d163ccad5ec12d910ac67e887f58bb538461c073 WHIRLPOOL fe78cd03b0e10ee135b1757511f22aacc8672717dd8b3d0d219c6763583520feda21f9e76da6c8c51cd4cb4e06f94d13c1036073c324e882cfad45a5f4d4248d
diff --git a/net-misc/plowshare/metadata.xml b/net-misc/plowshare/metadata.xml
new file mode 100644
index 000000000000..97b641614acf
--- /dev/null
+++ b/net-misc/plowshare/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<use>
+		<flag name="view-captcha">View captcha with aview</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mcrapet/plowshare</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/plowshare/plowshare-2.1.6.ebuild b/net-misc/plowshare/plowshare-2.1.6.ebuild
new file mode 100644
index 000000000000..52227ef820ef
--- /dev/null
+++ b/net-misc/plowshare/plowshare-2.1.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
+HOMEPAGE="https://github.com/mcrapet/plowshare"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="bash-completion +javascript view-captcha"
+
+SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+RDEPEND="
+	>=app-shells/bash-4
+	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
+	dev-vcs/git
+	net-misc/curl
+	sys-apps/util-linux
+	virtual/imagemagick-tools[tiff]
+	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
+	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
+DEPEND=""
+
+# NOTES:
+# javascript dep should be any javascript interpreter using /usr/bin/js
+
+src_prepare() {
+	# Fix doc install path
+	sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
+
+	if ! use bash-completion
+	then
+		sed -i -e \ "/^install:/s/install_bash_completion//" \
+			Makefile || die "sed failed"
+	fi
+
+	default
+}
+
+src_compile() {
+	# There is a Makefile but it's not compiling anything, let's not try.
+	:
+}
+
+src_test() {
+	# Disable tests because all of them need a working Internet connection.
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" \
+		PLOWSHARE_FORCE_VERSION="${PV}" install
+}
+
+pkg_postinst() {
+	elog "plowshare is not delivered with modules by default anymore"
+	elog "Per-user modules can be installed/updated with the plowmod command"
+	if ! use javascript; then
+		ewarn "Without javascript you will not be able to use modules"
+		ewarn "requering a Javascript shell (/usr/bin/js)"
+	fi
+}
diff --git a/net-misc/plowshare/plowshare-2.1.7.ebuild b/net-misc/plowshare/plowshare-2.1.7.ebuild
new file mode 100644
index 000000000000..52227ef820ef
--- /dev/null
+++ b/net-misc/plowshare/plowshare-2.1.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
+HOMEPAGE="https://github.com/mcrapet/plowshare"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="bash-completion +javascript view-captcha"
+
+SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+RDEPEND="
+	>=app-shells/bash-4
+	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
+	dev-vcs/git
+	net-misc/curl
+	sys-apps/util-linux
+	virtual/imagemagick-tools[tiff]
+	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
+	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
+DEPEND=""
+
+# NOTES:
+# javascript dep should be any javascript interpreter using /usr/bin/js
+
+src_prepare() {
+	# Fix doc install path
+	sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
+
+	if ! use bash-completion
+	then
+		sed -i -e \ "/^install:/s/install_bash_completion//" \
+			Makefile || die "sed failed"
+	fi
+
+	default
+}
+
+src_compile() {
+	# There is a Makefile but it's not compiling anything, let's not try.
+	:
+}
+
+src_test() {
+	# Disable tests because all of them need a working Internet connection.
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" \
+		PLOWSHARE_FORCE_VERSION="${PV}" install
+}
+
+pkg_postinst() {
+	elog "plowshare is not delivered with modules by default anymore"
+	elog "Per-user modules can be installed/updated with the plowmod command"
+	if ! use javascript; then
+		ewarn "Without javascript you will not be able to use modules"
+		ewarn "requering a Javascript shell (/usr/bin/js)"
+	fi
+}
diff --git a/net-misc/plowshare/plowshare-9999.ebuild b/net-misc/plowshare/plowshare-9999.ebuild
new file mode 100644
index 000000000000..a0c97507680a
--- /dev/null
+++ b/net-misc/plowshare/plowshare-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 git-r3
+
+DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
+HOMEPAGE="https://github.com/mcrapet/plowshare"
+EGIT_REPO_URI="https://github.com/mcrapet/plowshare.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="bash-completion +javascript view-captcha"
+
+RDEPEND="
+	>=app-shells/bash-4
+	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
+	dev-vcs/git
+	net-misc/curl
+	sys-apps/util-linux
+	virtual/imagemagick-tools[tiff]
+	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
+	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
+DEPEND=""
+
+# NOTES:
+# javascript dep should be any javascript interpreter using /usr/bin/js
+
+src_prepare() {
+	# Fix doc install path
+	sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
+
+	if ! use bash-completion
+	then
+		sed -i -e \ "/^install:/s/install_bash_completion//" \
+			Makefile || die "sed failed"
+	fi
+
+	default
+}
+
+src_compile() {
+	# There is a Makefile but it's not compiling anything, let's not try.
+	:
+}
+
+src_test() {
+	# Disable tests because all of them need a working Internet connection.
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" \
+		PLOWSHARE_FORCE_VERSION="${PV}" install
+}
+
+pkg_postinst() {
+	elog "plowshare is not delivered with modules by default anymore"
+	elog "Per-user modules can be installed/updated with the plowmod command"
+	if ! use javascript; then
+		ewarn "Without javascript you will not be able to use modules"
+		ewarn "requering a Javascript shell (/usr/bin/js)"
+	fi
+}
diff --git a/net-misc/pmsvn/Manifest b/net-misc/pmsvn/Manifest
new file mode 100644
index 000000000000..5496f0dbcf9f
--- /dev/null
+++ b/net-misc/pmsvn/Manifest
@@ -0,0 +1,9 @@
+DIST pmsvn-1.0.5.tgz 5867 SHA256 f97b2c43eded8948fabf203a8e91dd6b70c52fc9875bc211804b32ee023c6b8c SHA512 0fc9d06a2911d361d004e7f809bce7292f4fb1ba79152defcede426a15a7792d70c05d527d7b1627c4094bcb3e180d77684e9c55aea7df5e4e1e821d943d0221 WHIRLPOOL 10d8466046aff0e6f8af9353d6f43ba1e091296b30db747df6a0e23efa6c536449b4c08baee735bf72c7849d38ac7f00f35040040c4ee2ca5b8556b7ba564228
+DIST pmsvn-1.0.6.tgz 22021 SHA256 6cd8498b6d80e1b2d6aa10adb3e765fde03d219e9e1149898393b542fee95c89 SHA512 e06ee3f43468a0fd71799b08ba3f1dc8dd26cfb1ea8d1409674418bfa27db0f095edb2b60f61ad6aeb68a9a3f76e987b52fb9b0c3d9d54d82c790668af68b541 WHIRLPOOL e2fc1ad5756a0b8f98bb8e0fc87fc4d8fb6ad79a812ce6835b92c21cfbad7521bd0e0dbc9f1294f7e1d16c003fba27ee33018e6b15294a1af3971c743453e324
+DIST pmsvn-1.0.7.tgz 7565 SHA256 945dc86b1276719af5e009fd9d38ac3a555fc9e466f98b189a16f20b0d954028 SHA512 1bf205ec142c6ea018b9f606a67fb97c87aaefa56e0dbd848db6c09f6ce6115856b94c2b75cc4e923be8d66b322ffd8adeca88bfe1d3cdcc72377adfed3976d4 WHIRLPOOL a4f295e63d9ae0932514b932e19bacc58c34ced52e0019bb82e58be27b95b32f57033a0fecdf5ce2b64f06ffb108731c638d99aee8e1d2093c3a124010795964
+EBUILD pmsvn-1.0.5.ebuild 893 SHA256 dc26cab7e36fd5aa45e7ce84bc2049ba349798abf71e80b44951f0169e7d110d SHA512 79218d8b8fb8bfbcbb2d752ca5fac74a8c6abc44443ae43d9e7b163c61ff0b4e1c88c2104abc614524e9f9c373b315f25bb538a574346ef112f353add5751ce7 WHIRLPOOL 13b0bae410d6225ca83de14cca815c41dfeef0c532022e6e5b4d8239117718c30a09f4885f4bacb8f16970f4ef01c7e9758289e6fd18eb3184fac92a3512dee8
+EBUILD pmsvn-1.0.6.ebuild 846 SHA256 c3293795a561be8e94caeff43b9e1c57e54b0e583d933e65259f69ba52afb9a5 SHA512 a3f698fe2a94a8ea97ef77b53e2dcf4bf6561d94e0e25e7b7694e4cb09f88042ab2a9211bf555d9f6ea17d1550e8beced4a516fd37acca20718e81ad5f419097 WHIRLPOOL 54b4cb01e8fee97a41e11ad4569e2c255ccdd87c0c8a89fc9d82d2c673fb442f3b79eef15d89b3ea5eefa7bf954408ad16ff71551482081f0e661d267dba5ee5
+EBUILD pmsvn-1.0.7.ebuild 782 SHA256 db6a0d189387e53a11bf955863e48ed6c146ed98483e80aa7eb734c56c377e29 SHA512 d3ebefd72550e338c5d67f9bcede8a339f528744da2de3e62fbb9f03f07b66987fd34a354fcc19f700c92ce310486466544a260c2b2f0d7be37f63f8c8ebaab2 WHIRLPOOL 9b89e943545bb34679b951ac85644dc22fcbdd5e2a369d2135af0dad740dbb20affbd3a5c45aff25fac7bc5108418b3043d200b68d94f860ad5d91a4dfb44f5e
+MISC ChangeLog 2418 SHA256 5b9db448422efe4bb66738e1098434ff28aaa40a9cf8424a8c05e40983a61c05 SHA512 55ebd267d0b1a475922b36b7b9c9013bcf2891d3ad1b153da6b2e6f5ce16389d1948732c2f027af9a02b908f40d18fcfb666a4f5eefcd7dc45d9c00f6c4aae23 WHIRLPOOL 6ea6cd9a1c5bd13f417ddba1a870734e5534e4a24ae0b0fba5ef23213b9c9079a9ff21a53ed3494efc2b56311c72116e89c7714fbed0671ff16ac842a0a2617c
+MISC ChangeLog-2015 1730 SHA256 78e89ef2e84ddcc5e8fb7c7453548f12ac447ef7bdc5661bb3e0b5706d9b5eb3 SHA512 947609e83756b0f3294021d07407c7c67255693f908fbc0a51bea17d99c725d8d6b1917e1548a7e21e5a1c67827680657f1127f23ef8febc4a3af4f550ea5b7c WHIRLPOOL 71ad0f96a5fbde7fd8a319127a9c0171c8c8692b50827e7640ed830258cabf38e9c856bda1d4c1908968025df2b9bca928206e17a3c30c9497790684a827747f
+MISC metadata.xml 325 SHA256 fda68cc47b25e3cff14af9a83f792a96cdb8f77ab2fe060d94e9c87b71e908ff SHA512 5c984349af76dff4b32c0268d0dfd6f3540e217aa33141a9276a27e0304e358f5f019a95986c23eceb2123398f7bf012c9a84745fc054978049bbb5e78ea7298 WHIRLPOOL 1263ed92a54545cae7e51f7356116beae821d425ed81a4bce137ad69766bfa28e23076b2c52938635cf5af18ee0278a9746c3e90754b67e46f2a4dfc0fae970f
diff --git a/net-misc/pmsvn/metadata.xml b/net-misc/pmsvn/metadata.xml
new file mode 100644
index 000000000000..7861b3ffc82e
--- /dev/null
+++ b/net-misc/pmsvn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pmsvn</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/pmsvn/pmsvn-1.0.5.ebuild b/net-misc/pmsvn/pmsvn-1.0.5.ebuild
new file mode 100644
index 000000000000..10ce2da7ad48
--- /dev/null
+++ b/net-misc/pmsvn/pmsvn-1.0.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Server's configuration management and monitoring tool"
+HOMEPAGE="https://sourceforge.net/projects/pmsvn/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="net-analyzer/nrpe
+	>=app-shells/bash-4.0_p37
+	>=sys-apps/sed-4.2
+	>=dev-vcs/subversion-1.6.9"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# move configuration file from /etc/${PN}.conf to /etc/${PN}/${PN}.conf
+	sed -i "/etc\/${PN}.conf/s:etc/${PN}.conf:etc/${PN}/${PN}.conf:" ${PN} \
+		|| die "failed to fix path for configuration file"
+}
+
+src_install() {
+	dosbin "${PN}"
+	dodoc README
+	insinto /etc/${PN}/
+	doins pmsvn.conf.sample
+}
+
+pkg_postinst(){
+	elog
+	elog "A configuration file sample is located at /etc/pmsvn/pmsvn.conf.sample."
+	elog
+}
diff --git a/net-misc/pmsvn/pmsvn-1.0.6.ebuild b/net-misc/pmsvn/pmsvn-1.0.6.ebuild
new file mode 100644
index 000000000000..844512be8fff
--- /dev/null
+++ b/net-misc/pmsvn/pmsvn-1.0.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Server's configuration management and monitoring tool"
+HOMEPAGE="https://sourceforge.net/projects/pmsvn/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="net-analyzer/nrpe
+	>=app-shells/bash-4.0_p37
+	>=sys-apps/sed-4.2
+	>=dev-vcs/subversion-1.6.9"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# move configuration file from /etc/${PN}.conf to /etc/${PN}/${PN}.conf
+	sed -i "/etc\/${PN}.conf/s:etc/${PN}.conf:etc/${PN}/${PN}.conf:" ${PN} \
+		|| die "failed to fix path for configuration file"
+}
+
+src_install() {
+	dosbin "${PN}"
+	dodoc README
+	# No sample file anymore. Autogenerated on first execution
+	# insinto /etc/${PN}/
+	# doins pmsvn.conf.sample
+}
diff --git a/net-misc/pmsvn/pmsvn-1.0.7.ebuild b/net-misc/pmsvn/pmsvn-1.0.7.ebuild
new file mode 100644
index 000000000000..61cd9070c9d9
--- /dev/null
+++ b/net-misc/pmsvn/pmsvn-1.0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Server's configuration management and monitoring tool"
+HOMEPAGE="https://sourceforge.net/projects/pmsvn/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="net-analyzer/nrpe
+	>=app-shells/bash-4.0_p37
+	>=sys-apps/sed-4.2
+	>=dev-vcs/subversion-1.6.9"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# move configuration file from /etc/${PN}.conf to /etc/${PN}/${PN}.conf
+	sed -i "/etc\/${PN}.conf/s:etc/${PN}.conf:etc/${PN}/${PN}.conf:" ${PN} \
+		|| die "failed to fix path for configuration file"
+}
+
+src_install() {
+	dosbin "${PN}"
+	dodoc README
+	insinto /etc/${PN}/
+	doins pmsvn.conf.sample
+}
diff --git a/net-misc/polly/Manifest b/net-misc/polly/Manifest
new file mode 100644
index 000000000000..fc90da216767
--- /dev/null
+++ b/net-misc/polly/Manifest
@@ -0,0 +1,7 @@
+DIST Polly-0.93.12.tar.gz 573637 SHA256 376ae60067b192bc5d5147203f9116e207599f73929dfb8b6343be9f250ba410 SHA512 71cef70d6ed8ade018a880a81c9ec83f9d32f2dde3c5fb192655f56d39e6cc17ac164e746085434caca863af08a075a3a7f05b9010a263956b92294fa4b4f370 WHIRLPOOL ffc852531b8350f28c0c0e191373db5525aab42bf1d974d2a9f94f395af1118b5d0d80cec5e3285630c38c9da470cd5e0115e6210a06e1245ec61ece8902b8f1
+DIST polly-0.93.11.tar.gz 575357 SHA256 c1e4c2d2c419626da484870e53866afdfbf14156bc2929f510c7f1142b457416 SHA512 75ded540371f63202cf84f685f5fbd9a6be0766bb03089ae2afc6b8056dbd28213ed1dda235fe53b285677e0fe9fdf3b3fd7b744d61824de607eb89c55cc299f WHIRLPOOL c9ec57320b5f552235409bd041f9c0242da9067c3b55fd8e3623ffa32170e4f7e8dd72f02b94df6830fdd28afb2b7912e185a79c9f08f74dad0be253960874fa
+EBUILD polly-0.93.11.ebuild 1237 SHA256 97ae5d665e1b60900d25615095c2b875e67d30b27757c849a770ed6005f2edc5 SHA512 f262cbdbfe9b72a72d5e8e27357f0a70f12195181d9e8a215ca3470eb68fc51e67c2fc993fae1133055ed6ab20cf408bd777d91df933df07031ebf85400e8f1b WHIRLPOOL f6f60a883c988ee10ee01f521986d359558b4dcdcb018a21513908f6ff4ae8b54201f305d2255d613c122fd5f72faaeb8a98cea89c77ec3eaa96fc582e9aa2a8
+EBUILD polly-0.93.12.ebuild 1225 SHA256 b9de5b476cfdfb026af9b24ef20a4bf573d42831d4392770d43e6aa3dcbcd4bf SHA512 d1cddc8f23fb2f5c29de371d272f27ad32c0ff150eed2d6ee6eaf9ce6cf78ceae3701be6face620a506a9ef4df8a9cddd5ff5f7d96cb574bc8f57b19633674c0 WHIRLPOOL 10ffc2a06b30c27b8823c3be16d3075775399e8f8cc47021359423c10309bcf06cae920850122e7d48e1cec1e82f61735566072b9466dcdae4b0bfec27c7c822
+MISC ChangeLog 3058 SHA256 0cb16e44a3a9fdd5e47a8e206ec5ef762edbf254b252516ecc3faa360ccd9ce1 SHA512 43af1a114bd14b4d974b88273bcaf9c5644acb0e4d499ed04b692b465b059bb8a56c9d0c974d22b554be438c612f7041c7a034516d8f4dd08664303a837f0505 WHIRLPOOL 76d811ab3c5bc35eeaf173be97beda5c017e6bdebdb55de781e95ac07a0602848641f2ab7e8154ab2598060da076840502ccf655b36996f953aa16b6f43b1f0d
+MISC ChangeLog-2015 1077 SHA256 b5bd473a426d6dfc5255c5e90491ab81c98f70af1c8350680163a56f95ab982f SHA512 c7f1b4c4209a22276a79e68be98c3a857876f291ebcf7a8fc1d50247399286beecdfa55ab7fcf0f2846bbc0a8fb842579af677309a72f653bf92d71f08dce014 WHIRLPOOL 7d2cad680c01104b2c17732d63584c4e0e617f6ed3cfe2b072462e7d608ea85f46d08dd5c1a89e1d1165742a5e84b8c4aa0068bc148e1f0e3c8689ea37010af4
+MISC metadata.xml 316 SHA256 189ff5fb1994ee47067e2f5d8d27bc6203241606b8514c4f5338a843d2048155 SHA512 b93fa678d02c24b364406995e92498d3abf389f9db5b65b664e0e9732c9e51cd0ef200170b3e9d549f110c7a3b3deed48b07a930256dc5beca0015a92afadbb7 WHIRLPOOL 9793432447c9894320c96b4083f3b89cc307343acdc77d43866e6af4cf241c89932a683aa8453ca356a5ccbee23d6c606bf40867e025cf642040af7da9f5a8c5
diff --git a/net-misc/polly/metadata.xml b/net-misc/polly/metadata.xml
new file mode 100644
index 000000000000..305b87389afd
--- /dev/null
+++ b/net-misc/polly/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">polly</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/polly/polly-0.93.11.ebuild b/net-misc/polly/polly-0.93.11.ebuild
new file mode 100644
index 000000000000..d64019e751b5
--- /dev/null
+++ b/net-misc/polly/polly-0.93.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE=( gdbm )
+
+inherit distutils-r1 gnome2-utils vcs-snapshot
+
+DESCRIPTION="twitter client designed for multiple columns of multiple accounts"
+HOMEPAGE="https://launchpad.net/polly"
+SRC_URI="https://launchpad.net/${PN}/1.0/pre-alpha-2/+download/Polly-${PV}%20%28pre-alpha%203.11%29.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-NC-SA-3.0 GPL-2 GPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/gtkspell-python[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	rm -rf external/keyring || die
+	distutils-r1_python_prepare_all
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+}
diff --git a/net-misc/polly/polly-0.93.12.ebuild b/net-misc/polly/polly-0.93.12.ebuild
new file mode 100644
index 000000000000..6a285f6c600b
--- /dev/null
+++ b/net-misc/polly/polly-0.93.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE=( gdbm )
+
+inherit distutils-r1 gnome2-utils vcs-snapshot
+
+DESCRIPTION="twitter client designed for multiple columns of multiple accounts"
+HOMEPAGE="https://launchpad.net/polly"
+SRC_URI="https://launchpad.net/${PN}/1.0/pre-alpha-2/+download/Polly-${PV}.tar.gz"
+
+LICENSE="CC-BY-NC-SA-3.0 GPL-2 GPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/gtkspell-python[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/Polly-${PV}
+
+python_prepare_all() {
+	rm -rf external/keyring || die
+	distutils-r1_python_prepare_all
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+}
diff --git a/net-misc/portfwd/Manifest b/net-misc/portfwd/Manifest
new file mode 100644
index 000000000000..c9484347766b
--- /dev/null
+++ b/net-misc/portfwd/Manifest
@@ -0,0 +1,8 @@
+AUX portfwd.confd 55 SHA256 3a76b31f281da7c6489cf1523ae91d7f3ce0020c05f65ac8b1e958441f0d67e7 SHA512 cd9332cd659982fb2d8b6d4c27b75814d725aad534b2e72c4e287b6aac4595dae8a11bc711592e290919a3959b7ac5d9c1fc4921572593ff80876630d6b52296 WHIRLPOOL 7b3ea50d241d230f6fb115a426fbfb4ae0bace84b9a9794677663e9231030f7cfa683bf3ee62c550148dd7b890761dc0f193831748478f93b412bd805c58e78f
+AUX portfwd.init 773 SHA256 30c1e9560f907739855f661b0347be03b04c5ffc3ab6f40aa974c191af513cb6 SHA512 380bb2e2ee7423e781d3b637afe60cd79f5fd35806e897d89885b3fdbe1b3aeff396acaa74b4b6158d874a31831c8393c549642468e2a5fc0926361c4d6869c8 WHIRLPOOL ed968b7465927187808d1d610acf9850219b6332838b05720e192fd9971a9f160d970fca483a1cc0c0a3b502a4d4c1459cb5a198d7fab89694820115cee0aa17
+AUX portfwd.service 128 SHA256 f887bfa02621610ef2a6a477aa29fd57e0163e5641b2256bc10049ccd579c5f0 SHA512 1e15366d1d284db537d90d07857baaf44ba3447bed0b6cff35b957d787bf5893c8bdb7e01eb692cb26d68aea9256fbe9e6b012cbeb1899a40a531050a4521f04 WHIRLPOOL dd41b8f90e608229cdd02d26c4f47e025f83d31157153d44f3543c7996afa273ea1854f56d147f1c5813c75575beaf97f245e186074e244f2bd80b991765a9b5
+DIST portfwd-0.29.tar.gz 168318 SHA256 a880cf57ae00224c470c387cf2de8abbb53c4d761b4d67be5b0c9e15c3484066 SHA512 790d30afb42eb5e03846534e5098c7d1cb4241758df77fd56fc3f4fdbb05dae88ef84e16b27434035dd39a7c82beb77d490f64741181c38efc3b3928face51d1 WHIRLPOOL a83de6db3feab5fc03f3115013eebd650bb795be91e0b674ae102c9c59d260fd7faa5b8a738e5eb9ad891103bac0c91e3626b7ac6cabf6f565e936403d8dbc17
+EBUILD portfwd-0.29-r1.ebuild 1239 SHA256 9eae87f9a588d6a9e668af6e04dd6241b853fea84f95d4d241a0ef6357e43dfc SHA512 aa4cd8fc3c799345571ca0f0d443c316fb38de8a2fe296ab65f831c89cbd50341536ed1dfadea8452116a2e8bec6b8a36eaf3d195c89dbd00f0595a9b00c801e WHIRLPOOL ffe9343b8c8cc6e6dd149652c87a61c896cc0c240694f3a6318029166a17235af01212392ac2e363c821f5c7ef5c302e1c31987449f04c55fa40438267d9539a
+MISC ChangeLog 3024 SHA256 5f859e76d1da1750e26a825b0bd5a633c1f1d2170d31e4521987fdbc1040f70e SHA512 cfffa41e98349c4c7f1f80bf2843e2fb55722373517ce9d6cb94e922c7e8906ffe5ef0e3f4ea71de88abaaa86b9f6da93bf0b2aff98dc00b3ba9eac0088165ec WHIRLPOOL 86bd5da76520b11d5cb433aa4b4660aa455fa8a574091d09f9dfda7c96c217a4a1d1a9d3c8aed95be3dbf96abe78b9ba6843edcf99cc824874564dff08c92c8c
+MISC ChangeLog-2015 3672 SHA256 6069c9c9f7ab6e20c19cf6b93d34cdf564935c1909abcac334358bcb5e14f807 SHA512 66e065213ff9d3c775da1a4ea844466521c70da55920138f1a17b6cc72fe4e9f6d9ceff07369422e7480718b033964f2293710e56bcf71cef9aa0b9056c4b8bd WHIRLPOOL a429cf65168b81614e010119c33c96b92ec6ad006a7e0bf24b983199de965f0cef221135fbd3ab632e761339f507f4bcd58116aaa92ac85f622a55b38ad42aef
+MISC metadata.xml 443 SHA256 e748446e2cab9d75ba26f47f94ec145b05a10af451511b0d226831726f52dad4 SHA512 97bcf064333617a9cd93fdc4994f979eebb8b5e259d2f2a72b1a68c6add80231058345cb2b9ee810f7eea115bb2d8617f7496263f43e74a9c582d6efe46700a3 WHIRLPOOL 552e275d4352e2feea9525e82038fb331e0c606cece9560e488af772d7ad60fe7f53febb33dfa89882511863ae6940f1cb6bcde2c6fa48368e90346008010f22
diff --git a/net-misc/portfwd/files/portfwd.confd b/net-misc/portfwd/files/portfwd.confd
new file mode 100644
index 000000000000..7e1ac3b3fb4f
--- /dev/null
+++ b/net-misc/portfwd/files/portfwd.confd
@@ -0,0 +1,3 @@
+# See `man portfwd` for options.
+
+PORTFWD_OPTS="-f -t"
diff --git a/net-misc/portfwd/files/portfwd.init b/net-misc/portfwd/files/portfwd.init
new file mode 100644
index 000000000000..aa4aabd70546
--- /dev/null
+++ b/net-misc/portfwd/files/portfwd.init
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/portfwd.cfg ] ; then
+		eerror "You need an /etc/portfwd.cfg file first"
+		eerror "There are samples in the documentation directory"
+		return 1
+	fi
+}
+
+start() {
+    checkconfig || return 1
+    ebegin "Starting portfwd"
+    start-stop-daemon --start --quiet --pidfile /var/run/portfwd.pid --exec /usr/sbin/portfwd -- ${PORTFWD_OPTS}
+
+    _pid="`ps -C portfwd -o pid= | head -n 1`"
+    if [ -n "$_pid" ] ; then
+        echo "${_pid/ /}" > /var/run/portfwd.pid
+        eend 0
+    else
+        eend 1
+    fi
+}
+
+stop() {
+    ebegin "Stopping portfwd"
+    start-stop-daemon --stop --quiet --pidfile /var/run/portfwd.pid
+
+    if [ $? -eq 0 ]; then
+        rm -f /var/run/portfwd.pid
+    fi
+
+    eend $?
+}
diff --git a/net-misc/portfwd/files/portfwd.service b/net-misc/portfwd/files/portfwd.service
new file mode 100644
index 000000000000..77f6cd3663b7
--- /dev/null
+++ b/net-misc/portfwd/files/portfwd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Port Forwarding Daemon
+
+[Service]
+ExecStart=/usr/sbin/portfwd -g -f -t
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/portfwd/metadata.xml b/net-misc/portfwd/metadata.xml
new file mode 100644
index 000000000000..39b8daee10f0
--- /dev/null
+++ b/net-misc/portfwd/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-needed -->
+	<longdescription lang="en">
+		Portfwd stands for port forwarding daemon. It's a small C++ utility
+		which forwards incoming TCP connections and/or UDP packets to remote
+		hosts.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">portfwd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/portfwd/portfwd-0.29-r1.ebuild b/net-misc/portfwd/portfwd-0.29-r1.ebuild
new file mode 100644
index 000000000000..30e0f893ba17
--- /dev/null
+++ b/net-misc/portfwd/portfwd-0.29-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils systemd
+
+DESCRIPTION="Port Forwarding Daemon"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://portfwd.sourceforge.net"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ia64 ~ppc ~sparc x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND=""
+
+src_prepare() {
+	default
+
+	cd src
+	sed -iorig \
+		-e "s:^CFLAGS   =.*:CFLAGS   = @CFLAGS@ -Wall -DPORTFWD_CONF=\\\\\"\$(sysconfdir)/portfwd.cfg\\\\\":" \
+		-e "s:^CXXFLAGS =.*:CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\\\\\"\$(sysconfdir)/portfwd.cfg\\\\\":" \
+		Makefile.am || die
+	cd ../tools
+	sed -iorig \
+		-e "s:^CXXFLAGS =.*:CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\\\\\"\$(sysconfdir)/portfwd.cfg\\\\\":" \
+		Makefile.am || die
+	cd ../getopt
+	sed -iorig -e "s:$.CC.:\$(CC) @CFLAGS@:g" Makefile.am || die
+	cd ../doc
+	sed -iorig -e "s:/doc/portfwd:/share/doc/$P:" Makefile.am || die
+	cd ..
+	sed -iorig -e "s:/doc/portfwd:/share/doc/$P:" Makefile.am || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	dodoc cfg/*
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/net-misc/portspoof/Manifest b/net-misc/portspoof/Manifest
new file mode 100644
index 000000000000..9c739ba88926
--- /dev/null
+++ b/net-misc/portspoof/Manifest
@@ -0,0 +1,8 @@
+DIST portspoof-1.1.tar.gz 399119 SHA256 84e07ac328d741c1ccea3847d413d01185a6a2393f8637e67178f984703ef613 SHA512 ff78058d66aa142e34f70c6759bf04bfd69c5149e294803c41837276646fad21eea2d20b9eb1ba897e2fbd5f57f65b3a86fecb8ebbc25cdec7d31a2f7997f91b WHIRLPOOL c736160d3643fe96bf50e392953a8e78f2bb792211b16f16313ddc8d21906fb4afd02079a9d45ca22e32b550819357bcfa7413b99cb1510588ddc20e6d00080a
+DIST portspoof-1.3.tar.gz 401187 SHA256 56287536b9baf71d8a9f8009f9ce1fafcae85587e881da1ce86f7f46bc8afc8f SHA512 8d537ecf2ae5de8388c2b9b7210a2d38fe614e525a2ba286321fcf3b237f0888e59bb79a80056e49cf7f850be8ef274e87f04597a50dc1b86350bbc094e8be6e WHIRLPOOL 683f4cb89f2ba9d4ba3323161e9847638c6d6ac7a3a22ccd5b2c61784f9a43590863484aa7cbd5004a24b6d143b001fa50c27e351bb1df23f9a8e94d30123cde
+EBUILD portspoof-1.1.ebuild 588 SHA256 c778d20a2975355d7aa14a590d6779fffcedfe2ea36d427a95a445029e4303cb SHA512 811b5d10336441119c8d0d1f48d45fed962221a2652d46971884b8fd8bcd28cc49b7f93bbe2653bda3ed53ffda70a18f801a8c2f47da11fd4a1f07700dd94070 WHIRLPOOL 2d49fe0352307eccf330f7fbff7db2929f5b30764404c020de5205ea60367b1567ff05c016f8f4b48b0ebf921384811557d3e15009c0b3cae6cf8dd293bdbc43
+EBUILD portspoof-1.3.ebuild 913 SHA256 c44fda88e7971413b41662582738570270972adf1785957467f7c2019bae191c SHA512 0dd22701c48035f16eec96e50147cc35a8b3b24fcec0136711c6309eddb8a711cce7a774e3f40b2c1162469ad76eda3053a615f620217707ee75833ab99ea34b WHIRLPOOL e37d24bff24dc16fd0ecfaec718485bfbd23150132c402ba0eaaa9b6646a533d456ad487aa261c6a7db9b9d37836819e45492535aec40f47f0a513954fbb6095
+EBUILD portspoof-9999.ebuild 913 SHA256 c44fda88e7971413b41662582738570270972adf1785957467f7c2019bae191c SHA512 0dd22701c48035f16eec96e50147cc35a8b3b24fcec0136711c6309eddb8a711cce7a774e3f40b2c1162469ad76eda3053a615f620217707ee75833ab99ea34b WHIRLPOOL e37d24bff24dc16fd0ecfaec718485bfbd23150132c402ba0eaaa9b6646a533d456ad487aa261c6a7db9b9d37836819e45492535aec40f47f0a513954fbb6095
+MISC ChangeLog 2284 SHA256 966c6c4b1a234939ddc6d241524884f40d1fa5af4c55b0d577c47d36eef43886 SHA512 04b0b13cbe451a778b9edd3fe0edd797d5ce9517b6187885926e44c12ffd1a2c6c1a28e5acb560295ccc3a57bb67e8291df772f3ae3d350f000639f41c9eaa7f WHIRLPOOL ca13f413ad3280eb03450066bc46d178beeb162dcfc5564c14d404ddad591127ca21be0d0c284cdc91e93ffabf785c29f7f86dad731d538f729455c48beb0492
+MISC ChangeLog-2015 830 SHA256 4eb63309fcf388333b89167cc5ac79224cd4640a6471137be1c9083109ab5d22 SHA512 3813c61dc412d0172e6f6988c7c759fb193523cc0c00ea3cb596273d7f1fe3f5b7bc7942f2431408ac0a47e495573d606db7f58dbb68b190832fd630148e3c2c WHIRLPOOL 02c7146cb51287a0c66be4984e22202c5389ea4eef318280027ad90076b64d10da57f43dd10d70715da2a663429f554a5e1da6793c96953e7b0b7c66c6e1ed0c
+MISC metadata.xml 328 SHA256 1a5cad079cbd89faf828f920e9a1e45e1c86afe42fb88e2f5805a7622b619293 SHA512 328a86e4be2cc8a6de438e3684832d6dcfde5562581d65ddb88b68a56aa980be8b838f93ce9925accb239dd7d2fbb67249661b55db7631b6fd7906b0b63aedd3 WHIRLPOOL 9870eddb4798caf8e5bc2ae3e0cad7ee9cb015e60847e5f0444baf97e99cb7fd9d4196e4eb5f7320dfa0c6efae19f0ee274ada4bf6add7e7034a56c19716621b
diff --git a/net-misc/portspoof/metadata.xml b/net-misc/portspoof/metadata.xml
new file mode 100644
index 000000000000..f114c9f149d6
--- /dev/null
+++ b/net-misc/portspoof/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">drk1wi/portspoof</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/portspoof/portspoof-1.1.ebuild b/net-misc/portspoof/portspoof-1.1.ebuild
new file mode 100644
index 000000000000..40f7b22b52d1
--- /dev/null
+++ b/net-misc/portspoof/portspoof-1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="return SYN+ACK for every port connection attempt"
+HOMEPAGE="http://portspoof.org/"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://github.com/drk1wi/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/drk1wi/portspoof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
diff --git a/net-misc/portspoof/portspoof-1.3.ebuild b/net-misc/portspoof/portspoof-1.3.ebuild
new file mode 100644
index 000000000000..7dc45df92641
--- /dev/null
+++ b/net-misc/portspoof/portspoof-1.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="return SYN+ACK for every port connection attempt"
+HOMEPAGE="http://portspoof.org/"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://github.com/drk1wi/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/drk1wi/portspoof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+	sed -i \
+	's#/usr/local/bin/portspoof -D -c /usr/local/etc/portspoof.conf -s /usr/local/etc/portspoof_signatures#/usr/bin/portspoof -D -c /etc/portspoof.conf -s /etc/portspoof_signatures#'\
+	 system_files/init.d/portspoof.sh
+}
+
+src_install() {
+	default_src_install
+	newsbin system_files/init.d/portspoof.sh portspoof-runner
+}
diff --git a/net-misc/portspoof/portspoof-9999.ebuild b/net-misc/portspoof/portspoof-9999.ebuild
new file mode 100644
index 000000000000..7dc45df92641
--- /dev/null
+++ b/net-misc/portspoof/portspoof-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="return SYN+ACK for every port connection attempt"
+HOMEPAGE="http://portspoof.org/"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://github.com/drk1wi/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/drk1wi/portspoof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+	sed -i \
+	's#/usr/local/bin/portspoof -D -c /usr/local/etc/portspoof.conf -s /usr/local/etc/portspoof_signatures#/usr/bin/portspoof -D -c /etc/portspoof.conf -s /etc/portspoof_signatures#'\
+	 system_files/init.d/portspoof.sh
+}
+
+src_install() {
+	default_src_install
+	newsbin system_files/init.d/portspoof.sh portspoof-runner
+}
diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
new file mode 100644
index 000000000000..014544edf24c
--- /dev/null
+++ b/net-misc/pps-tools/Manifest
@@ -0,0 +1,7 @@
+AUX pps-tools-0.0.20120407-build.patch 1268 SHA256 825557e79c640edcf92e35986e51c74b609f549b08d9fd4b22c56e262c5ecb23 SHA512 942f1a94e4f0811a82e7b15905c84050e9990266690bb26f4145ecd5c29a9804dd5917158f925cf0df3908f3d2eee67c7df6daef32e745cec574f9169c6f0818 WHIRLPOOL 5e2d560e7477be1fa63a22ccf463907725f37c5b156e31064a18c21fe38ad7b949def508731ec6408acd4f5ebec9c608443facee4c54c62270ecc1589d9a75d8
+AUX pps-tools-0.0.20120407-install.patch 740 SHA256 95e567de9cc958dcd8b926d91bb35ae5989685593dfd288a973101edb990a8aa SHA512 0f08cd8018ec279751d297c0392bb685488e44aea0b03f754e7f81cc020a5d8872b4aad362c59eebe857a3ea0127827a66567f70f269fcbd0961fb4fe284dce2 WHIRLPOOL be1264b5d2f43f33b1537606526c06a7d1993e361ac38bc9ac7f0e3794b8bd5e3a87b873428411c3924b46731f02f515cbf662a1c73e05272403880651d168b4
+DIST pps-tools-git-0.0.20120407.tar.gz 13619 SHA256 eb020d40a3938546620889bb6ecdeead2c188e87ffd43c3ae04a41e5998e7997 SHA512 d2014262b0594959f337c25df859591d0737994decec663389392d3c7e53376ded2485713f6364c4833d8d7c40b4b0c3b88865ab85e481bcc2e81e35931d84de WHIRLPOOL 03ff250da63ff2ca2f9111b8207608e0e989c376a5af51b919d4fb8889936e00db2b15d14309dda68e92e13c7478f81e5a2d72544eefa73eb93287dd0396fc14
+EBUILD pps-tools-0.0.20120407.ebuild 662 SHA256 a3af0baf7feb85ed8f700d2fe598901df81bb5db55b27038f3a1753b832b99ab SHA512 0e13fdd0be326f43b216075377e29bd1c9cf99ba940733e04a0b52f575820f19144e5480b9e4702196657b21a8befe9ed437f43bce4ecea1f96353267c7433a4 WHIRLPOOL 8b929c4b5e195aa18ec03c38d7247cbe8b412d2b37d31be645fa08c62322a083f13039acf04e7cd76671db4c089cf91a6e41a882a6e711c161c5bb64a0559605
+MISC ChangeLog 3418 SHA256 4524cb154ade79fdeea9223c9a86edaf25f4a8b2b3e726be3c77c9051957732a SHA512 9cdf52965e2fa0943dabbc69e298df089b9d88a46ef0ea101d511ce16b7880e646fa83f659debcbe4de72902f0c4da9627a8f6dc85172eea0676ed82dc3d8cf7 WHIRLPOOL 5b62242024470b157e55a233a2b22b053d94b8b1e2d6e6fe430b5fd4452ccf4f53e391b24990ef76d27ee5095571188732731bcd408e126f3661134145519dd0
+MISC ChangeLog-2015 1273 SHA256 1690d73a6fc856daa756ef6edd964d0c05e50000287c353e4528c73b39cccdaf SHA512 df57b5b31c187d47531afea58db95659705d227f9d0605478050e919c5446304693bcc9069bb5195ef0461210e547d9758508905036a5c106768703cf64179e8 WHIRLPOOL 9133660f5baa5b40c9bcab0cecfd790ce78ae9efbbb1155aa970091abb8d5e660ed8ed5144c74ebcacd84d323cbc627af673f2be1d0088f2fe57cdb45a3503f0
+MISC metadata.xml 345 SHA256 6420fa692cd0acfc0c009ea153ef2d05dff469420f95ebb1ecd8c40751c2adfc SHA512 cd79fd584727403db3f11615834967c49fd5bfb191ef1eb347ac6908db75f34358d0a8480e749bfc7c0ab7e0a4dc4afc7ccdac65c624c249ed95faf40a06878b WHIRLPOOL 1d2a202c7eebdd3ac95bf261e2eb303e24ac90e52b05e0cfc43960bb1e19166ab9c238752fb9faebb1c3b0dae42669b56312de64d687a7a7a85dca3ebfa15e67
diff --git a/net-misc/pps-tools/files/pps-tools-0.0.20120407-build.patch b/net-misc/pps-tools/files/pps-tools-0.0.20120407-build.patch
new file mode 100644
index 000000000000..5a27bb65184b
--- /dev/null
+++ b/net-misc/pps-tools/files/pps-tools-0.0.20120407-build.patch
@@ -0,0 +1,53 @@
+From f4133df52856adfe9ffa2152f0e449f2f8adb49d Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 18 Aug 2012 17:04:43 -0400
+Subject: [PATCH] fix up makefile
+
+Make sure we respect CFLAGS/CPPFLAGS properly.
+
+Also fix up the depend include so we get reproducible behavior --
+the depend file is generated & included first, and we don't get
+weird behavior when we run:
+	git clean -x -d
+	make
+	make
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile |   13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0fb84b4..a07156f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,8 @@
+ TARGETS = ppstest ppsctl ppswatch
+ 
+-CFLAGS += -Wall -O2 -D_GNU_SOURCE
+-CFLAGS += -I .
+-CFLAGS += -ggdb
+-CFLAGS += -D__N_PPS=18
++CFLAGS ?= -O2 -ggdb
++CFLAGS += -Wall
++CPPFLAGS += -D_GNU_SOURCE -I. -D__N_PPS=18
+ 
+ # -- Actions section --
+ 
+@@ -12,11 +11,9 @@ CFLAGS += -D__N_PPS=18
+ all : .depend $(TARGETS)
+ 
+ .depend depend dep :
+-	$(CC) $(CFLAGS) -M $(TARGETS:=.c) > .depend
++	$(CC) $(CPPFLAGS) $(CFLAGS) -M $(TARGETS:=.c) > .depend
+ 
+-ifeq (.depend,$(wildcard .depend))
+-include .depend
+-endif
++-include .depend
+ 
+ install : all
+ 	install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
+-- 
+1.7.9.7
+
diff --git a/net-misc/pps-tools/files/pps-tools-0.0.20120407-install.patch b/net-misc/pps-tools/files/pps-tools-0.0.20120407-install.patch
new file mode 100644
index 000000000000..e268d6622a94
--- /dev/null
+++ b/net-misc/pps-tools/files/pps-tools-0.0.20120407-install.patch
@@ -0,0 +1,28 @@
+From 0b3a849153ffb42fb22fe42dc2b9e59ca23cec8c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 18 Aug 2012 17:15:19 -0400
+Subject: [PATCH] fix DESTDIR installs
+
+Make sure the dirs we install into exist first:
+	make install DESTDIR=$PWD/foo
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index a07156f..bebcce7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,6 +16,7 @@ all : .depend $(TARGETS)
+ -include .depend
+ 
+ install : all
++	mkdir -p -m 755 $(DESTDIR)/usr/bin $(DESTDIR)/usr/include/sys
+ 	install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
+ 	install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
+ 
+-- 
+1.7.9.7
+
diff --git a/net-misc/pps-tools/metadata.xml b/net-misc/pps-tools/metadata.xml
new file mode 100644
index 000000000000..53886946600b
--- /dev/null
+++ b/net-misc/pps-tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ago/pps-tools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/pps-tools/pps-tools-0.0.20120407.ebuild b/net-misc/pps-tools/pps-tools-0.0.20120407.ebuild
new file mode 100644
index 000000000000..1129176e3db8
--- /dev/null
+++ b/net-misc/pps-tools/pps-tools-0.0.20120407.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils
+
+GITHUB_USER="ago"
+PV_COMMIT='0deb9c7e135e9380a6d09e9d2e938a146bb698c8'
+
+DESCRIPTION="User-space tools for LinuxPPS"
+HOMEPAGE="http://wiki.enneenne.com/index.php/LinuxPPS_installation"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/tarball/${PV_COMMIT} -> ${PN}-git-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86"
+IUSE=""
+
+S="${WORKDIR}/${GITHUB_USER}-${PN}-${PV_COMMIT:0:7}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-install.patch
+	tc-export CC
+}
diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
new file mode 100644
index 000000000000..9c83e99b6152
--- /dev/null
+++ b/net-misc/proxychains/Manifest
@@ -0,0 +1,9 @@
+AUX proxychains-4.10-makefile.patch 1327 SHA256 1bdec48ea74e07e168aae5e43ddff04c74c05cecb03cf6deb136e3f0e9ce2dc5 SHA512 09defd6121aa024311fa27aaaf421ac74edcdd63d4fa3dacadec927cab119663ec77f887e74d4b42b249091237a76e62149124fdc329a7f5f21efa94d75ed081 WHIRLPOOL 29e3c25992693ec7c3ebbf99148f2b1251d81dad9e25e00444d55fd8040de89e0f26355b6bb9cac2ae59bbaab2244f05bd0031f0de4eadeb2381c99349ac6e70
+AUX proxychains-4.12-makefile.patch 1269 SHA256 19f686bee7600de563e7effa6de1f578ee9a4324f0cb344da85ee1f0d75fa02e SHA512 c25bae5b6d72c496cc4d92b0f8db22a113bd5e138cfccd0c5cebe45788f2dc88a4e2b194a86e635619e5ba575747bbf460b246efb35993544dab06b12009ea04 WHIRLPOOL 42fafa1df5960fec558ac57ceba06bd7cfee348fe36c2ad573f1437ce7a3ff6c94f9c894055aa5fea83b80a268f7928ea118da05f25dfe1cebe6962ee3c6acb0
+DIST proxychains-ng-4.11.tar.bz2 31856 SHA256 dcc4149808cd1fb5d9663cc09791f478805816b1f017381f424414c47f6376b6 SHA512 241365e8a8bbcead22c7844a2970f59bfc1ee9ef9a42a3f800823e70008bd976835d705a8b9894980c46307dce3a886514051023bafef113845531cb5d928e1c WHIRLPOOL 3e74678745ba09c7484f111f0ced0dd030efe0c3cd9ae427d996ca8240101ea0746e152dee84c5b0023305087e4bc0ed72e0b6589ec9b4ceba93549e3282ecc8
+DIST proxychains-ng-4.12.tar.xz 31816 SHA256 482a549935060417b629f32ddadd14f9c04df8249d9588f7f78a3303e3d03a4e SHA512 c1319065b2885fb16f1cd10092a25f49c20ace82dc67edcb2e8845fe79274fe63f5214d117eef3bfdffdc6aa8bf6904ea216047bd626043c5ecb36cd15d5560a WHIRLPOOL c24fef1501f08bf39e1d6c8a27d1d842c7036f3293d43b58c129b5eed49cf8e38c2909863ece08690d9b8c854a1e5e7339d027fe77034493f2d4fe25172a7853
+EBUILD proxychains-4.11.ebuild 1053 SHA256 ee1e6c866c040741e1cf5dca3d40a1373e41b194d425c6700dedf8930156d738 SHA512 7683acabd17b189a2af0fd2b15e2e3ed18064e7dc1d636cf8822a11aa60ac7c7386f352ae6342b23f129d25ee9e51dcdf7cc4cb1145b7f53a9dec043404370a5 WHIRLPOOL 793e04b19013b4f4b18019d22a77592a4d533a6c05ad7c494ea4324da54b9a3a3ac64c7586fb1674a6c23049741a2fe828f90f931b2e688a91359fc57cbd4401
+EBUILD proxychains-4.12-r1.ebuild 1056 SHA256 5123b6c5cc2c9153bea356fffd6fcc3fed56be48e1bf64ded71f3df25e61fc60 SHA512 003d70dd53e7ea0c6b7c6e987fab3155425ee691e0cb9e602a495a967460be74bfd55500501d7529169720df1b35754dfdfff1c9aab31a3366e7a5c698ddd3e6 WHIRLPOOL 713145b26da5d76b199b229d8d501a42b5db77df5ece6bfdd28a36eb60d150febc6f572f44f3a6ba5bbc38805ae79d3230ae8aa0703c54e4142bcecfd38e9792
+MISC ChangeLog 2777 SHA256 6f8bb592b40f6b2a45c7a44edcbe4d8230dcf81939c9b0402e915f02d614dc7e SHA512 20deac0da4559f72de4b65a5d39b904fffde4730cb4e282b2a64cf3667d2e2cf669e91f38cef6bb5144e0b164b99ea0d467c6a0dce88006588c4b9c0940ede5d WHIRLPOOL 34e527615de151d25974fe2f9e5be98feb6f0e868773f96911edd6d9e1233e6e06f2428f53db408f6c0eec18de91d201851931b036323e8817c7c26eacb6fed2
+MISC ChangeLog-2015 5685 SHA256 e2bfb86a46f17de15a14e4a8bc46cb281bae63677003f30b2761f6f9720ad4d8 SHA512 4eca7d7a33bd4f31268baa0cfa71ae99081e4d54977195a28161587c7df74fcbcf2a23a6d3b15bf16b6c928d6332e001bc22a7ec707402dfc7a1945d733d71e9 WHIRLPOOL dd86ebe047ac31b74d65c640913835d8a80b98c62b5cd00e909a1610accfc292f8f8707a71a8840f1ec17eadd658f39226f1a1b7d0f5ad430ecad28ae34f888e
+MISC metadata.xml 332 SHA256 f62857409ae3a31fe25c65f5717be4e944fed57572e8d3dcda36ac9ad796aa2d SHA512 fd3dc4c1f4bc62a11a150838c07c619a57dcac24070b56594e73c0fc75551432449da46424b3c1072d24c2c0dbc0ffc02af8473772c4adf5d72da86b68d0e5eb WHIRLPOOL dd1c4aeb95251dbdd56af8baddd21af6d8e53939a2d512656cf0cce8077480b7ddad08241342e9e3d90b2fcf4b8707427454455a0bd8a042a8b6e12a52538847
diff --git a/net-misc/proxychains/files/proxychains-4.10-makefile.patch b/net-misc/proxychains/files/proxychains-4.10-makefile.patch
new file mode 100644
index 000000000000..5a3a2e1a6e8b
--- /dev/null
+++ b/net-misc/proxychains/files/proxychains-4.10-makefile.patch
@@ -0,0 +1,45 @@
+--- proxychains-ng-4.10.orig/Makefile
++++ proxychains-ng-4.10/Makefile
+@@ -22,11 +22,9 @@
+ 
+ GENH = src/version.h
+ 
+-CFLAGS  += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
+-NO_AS_NEEDED = -Wl,--no-as-needed
+-LIBDL   = -ldl
+-LDFLAGS = -shared -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread
+-INC     = 
++CFLAGS  = -Wall -std=c99 -D_GNU_SOURCE
++LIBS    = -ldl -lpthread
++INC     =
+ PIC     = -fPIC
+ AR      = $(CROSS_COMPILE)ar
+ RANLIB  = $(CROSS_COMPILE)ranlib
+@@ -35,11 +33,11 @@
+ LD_SET_SONAME = -Wl,-soname=
+ INSTALL = ./tools/install.sh
+ 
+-LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
++LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX)
+ 
+ SHARED_LIBS = $(LDSO_PATHNAME)
+ ALL_LIBS = $(SHARED_LIBS)
+-PXCHAINS = proxychains4
++PXCHAINS = proxychains
+ ALL_TOOLS = $(PXCHAINS)
+ ALL_CONFIGS = src/proxychains.conf
+ 
+@@ -81,11 +79,10 @@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
+ 
+ $(LDSO_PATHNAME): $(LOBJS)
+-	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) $(USER_LDFLAGS) \
+-		-o $@ $(LOBJS)
++	$(CC) $(LDFLAGS) -shared $(PIC) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS) $(LIBS)
+ 
+ $(ALL_TOOLS): $(OBJS)
+-	$(CC) src/main.o src/common.o $(USER_LDFLAGS) -o $(PXCHAINS)
++	$(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS) $(LIBS)
+ 
+ 
+ .PHONY: all clean install install-config install-libs install-tools
diff --git a/net-misc/proxychains/files/proxychains-4.12-makefile.patch b/net-misc/proxychains/files/proxychains-4.12-makefile.patch
new file mode 100644
index 000000000000..98fdaacba6c0
--- /dev/null
+++ b/net-misc/proxychains/files/proxychains-4.12-makefile.patch
@@ -0,0 +1,43 @@
+--- proxychains-ng-4.12/Makefile
++++ proxychains-ng-4.12/Makefile
+@@ -22,10 +22,8 @@
+ 
+ GENH = src/version.h
+ 
+-CFLAGS  += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
+-NO_AS_NEEDED = -Wl,--no-as-needed
+-LIBDL   = -ldl
+-LDFLAGS = -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread
++CFLAGS  = -Wall -std=c99 -D_GNU_SOURCE
++LIBS    = -ldl -lpthread
+ INC     = 
+ PIC     = -fPIC
+ AR      = $(CROSS_COMPILE)ar
+@@ -35,11 +33,11 @@
+ LD_SET_SONAME = -Wl,-soname=
+ INSTALL = ./tools/install.sh
+ 
+-LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
++LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX)
+ 
+ SHARED_LIBS = $(LDSO_PATHNAME)
+ ALL_LIBS = $(SHARED_LIBS)
+-PXCHAINS = proxychains4
++PXCHAINS = proxychains
+ ALL_TOOLS = $(PXCHAINS)
+ ALL_CONFIGS = src/proxychains.conf
+ 
+@@ -81,11 +79,10 @@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
+ 
+ $(LDSO_PATHNAME): $(LOBJS)
+-	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) $(USER_LDFLAGS) \
+-		-shared -o $@ $(LOBJS)
++	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -shared $(PIC) -o $@ $(LOBJS) $(LIBS)
+ 
+ $(ALL_TOOLS): $(OBJS)
+-	$(CC) src/main.o src/common.o $(USER_LDFLAGS) -o $(PXCHAINS)
++	$(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS)
+ 
+ 
+ .PHONY: all clean install install-config install-libs install-tools
diff --git a/net-misc/proxychains/metadata.xml b/net-misc/proxychains/metadata.xml
new file mode 100644
index 000000000000..08334168ca3c
--- /dev/null
+++ b/net-misc/proxychains/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rofl0r/proxychains-ng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/proxychains/proxychains-4.11.ebuild b/net-misc/proxychains/proxychains-4.11.ebuild
new file mode 100644
index 000000000000..653885331f48
--- /dev/null
+++ b/net-misc/proxychains/proxychains-4.11.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs eutils multilib
+
+MY_PN=${PN}-ng
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
+HOMEPAGE="https://github.com/rofl0r/proxychains-ng/"
+SRC_URI="https://github.com/rofl0r/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.10-makefile.patch
+	sed -i "s/^\(LDSO_SUFFIX\).*/\1 = so.${PV}/" Makefile || die
+	tc-export CC
+}
+
+src_configure() {
+	# not autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		|| die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc AUTHORS README TODO
+
+	dolib.so lib${PN}.so.${PV}
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	insinto /etc
+	doins src/${PN}.conf
+}
diff --git a/net-misc/proxychains/proxychains-4.12-r1.ebuild b/net-misc/proxychains/proxychains-4.12-r1.ebuild
new file mode 100644
index 000000000000..e7dcaf5f22b5
--- /dev/null
+++ b/net-misc/proxychains/proxychains-4.12-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib
+
+MY_PN=${PN}-ng
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
+HOMEPAGE="https://github.com/rofl0r/proxychains-ng/"
+SRC_URI="https://github.com/rofl0r/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_prepare() {
+	default
+	sed -i "s/^\(LDSO_SUFFIX\).*/\1 = so.${PV}/" Makefile || die
+	tc-export CC
+}
+
+src_configure() {
+	# not autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		|| die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc AUTHORS README TODO
+
+	dolib.so lib${PN}.so.${PV}
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	insinto /etc
+	doins src/${PN}.conf
+}
diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
new file mode 100644
index 000000000000..6ba7e58ee591
--- /dev/null
+++ b/net-misc/proxytunnel/Manifest
@@ -0,0 +1,6 @@
+AUX proxytunnel-allowTLS.patch 592 SHA256 fc8ee55c56a230410bb89b95c7824fa976cecf0ef1c0b2582afd519ddee0f07a SHA512 67b0103054c56c69cd9c0d1aa144498151f105004b400bcdbbb3df519d37424630554e101e5617faf075fd978edddfc4d06cca7524c51e28cd33c1165b6a22f9 WHIRLPOOL e9afde509b74248bba62511d3e60ce030263b18f95e57b67ab4538b86c57c782a9326ab0ecd61c08cc813939e6fe9467b240eae9fefe4c8f7728221ecc740b30
+DIST proxytunnel-1.9.1.tar.gz 48025 SHA256 4a68d2c33bf53c290346b0a76e2c3d25556e954ba346be68cf65ae8f73ae8007 SHA512 819dd11bc13fc279d2d475b89909c0eea414ff71d772d4bfed742dd8d425669dc502f2c22d983bb8c58e426a2bc7209526cb21492ca5f8e92ea1b9ea961fcfdc WHIRLPOOL 5ec64622c062c45bf21275efc785ccb91bd9f61ff13b2cf40b45ea3d73edd06ef6f1b569f5e80ccd3db51a64b38601462edfe2adebf3cdf18ae34b88184a0940
+EBUILD proxytunnel-1.9.1-r1.ebuild 1062 SHA256 68c8ad01ef66b6381b1f884baf2947de5287facdfdcc5cd74bab66151513d0f3 SHA512 8bc963c149db9d497a969d6f24b3cedd64d0a9d099d94825cf85b89415e98d9b11defc545f424dd1366aa1c28f089692f2efd0f8bc3e488341d7b09bdddf1518 WHIRLPOOL 5b2fd5664fae07a553371e568566c47e2507f1506e2e0ab358c9f988209afb6e7586b99aba3cccdca3e28f2a081051b2f5c84514dd55e5b18eed152beeee3b20
+MISC ChangeLog 2888 SHA256 e60cae9dc01b25286ea15d8edecfae11c29ea0ed5ee697074469a789b6b5ed04 SHA512 7f9cde32d9cf520fde165aec582b09a4b80957c4b30cc9caae48866c22e3c2cd1d1f413b261e94151882a4a66fa7dab0a5f40eb0e25037ea483abb4a7544c94a WHIRLPOOL de4b2970094512a187c4bd7d617c8ccbc3f109de94deebce9ff90fd5d3c3f513a4d27026296fa535b8e4a44ea1c6ce36995a68b757389d2c3978a8c350586a59
+MISC ChangeLog-2015 4127 SHA256 373c5a798afb0bae5e5f1d82c280d66f68d97f09e805381781e2f3f402cf96d9 SHA512 25bc7eb7db52e33ada06b174f10afca673d5d6a9e8fc2bb957070d0b8c23b7a6528da433e46833f1541a64576623e891297efc11af7c85924d24169415649694 WHIRLPOOL 7c32527cb86e44cb7cfeec52fc3face2aa121338f6cf1b1bbf0054f8e9fe24d527d5493694300fc2cb848c5171f3d54a59d474e06c0beac18c3a1fab3d78f6dc
+MISC metadata.xml 722 SHA256 477f1398f6c1095193b743fb4ec506f1dd453f2c412d24eb2c8df5e9fc07efc6 SHA512 b51f63b3865144d4a4f21f851d7316ebab5e2c194e5019333ce80d6df7f41bf1b9217ba864dafbc8db7569a89a22861fc0a6bd07664040172e472fe9de00c7eb WHIRLPOOL b34695467493755e6b5e4b5880a5a30a4593711fbbd0da8acd0a4a903999ca15eba4ee4ac613f1d51a67b3537f129e526fdcbbe6d25ee39dad5004021bcf746c
diff --git a/net-misc/proxytunnel/files/proxytunnel-allowTLS.patch b/net-misc/proxytunnel/files/proxytunnel-allowTLS.patch
new file mode 100644
index 000000000000..b6865a73fc5f
--- /dev/null
+++ b/net-misc/proxytunnel/files/proxytunnel-allowTLS.patch
@@ -0,0 +1,22 @@
+From 2a26224b5ff103d2b8e2ff7be56e616d1ecde1f4 Mon Sep 17 00:00:00 2001
+From: wicher <wicher@gavagai.eu>
+Date: Sun, 26 Apr 2015 13:07:13 +0200
+Subject: [PATCH] Allow TLS
+
+---
+ ptstream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ptstream.c b/ptstream.c
+index 4c87c80..6d55137 100644
+--- a/ptstream.c
++++ b/ptstream.c
+@@ -151,7 +151,7 @@ int stream_enable_ssl(PTSTREAM *pts) {
+ 	
+ 	/* Initialise the connection */
+ 	SSLeay_add_ssl_algorithms();
+-	meth = SSLv3_client_method();
++	meth = SSLv23_client_method();
+ 	SSL_load_error_strings();
+ 
+ 	ctx = SSL_CTX_new (meth);
diff --git a/net-misc/proxytunnel/metadata.xml b/net-misc/proxytunnel/metadata.xml
new file mode 100644
index 000000000000..faa64f120cb8
--- /dev/null
+++ b/net-misc/proxytunnel/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vikraman@gentoo.org</email>
+		<name>Vikraman Choudhury</name>
+	</maintainer>
+	<longdescription lang="en">
+		ProxyTunnel is a program that connects stdin and stdout to a server
+		somewhere on the network, through a standard HTTPS proxy. We mostly use
+		it to tunnel SSH sessions through HTTP(S) proxies, allowing us to do
+		many things that wouldn't be possible without ProxyTunnel.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">proxytunnel/proxytunnel</remote-id>
+		<remote-id type="sourceforge">proxytunnel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..40ac24ea6cf2
--- /dev/null
+++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Connect stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"
+HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ http://proxytunnel.sourceforge.net/"
+SRC_URI="https://github.com/proxytunnel/proxytunnel/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static"
+
+RDEPEND="dev-libs/openssl:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/asciidoc
+	app-text/xmlto
+	"
+
+src_prepare() {
+	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
+	epatch "${FILESDIR}"/${PN}-allowTLS.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die
+	dodoc CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO
+}
diff --git a/net-misc/ps3mediaserver/Manifest b/net-misc/ps3mediaserver/Manifest
new file mode 100644
index 000000000000..9fd99c643093
--- /dev/null
+++ b/net-misc/ps3mediaserver/Manifest
@@ -0,0 +1,7 @@
+AUX ps3mediaserver.confd 169 SHA256 30518c4b1f528a6d906f55a6764c73a9c6f1cc75ec75de30618fc95c5fcf6d40 SHA512 3ecbd0a99c422f2fad3082ea70d0755d3af9aca3d426865e57fbe8669647603df90006c79064166ca6866e4e61a86f0dccfb5f8c8429476de69b91c4e6e10f37 WHIRLPOOL 15fc071d76e54f32994007e5dfbcd877602d21d90d2bdf6b6802137cd7fc9877e984116baeb08647794bd4bd24f717d63f0fcadbdfbd6c4f5521f57a0d41113c
+AUX ps3mediaserver.initd 399 SHA256 8021c07b503fcf3ed4f2e8941a19c9f9309f47a1e62f1dde040b375b2134457b SHA512 bd260d16f7d4b29d922ede6531d774031f548889fdd9156dd025ec7135824362dc4026cc9577ce85733a00b3eed70a8ce96fb894ccfeb81355b818013de12406 WHIRLPOOL 0218f04c0535997ee3828b4309e90f590ad6747eb14788225b2f3ca7212d34a1c9fbe500c1f4369026b7015fc2b691599e4595d0c425476dff27fff2d8a5ec62
+DIST pms-1.90.1-generic-linux-unix.tar.gz 15789602 SHA256 e90b20e548f66514c66524634f8458d9d133846fa1fc2fcabdbab19907047311 SHA512 af5748989dff1b106ba44a952fc68b43d11a929dec56440cf11ffd6f0a0c561febce54557855bf1afc2614cfb904b5997265f0bdf4ecf45535e12bbabc0fd11f WHIRLPOOL 27d84d5c115b76a5e60c5a5ed8a2a39bb67d92e0a7cb59ce73037668deb03522c8a5a5de490893e23e3cd8e57aee50bd6e85e33ee8d3dbec2b5bc1dacf1d5b51
+EBUILD ps3mediaserver-1.90.1.ebuild 2060 SHA256 80179c8f4e9162fecdd3fcdb51226021cac198b0c493dbb4762177195375271e SHA512 8879d3781dda5a43c6a9d7039d8d0565f5844a97f9d291baf3fb75d8a0b0c1125bdd487ad47c2b99c9106c2a04e2d465296b873945cfff826fc35bef017ec60f WHIRLPOOL f23d714242e5be94f293d452102f51dd8dba9e937f620b588c5b518b5d215de8265e63b55ae5514b0a0c65b27c28efbb173be49f63ee2b87487899d12959b17b
+MISC ChangeLog 3481 SHA256 b8b0808403a199e8a0848b382de7c50c271a5a0a9e007dd017e1f27f577a9111 SHA512 2b43139c82a7e310581f762b21331eb5c4b5b47be8597ba8ce17f4d5edc47a153954becb8f9d8f3942d3ae34b714562a5329f5bfadb228060e096b952f6356c3 WHIRLPOOL b725f0e3a9261426c1f0e8a454090cdd58b719d4f476042858c24c9ee82d10a16e85e497714bc694f987061070edb2df790554a8c452523687d061279729170e
+MISC ChangeLog-2015 3755 SHA256 275a97d1f99adfcd2500c7b6c14828e91b00744df4d498f720c562e7c3167858 SHA512 7f30f529a7bc6df4934ead2eff01950930fe84a22f3726549d91e9b712efcc3b773a4c2ae265f9bac83b8f1c95b4d0b6a557c14941bfcdeb3310069b60c15638 WHIRLPOOL dde95987a0ce7a5b55b8ab546dbfaa0b6d280271e2974225ddb4707f75a4c88940dbdaf49225bb08cd9a3341c323c2260f9f791cd2f20325b33b241e6d636625
+MISC metadata.xml 840 SHA256 afad36e03b4494f143e25d39cbf20dd36b14a18d16c4b4ca8e991f061af18bd9 SHA512 eb55917d813dce827cad28056f6583081760fbe344b4b50af75844faa98485a7d915ece3bc37d9c880e2344335b6f57a592849022e4eb9b367763cc95b783f89 WHIRLPOOL ffeceb83061bea6c490b63358e47d590c3d86b9d1e7d25a98eacac618f191393b5a02559e80f8d058f0457d0b0cf9a7ff39ada2173dbe07a3d50c044d9a284e9
diff --git a/net-misc/ps3mediaserver/files/ps3mediaserver.confd b/net-misc/ps3mediaserver/files/ps3mediaserver.confd
new file mode 100644
index 000000000000..609393750f4d
--- /dev/null
+++ b/net-misc/ps3mediaserver/files/ps3mediaserver.confd
@@ -0,0 +1,6 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PMS_USER=
+PMS_GROUP=
+PMS_PIDFILE=/var/run/ps3mediaserver.pid
diff --git a/net-misc/ps3mediaserver/files/ps3mediaserver.initd b/net-misc/ps3mediaserver/files/ps3mediaserver.initd
new file mode 100644
index 000000000000..59df7b7b4503
--- /dev/null
+++ b/net-misc/ps3mediaserver/files/ps3mediaserver.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/ps3mediaserver"
+command_args="console"
+pidfile="${PMS_PIDFILE:-/var/run/ps3mediaserver.pid}"
+retry="10"
+start_stop_daemon_args="
+	--background
+	--make-pidfile
+	${PMS_USER:+--user} ${PMS_USER}
+	${PMS_GROUP:+--group} ${PMS_GROUP}
+"
+
+depend() {
+	need net
+}
diff --git a/net-misc/ps3mediaserver/metadata.xml b/net-misc/ps3mediaserver/metadata.xml
new file mode 100644
index 000000000000..251933666ff1
--- /dev/null
+++ b/net-misc/ps3mediaserver/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="multiuser">Allow renderer customization per-user.</flag>
+		<flag name="transcode">Install optional dependencies for transcoding support via media-video/mplayer</flag>
+		<flag name="tsmuxer">Install optional dependencies for transcoding support via media-video/tsmuxer</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">ps3mediaserver</remote-id>
+		<remote-id type="sourceforge">ps3mediaserver</remote-id>
+		<remote-id type="github">ps3mediaserver/ps3mediaserver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild
new file mode 100644
index 000000000000..d407c37977c3
--- /dev/null
+++ b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="DLNA compliant UPNP server for streaming media to Playstation 3"
+HOMEPAGE="https://github.com/ps3mediaserver/ps3mediaserver"
+SRC_URI="mirror://sourceforge/project/ps3mediaserver/pms-${PV}-generic-linux-unix.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="multiuser +transcode tsmuxer"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.6.0
+	media-libs/libmediainfo
+	media-libs/libzen
+	tsmuxer? ( media-video/tsmuxer )
+	transcode? ( media-video/mplayer[encode] )"
+
+S=${WORKDIR}/pms-${PV}
+PMS_HOME=/opt/${PN}
+
+src_prepare() {
+	if use multiuser; then
+		cat > ${PN} <<-EOF
+		#!/bin/sh
+		if [ ! -e ~/.${PN} ]; then
+			echo "Copying ${PMS_HOME} to ~/.${PN}"
+			cp -pPR "${PMS_HOME}" ~/.${PN}
+		fi
+		export PMS_HOME=\${HOME}/.${PN}
+		exec "\${PMS_HOME}/PMS.sh" "\$@"
+		EOF
+	else
+		cat > ${PN} <<-EOF
+		#!/bin/sh
+		export PMS_HOME=${PMS_HOME}
+		exec "\${PMS_HOME}/PMS.sh" "\$@"
+		EOF
+	fi
+
+	cat > ${PN}.desktop <<-EOF
+	[Desktop Entry]
+	Name=PS3 Media Server
+	GenericName=Media Server
+	Exec=${PN}
+	Icon=${PN}
+	Type=Application
+	Categories=Network;
+	EOF
+
+	unzip -j pms.jar resources/images/icon-{32,256}.png || die
+}
+
+src_install() {
+	dobin ${PN}
+
+	exeinto ${PMS_HOME}
+	doexe PMS.sh
+
+	insinto ${PMS_HOME}
+	doins -r pms.jar *.conf documentation plugins renderers *.xml
+	use tsmuxer && dosym /opt/tsmuxer/bin/tsMuxeR ${PMS_HOME}/linux/tsMuxeR
+	dodoc CHANGELOG.txt README.md
+
+	newicon -s 32 icon-32.png ${PN}.png
+	newicon -s 256 icon-256.png ${PN}.png
+
+	domenu ${PN}.desktop
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "Don't forget to disable transcoding engines for software"
+		ewarn "that you don't have installed (such as having the VLC"
+		ewarn "transcoding engine enabled when you only have mencoder)."
+	elif use multiuser; then
+		ewarn "Remember to refresh the files in ~/.ps3mediaserver/"
+	fi
+}
diff --git a/net-misc/pssh/Manifest b/net-misc/pssh/Manifest
new file mode 100644
index 000000000000..8f642f3b6d3d
--- /dev/null
+++ b/net-misc/pssh/Manifest
@@ -0,0 +1,5 @@
+DIST pssh-2.3.1.tar.gz 23427 SHA256 539f8d8363b722712310f3296f189d1ae8c690898eca93627fc89a9cb311f6b4 SHA512 c39e1c2b0a3bc2bd736f1e7d2f402db6a128e81d6a80ce7e97f39e7fae93f7a20037b43b5725bed5ba911f54e36a9b65c509d858a53c696989b76b1322e7680f WHIRLPOOL ff5eb7c2d11b47d74793f44acc9091cc3f0707b7a70a1d0d4074d2d19a4d0cebe381b30d211a140ff9ebfa90f1cee566f0b9c42a354fef9a4f2099e5c1aee7c7
+EBUILD pssh-2.3.1-r1.ebuild 770 SHA256 7114d995d3e1a0fbd7b1939158b7fac5719343ab604bcf64a79586659832982b SHA512 bf34b050e61e4d3d8019e2432f5f8dda6e1aa567fb5f5f654de696ddfdd819513c742bbb1d57b92c9f1ec4c5c569b7c7394a4dc74fee7b9c58d11462e2d676e9 WHIRLPOOL ec5a9b224234d0a6a28048ecd9e740b2f4b9e855ee2dfb647a611d808488e222ea2050a9c3eb3fb5b76e367ba28d1f818452d84da85a5e9df2427ed94a10eed9
+MISC ChangeLog 2742 SHA256 b039b94c75836ea2ade84fa7837c9500e5f1411b3ee794aebd4790d51ea5870d SHA512 3f968bacc0e3c8503839a3f7285761ea73cef3c55c49bce552ff5907750ac37aea6a05e7eab610e2800f932546874a3b1a60e2f0c1dec73b8f4fde5a8029ef4f WHIRLPOOL fe6c46f41200341c693899ffa874e641e73ce2ef414202cea249b8da6231cf00fcc59998f235c759082f1321830b52d9ad1de6e94a91104d4bff59f527fe5a99
+MISC ChangeLog-2015 4081 SHA256 492c5a083095cf31fdcee1d90565c3c194e5e5bb81828d7b626ae65884ce3880 SHA512 b997625b313b6cded36c2cd047b41513eba20e62695d454adcccc48f703f48e3b58b084efdff62b72a0da3b9e1f6b447a2a7dc871524f6c7ba4cd069a1220977 WHIRLPOOL 889c80a785fdedcc5b3caa5d34e241cc952a68356be748828a9b3830439b40a298ae828746ccecfa470fa31880dd2dd26642de0e950f2ce4a6b70d22c5844621
+MISC metadata.xml 339 SHA256 e2d00caf8c47da917523a68257bde755e0a7d572c647168f305d1f9d7b086064 SHA512 bcea2011bb23b0796bbfa66c6cadedbd03d06ab15f9254c444d6cfe6c1985a41ad37dbafc214cbcdba73f3cb789ac3ec4a42fdb5a20cf9d38a88ef0d23c588ff WHIRLPOOL 04f8f47b4a1702355c9f858ae8122843a85cb5273277065dd67ea51e1ffc1cdc955d16cb841018be8d0d7f0d56d72622b18ba47c774b52a576f65ddb3bc843b8
diff --git a/net-misc/pssh/metadata.xml b/net-misc/pssh/metadata.xml
new file mode 100644
index 000000000000..b6d9446e89b5
--- /dev/null
+++ b/net-misc/pssh/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">parallel-ssh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/pssh/pssh-2.3.1-r1.ebuild b/net-misc/pssh/pssh-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..a79e2bcdd73c
--- /dev/null
+++ b/net-misc/pssh/pssh-2.3.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="PSSH provides parallel versions of OpenSSH and related tools"
+HOMEPAGE="https://code.google.com/p/parallel-ssh/"
+SRC_URI="https://parallel-ssh.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="net-misc/openssh
+	!net-misc/putty"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Requires ssh access to run.
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	sed -i -e "s|man/man1'|share/&|g" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/net-misc/ptpd/Manifest b/net-misc/ptpd/Manifest
new file mode 100644
index 000000000000..99459e14a83d
--- /dev/null
+++ b/net-misc/ptpd/Manifest
@@ -0,0 +1,9 @@
+AUX ptpd2.confd 61 SHA256 0c0c1a6e6260b90c8420066ab64acd1c0f70ac7cf6af5dddd64a627d4dcf628f SHA512 40ea56a92222eb10dc429343a23bdcc0e75f626e34fea139a09ca545a50aee0550253965de036218889554a2c0c7928c0051e3e71d9b9cd0a9d44d334e0bac47 WHIRLPOOL 61155a827f264ae2e2a1763722fb561f2446b6d50f344d79f3423989d5de30a837cf92b0edd0561c40a910380e04a7ed5d2a6d7bbbbf8f62df10adc86f5f8f3b
+AUX ptpd2.rc 1372 SHA256 186237698e46fcc073dcd2f628fe5e4b1f7acb49f5ea4d2946daeae5b26bf681 SHA512 37af776a265fbabdabed381d98cf50d78a512634fd84ce07466a47a0e96a6b2cccfb762732a043139b6c136eefdc6443ab9a5cba1c30234b6c66acc23e98a5b2 WHIRLPOOL c17e33bd0917725f3e3c1a4a8f9e94053a02bf5620eefd5fc07263ee78843dda6fda3f85ab33a5d9bc5f9c176d7b156cf15454885f660083724805e6672efc28
+AUX ptpd2.service 228 SHA256 3cda793010dbcc4be0f032f249fa8235d444846fa97a610a7a00fbf30c1ce29b SHA512 72d609c9b803921b55cc0528aafa5cbbff0b7ed2f1267fa5f06e410ec640295642717928bbf38c849f632d157132f01f60a8bad826428b846d8248bac27e932a WHIRLPOOL e5fd83c5ef4e060b7c72e339ba2ec378ad198deb6fbb7da3bda2d3f5b2355f6a52d58d9d80d1dad4234dc06b88e9ef6db1a79e075c1fc23175a66c5664d98d7e
+DIST ptpd-2.3.1.tar.gz 884161 SHA256 267ad61d09d97069acec5d4878dceda20d0ddbebd27557d80230847848cee6c2 SHA512 25c128ce1920ae2c1469e986bfa5d5b8ebca04ec14b838fb8232b36e0a1ef94646507e1b25034846d11cf0f71d7e2da983b9f6408f8fcfc608904ecfec2a15c4 WHIRLPOOL dfc107c0011db56b1e943bf9ac794c51631e0320e8ae19c5db2d67af55cd15a73e2e71117abca0db787896ea0366987eee29d91f15eea336c96be7093accfd6b
+EBUILD ptpd-2.3.1-r1.ebuild 1358 SHA256 34eda559d8640329822e633c4e7f1f33953af73652319188f3773fcbc075d1d6 SHA512 157ebd631b8066ce73f1d1bc8133e23dea20fcf34585e219c59a792ff90d0b80be4fd74bed2d30e0f256c99e5f24ac2a861fba14f69904ad899330b32dcafc97 WHIRLPOOL 2035ed9e25bfda51fad4b51f42a3622c85a26f53881cbbe4dd084a8cdc076072f4008a3a391194540aba09a2d6421e09293e7dfbe7ea176a3e244cb2336151dd
+EBUILD ptpd-2.3.1.ebuild 1273 SHA256 9fc01d296df030342d4ada8b166af4e55004db6ffb68636c9efc7b3df848e24b SHA512 d4fd3b4a44e0fd2462ede9035968c18787771fcc9ef80093a42f43da13bc7757ca00aaae02016efb79d0f63aa7293af5ebc29563d154b92d5e51cc6dd01a91f2 WHIRLPOOL 1fa3974887c5d081ef2119aebfec51bbec9f27e6a4301d92c46ae033eb4a1b55bce670804b19a0461f60cc99312c07967c6d604e9cfaa49e4f13ac1771b688b5
+MISC ChangeLog 3729 SHA256 b75f161221cb7948acb2e0dbce3ffaf09de93bcbb27a8ddf5c16a1e4ab6f0d88 SHA512 e371d3ed8799e27696c42a3af668687e6c730ff53848af15aa599172d62bf5e00118b5cb54580af923b9e7a2fc1038ac7856394f6eb25aba89881a2919cbca61 WHIRLPOOL 3595107e7fa82104343337d3a16ec5ec58e3e92ada8dbdc252725a42acb5f5886b9afdd29ebd360acd90cd39515f402fce86ca3426e5d14f10714038eb6a7c96
+MISC ChangeLog-2015 1091 SHA256 b08d875b305af3c91274a6c6b73c9553f551f8dac9d6cf94d8da20ccc6504cf3 SHA512 ec50a766a69dfb2f5f0d47dff5caa8fdc0083520bd007367e0130b6751efa97e3381154a7c147e2eff796eab7fa497b5134a144ec08d2dd746250d9c32e62b7f WHIRLPOOL b3d74ff6c7c0e278a47f667ad766c1e419feb76b06b19a2e29f80603257e99eca7deb4ee498faa634e89754d685f57a0dad219853f18f055d26a2104ed9c0c9c
+MISC metadata.xml 988 SHA256 d894cf97f2c8bb0d5df28c72fdf244cba210b33deccaf538c1cdf1cfd21d0f01 SHA512 a96ee23e21b8230c4756022e5678df1f72c61576b0aae1de04c10328417f64535129ed4a10beb7545c7316e36b9fe658e8c5ced5f28177ff84b106caf525ec06 WHIRLPOOL fefe3bba682208ad3fcc4db3735a4f9ec49ed50ea65c154f09fc20f5c42e8090d034ba4aa271479bb7a7c8a34d8cb562891bccd4235297f68c611ff1e4cd9ad9
diff --git a/net-misc/ptpd/files/ptpd2.confd b/net-misc/ptpd/files/ptpd2.confd
new file mode 100644
index 000000000000..22fe2d49285f
--- /dev/null
+++ b/net-misc/ptpd/files/ptpd2.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/ptpd2
+
+# Options to pass to ptpd2
+PTPD_OPTS=""
diff --git a/net-misc/ptpd/files/ptpd2.rc b/net-misc/ptpd/files/ptpd2.rc
new file mode 100644
index 000000000000..bf8e14332298
--- /dev/null
+++ b/net-misc/ptpd/files/ptpd2.rc
@@ -0,0 +1,56 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PTPD_CONFIGFILE=${PTPD_CONFIGFILE:-/etc/${RC_SVCNAME}.conf}
+PTPD_STATEFILE_DIR=${PTPD_STATEFILE_DIR:-/var/run}
+PTPD_STATEFILE=${PTPD_STATEFILE:-${PTPD_STATEFILE_DIR}/${RC_SVCNAME}.status}
+PTPD_PIDFILE_DIR=${PTPD_PIDFILE_DIR:-/var/run}
+PTPD_PIDFILE=${PTPD_PIDFILE:-${PTPD_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+command="/usr/sbin/ptpd2"
+command_args="--global:lock_file=$PTPD_PIDFILE --global:status_file=$PTPD_STATEFILE -c $PTPD_CONFIGFILE $PTPD_OPTS"
+pidfile="${PTPD_PIDFILE}"
+description="Precise Time Protocol daemon"
+
+
+depend() {
+	use net dns logger
+}
+
+checkconfig() {
+	ebegin "Checking ${SVCNAME} configuration"
+	msgout="$($command -k $command_args 2>&1)"
+	RETVAL=$?
+
+	# colorize output
+	echo "$msgout" | while read ln; do
+		if [[ "$ln" == *ignored* ]]; then
+			ewarn "$ln"
+		elif [[ "$ln" != "Configuration OK" ]]; then
+			eerror "$ln"
+		fi
+	done
+
+	eend $RETVAL
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec ${command} \
+		--pidfile ${pidfile} \
+		-- ${command_args}
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading ${SVCNAME} configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-misc/ptpd/files/ptpd2.service b/net-misc/ptpd/files/ptpd2.service
new file mode 100644
index 000000000000..35fb34fd6897
--- /dev/null
+++ b/net-misc/ptpd/files/ptpd2.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Precise Time Protocol daemon
+Documentation=man:ptpd2(8)
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/ptpd2 -C -c /etc/ptpd2.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ptpd/metadata.xml b/net-misc/ptpd/metadata.xml
new file mode 100644
index 000000000000..6633371ca920
--- /dev/null
+++ b/net-misc/ptpd/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>honza.breuer@gmail.com</email>
+		<name>Jan Breuer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="debug">Enable debugging informations</flag>
+		<flag name="experimental">Enable experimental features</flag>
+		<flag name="ntp">Enable NTPD cooperation</flag>
+		<flag name="snmp">Require <pkg>net-analyzer/net-snmp</pkg> to enable SNMP configuration</flag>
+		<flag name="statistics">Enable compution of statistics</flag>
+		<flag name="pcap">Require <pkg>net-libs/libpcap</pkg> to allow layer 2 (raw Ethernet) transport</flag>
+		<flag name="slave-only">Enable slave only operation (remove master mode functionality)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ptpd/ptpd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/ptpd/ptpd-2.3.1-r1.ebuild b/net-misc/ptpd/ptpd-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..9c358e02c8f6
--- /dev/null
+++ b/net-misc/ptpd/ptpd-2.3.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Precision Time Protocol daemon"
+HOMEPAGE="https://github.com/ptpd/ptpd"
+
+SRC_URI="https://github.com/ptpd/ptpd/archive/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug experimental ntp +pcap snmp slave-only +statistics"
+RDEPEND="
+	pcap? ( net-libs/libpcap )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	ntp? ( net-misc/ntp )"
+
+S=${WORKDIR}/ptpd-${P}
+
+src_prepare() {
+	eapply_user
+	sed -i -e 's/U64/struct counter64/' src/dep/snmp.c || die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	econf \
+		--enable-daemon \
+		$(use_enable snmp) \
+		$(use_enable experimental experimental-options) \
+		$(use_enable statistics) \
+		$(use_enable debug runtime-debug) \
+		$(use_enable pcap) \
+		$(use_enable slave-only)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	insinto /etc
+	newins "src/ptpd2.conf.minimal" ptpd2.conf
+
+	newinitd "${FILESDIR}/ptpd2.rc" ptpd2
+	newconfd "${FILESDIR}/ptpd2.confd" ptpd2
+
+	systemd_dounit "${FILESDIR}/ptpd2.service"
+}
+
+pkg_postinst() {
+	elog "Do not forget to setup correct network interface."
+	elog "Change the config file ${EROOT}etc/ptpd2.conf to suit your needs."
+}
diff --git a/net-misc/ptpd/ptpd-2.3.1.ebuild b/net-misc/ptpd/ptpd-2.3.1.ebuild
new file mode 100644
index 000000000000..3fcbbbc2a23e
--- /dev/null
+++ b/net-misc/ptpd/ptpd-2.3.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic systemd
+
+DESCRIPTION="Precision Time Protocol daemon"
+HOMEPAGE="https://github.com/ptpd/ptpd"
+
+SRC_URI="https://github.com/ptpd/ptpd/archive/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug experimental ntp +pcap snmp slave-only +statistics"
+RDEPEND="
+	pcap? ( net-libs/libpcap )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	ntp? ( net-misc/ntp )"
+
+S=${WORKDIR}/ptpd-${P}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	econf \
+		--enable-daemon \
+		$(use_enable snmp) \
+		$(use_enable experimental experimental-options) \
+		$(use_enable statistics) \
+		$(use_enable debug runtime-debug) \
+		$(use_enable pcap) \
+		$(use_enable slave-only)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	insinto /etc
+	newins "src/ptpd2.conf.minimal" ptpd2.conf
+
+	newinitd "${FILESDIR}/ptpd2.rc" ptpd2
+	newconfd "${FILESDIR}/ptpd2.confd" ptpd2
+
+	systemd_dounit "${FILESDIR}/ptpd2.service"
+}
+
+pkg_postinst() {
+	elog "Do not forget to setup correct network interface."
+	elog "Change the config file /etc/ptpd2.conf to suit your needs."
+}
diff --git a/net-misc/puf/Manifest b/net-misc/puf/Manifest
new file mode 100644
index 000000000000..2181f93725a6
--- /dev/null
+++ b/net-misc/puf/Manifest
@@ -0,0 +1,6 @@
+DIST puf-1.0.0.tar.gz 153540 SHA256 3f1602057dc47debeb54effc2db9eadcffae266834389bdbf5ab14fc611eeaf0 SHA512 c26a9c2dc0ae12ea20478cd4328891c88d32c0217e215bff1ee817463445a748e4d0893ac0af1fd47b8822e5bfed6a44c7cc2d22c915a825bf943b159d61e135 WHIRLPOOL 6e9a6df3a79c09ec178a4eb6adb125a78bf4fab4581cb6ad5782a388f4d34af1eacd1a4a6aea35d8f91aac6384d769c946280da84997f7ce879e2bad43a2acf7
+EBUILD puf-1.0.0-r1.ebuild 362 SHA256 de984371d1b0bf0b8d45864d632490a53459148dbbd15a19a410cb18a9baddfa SHA512 0fb1fcb36f671b020d55b280a40b30c390501389220fbc24b0fa3623951b44bf75dce7647354eda1e258d17583b9e86422ed389e89536fa81e1da8809f5952ac WHIRLPOOL 88ad6bc0b04185dc8b33d7898d27786e341fbbc83fa6c11dd5504629dd1c4ffac3624bfdcb207ebb07d2773e181403a437e9fd124d405a9ab6959495351b7242
+EBUILD puf-1.0.0.ebuild 370 SHA256 7de15a59fee90c5bc261784d1bd3ff2db53882ea31c29fbae38de0a72946b5bd SHA512 4420d12d3e535130cf6a9bad2ad7a2e014863a14b6d4b04e06eaf099c6a4f5bdfddf16b9f103457212cc80be7b2a0a983376b0879fda16d9664a1661393c0161 WHIRLPOOL b66ceb9f7a8ba4de7332bb72692b9d3152c1cba65303c4d90013da80f65b9abce9990d05ae5caf728d6918a41e3c22c68bd97e3e4a8050527074a4208d7d1483
+MISC ChangeLog 2510 SHA256 9047b1251481017dc60e78b34dcfc4ec666a92b2b98ca56d323d3071b1a27e9a SHA512 9656d8ef10f1bf6f403def959230d013d60faf2058468480e0bf89dd82f610488480df3f87fca8bad26897d3aacec76399baa1d0961c272f2ac646ee48699863 WHIRLPOOL 938974cdf911e66b770964f6980936a00b15d56f84fe4dd96746b7372b4836b27dfbd5b1d117f4c196e3658da06f70add457fe11e48ab0b917379b14ac4e21a9
+MISC ChangeLog-2015 1466 SHA256 da579a0caa1d292d0459bbfd1cffdcb0399b3a9a605bb355593b09140f7abde8 SHA512 8658541facf8fb8c23086d622d0732a6880b12fff928a9d869c85fd6a8cae2f042b876dc31b50ad9a4124f8daeb09792a6fb1b362e710077b35bb43023824313 WHIRLPOOL d7a1da6adcde0f36bd5414cfba7643947f11617b10a512837f5b0eadbdb6c8a78091399d09f0f1f135888fd65aa424553e10dd0c18f1c2fb6884e0f95f9d2d86
+MISC metadata.xml 240 SHA256 2554c3bd6547a5c8c4f5f4feaa59370ad6f0486de2c22ed409f3b43a7a5f4078 SHA512 343e2b423c83e47e311bcca8a127c72104474fe5d956e039c259c3dd7dbe01c1a16a7d383900345f385453f5175920cd51629e84dfabe8f082878e504e6845cf WHIRLPOOL cea9cbc2c3152af81c17026e945a987f57e2b9c5ac62871025835e492e58cfb90382e9642e668699e322f5cfefdcee00897697830f50aa65c94fedcd33ff7694
diff --git a/net-misc/puf/metadata.xml b/net-misc/puf/metadata.xml
new file mode 100644
index 000000000000..9415c48a6b41
--- /dev/null
+++ b/net-misc/puf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">puf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/puf/puf-1.0.0-r1.ebuild b/net-misc/puf/puf-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..cc241aa7a92c
--- /dev/null
+++ b/net-misc/puf/puf-1.0.0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A download tool for UNIX-like systems"
+HOMEPAGE="http://puf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/puf/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( AUTHORS NEWS README TODO )
diff --git a/net-misc/puf/puf-1.0.0.ebuild b/net-misc/puf/puf-1.0.0.ebuild
new file mode 100644
index 000000000000..04a6a67d2ea9
--- /dev/null
+++ b/net-misc/puf/puf-1.0.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A download tool for UNIX-like systems"
+HOMEPAGE="http://puf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/puf/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DOCS=( AUTHORS NEWS README TODO )
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
new file mode 100644
index 000000000000..652e7dea5280
--- /dev/null
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -0,0 +1,6 @@
+AUX pulseaudio-dlna.desktop 300 SHA256 adb354cfd909ccfba92e573ded6fd295a4dc084c878bb8e548b8a78bd7433308 SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3 WHIRLPOOL dc8570bd81e4ca0c89d1205984665546c93c36cad411c34376225a280baeccaa78ed121cf0996e3a444233df6d7186a0c08070c1c8f602b22ed0edda93dac918
+DIST pulseaudio-dlna-0.5.2.tar.gz 701412 SHA256 e07f6db31502d90f6f8971d2cd1f96a540e2bd7f26f0090afdaee5b5c73f6a68 SHA512 298f61d643c35449fbb0001efa69a1792e41518953f58506703f3568902da4457d0f4f9e52b9641df26fc6f978670dd29a7f5d786b99339bd2a71f5fa59dd7db WHIRLPOOL 3a338048e99e9b37e6b583890d6799f07cc94470b8dc2d0a65f6e94c23528c4f4c10399856340d98fb4f2d580ed1fced2b457ad5129664db5678ceaabe13b86c
+EBUILD pulseaudio-dlna-0.5.2-r1.ebuild 1692 SHA256 0e210b4bb0e8df8ae404260a3762fb8fc28969c707c410d2b27f9151e16a268c SHA512 0add5a8d68bf0cbb8c1f6dae3b3b089f55014d52fe404b4c3204ed09c4c0c8c4487cb6540c948a4a4838b08c4e67ff161d47c6db6d0ec01a47def7351abdde89 WHIRLPOOL 760a1744252b104a072895e14029163003623d50aab00deb14a209872fada8ab6604aad69f71c989f8051956ca6dfc532e498d6f70be9f374f790986b3bed507
+EBUILD pulseaudio-dlna-0.5.2.ebuild 1635 SHA256 80fad7cd7c78234767b158fff0bb8856ff2222ac7c7a1d4a276f4b70ae35bd29 SHA512 15ff8e21bdeae53480132106fa1bba7954eac5dee19e31a611fb02764e9c23b702419360c7ad46ec62321e5c580b5fdc095a9e519280592896d0f542fe8b7ba8 WHIRLPOOL ea92a79bbe4e29e9af6c945068e1487f13195ea8225d9206de0ae084b398b5c6f3cbe4fee44435f4f1d4fc36863dcec407583f2e0ec98e223d1fe66ee1f8f29f
+MISC ChangeLog 380 SHA256 5289ec979ceb5e8aed3f8d10d3ceeb0eca79b5a41fd72c13f7130dcbdf8545d0 SHA512 68363fccbd58e788d37bbf11768f67d97b2b02afc60f98bdbc874ab48d3e419b5d4e1bb6b37111ebc307b73f7cc31087962139c244571cb9b7fe5da179544207 WHIRLPOOL e741a2785904753c4ef2956f0553a80688f31f5e569842e1defeb62f5413a28a1091dae6bbdbf5ba142be601be0ee1eec280aa33aefcac839454200eaf032157
+MISC metadata.xml 340 SHA256 6d76107907271eef5946cb6a1911573b8aeca4cbc6dd298b7ce5635cb7cd5c8f SHA512 43640a91e95c2ec3969e19341e64dd653e8e00136c03e98119e4d5f357a3f79754a49d17837326dcb8f10023ec0fc6ad3bde80f0912d532db77f3fb7727d4493 WHIRLPOOL 6166945fdfbf0826a4d181519649f60dc28bdee7852ebc478b17c7f6fd33b32bfd2e8f948b123c79adc99526c051c6882acd1a8850d104ab63b8c7d9291e40d9
diff --git a/net-misc/pulseaudio-dlna/files/pulseaudio-dlna.desktop b/net-misc/pulseaudio-dlna/files/pulseaudio-dlna.desktop
new file mode 100644
index 000000000000..dd6bcde58487
--- /dev/null
+++ b/net-misc/pulseaudio-dlna/files/pulseaudio-dlna.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Pulseaudio DLNA
+Type=Application
+Comment=A lightweight streaming server which brings DLNA / UPNP and Chromecast support to PulseAudio and Linux
+Exec=sh -c "pkill pulseaudio-dlna; pulseaudio-dlna --request-timeout=30"
+Terminal=false
+Categories=
+NoDisplay=true
+StartupNotify=false
diff --git a/net-misc/pulseaudio-dlna/metadata.xml b/net-misc/pulseaudio-dlna/metadata.xml
new file mode 100644
index 000000000000..23b50d1eb70d
--- /dev/null
+++ b/net-misc/pulseaudio-dlna/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">masmu/pulseaudio-dlna</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2-r1.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..6714dd0bdc2d
--- /dev/null
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
+HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
+SRC_URI="https://github.com/masmu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
+	dev-python/librsvg-python[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
+	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.2.1[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.17[${PYTHON_USEDEP}]
+	|| (
+		|| ( media-video/ffmpeg[encode,faac,mp3,opus,vorbis]
+		     media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
+		( media-video/libav[encode,faac,mp3,opus,vorbis] )
+		( media-libs/faac
+			media-libs/flac
+			media-sound/lame
+			media-sound/opus-tools
+			media-sound/sox
+			media-sound/vorbis-tools )
+	)
+	virtual/python-futures[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-sound/pulseaudio"
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}/${PN}.desktop"
+}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2.ebuild
new file mode 100644
index 000000000000..eca97fcf2c71
--- /dev/null
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
+HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
+SRC_URI="https://github.com/masmu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
+	dev-python/librsvg-python[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
+	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.2.1[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.17[${PYTHON_USEDEP}]
+	|| (
+		( media-video/ffmpeg[encode,faac,mp3,opus,vorbis] )
+		( media-video/libav[encode,faac,mp3,opus,vorbis] )
+		( media-libs/faac
+			media-libs/flac
+			media-sound/lame
+			media-sound/opus-tools
+			media-sound/sox
+			media-sound/vorbis-tools )
+	)
+	virtual/python-futures[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-sound/pulseaudio"
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}/${PN}.desktop"
+}
diff --git a/net-misc/pump/Manifest b/net-misc/pump/Manifest
new file mode 100644
index 000000000000..447602285878
--- /dev/null
+++ b/net-misc/pump/Manifest
@@ -0,0 +1,6 @@
+DIST pump_0.8.24-7.diff.gz 29280 SHA256 2bc790e57a6476693395075ae2e64791afb269a3a5b79029a3915d2ecae6cc64 SHA512 8d70bb31f9d56d79b4cb74def6d3df2a3115b62672190d8c38b7fa628ad35481ad637dd4854e8331a4c5a649fa573c58c9b867b014bbaad7fe6c8c870a02eae2 WHIRLPOOL cda44ce5c5e8f7404aaf23fcc0525930bd5bc5d4963c7d7f383c15c1f2771467351c6f2a3234edcd0bd0bfbaac09b3f9ebbf1fd44ee9c942e301807fa89e5908
+DIST pump_0.8.24.orig.tar.gz 79790 SHA256 cbb423942a4295a07a23b76a02d645b76b4ac0b58c3a30076ad42c2ab80c2dba SHA512 b6956f0ab2a5fbcda2320efd454d21aee651816a13a55622e21dc3a29919aef7db7c9a8d71c3b37b1969f29cff37c67d313f763a17404652fb962bc54eabcb34 WHIRLPOOL e007ca89139f16afcd42585299e97c960c7136b192499c3b042083f832fd2f3347b814c94a40ea65515db243f26e7ad81deee923d2eb632af7e428f9e6a013d2
+EBUILD pump-0.8.24-r4.ebuild 1401 SHA256 a469bd151b0146e19634e1fa1325b3d5d214a5cd73a7588c8a1158b26290ba5f SHA512 5b96107c27a1c63653c0e541dc9f099c02c82c12c182391bd345f0d54ca188ce4ddf947e04b9e1271c9ac7eab06b98a4a8cee1a371b532175dd285732a7704d0 WHIRLPOOL 537dc883c010e5fbf7248ab8107637300d82f2c5cd1131ebd0958efb4fcf74f2af166547b886d45b8f26cee1a829809ff425c2b0c2ee1a36438f97baf3bb3f5f
+MISC ChangeLog 2521 SHA256 02f3512812a6634e14be73729c37cdee60a4a0c327100c3e42e0d58929d885b2 SHA512 40242ea6d53499c738297e7b5ef0eb8d1698bea81ff4713a9c67c2e4f5e648173db14993e9bbe873fa3c23a3db43c316f26e969de1c05d970471e3b7f0b35355 WHIRLPOOL 70f3e0d806df5a1d082e2b4291e558e003a3fab50d5b8a8f12578d1975b51b060af950c34aab57e2da263e3f624bb5b752213a57040f89b346e57ec374d3a045
+MISC ChangeLog-2015 9520 SHA256 ce6aec15a0fb684a7083c4a4b748c3ba04d87d4863002a32d1ee464e8429b8ec SHA512 122dd7c6a576bee60bdf627b31a664eb63cab6e4fd7f4d2227c19e2be72a1ff4ea0d4aeeccf88e6b04f7c4da5ec3384e97b86dd3fa676cec3734b399cffa5490 WHIRLPOOL dedbc29381487de1e4d00dc25d39fc24f3771fc1440d7f9ce7bbf3a4112a56be077b9ff73b4023be4d17e99243f2ea705752069094c6709910a9bc4b02310631
+MISC metadata.xml 238 SHA256 3fb35ac408faa618010ef8a4813876521e234671e1028fb82e83dab364ad6840 SHA512 852836ec4f7a56d54fcdb6f5cd189be8d15770fa64bb9ecde5b22a8e12dfc2d6f38a905a85a1f493d8100e1889283c0bb32d25521e13de98b7c00d2e45450261 WHIRLPOOL b7ce2112551154e5622383ed98acd393c3501dcff5008127cbe1fa9cd294f20527b431caaea7e18bc138a454d98270f61323b15819db6ff099ec7e33baed048d
diff --git a/net-misc/pump/metadata.xml b/net-misc/pump/metadata.xml
new file mode 100644
index 000000000000..ef1a6e7a5e0e
--- /dev/null
+++ b/net-misc/pump/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A DHCP/BOOTP client
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/pump/pump-0.8.24-r4.ebuild b/net-misc/pump/pump-0.8.24-r4.ebuild
new file mode 100644
index 000000000000..e02eb9581e3b
--- /dev/null
+++ b/net-misc/pump/pump-0.8.24-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+PATCHLEVEL="7"
+
+DESCRIPTION="This is the DHCP/BOOTP client written by RedHat"
+HOMEPAGE="http://ftp.debian.org/debian/pool/main/p/pump/"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/p/${PN}/${PN}_${PV}-${PATCHLEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ppc sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/popt-1.5"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Fix Debian patch to fit epatch logic
+	sed -i \
+		-e 's:/debian::g' \
+		-e '/^---/s:pump-0.8.24.orig/::' \
+		-e '/^+++/s:pump-0.8.24/::' \
+		"${WORKDIR}/${PN}_${PV}-${PATCHLEVEL}.diff" || die "sed on ${PN}_${PV}-${PATCHLEVEL}.diff failed"
+
+	# Apply Debians pump patchset - they fix things good :)
+	# Debian patchset 7 include gentoo patchset too
+	epatch "${WORKDIR}/${PN}_${PV}-${PATCHLEVEL}.diff"
+	# Add LC_ALL workaround to make sure that patches are applied in right order(bug 471666)
+	LC_ALL=C EPATCH_FORCE="yes" EPATCH_SOURCE="patches" EPATCH_SUFFIX="patch" epatch
+
+	# respect AR, wrt bug #458482
+	tc-export AR
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" DEB_CFLAGS="-fPIC ${CFLAGS}" pump
+}
+
+src_install() {
+	exeinto /sbin
+	doexe pump
+
+	doman pump.8
+	dodoc changelog CREDITS
+
+	dolib.a libpump.a
+	doheader pump.h
+}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
new file mode 100644
index 000000000000..58df0b72de56
--- /dev/null
+++ b/net-misc/putty/Manifest
@@ -0,0 +1,11 @@
+DIST putty-0.68.tar.gz 2114499 SHA256 7ba256f46e5a353cafe811ce7914d0e22a52bdfc0e6e2d183ad28b5af44cd09c SHA512 e3a6e4f45e1fce70d4cbb6d4769ab72b23c10920e48a88bba95b3f4c225b0193ddc1444e69d572bdec5e505d2c56fed365f07d990c156b35f272b56f978ef5d3 WHIRLPOOL d24ceb3ed62eca52bb3a8f4fae08256269002265650e6fc42af10fc10a7b85b677b70c68e6b0a98915371921eabfbcbfa8a9b64b6be1a51cff418aef2feb6650
+DIST putty-0.69.tar.gz 2122306 SHA256 b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1 SHA512 2739829adec60df5658709d61f8539d431f6b5d71b9b893fcefb2a04ac52bf2ace26f9ca784156d6540fa3f3e5858a86eb2921002b4cc05f9fbf22da7931ec2a WHIRLPOOL 7f003a0bc0f94c14aa3ea5c0b38bbe7fd9dbc6e92d7fac1a4aa004c775d567db49526439c7ed6fe37eb5e345b499ace3a27dd218cdf97d81eeb4bf4d0ea83343
+DIST putty-0.70.tar.gz 2386108 SHA256 bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be SHA512 2aaf4fa2b4ad2d82eb5cdc4419ade79e0c5d8bd3c093db92b3c048e6107f85a5f1647f9d8203cda0906ce2b926725a75319f981cb32e6f1ebf50b1f738564fed WHIRLPOOL db30d70c882201ceed43eeae86b499e4b0040891ccb06ed91102c55acecfeb693bc369fa6f5314673d4cafa59690792aa6489e8513a3d18f667b1ad19259e44a
+DIST putty-icons.tar.bz2 4878 SHA256 960b189069dbfb20a1f49e378ab88bed716c6457593815e414d51ad7a3fa93a7 SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 WHIRLPOOL ec96fe682582bfa58ce73c3e5cb7bb61d2363b7a5e9d3259dfd11cd6396512b5b9ed954f6a431baab36b1f17963714b30c239cdf4c08191d27b5abb858f54a57
+EBUILD putty-0.68.ebuild 1583 SHA256 d06362557bbde4a9285de862d9bbca0c2d38e1c9b2eadf0b03c43dc5e949fac3 SHA512 bf95be4ebfabebbb0bed3b6494e784127b60649caa5344771f19eb0ed2268946a921f16144fe84dfb92d51ba128a5955f3c698eaffbb85c70ddce4fdb8b7007c WHIRLPOOL c571bfe5870a219b6f0ab5c51cb8767e157234e06a5ed07cfe8c7c0d99b791be3e833398f48a3717dac14da19ee50b2fce305f8cd92aac3dca96ed8701211230
+EBUILD putty-0.69.ebuild 1590 SHA256 73cca5432871e33447650ee4ecca6d9584dc51e9d96a61635ddd7123e166ded5 SHA512 1f5abf4bd861f03b894fbc0e10b1b1f625ae8ee153d9c1ee9e1a643989afe0bb12c826cc3e9b81fd34e23cefd7627f8471c867d4b5641f1256da21f007c02105 WHIRLPOOL 5392956e1c8db9e14af4718e0aebff8aa8f8652686d05fad6704d3e8c596027bb2cd852e4d10bb320c426e15cd3ea909f808d64a6d6a5eb920a586fca75e30a3
+EBUILD putty-0.70.ebuild 1590 SHA256 73cca5432871e33447650ee4ecca6d9584dc51e9d96a61635ddd7123e166ded5 SHA512 1f5abf4bd861f03b894fbc0e10b1b1f625ae8ee153d9c1ee9e1a643989afe0bb12c826cc3e9b81fd34e23cefd7627f8471c867d4b5641f1256da21f007c02105 WHIRLPOOL 5392956e1c8db9e14af4718e0aebff8aa8f8652686d05fad6704d3e8c596027bb2cd852e4d10bb320c426e15cd3ea909f808d64a6d6a5eb920a586fca75e30a3
+EBUILD putty-9999.ebuild 1648 SHA256 1949bb9d72850173ff7855d9a0d2e79a785c3b9a05673e7ab3b1a85f08d042ef SHA512 111a6370e8a416ea1bb2e4f1d249726ab8504c787cc52c0db9d2a52624080051af773d51c9633f20bd0d092a166dbc041a014b46caea8c03bd33252d02f95ae2 WHIRLPOOL b0d32b3909d50f25b8d58994bd0511b68fe4834f72009bfe6b53e2391f80fcd02b773c92543eed8c50f4938236e3d4a3309444dd00d0c4b01914cb4297765aac
+MISC ChangeLog 7200 SHA256 190a1931c24532b63b668c7f37ceb9da4d80678278b6967b0c1ebf94527106fb SHA512 ea7abbb2b82cd167a62f40b21f6d842b49590d13138d1ad99a9cc4aaa990d987add5bbde0e99c76ccda19115a682b432d7d15ee4b56d940f9f127c3b913cb13c WHIRLPOOL afc1d847a5ca7774ffc1e3d2b2bd306b87d41674092206eb7d8c16a9e40985d8e75363377021ba6bc4d0d500f985a9efcd697dcba308b11563264cf9c700a698
+MISC ChangeLog-2015 14420 SHA256 e441f0f843502e8f485326ba2ef075deeeaf3cf0ca86fcaa13eb6667f1838479 SHA512 2bb24e2f95e23ed32797686a99298d9455bef1197f1627f199515a4aa7d180964863340b517042447dcae5cc13bce738993843025256698659fe91db9761f68c WHIRLPOOL 398acd1f44e1914a722cae4d9cd81d7967e612c335e6f27e75ca692f04d80cd0f38fad01fba9e6802afa261b426d860b1efd9325ef1a727a836067c428c344e9
+MISC metadata.xml 803 SHA256 227b6d830887ecdcadde969e63e8399f865e2542576929350402b09590760efd SHA512 d350ca1ff3c8ab8ba1b13e098c6e0f215f31c8c4d673566d2e0befef1404cd3a8dafdf5c7f90ed78d7d06a113b2d9ca92014909257e638982ed7a73797113c1d WHIRLPOOL fdeac41e12a58fb119fc2b97c8824bec3ede43017f72406db836d21a83393f63fc30cd12daaa8b2b346bb384ca66bcd7decbfc605512b650e0366bb0a076c531
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
new file mode 100644
index 000000000000..f8db72350db4
--- /dev/null
+++ b/net-misc/putty/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<longdescription lang="en">
+		PuTTY is a free implementation of Telnet and SSH for Windows and Unix
+		platforms, along with an xterm terminal emulator. It supports flexible
+		terminal setup, mid-session reconfiguration using Ctrl-rightclick,
+		multiple X11 authentication protocols, and various other interesting
+		things not provided by ssh in an xterm.
+	</longdescription>
+	<use>
+		<flag name="gtk">Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>:2. Otherwise only the CLI tools puttygen, plink, pscp and psftp will be built.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/putty/putty-0.68.ebuild b/net-misc/putty/putty-0.68.ebuild
new file mode 100644
index 000000000000..e09e97c727ab
--- /dev/null
+++ b/net-misc/putty/putty-0.68.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2-utils toolchain-funcs
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+IUSE="doc +gtk ipv6 kerberos"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
+	http://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
+"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/AM_PATH_GTK(/d' \
+		-e 's|-Werror||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	econf \
+		$(use_with kerberos gssapi) \
+		$(use_with gtk)
+}
+
+src_compile() {
+	cd "${S}"/unix || die
+	emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+	dodoc doc/puttydoc.txt
+
+	if use doc; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	cd "${S}"/unix || die
+	default
+
+	if use gtk ; then
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/putty/putty-0.69.ebuild b/net-misc/putty/putty-0.69.ebuild
new file mode 100644
index 000000000000..448708462c89
--- /dev/null
+++ b/net-misc/putty/putty-0.69.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2-utils toolchain-funcs
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gtk ipv6 kerberos"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
+	http://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
+"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/AM_PATH_GTK(/d' \
+		-e 's|-Werror||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	econf \
+		$(use_with kerberos gssapi) \
+		$(use_with gtk)
+}
+
+src_compile() {
+	cd "${S}"/unix || die
+	emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+	dodoc doc/puttydoc.txt
+
+	if use doc; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	cd "${S}"/unix || die
+	default
+
+	if use gtk ; then
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/putty/putty-0.70.ebuild b/net-misc/putty/putty-0.70.ebuild
new file mode 100644
index 000000000000..448708462c89
--- /dev/null
+++ b/net-misc/putty/putty-0.70.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2-utils toolchain-funcs
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gtk ipv6 kerberos"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
+	http://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
+"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/AM_PATH_GTK(/d' \
+		-e 's|-Werror||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	econf \
+		$(use_with kerberos gssapi) \
+		$(use_with gtk)
+}
+
+src_compile() {
+	cd "${S}"/unix || die
+	emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+	dodoc doc/puttydoc.txt
+
+	if use doc; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	cd "${S}"/unix || die
+	default
+
+	if use gtk ; then
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
new file mode 100644
index 000000000000..f6f0e21c65a1
--- /dev/null
+++ b/net-misc/putty/putty-9999.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2-utils git-r3 toolchain-funcs
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+EGIT_REPO_URI="git://git.tartarus.org/simon/putty.git"
+SRC_URI="https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="doc +gtk ipv6 kerberos"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+	app-doc/halibut
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+src_unpack() {
+	git-r3_src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/AM_PATH_GTK(/d' \
+		-e 's|-Werror||g' \
+		configure.ac || die
+
+	./mkfiles.pl || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	econf \
+		$(use_with kerberos gssapi) \
+		$(use_with gtk)
+}
+
+src_compile() {
+	emake -C "${S}"/doc
+	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+	dodoc doc/puttydoc.txt
+
+	if use doc; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	cd "${S}"/unix || die
+	default
+
+	if use gtk ; then
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/pycnb/Manifest b/net-misc/pycnb/Manifest
new file mode 100644
index 000000000000..f41e72aa6ce6
--- /dev/null
+++ b/net-misc/pycnb/Manifest
@@ -0,0 +1,5 @@
+DIST pycnb-0.0.4.tar.gz 2991 SHA256 11cbb9dff1dc79daba1dde2a5d2f5db9283614a00166bc505cae41006a87bd3d SHA512 e127525bffdd479a5717230f520602cd1dd587000a1adc398739399530fbb3e06d7bbf3e4f7b24c7bd145f2424427ddb6fc86d6bc597d2cab3cdfc6d554cecf9 WHIRLPOOL 2f11c9020b6c3e2f2a00835e8b0307fd7292879a104f37f0b38e77022eb504211626f51584b1560a81a97ed7cb5ab65e847228667f79d0395753ff179679f6a1
+EBUILD pycnb-0.0.4-r1.ebuild 581 SHA256 7cd24737b325e085591ea153b0830958e8faa3fa074147a493f7dd3351b96d94 SHA512 a61ce520e1636277f04b8a8ddd0825bd5668ae274cbd3c964b49001c890f6706bf02f96a14bc578e2530601c1a3714fa77062ebea07b513010c5a089c1683f59 WHIRLPOOL 4149fd9dcd097499ec54c21da3cc44806bd30efc02399e4da5f06b2806d7a54d90969fd911802c6adb8b2e92d3eef9a12b1fa203b53405963536831809d053bf
+MISC ChangeLog 3089 SHA256 6f853925fce1488285c225743bf2a7d7043263272d66eb72b0406d8361f7bd3d SHA512 1913cdfe809b41a5480084987bd092522682de6b1b91d492b920f6748790aace3ea0b0597a65852094cedbc0d97cbbd559409b8c5daf9de5bb6996c10e5ec4cb WHIRLPOOL 6f143c9f472960c9a81ecc1ef3989f5ff259b1755f16e9c6e6a351ec39edc2ea7ce37415b4d443340826f90b3dbbff278274ef7ed9370dee9eef1d1b38792e27
+MISC ChangeLog-2015 620 SHA256 548709f7c30fe27a587e9287b7a19f4a20d9d912bc34eb7ff42b2bb07f8c34fc SHA512 db2431e89abd5fc0887a1e32be6925691564eaa2fcfa190d20eb8a40532ea2d8ce69dde3f215da109c7d5be786009ea0b581c28d2593f943c2f052d0c47351ea WHIRLPOOL b60339f03aa1e41b1de06354a5186e37c50385b42f49a0749b7d5a37a9a32de354e133d89100592e1730b9a78f0c265cc9150f49c55a8f7f08380d71f6651d2e
+MISC metadata.xml 293 SHA256 3f2901974684635167daae0c8044d285db0e0281dcf0a9f50effc6cd1b181f99 SHA512 78d1d04e9a89127917f500ca2510f5b717139167a3ab2ba7892d998ac8c2e52c4900b7a6b3118a97c521e77c8224c016f2f81ab1cfb6901c5c16fbbca50916bd WHIRLPOOL 2fd25bfc80dc5c4c86b6e8b8b09a817bd5635eda56bcdad91362e09de7a15552a67ad46cd331c2b8ff0c09e7af0271dc9e4c05d67a1d853208e8bfd8e926f886
diff --git a/net-misc/pycnb/metadata.xml b/net-misc/pycnb/metadata.xml
new file mode 100644
index 000000000000..454cf0a6a1d8
--- /dev/null
+++ b/net-misc/pycnb/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="pypi">pycnb</remote-id>
+    <remote-id type="github">yaccz/pycnb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/pycnb/pycnb-0.0.4-r1.ebuild b/net-misc/pycnb/pycnb-0.0.4-r1.ebuild
new file mode 100644
index 000000000000..cec3b7b3924d
--- /dev/null
+++ b/net-misc/pycnb/pycnb-0.0.4-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Access cnb.cz daily rates with the comfort of your command line"
+HOMEPAGE="https://github.com/yaccz/pycnb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-python/cement[${PYTHON_USEDEP}]
+	dev-python/twisted-web
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+	chmod -R a+rX,u+w,g-w,o-w ${P} || die
+}
diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest
new file mode 100644
index 000000000000..d33584680840
--- /dev/null
+++ b/net-misc/pyhoca-cli/Manifest
@@ -0,0 +1,7 @@
+DIST pyhoca-cli-0.5.0.3.tar.gz 32170 SHA256 4768e85b45043fc509fe6a7847a93400dc377ece4987b83bbbb620e213ba9825 SHA512 84f92008b099fa3f753a2143115486e121d66407f318ffa4840d7b4e8fd2ee2aa620b152a384ea1c59823eb2acfdb9426257247041cbc248872e2e33dbc9c279 WHIRLPOOL b64991f2e96692d66620e37b648597848be922605213978c0ffac35c6d883d1c5c1125a39a846c5a34eb2da14d4ac2341f187f17d41da23fc30ff032ed3e1ffe
+DIST pyhoca-cli-0.5.0.4.tar.gz 32486 SHA256 7d5814b2eecec7265ef0b198d04888733130777fdb114b1681e1e9b22df2ae9d SHA512 6dadbd01922f9957469c2f401a6b1d7da4ad7bfa9c82f38d951b230cd880b826e96a63cf3d244d27299ea9bab4d1f42239a2f0d73702e62eb4859a52c25158bd WHIRLPOOL 13bfb245f1704b0a6f7b1ac3595ac4bef84f9bb0cf88d7a7e1bb8f7667294d722150ba306c3ee0dbeb8631e1db5a904d352247f3cb8a6006a34dd69cb763c41d
+EBUILD pyhoca-cli-0.5.0.3.ebuild 632 SHA256 0bfc53ef23912cf3ea57f1997af427e26d4fe20644c743ba3b2e926637e85880 SHA512 c33f3342e3aebfea8e1624d96dbb190650550a6e0c8c4a0b2988a1d3078933b601709f497fd9720c1dd615caa96f573c3f024b91525de2ea4c17b426fcf8249d WHIRLPOOL 56d69b5823773df5e034d754fe5169c44faa4f4c40e4ec8a21de52df50f7d6addad12dd4156a96a77d8985caab8f80a289928ec766a6e70e3362e5325898fa92
+EBUILD pyhoca-cli-0.5.0.4.ebuild 632 SHA256 67f3b2782cdae0f1d854b039a92e6b5f93bca7601f365c86d764e6d5a0d6ef33 SHA512 f8f04b7e2eefe51364fe3288037eca80ba02fb5b254824d5504802d9b14e54324d3b88989a02354535b138a14cfeea3fe7bb7dde670f395f601d80cf1c0248c1 WHIRLPOOL 00e8a2b4f7480204343968a916305a416727dcdbc7acc8c1cd2c2caad7bed2a13ac94fdf7f822e4ed33ce8e1b16ef7096482ef5069daa7f26734a03df5845cb0
+MISC ChangeLog 2617 SHA256 d02f419665d7b3cd4b6171a285c24240d502ff8328d56e739caad3a17ffda9fc SHA512 52e195884d3d3d0f8e59bfd10a775debd544c24419547c3de6de781168e55e5bb724fa6bbadaeaff780e520673fe3bf683e7707f504cf0fadecf7611878e8d53 WHIRLPOOL 80bade9beb4fec812cc890ccbd078669af8a753ebf0c72a51f3fdf2a6912db7892b78b44daa9132aef7621053dbc3bb8ac8d965df68d82ee0578bbb39c0f4b39
+MISC ChangeLog-2015 923 SHA256 24c58323ec0cc5c8d5d49b5c400d9ad5d5abab5f084d2cfe7f60bd512a639e26 SHA512 7d4f6dccb6a9b5f4f681c1a3e062acdd6200654ec2e91225403553d9cb3bd1e53086ee9b7fce03dab20b650c9cc2335089ab504713ec18cd122999cabfb3dad5 WHIRLPOOL 8642e39eb8c8742fbe523b5eb7bc2991bcf27ada9e7a567feed4965b4ffbd27ef2964f26274eedd24d3a96b77a4f3cd62bd5446cb594fa7900952afcd1087864
+MISC metadata.xml 521 SHA256 a5437fcdda010c86bbea19890b72a38dbb16581752a401a3feef4df67661ed2f SHA512 7be8e7f29191fc70cfb2c9f3482dc536803ba374996c52fb8c7011c60c0f7de0b10ab333792ee59b391d04e8a74bd778a30db7a6722118e612db232567527959 WHIRLPOOL 481e89cd3c34767d2527f231b4093820c7890d4ba7ba762a15861a41dd5a74a735b95f380bb8a397cd866d8e52cf43cb157c78cfa8432c77ea580625b0338b5a
diff --git a/net-misc/pyhoca-cli/metadata.xml b/net-misc/pyhoca-cli/metadata.xml
new file mode 100644
index 000000000000..fa439d9e97ee
--- /dev/null
+++ b/net-misc/pyhoca-cli/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+PyHoca-CLI is a client implementation for X2Go using the project's Python API (Python module). PyHoca-CLI can be operated completely from the command line and the goal is to reflect the full functionality spectrum of Python X2Go.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.3.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.3.ebuild
new file mode 100644
index 000000000000..93547ab26559
--- /dev/null
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="X2Go command line client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]
+	>=net-misc/python-x2go-0.5.0.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/man1/*
+}
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.4.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.4.ebuild
new file mode 100644
index 000000000000..2a3ca05effb4
--- /dev/null
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="X2Go command line client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]
+	>=net-misc/python-x2go-0.5.0.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/man1/*
+}
diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest
new file mode 100644
index 000000000000..ba0c1a1b25a7
--- /dev/null
+++ b/net-misc/pyhoca-gui/Manifest
@@ -0,0 +1,7 @@
+DIST pyhoca-gui-0.5.0.6.tar.gz 1345011 SHA256 5e4e7b585abc3efa8a91205b585ac923c7aaff60c0e1925b5dfa351a5e5d1952 SHA512 46edc32425e083ef9043f6fdd6b2e4f973109688e5cc3167ed09132441213292f6aed94b26a63829101912388293c239eb689163f933cf4d95125295e3336b89 WHIRLPOOL d747f3994cb8d3cd35e3ed19a5262368aaf7d16ec3af4182fc617cdb0cafb5b5c5361ecc800112f18cfdf6b8064beb273d78947da9be7c07c88264311804a2e8
+DIST pyhoca-gui-0.5.0.7.tar.gz 1345182 SHA256 95aa0addfe3ee25e5724437db211ebe56f905994d2905f7ac9ce40ddf7ec4a7c SHA512 bfb0eb95a87e19ff84fd13c642725be40369ec8e7f58615301033d22e3c1f81ed8b47542989711b1ee9414382989c8e258fa24f3f3c6cb950c42a53a9a6bd8b6 WHIRLPOOL b6b16809851ceb40d4927c729ef8250f92526b0e57e6f54949d5b81a2fbb8bb9452e3f71647dbdcee86769438355217a294f2d1ccbdec59ebeae219ea650be6d
+EBUILD pyhoca-gui-0.5.0.6.ebuild 809 SHA256 9b470dee612125516c3858395b575302ddc6d34e6cd14982c50f0548a599c282 SHA512 5a4a47d0e9aee92b0f23fac9758e66aeb9c4f62a197b31305d35a32f36d41d3b94d319069ad0f3642daaff6ed1396ceaeeda0e70b8e24952078f55b53d304062 WHIRLPOOL ee9efe19fbfe5659561a8a818bc12459c6ad2399b6fc581d8708fbac143acf01c6482a9134206accf3621572c48335887bece8daa55f810bf628657d24cd67ab
+EBUILD pyhoca-gui-0.5.0.7.ebuild 809 SHA256 7099cb77853261500a2c7d7bd9ddf07e4a2845e9f7ff3384ec9de43d9d9fb1e6 SHA512 c4e457b3f8d597fabc3842cde26f5acd5fad4a54d7849a0c1349aaf253146217ba8695e9ebc879bdec939dad897e5f57680e7121981da0483ae8d4ff382ec092 WHIRLPOOL ca5a7a2369d76f486f410afa0e56604c3caa6313234bd6c61845d72773b1935d5da5a3ff63cbe2be106bbdf6f8406dd057db317a1cbf69a82e0c3f00669598f3
+MISC ChangeLog 2788 SHA256 807b49e65b7dfeb7fdcea1901f2c7f47c1d5cf0dadcef67c25940cb337e91852 SHA512 3753dd33a8f98d49b8464a604d759d4d4fa397443f2bd4fb9b124cdcd64e0a0286c0384018c04cbbdd293534a4a262bac97806bf913fe9806b9a7fb5286cccad WHIRLPOOL 9874ed5b1b4082f413644679068e4a9cb7885a752d21d696d00d9c8538de0747a2a1edaf83ac0b8003178f19610f9a038f3233932ce5e021206acc4945fa1665
+MISC ChangeLog-2015 801 SHA256 e1381a2c58a0178335e13c286f87e10c5a09001b2c2400d81775a5753ffffb91 SHA512 3251a65762d4f0aaf3ccfa02ef751b81cb81a2799626e635dd7765c7b16b9fa22c17c5730eae22ce19d70a1f653d220d59ec728fb455f1e81ae08d9d11f6f6d6 WHIRLPOOL 1989806e2ae0e0f7f60d2ad049eb35021397b3e2cc1020f6b5cc08e25d6a83aa767eb236c357df9940362b85e5130333220c4ba3bd36e1191637f24d452e680e
+MISC metadata.xml 791 SHA256 c2bbb9c6cc86308f56418f7c94e092d708a72807210a5b14b5d11e5820eb43ec SHA512 5e05aefac383cb0cc65e2747aa5d9eef23b2f26931196fa544f263a0c0bf2dfc63c026fa606fd910ab589f447d3bd78f42de0bff61a44286964098531000a5cb WHIRLPOOL 4ddfc24c8d409f88b61c27eaa610c387f95fa78f92545878063b0d049478074be366ffef50cef1ae39456783d7cbe64a5411265253fd80964dec2e640d7e8422
diff --git a/net-misc/pyhoca-gui/metadata.xml b/net-misc/pyhoca-gui/metadata.xml
new file mode 100644
index 000000000000..b87a98e44d52
--- /dev/null
+++ b/net-misc/pyhoca-gui/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+PyHoca-GUI is a client implementation for X2Go using the project's Python X2Go client API (a Python module). PyHoca-GUI uses wxPython for rendering graphical desktop elements (menus, dialog boxes etc.).
+
+PyHoca-GUI is designed as a very minimal GUI that behaves very similar to GNOME's network manager applet (nm-applet). It appears as a small Phoca icon (a little seal) that docks to your systray panel (also called notification area) and allows you to manage multiple X2go sessions simultaneously.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.6.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.6.ebuild
new file mode 100644
index 000000000000..7f3d94759271
--- /dev/null
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="X2Go graphical client applet"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pycups[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/wxpython[${PYTHON_USEDEP}]
+	>=net-misc/python-x2go-0.5.0.0[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/man1/*
+}
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.7.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.7.ebuild
new file mode 100644
index 000000000000..6ea82c839c84
--- /dev/null
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="X2Go graphical client applet"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pycups[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/wxpython[${PYTHON_USEDEP}]
+	>=net-misc/python-x2go-0.5.0.0[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/man1/*
+}
diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest
new file mode 100644
index 000000000000..15d968a87a2b
--- /dev/null
+++ b/net-misc/python-x2go/Manifest
@@ -0,0 +1,7 @@
+DIST python-x2go-0.5.0.5.tar.gz 198260 SHA256 be41f48a28efc2b4be6cf139ed82a45b802cf5462c7361860ad37559504d491e SHA512 a8cb97f321921b9c98a64b2ef9b3763118150a585b6797837ec890dc588d8f4884fa58d374690a0cfe025ad338b1f7e1c048e4d8c48736205975856a5d82d1d1 WHIRLPOOL aab3a3a3a49bfbcaa32d9ec832b552fef9f2454f436191ea802bdb2098687b72e33f11e8b9e17359db5e2170ff7db604f503dda2453dec44e72ba8da3371b1e7
+DIST python-x2go-0.5.0.6.tar.gz 198236 SHA256 7b6a7f373a6368a430fa777a5b4885b228ce00cad0caf269290e52fdf3a1456f SHA512 bad064490ed1b30ec63631d4e6af4ad133f4f1049e60f345dfc0a45abfd5d54a54556953baeae40bb543573d23987da745ad67bf6270f28be4dd6b130a05a9f2 WHIRLPOOL f7395970a859d97b92160f5842117a81eebff18a9e7af519497e0d8f44481aa9024373fa67c86f3aee7aada2180786b0f9211e419b50639537ac88f0e3de8ff1
+EBUILD python-x2go-0.5.0.5.ebuild 591 SHA256 81f45d570954328bdb43667125ada49573fd1dd336791e312ef4d6974caf57a6 SHA512 fbddfe4f5dae098c33f30047d369d3fb9d0c2d9e367200396b9ff7f1f095c5b45d5be316bed423547e6b1ff69392cce6cceccae7bfd508ced473d945d6bed1fa WHIRLPOOL 99821b807ef6fa572adbcaeefd2464106f6c832a5ab221e056326e353134e2e64601442bf61e57976d8801ec19f935f1fe8b206cd752139dafeda69a58a43a94
+EBUILD python-x2go-0.5.0.6.ebuild 591 SHA256 81f45d570954328bdb43667125ada49573fd1dd336791e312ef4d6974caf57a6 SHA512 fbddfe4f5dae098c33f30047d369d3fb9d0c2d9e367200396b9ff7f1f095c5b45d5be316bed423547e6b1ff69392cce6cceccae7bfd508ced473d945d6bed1fa WHIRLPOOL 99821b807ef6fa572adbcaeefd2464106f6c832a5ab221e056326e353134e2e64601442bf61e57976d8801ec19f935f1fe8b206cd752139dafeda69a58a43a94
+MISC ChangeLog 2507 SHA256 9fdc441ba2dfd81361841d812e64141ff755810ce27b6f76638f87969388cd9c SHA512 799abfd55415e0d17c5fcfb14fe2aaeb1f243b5882fb0b34e2f371eddfd99a3b6e519527367010c08bc3fc6eb2c75c3099f0406ad8771bb77229b4579a0c0e3a WHIRLPOOL edb5e6174c752bc328797d6dfeb75493c68336e4d60f22f395ca294e4ee3a1cd9133a6998a122bf6a8c44f7a7eda2d8f6f8225a44101facc838c1dd33efd85f5
+MISC ChangeLog-2015 675 SHA256 3b863a58310634896596e42ddfa50e4ce8b96fda24f0f0e79d75e75199fa87b9 SHA512 dc719b5cffbd16a380914e27d8a203e3b5cf8b9991f12d147c380d7cb2dac74507d0e8b29fc5e50a8a90aff25b12a61bfba98725407e7cf0891fcef39bc3952b WHIRLPOOL a9d71a39feffcdb007cec3b7729b8f89176e2945995e323f9084ae26c6f55246e064f7ec11bb0a7537a6b8fcbe02a53f37c1b90e905e6f750fd6a0363dc646ef
+MISC metadata.xml 483 SHA256 f1e464adca999df5de36a3fcab15159625dcc0d3e3a9245e5eb3e71d916c6e1d SHA512 42c6decd895d3cf1097fc1e9a4a8eeeda0fff769a74fe4a74b17ba2943c76b63bc243d200b08d050aa1e778f3ee71f8a504f59384c79a54b220c7a022b23bc6e WHIRLPOOL 5cd0bd08a18673d59d76f078acd437747b42fe2efe2aa2fa0a62741fb657e99fb8ea84e120dd09a8b9b40915c5ec3dce658fdd3f6c617c68504398b6161b0686
diff --git a/net-misc/python-x2go/metadata.xml b/net-misc/python-x2go/metadata.xml
new file mode 100644
index 000000000000..0a75ba291b54
--- /dev/null
+++ b/net-misc/python-x2go/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+The Python X2Go module integrates X2Go client support into your python programmes.
+Python X2Go is used in the headless X2Go client "pyhoca-cli" and by the tiny systray GUI applet "pyhoca-gui"
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/python-x2go/python-x2go-0.5.0.5.ebuild b/net-misc/python-x2go/python-x2go-0.5.0.5.ebuild
new file mode 100644
index 000000000000..8f666b8ffe49
--- /dev/null
+++ b/net-misc/python-x2go/python-x2go-0.5.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="X2Go client-side Python API"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
+DEPEND="dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	net-misc/nx"
+RDEPEND="${DEPEND}"
diff --git a/net-misc/python-x2go/python-x2go-0.5.0.6.ebuild b/net-misc/python-x2go/python-x2go-0.5.0.6.ebuild
new file mode 100644
index 000000000000..8f666b8ffe49
--- /dev/null
+++ b/net-misc/python-x2go/python-x2go-0.5.0.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="X2Go client-side Python API"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
+DEPEND="dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	net-misc/nx"
+RDEPEND="${DEPEND}"
diff --git a/net-misc/pytvshows/Manifest b/net-misc/pytvshows/Manifest
new file mode 100644
index 000000000000..ca70dbcb0cf3
--- /dev/null
+++ b/net-misc/pytvshows/Manifest
@@ -0,0 +1,9 @@
+AUX pytvshows-0.2-ezrss.it.patch 1339 SHA256 5a7aed7e69661345043dd63654207d1342594e22059df2675f5f7052f32c6c28 SHA512 45ee987549fe8648ec4ff5ac7a54cf5f5cea15ff7c467d1bd04a36f2587a4f76afd3bf61331ffb01b150d4d425f71bbb397a03ff8b00a04825901458169a87bc WHIRLPOOL 2030fa481cc4ca1b6eb4548aa83f6988cb3c07ba25186ca817167faa616678f540b4afc65b8dbf0aaa158878de4db486606c108328ce237596edd77cabe2055b
+AUX pytvshows-0.2-feedurl.patch 13082 SHA256 ec37372da122ac18d001f350f5414b60df72277bc221f8d012855d3239d9e801 SHA512 0ba4e1ec330be7bfaccbc6087ba093c5c54ef63ab9d62592bfd41acdfd48e30ac0a23cbd04b43972a6d7da6bb07f0813e05f16f625c0e375f17b94ff23f4e978 WHIRLPOOL a41d227c6f2dfc4f7846a0ab828725bec5222cf3bae9d6eb8bd8450f09733417d3583221f2abd6454f1c24ce68f8ddd417196d494fe4ef0eb38de5693945012c
+AUX pytvshows-0.2-improved-re.patch 680 SHA256 bef670a2ab39b199ce870a808c263203b446194a33356f9ff13bb0eebe7b0f10 SHA512 15cf4beb2b7da4efed4cf4ae744c0dcefffb4ef61b6a920c41e7926a2666bc07b9cb4ec9b058cfe84566415e7659e00adad423ae90aab0e91ba43646ecc0f6a9 WHIRLPOOL a07d20f8f0272cc96f3a4251a7fefc4ef94fa6bed1f2153470a82e8a0160267b6b35e1fa7e3c7c04717dd8f67f90e7e804bdceb28c78dee7160a8894c73b3f3c
+AUX pytvshows-0.2-rename-var.patch 484 SHA256 f53944762570318fd4b9b87b198dbbe80c409fface4595d4df87ca3cbc843da9 SHA512 15de0a4fdef7f70df5b5e7612bc3c40741bd2efe4ef0e714b067635b400a4b5676e1f1bbbaa53818380c915714cdfc141cea3aafed75871edfb4f0bec89a9c0f WHIRLPOOL b638389044f1019115bf657f4e5bc8bb1bd383b06072493dcd11e47310980b88a0016799647752acdb1f42c5b0e91a527429aac84e6ea38393b6eb3a53714754
+DIST pytvshows-0.2.tar.gz 14156 SHA256 f5714373bedf466313f99ac8bc184c27d824160e0b8ba359c5b7aaa6d2a735d3 SHA512 c4acd9b968dba7af1c787f9a3f5db4986ffbc52bfc43a4b7101070f8e91e80e78be0e59c4a4fbd873e64a6c4862e64abed2396c7140e9165d72e7d3cea267d5f WHIRLPOOL cfa80afa8d0963283b6b2bc054fe95e07e6ae5704f2a137262b3e27c412037d0500728c8f696cb5b609bae3a9a73a69ec57039e544e725f45a381686e747b5f3
+EBUILD pytvshows-0.2-r3.ebuild 700 SHA256 a0eca151f4f3fd5c01f21a58a243641cdf5b9b3791344f3833291761f8ac1912 SHA512 16542d842d135dc535482a5366e2803dad33b3d444f61e48c6d5747b5a42ab58f41179678447e9c617d38d94b5493b0ef4c814f95e78c0d880eada702cfd250b WHIRLPOOL 03aae2229ec5cf33f393d48d77de02b0916a24b03cc2ad739a9154975564dc7d88babb29d291233d8b0bef716836cfed7b67be3affb90ce2283c4f70f918e963
+MISC ChangeLog 3635 SHA256 584b0bb82a07277112ca1130abfe5dd3ed52b09bf153b03eb46ae6656c07fb69 SHA512 71eae148edaf6ebc2be7103a6c438ac6f09f669ff2aa0400aedb54d67c192d22987f99006db12e2aebed25f32fb094f3e822f8d8f4acb36190cc28ad13c24445 WHIRLPOOL e934f4b550090f6392d3eae92b466fabc1f302eca78b110066d9d62b2f7444b228738df54ff9ad83cad02cfc798224c3742566bb1f11debb118b5b7c992bbcc1
+MISC ChangeLog-2015 2055 SHA256 99dc0362577ab87e043a325588cec612211ab5927c57a63ec6cc0c8ba41621b3 SHA512 459b100dedba1d68ef08139eecf9b6684fa76b58d12aef3bca66f2ffd85816f7eba3659ece33b6943d21253604e3520292596c90283cd2a3adb66f15caccc11d WHIRLPOOL 53860eff6f7887299d9100231630d34ad5316e950dc3d4ef4d504fa9ce3908bbb091cfccf5bf2f6c480e2c124042fc22060fdbf2e6c7ff56debae17f3ffeeeb6
+MISC metadata.xml 246 SHA256 de87faa5914938adbf875cf827c74ed55ae185313b3a19e51c68e6a9be3dea1b SHA512 6f6e043d6a63993611316553ea1c70736c02151d19f1ee63ad855226dd79862c7ae7bdeccc572f23ed4dc9dfe3b0e77dd80d48bcbc33c02091c40111ac5e1aa1 WHIRLPOOL c4530b2ab5f23292a1b06f9eb55d4c89032b9f6ab24fb4708be99123a77c752b0b38b94bf168f10639d5ae90e0db16950c8931991c9481bbe0427c094dd5cfba
diff --git a/net-misc/pytvshows/files/pytvshows-0.2-ezrss.it.patch b/net-misc/pytvshows/files/pytvshows-0.2-ezrss.it.patch
new file mode 100644
index 000000000000..ba0a1b91e8e1
--- /dev/null
+++ b/net-misc/pytvshows/files/pytvshows-0.2-ezrss.it.patch
@@ -0,0 +1,30 @@
+This patch simply alters the feed site since txrss.net was closed/shut down.
+Luckily, ezrss.it expects the same arguments and should generally work. You can
+find similar details at:
+https://sourceforge.net/projects/pytvshows/forums/forum/726961/topic/3309243?message=7544190
+
+Yes, this could have been accomplished via the --feed paramater, but this is
+more user friendly.
+
+--- a/pytvshows.orig	2009-09-15 22:36:34.575002779 -0500
++++ b/pytvshows	2009-09-15 22:43:18.283754081 -0500
+@@ -59,7 +59,7 @@
+   -cFILE, --config FILE
+                   Path to config file. Default: ~/.pytvshows.cfg
+   -fFEED, --feed=FEED
+-                    Override the tvrss.net feed. %%s is replaced with the 
++                    Override the ezrss.it feed. %%s is replaced with the 
+                     exact show name.
+   -h, --help        This help message
+   -oDIR, --output_dir=DIR  
+@@ -77,8 +77,8 @@
+ commands = ['update', 'subscribe', 'unsubscribe', 'run']
+ config = {
+     'config_file': os.path.expanduser("~/.pytvshows.cfg"),
+-    'feed': "http://tvrss.net/search/index.php?show_name=%s&show_name_exact" \
+-            "=true&mode=rss",
++	'feed': "http://www.ezrss.it/search/index.php?show_name=%s" \
++            "&show_name_exact=true&mode=rss",
+     'output_dir': os.path.expanduser("~/"),
+     'output_dir2': None,
+     'quality_matches': {
diff --git a/net-misc/pytvshows/files/pytvshows-0.2-feedurl.patch b/net-misc/pytvshows/files/pytvshows-0.2-feedurl.patch
new file mode 100644
index 000000000000..fb78581b04f9
--- /dev/null
+++ b/net-misc/pytvshows/files/pytvshows-0.2-feedurl.patch
@@ -0,0 +1,279 @@
+David Reitz writes:
+
+I created this so that I could specify a feedurl parameter in the config file,
+which allows me to use the public RSS feeds at showRSS (http://showrss.karmorra.info/).
+This patch will ONLY work for seasonepisode. I made no modifications for other types.
+
+Simply apply this patch and then modify your config like so:
+
+[Weeds]
+feedurl = http://showrss.karmorra.info/feeds/68.rss
+episode = 4
+season = 5
+show_type = seasonepisode
+human_name = Weeds
+
+https://sourceforge.net/tracker/index.php?func=detail&aid=2818315&group_id=203642&atid=986413
+
+--- a/pytvshows.orig	2009-06-20 15:46:23.000000000 -0400
++++ b/pytvshows	2009-07-07 20:41:39.000000000 -0400
+@@ -83,11 +83,14 @@ config = {
+     'output_dir2': None,
+     'quality_matches': {
+         "[HD": 1,
++        "HDTV": 1,
+         "[DSRIP": 1,
+         "[TVRIP": 1,
+         "[PDTV": 1,
+         "[DVD": 1,
+         "[HR": 2,
++        "720p": 3,
++        "720P": 3,
+         "[720p": 3,
+         "[720P": 3,
+     },
+@@ -189,6 +192,7 @@ class Show(object):
+         self.show_type = args['show_type']
+         self.season = args['season']
+         self.episode = args['episode']
++	self.feedurl = args['feedurl']
+         #YYYY-MM-DD HH:MM:SS
+         if args['date']:
+             self.date = datetime.datetime(*(time.strptime(
+@@ -290,7 +294,10 @@ class Show(object):
+     
+     def _get_rss_feed(self):
+         """Gets the feedparser object."""
+-        url = config['feed'] % self.exact_name
++	if self.feedurl:
++	  url = self.feedurl
++	else:
++          url = config['feed'] % self.exact_name
+         if config['verbose']:
+             print "Downloading and processing %s..." % url
+         r = feedparser.parse(url)
+@@ -335,50 +342,21 @@ class Show(object):
+         if not self.rss:
+             return False
+         episodes = {}
+-        for episode in self.rss['entries']:
+-            if self.show_type == 'seasonepisode':
+-                r = re.compile('Season\s*: ([0-9]*?);')
+-                season_match = r.search(episode.description)
+-                r = re.compile('Episode\s*:\ ([0-9]*?)$')
+-                episode_match = r.search(episode.description)
+-                if not season_match or not episode_match:
+-                    # This might be a special with a title
+-                    r = re.compile('Show\s*Title\s*:\s*(.*?);')
+-                    title_match = r.search(episode.description)
+-                    if title_match and title_match.group(1) != 'n/a' \
+-                                        and title_match.group(1) != '':
+-                        title = title_match.group(1)
+-                        if config["verbose"]:
+-                            print "Found episode with title %s and no " \
+-                            "season or episode in seasonepisode show." % title
+-                        quality = 0
+-                        for key, value in config["quality_matches"].items():
+-                            if key in episode.title:
+-                                quality = value
+-                                break
+-                        date = datetime.datetime(* episode.updated_parsed[:6])
+-                        obj = EpisodeWithTitle(
+-                            self,
+-                            episode.link,
+-                            date,
+-                            title,
+-                            quality)
+-                        last_key = 0
+-                        for key in episodes.keys():
+-                            if key[0] == 0 and key[1] > last_key:
+-                                last_key = key[1]
+-                        episodes[0, last_key] = [obj]
+-                    elif not self.ignoremissingdetails:
+-                        print >> warn, 'W: Could not match season and/or ' \
+-                            'episode in %s' % episode.description
+-                else:
++	# we've defined a feedurl in the config file...
++	if self.feedurl:
++	    for episode in self.rss['entries']:
++	        if self.show_type == 'seasonepisode':
++		    r = re.compile('S([0-9]+)E([0-9]+)')
++		    match = r.search( episode.title )
++		    season_num = int(match.group(1))
++		    episode_num = int(match.group(2))
++                    if config["verbose"]:
++		        print "Found Show:  Season %i, Episode %i" % (season_num, episode_num)
+                     quality = 0
+                     for key, value in config["quality_matches"].items():
+                         if key in episode.title:
+                             quality = value
+                             break
+-                    season_num = int(season_match.group(1))
+-                    episode_num = int(episode_match.group(1))
+                     if season_num != 0 and episode_num != 0:
+                         obj = EpisodeWithSeasonAndEpisode(
+                             self,
+@@ -394,57 +372,117 @@ class Show(object):
+                     elif config['verbose']:
+                         print 'Season or episode number is 0 in %s' \
+                                 % episode.description
+-            elif self.show_type == 'date':
+-                r = re.compile('Episode\s*Date:\s*([0-9\-]+)$')
+-                date_match = r.search(episode.description)
+-                if not date_match:
+-                    if not self.ignoremissingdetails:
+-                        print >>warn, 'W: Could not match date in %s' % \
+-                            episode.description
+-                else:
++	else:
++            for episode in self.rss['entries']:
++                if self.show_type == 'seasonepisode':
++                    r = re.compile('Season\s*: ([0-9]*?);')
++                    season_match = r.search(episode.description)
++                    r = re.compile('Episode\s*:\ ([0-9]*?)$')
++                    episode_match = r.search(episode.description)
++                    if not season_match or not episode_match:
++                        # This might be a special with a title
++                        r = re.compile('Show\s*Title\s*:\s*(.*?);')
++                        title_match = r.search(episode.description)
++                        if title_match and title_match.group(1) != 'n/a' \
++                                            and title_match.group(1) != '':
++                            title = title_match.group(1)
++                            if config["verbose"]:
++                                print "Found episode with title %s and no " \
++                                "season or episode in seasonepisode show." % title
++                            quality = 0
++                            for key, value in config["quality_matches"].items():
++                                if key in episode.title:
++                                    quality = value
++                                    break
++                            date = datetime.datetime(* episode.updated_parsed[:6])
++                            obj = EpisodeWithTitle(
++                                self,
++                                episode.link,
++                                date,
++                                title,
++                                quality)
++                            last_key = 0
++                            for key in episodes.keys():
++                                if key[0] == 0 and key[1] > last_key:
++                                    last_key = key[1]
++                            episodes[0, last_key] = [obj]
++                        elif not self.ignoremissingdetails:
++                            print >> warn, 'W: Could not match season and/or ' \
++                                'episode in %s' % episode.description
++                    else:
++                        quality = 0
++                        for key, value in config["quality_matches"].items():
++                            if key in episode.title:
++                                quality = value
++                                break
++                        season_num = int(season_match.group(1))
++                        episode_num = int(episode_match.group(1))
++                        if season_num != 0 and episode_num != 0:
++                            obj = EpisodeWithSeasonAndEpisode(
++                                self,
++                                episode.link,
++                                datetime.datetime(* episode.updated_parsed[:6]),
++                                season_num,
++                                episode_num,
++                                quality)
++                            try:
++                                episodes[season_num, episode_num].append(obj)
++                            except KeyError:
++                                episodes[season_num, episode_num] = [obj]
++                        elif config['verbose']:
++                            print 'Season or episode number is 0 in %s' \
++                                    % episode.description
++                elif self.show_type == 'date':
++                    r = re.compile('Episode\s*Date:\s*([0-9\-]+)$')
++                    date_match = r.search(episode.description)
++                    if not date_match:
++                        if not self.ignoremissingdetails:
++                            print >>warn, 'W: Could not match date in %s' % \
++                                episode.description
++                    else:
++                        quality = 0
++                        for key, value in config["quality_matches"].items():
++                            if key in episode.title:
++                                quality = value
++                                break
++                        date = datetime.datetime(*(time.strptime(
++                            date_match.group(1), "%Y-%m-%d")[0:6])).date()
++                        obj = EpisodeWithDate(
++                            self,
++                            episode.link,
++                            datetime.datetime(* episode.updated_parsed[:6]),
++                            date,
++                            quality)
++                        try:
++                            episodes[date].append(obj)
++                        except KeyError:
++                            episodes[date] = [obj]
++                elif self.show_type == 'time':
++                    r = re.compile('Show\s*Title\s*:\s*(.*?);')
++                    title_match = r.search(episode.description)
++                    if not title_match:
++                        if not self.ignoremissingdetails:
++                            print >>warn, 'W: Could not match title in %s' % \
++                                episode.description
++                        title = ""
++                    else:
++                        title = title_match.group(1)
+                     quality = 0
+                     for key, value in config["quality_matches"].items():
+                         if key in episode.title:
+                             quality = value
+                             break
+-                    date = datetime.datetime(*(time.strptime(
+-                        date_match.group(1), "%Y-%m-%d")[0:6])).date()
+-                    obj = EpisodeWithDate(
++                    date = datetime.datetime(* episode.updated_parsed[:6])
++                    obj = EpisodeWithTitle(
+                         self,
+                         episode.link,
+-                        datetime.datetime(* episode.updated_parsed[:6]),
+                         date,
++                        title,
+                         quality)
+                     try:
+                         episodes[date].append(obj)
+                     except KeyError:
+                         episodes[date] = [obj]
+-            elif self.show_type == 'time':
+-                r = re.compile('Show\s*Title\s*:\s*(.*?);')
+-                title_match = r.search(episode.description)
+-                if not title_match:
+-                    if not self.ignoremissingdetails:
+-                        print >>warn, 'W: Could not match title in %s' % \
+-                            episode.description
+-                    title = ""
+-                else:
+-                    title = title_match.group(1)
+-                quality = 0
+-                for key, value in config["quality_matches"].items():
+-                    if key in episode.title:
+-                        quality = value
+-                        break
+-                date = datetime.datetime(* episode.updated_parsed[:6])
+-                obj = EpisodeWithTitle(
+-                    self,
+-                    episode.link,
+-                    date,
+-                    title,
+-                    quality)
+-                try:
+-                    episodes[date].append(obj)
+-                except KeyError:
+-                    episodes[date] = [obj]
+         self.episodes = episodes
+         return episodes
+ 
+@@ -597,6 +635,7 @@ def main(argv=None):
+             'date': None,
+             'time': None, 
+             'ignoremissingdetails': False,
++	    'feedurl': None,
+         }
+         for key in args.keys():
+             if f.has_option(exact_name, key):
diff --git a/net-misc/pytvshows/files/pytvshows-0.2-improved-re.patch b/net-misc/pytvshows/files/pytvshows-0.2-improved-re.patch
new file mode 100644
index 000000000000..a0f114588b3e
--- /dev/null
+++ b/net-misc/pytvshows/files/pytvshows-0.2-improved-re.patch
@@ -0,0 +1,15 @@
+Improved regular expression for matching season and episode; see
+https://sourceforge.net/tracker/index.php?func=detail&aid=2818315&group_id=203642&atid=986413
+
+--- a/pytvshows.orig	2011-08-17 23:20:16.000000000 +0200
++++ b/pytvshows	2011-08-17 23:22:30.000000000 +0200
+@@ -346,7 +346,8 @@
+ 	if self.feedurl:
+ 	    for episode in self.rss['entries']:
+ 	        if self.show_type == 'seasonepisode':
+-		    r = re.compile('S([0-9]+)E([0-9]+)')
++		    #r = re.compile('S([0-9]+)E([0-9]+)')
++		    r = re.compile(r'\bS?([0-9]{1,2})\s*(?:E|x)?\s*([0-9]{1,2})\b')
+ 		    match = r.search( episode.title )
+ 		    season_num = int(match.group(1))
+ 		    episode_num = int(match.group(2))
diff --git a/net-misc/pytvshows/files/pytvshows-0.2-rename-var.patch b/net-misc/pytvshows/files/pytvshows-0.2-rename-var.patch
new file mode 100644
index 000000000000..0713a029c37f
--- /dev/null
+++ b/net-misc/pytvshows/files/pytvshows-0.2-rename-var.patch
@@ -0,0 +1,11 @@
+--- a/pytvshows.bug	2014-06-19 18:49:42.414928250 +0100
++++ b/pytvshows	2014-06-19 18:49:50.534957323 +0100
+@@ -255,7 +255,7 @@
+             self.show_type = 'seasonepisode'
+         elif date_match:
+             self.show_type = 'date'
+-        elif titlematch and titlematch.group(1) != 'n/a':
++        elif title_match and title_match.group(1) != 'n/a':
+             self.show_type = 'time'
+         else:
+             print >> warn, "Could not determine show type for %s." % self
diff --git a/net-misc/pytvshows/metadata.xml b/net-misc/pytvshows/metadata.xml
new file mode 100644
index 000000000000..b3afcab16c89
--- /dev/null
+++ b/net-misc/pytvshows/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">pytvshows</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/pytvshows/pytvshows-0.2-r3.ebuild b/net-misc/pytvshows/pytvshows-0.2-r3.ebuild
new file mode 100644
index 000000000000..48e83a238426
--- /dev/null
+++ b/net-misc/pytvshows/pytvshows-0.2-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="downloads torrents for TV shows from RSS feeds provided by ezrss.it"
+HOMEPAGE="https://sourceforge.net/projects/pytvshows/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ezrss.it.patch"
+	"${FILESDIR}/${P}-feedurl.patch"
+	"${FILESDIR}/${P}-improved-re.patch"
+	"${FILESDIR}/${P}-rename-var.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest
new file mode 100644
index 000000000000..720148ecf6f7
--- /dev/null
+++ b/net-misc/qtm/Manifest
@@ -0,0 +1,5 @@
+DIST qtm-1.3.18.tar.bz2 186137 SHA256 c10fcae059a8e05d83f215b9e718dd2ce7e51ade0c94809ec335faf7527af3d2 SHA512 d4685f22a883e1d7513dcac57a807b0d21c26dfceda547b22889ee980758de1a49c2e898c745bb597efd709823d96da59f7494015c0915edb34e9141fa60e2ca WHIRLPOOL d0af2b33b36097f1cffab9c33f65cc80b12341a3fc954a978561b177ae86472e0565d7dbe1d330519ca70dd47f38d2ef1a1d41351063b1e334d61ee1cf89dd00
+EBUILD qtm-1.3.18.ebuild 1064 SHA256 6d32613a94c44546c0ac5cffca909ad6f779be4f549b7407083b941f597a5ebe SHA512 e2878226dd960c11c612b918c4a6c51c78c58fb3d8e0223fbb1b69fe43bcc0f8c41b037ef42e836e28c1a62e3c2216900ecde71bf35768dedb8d41857ffd1781 WHIRLPOOL a6ad49f310499492f84aab5c8734937dbe540453d7648067c6359f4919b1ac72fca353aac93a42a316b86cd27a60c6a3f629d4c4fc2f304ded64866e2bac1d49
+MISC ChangeLog 2417 SHA256 91fe0cd018a17e16b5c150b17f883190400f4917101983aba226ea62b7c7e1ad SHA512 bf0a6437dd34e5e7b241bdf3a88525bd10f6ad891de24fda219a48b7e0bbe5123cf9950460c571cac9ced91eb6bc196429bcf07fc3e5fe15a942b831a75f241a WHIRLPOOL 4905e5cce92f8cf8b8a8a0d3ea23a7c42f6701461b346da6c9e2e78435097d7fea73b62ee3dd69195cc6353f367ab401f71564bc9b5175e0e9dc826f6cfdc8af
+MISC ChangeLog-2015 4903 SHA256 1f100700cb9eb8d966eedc17b847171441dddace5440100e82595b34422d399b SHA512 dd996a180963d63cd3cbc35f3606419cdb88390f938ba0e92977104a23081022e55dd40bce4632b1d1a98813d9d6ab37971cf0994c0614a8247e6e76d75b9ff2 WHIRLPOOL 5dd1561ebc7b026001d79545a0184b57646cd06b694b944e522be055f03ff762a824f3f517e34da67e4238ce6d0058809b241e6ceab93c2da7a1b60943948022
+MISC metadata.xml 493 SHA256 4982ce29c1da71e4f84fd665a033f8bc0b31d0b8aa2980e22246206d6f6b2dac SHA512 8445728ea4bfd9de955c5eb0dd5fb8daf79ed88512bf70e6bd610ad27b349c0a4b06b3d26a2cf79b2c95cab3730996d152f5ad88a26582b354e2bc75dff394bd WHIRLPOOL e13305618d5bf6f06385302cb24d9fd027c5d2bf7a020203b14a55ea29a816c1463aeabbeca9e6d1b78293f10140208d8143bef758da894df5d20c755c8da22e
diff --git a/net-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml
new file mode 100644
index 000000000000..c518c18a9063
--- /dev/null
+++ b/net-misc/qtm/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">catkin</remote-id>
+		<remote-id type="bitbucket">IndigoJo/qtm-1.3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/qtm/qtm-1.3.18.ebuild b/net-misc/qtm/qtm-1.3.18.ebuild
new file mode 100644
index 000000000000..cf52d2b32500
--- /dev/null
+++ b/net-misc/qtm/qtm-1.3.18.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD="1"
+inherit cmake-utils versionator
+
+DESCRIPTION="Qt blogging client"
+HOMEPAGE="http://qtm.blogistan.co.uk"
+SRC_URI="https://bitbucket.org/IndigoJo/${PN}-$(get_version_component_range 1-2)/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dbus debug"
+RESTRICT="strip"
+
+RDEPEND="dev-lang/perl
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	virtual/perl-Digest-MD5
+	x11-proto/xproto
+	dbus? ( dev-qt/qtdbus:5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( Changelog README )
+
+src_prepare() {
+	# bug 463810
+	sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die 'sed on qtm-desktop.sh failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQt5=ON
+		-DDONT_USE_PTE=OFF
+		-DINSTALL_MARKDOWN=ON
+		-DNO_SSL=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DDONT_USE_DBUS=$(usex !dbus)
+		-DQDEBUG=$(usex debug)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
new file mode 100644
index 000000000000..358257834ce2
--- /dev/null
+++ b/net-misc/quagga/Manifest
@@ -0,0 +1,23 @@
+AUX quagga-0.99.22.4-ipctl-forwarding.patch 731 SHA256 13944134f93a8b31ec0cad8444618afe9681f52de54b20be3be5ff4f7a647c83 SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447 WHIRLPOOL aacf456f7ccbf91ff9356606a475da00e486008bab35bd5c3f0bc3e742580079ab347f0be07d41816d7ecb438ea95cc4a128384898937b555b43c9b4531fdfe0
+AUX quagga-services.init.3 1072 SHA256 348b781bed87f50632391ea9efafca7e067f88c92ee7e21fe1c6b22869ba4a35 SHA512 03ce5cf77612ece73d3df85c6afa747dab479949299458b5c6f59dcf778b60314fd0a9c7987be289cc0b8363dcc6e337ab5309e0a86f716208ddfc5f12b8a4b3 WHIRLPOOL 8ef67c9a3b9a8fe32fa0df00e36733bf349cbd8818d12a009101775d94522bf83a9a2bc565702e1b144cc8ec1888d60bffc1edf42dc6a39ada6b1a3965d5ec61
+AUX quagga.pam 975 SHA256 aa68ac97d7a951324bc3c4124a1c70f6fa88a45da860f636ac01cbcbfa36db70 SHA512 92dc6c68146d46046c6f5ff410629a2a7170e81e9657b7a2aebe1d94c8fa267acdcac9d8d8596fb54dbbacc0566502e82d900ea33f8824c07fba497b7e0f1efe WHIRLPOOL defc345fe4ccbff1cf3b68bee46f589467d68b11f7511d1333f9cdf4dbef8c55c32e4b0d9eb2f2aa57df7bdb47baa75bada593f97059494534192d34c808733b
+AUX systemd/bgpd.service 347 SHA256 9912dc6178f332750bb373706745895664cea7a80c1715f444c3cbd3ba3e6e63 SHA512 dfefd7b758fd41ccaeb024c0ba4f08400086e05f44c1985cb387d0dfb0c0e19844879b49f84c350282e0d5d56dd1c65c8ac33f65e06543a20aacdfbba593606b WHIRLPOOL bdaf11a623d2f3d64da1402da70787eb4a17d03ad7f8e59d2b0266f8ae0a707e8dcb5412864f2d174210be1645287742c8398d527fd6414155e225efd831a4a4
+AUX systemd/isisd.service 352 SHA256 009ce3926808f7c2bb98c79ab46bdfcc6dfc5054d590db6a19326ee69c9a17d7 SHA512 28c054986c9171f960663056d3058c46c81270a0cb14c356d31deb1e77ef44e710535ec402773fc44191b449eae3367411ee6344386069fda9ac150c6c715713 WHIRLPOOL be36dc493f6aceb76ef61167b56f201f22447ade83158f36e9039ba7de8a0c22ffa4f680e37fab9cf3fe3e5356297a35661388f21a43de5662fbbf2d5065d971
+AUX systemd/nhrpd.service 344 SHA256 cbff1b0da3597479d3e4c444f8e4823989644c4f367e9fee6e8fbe99eebef069 SHA512 d289853f3dfca5f6de2a24935fbcd13018938e8d6614dd4eeb127b5085e6a772b0af2e8f15786c309d515b998fc7f49edd159d47e4fb7686029167775bca2635 WHIRLPOOL be9a1464a6a18c238604c1633d52aeebf84932b210c57099bb3dc2380cd00806d64942346ee7702866aa76c2eae309b285ad6d0a25b43af4c8f001178a20d677
+AUX systemd/ospf6d.service 364 SHA256 b4a4ff945d0340a729c937688ce7fe90587c2b3f1dc6170ad965c5ab9b0ba19f SHA512 379f72ec275329a715c0e4b044cbdeae8f51e06b3ed8eb1bf643163ab824a9539c6a1b0d6521cea6585eca58fbf8bd3fa153ef62936c14c06fad48395e7103ac WHIRLPOOL 7568da84e08ac39430a801d70ba3d068a760355bf844525e99f6aef4364c96a3e9bf14f37eb91406f95d743290e3922001f3479653c6748858fa471ce66f9629
+AUX systemd/ospfd.service 352 SHA256 98e7d99ca63b80143d53507e515b716c649ce497930916dd392d4ce478f35bfb SHA512 48fff984c5ac6e446fcf77307645258df881e194869aeff4d145233bb1306e422e7964f9043d244cd3bfcf9fe4cb2ebf117f562c564c847138ef32e070c50a85 WHIRLPOOL 5aec494c84bfa582f14b11c3bcd828a6d6759a556b74f915230804a400cbb1055a2fbb969ebf6f1db91850ab3da85f387b8697a22fb27e5fe068bcbb85b9e4f3
+AUX systemd/pimd.service 359 SHA256 c1a93da9b944258d77d14d92c8ad1ea52c9fb8fecc1bad4877bb92a28da2b32f SHA512 fc0d6dbf746c3fd95cf82be44415c456559596c03460c9975f957591b0d647cdf6968fe16091673114306f3dcdfce9fc401a053d8bf8f00b67b3957512b26640 WHIRLPOOL 2c39fe3517a84f275a2d4609840431263c4ca15665a0af19f5144b515072b05e7dbb78477a507701f0601bbfa24102b2523315582baaec769ee03ec3ddc92594
+AUX systemd/quagga.conf 33 SHA256 d1e6439001a6860419cecd97c36fa646fe4a9b81895cb2e2dd353cf024471953 SHA512 78effd7fe5ddd0187dc6e110ac2550001e24e803423ece7332e7dae0f83fde2d897aafe18665c64a15e2c1747b347d8eb9c99c8b95f16348deffca454a79ad8a WHIRLPOOL 94b97496109627f6f7d95ef605ba7e63bf6dc69b1e70559c252ec018563a66866e7b399c53cb7b1995e0a71fa5e446fd06b3015faf7092e446ace262cfe61fe6
+AUX systemd/ripd.service 347 SHA256 1bd58e78865a6ed7d68ef0e6545e220c44a6a66906d19bfe946b3f0365d60061 SHA512 4251609529c0fe7b8cee1191eae3d13ae1813d5d9544d2844df7e135f341f84cfd2192e6331bb2642da3637f7dd2ec29ffa93df918ecc1e071cfb45802ceabee WHIRLPOOL 0ff9a54ce7ba20faff30bcbfa7a11f4ef981a9fd557951286c6357a84a988e18e90ded89b9305216a9f1ca3c08b78ec04fafc18a25e06e58bf3d5e2add7a9b4d
+AUX systemd/ripngd.service 364 SHA256 387f38a6dd747e4ad60abcfc3f4b4fca415973b963bd8bd6a26635265edc9f56 SHA512 ccfd048152896ee7ebdc434554a080b8ba36444d4de1cd11b5d2408cddfeb2ea1312962460b9a761d1a2db31dd5e72cadddf1807f9783ac1c2a51fd52c85ad54 WHIRLPOOL f83c6ac4430662f312791204ead3566d8c4465b4fe77bc5e279c54c9b0b730f52eff43881162d0fa43cce8770e330d61fb8eb62253524342dc6edff0571ef300
+AUX systemd/zebra.service 354 SHA256 495eb109bc513784eff1028dbd8759cd583f37c7d07b083e4c3bb8a627e93713 SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a WHIRLPOOL 2e277d14608dd1b59c549b0046075bad22cf7fc531e7e9838de59aeb8349cd6048bf720622a51086a24a3c8c00c3076fde2de0e02573809f611677513879160f
+DIST ht-20040304-classless-bgp.patch 1581 SHA256 39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887 SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8 WHIRLPOOL cef99d64d52ab8c28bd672fb93dfbd8d716a31c76a5403496a6d104a5ff39531d6085134124d41fe4ff7adf895fa001cbe77b6e42846d849d6c108c81583d04e
+DIST quagga-1.1.1.tar.gz 2871705 SHA256 b5a94e5bdad3062e04595a5692b8cc435f0a85102f75dfdca0a06d093b4ef63f SHA512 51eb64ada07b42c663705cedf56be5b8b54143a5543b472e3dc7c703a4ab0542f39cfbeed64d1c33ceee6a15ea8d25ef84616fa40b6bf9cc32023f7241c18c58 WHIRLPOOL 795aa54b7930c441cbbc40a67db75865ccecada523164c906dd4a1b385b51820bff061ca58265fc67d1a814c8162d8b6e6758a4aab47ba54dab58cf846cb28be
+DIST quagga-1.2.0.tar.gz 2948778 SHA256 1043644d37975d9f920b76c593368cbe36ca43e27eb57cff316ee80ccb31dce3 SHA512 0ad28b828c2e52ad486189bd68e21041fe7c4affada7e3f12ba83a95f3532e0b012ba6b4271f9d0de63d4f5b15e80c706977b3afa54b57a3a5ec02400227d5ae WHIRLPOOL b4c73c4f7c99c971d762fbde79d5c6776b11b36d8a9b58e9c7cb5d322818ef8b6d90ca5c3f4c55f9b3353ae65042a99b41d39049b0a2f254bbd8904e5136ecce
+DIST quagga-1.2.1.tar.gz 2922514 SHA256 aaddba5d4f41ed8e4c2f155f4584c993465d122c9096b5b52ada3fc75266fbcd SHA512 ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb WHIRLPOOL aeaa20e007a77a8bda469c847ae4de904c8987973e6ad4e358b59c5847226060417efdec8952aa79f8698b76f10da0c257034873365402215d05205e4a1fa866
+EBUILD quagga-1.1.1.ebuild 3614 SHA256 766537dfd7b437115515d8d68a4aefe998d56397cdab1e25e75ab16f4865306e SHA512 93b78444d67d4206ec008566a3953c7c4c05ab325f79b3c9d29029ec9ded97283c48e376dfc273496598e7e8a7c665f74e08970ad9ee78bcdf39b4e19f1f698a WHIRLPOOL 5cee2e8cc0933a1a2f2e6f5a1e418dc04b3704edb0f8609d2d18f6f9fa5abe94ccd9d82c721f7532bce9b47f9d28dd78231e9203133b050364fa5f7e9120f23f
+EBUILD quagga-1.2.0-r2.ebuild 3734 SHA256 081e46b44c55c3056c9603cfb0fa52be3c07ceda33868527324547acdd9ab9a6 SHA512 c6317db3cc11f0d6f941a0665c52fc1b1af7648dea08a5d44a0cad1f218c2b14d4ae19d8b7d8f71a8776a2ef1a0975f9335a32fd5197bff19aecb5312a12d60f WHIRLPOOL 2bc4719a1d7686d51f1970bb6b3e8706417ff9b3628195f707665e3272c915dedd3cf749316e58ec20829e37bfe80d6635c051a97a8f833e1e1edb4b418bd855
+EBUILD quagga-1.2.1.ebuild 3680 SHA256 194126381b995d7ce48692c0eef7a258bb8bbeecbc00aabc5052d88d2de78de3 SHA512 cafc54c31ecb152b8fb0c10db80786f1f93e7d86e3ee85098a64847b200ff28591962925938afcfcd833d143d09478b95ba1e5fa933b9696359b21881a69df40 WHIRLPOOL 9f5bba38ef9f4ffb17b0890546fa6a82c3ed66df633f81bf95c6e18c9aae6edfe06c782af148318fc929373428ef0d59605f6d4ac0b633258d67bd950a45b0ef
+MISC ChangeLog 8782 SHA256 c764e8c1eb658ac2f9ce886f027078aa751b19580620ca70f66a5ac287673a63 SHA512 0ffa94a2d7973fca52bc83148da4c9ede153d00d2a8cfd3f2206dc96e9c429b03aaa29c6831d7d5f46ef16529cd589e9443369b150f434136a8e9eb79aa28a66 WHIRLPOOL 7b936711b434dbd08f6f06310a33bbf01a5ca3fefe33fe7c1f81f2ef5122ebcee2c3653ad091c56fa30907943653f5823848f5dde9236faa52f7f1ebb2965ce3
+MISC ChangeLog-2015 28261 SHA256 e4bdcf9343224b679e2e98e00e508ecaf40d06645a838b0e3e22ba567027a4cb SHA512 907689f10f73cbd3b9b5efb8a690002ed6548daa283cc61211f75df8eb369762c869a4c3774c8a3c9ac8db7ba3297f705f02e3765fb5c250c7f3e0113ad094a9 WHIRLPOOL 5a1eb4bf5ae04311b58e67557bd966e0addbf25e11a7e3d25a428d18bc1940885f9e3f65d12fce85547ce1b9d06ada6a1d8099dea60a85046b4c3e698d0076f1
+MISC metadata.xml 2375 SHA256 9dcdd681815e6d9ec3b29fcbd97760971c17c7fa7f15c3b540a0cac1d0ff2eca SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db WHIRLPOOL e3f3c299199353e880018c6233cf95e92c023ca0ad07da7f95a0422283127c5a4191587f5513356444bd69e1cde1a25f906c7826544b19fc745d06f996b72636
diff --git a/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch b/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch
new file mode 100644
index 000000000000..f6b726b591f7
--- /dev/null
+++ b/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch
@@ -0,0 +1,22 @@
+Fix for missing definitions on some Hardened configurations
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=437292
+
+diff -Naur quagga-0.99.16.orig/zebra/ipforward_sysctl.c quagga-0.99.16/zebra/ipforward_sysctl.c
+--- quagga-0.99.16.orig/zebra/ipforward_sysctl.c	2010-03-11 12:11:32.000000000 -0500
++++ quagga-0.99.16/zebra/ipforward_sysctl.c	2010-03-11 12:11:39.000000000 -0500
+@@ -31,6 +31,15 @@
+ 
+ #define MIB_SIZ 4
+ 
++/* Fix for recent (2.6.14) kernel headers */
++#ifndef IPCTL_FORWARDING
++    #define IPCTL_FORWARDING       NET_IPV4_FORWARD
++#endif
++
++#ifndef IP6CTL_FORWARDING
++    #define IP6CTL_FORWARDING      NET_IPV6_FORWARDING
++#endif
++
+ extern struct zebra_privs_t zserv_privs;
+ 
+ /* IPv4 forwarding control MIB. */
diff --git a/net-misc/quagga/files/quagga-services.init.3 b/net-misc/quagga/files/quagga-services.init.3
new file mode 100644
index 000000000000..e613b26abb03
--- /dev/null
+++ b/net-misc/quagga/files/quagga-services.init.3
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${CFGFILE:=/etc/quagga/${SVCNAME}.conf}
+
+pidfile=/run/quagga/${SVCNAME}.pid
+
+command=/usr/sbin/${SVCNAME}
+command_args="-d -f ${CFGFILE} ${EXTRA_OPTS} --pid_file ${pidfile}"
+
+get_service_config() {
+	[ -e "$CFGFILE" ] || return
+
+	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
+}
+
+depend() {
+	config "$CFGFILE"
+
+    [ ${SVCNAME} = "zebra" ] && need net || need zebra
+
+	[ "$(get_service_config log)" = "syslog" ] && \
+		use logger
+}
+
+start_pre() {
+    if [ ! -e "${CFGFILE}" ] ; then
+        eerror "Before starting ${SVCNAME} you have to configure it, by creating"
+        eerror "a ${CFGFILE} file."
+        eerror ""
+        eerror "A sample file has been installed in `echo /usr/share/doc/quagga-*/samples/${SVCNAME}.conf.sample*`"
+        return 1
+    fi
+
+	checkpath -d -m 0750 -o quagga:quagga /run/quagga
+
+	if [ ${SVCNAME} = "zebra" ]; then
+		ebegin "Cleaning up stale zebra routes..."
+		ip route flush proto zebra
+		eend $?
+	fi
+}
diff --git a/net-misc/quagga/files/quagga.pam b/net-misc/quagga/files/quagga.pam
new file mode 100644
index 000000000000..9a91ad852fbd
--- /dev/null
+++ b/net-misc/quagga/files/quagga.pam
@@ -0,0 +1,26 @@
+#%PAM-1.0
+#
+
+##### if running quagga as root:
+# Only allow root (and possibly wheel) to use this because enable access
+# is unrestricted.
+auth       sufficient   pam_rootok.so
+
+# Uncomment the following line to implicitly trust users in the "wheel" group.
+#auth       sufficient   pam_wheel.so trust use_uid
+# Uncomment the following line to require a user to be in the "wheel" group.
+#auth       required     pam_wheel.so use_uid
+###########################################################
+
+# If using quagga privileges and with a seperate group for vty access, then
+# access can be controlled via the vty access group, and pam can simply
+# check for valid user/password, eg:
+#
+# only allow local users.
+#auth       required     pam_securetty.so
+#auth       include      system-auth
+#auth       required     pam_nologin.so
+#account    include      system-auth
+#password   include      system-auth
+#session    include      system-auth
+#session    optional     pam_console.so
diff --git a/net-misc/quagga/files/systemd/bgpd.service b/net-misc/quagga/files/systemd/bgpd.service
new file mode 100644
index 000000000000..f5db0b2510ec
--- /dev/null
+++ b/net-misc/quagga/files/systemd/bgpd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=BGP routing daemon
+Documentation=man:bgpd(8) man:zebra(8)
+BindsTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/bgpd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/bgpd.pid
+ExecStart=/usr/sbin/bgpd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/isisd.service b/net-misc/quagga/files/systemd/isisd.service
new file mode 100644
index 000000000000..10eb0a8fe1d8
--- /dev/null
+++ b/net-misc/quagga/files/systemd/isisd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=IS-IS routing daemon
+Documentation=man:isis(8) man:zebra(8)
+BindsTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/isisd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/isisd.pid
+ExecStart=/usr/sbin/isisd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/nhrpd.service b/net-misc/quagga/files/systemd/nhrpd.service
new file mode 100644
index 000000000000..1a93bae61b14
--- /dev/null
+++ b/net-misc/quagga/files/systemd/nhrpd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=NHRP daemon
+Documentation=man:nhrpd(8) man:zebra(8)
+BindsTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/nhrpd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/nhrpd.pid
+ExecStart=/usr/sbin/nhrpd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/ospf6d.service b/net-misc/quagga/files/systemd/ospf6d.service
new file mode 100644
index 000000000000..b6372d10d898
--- /dev/null
+++ b/net-misc/quagga/files/systemd/ospf6d.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OSPF routing daemon for IPv6
+Documentation=man:ospfd(8) man:zebra(8)
+BindsTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ospf6d.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ospf6d.pid
+ExecStart=/usr/sbin/ospf6d -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/ospfd.service b/net-misc/quagga/files/systemd/ospfd.service
new file mode 100644
index 000000000000..310d219c0014
--- /dev/null
+++ b/net-misc/quagga/files/systemd/ospfd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OSPF routing daemon
+Documentation=man:ospfd(8) man:zebra(8)
+BindsTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ospfd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ospfd.pid
+ExecStart=/usr/sbin/ospfd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/pimd.service b/net-misc/quagga/files/systemd/pimd.service
new file mode 100644
index 000000000000..d39f59696c51
--- /dev/null
+++ b/net-misc/quagga/files/systemd/pimd.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=PIM-SSM routing daemon
+Documentation=man:zebra(8)
+BindsTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/pimd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/pimd.pid
+ExecStart=/usr/sbin/pimd -d
+ExecReload=/bin/kill -HUP $MAINPID
+SuccessExitStatus=1
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/quagga.conf b/net-misc/quagga/files/systemd/quagga.conf
new file mode 100644
index 000000000000..296083753e0a
--- /dev/null
+++ b/net-misc/quagga/files/systemd/quagga.conf
@@ -0,0 +1 @@
+d /run/quagga 0750 quagga quagga
diff --git a/net-misc/quagga/files/systemd/ripd.service b/net-misc/quagga/files/systemd/ripd.service
new file mode 100644
index 000000000000..b2a74df47fb9
--- /dev/null
+++ b/net-misc/quagga/files/systemd/ripd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=RIP routing daemon
+Documentation=man:ripd(8) man:zebra(8)
+BindsTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ripd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ripd.pid
+ExecStart=/usr/sbin/ripd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/ripngd.service b/net-misc/quagga/files/systemd/ripngd.service
new file mode 100644
index 000000000000..75c60d8395b5
--- /dev/null
+++ b/net-misc/quagga/files/systemd/ripngd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=RIP routing daemon for IPv6
+Documentation=man:ripngd(8) man:zebra(8)
+BindsTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ripngd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ripngd.pid
+ExecStart=/usr/sbin/ripngd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/zebra.service b/net-misc/quagga/files/systemd/zebra.service
new file mode 100644
index 000000000000..d2374411b459
--- /dev/null
+++ b/net-misc/quagga/files/systemd/zebra.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=GNU Zebra routing manager
+Documentation=man:zebra(8)
+After=network.target
+ConditionPathExists=/etc/quagga/zebra.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/zebra.pid
+ExecStartPre=/bin/ip route flush proto zebra
+ExecStart=/usr/sbin/zebra -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
new file mode 100644
index 000000000000..ec2a74e8dc3d
--- /dev/null
+++ b/net-misc/quagga/metadata.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<longdescription>
+		Quagga is a modern fork of Zebra. Quagga is a routing software package that provides TCP/IP
+		based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,
+		OSPFv3, BGP-4, and BGP-4+. Quagga also supports special BGP Route Reflector and Route Server
+		behavior.  In addition to traditional IPv4 routing protocols, Quagga also supports IPv6 routing
+		protocols. With SNMP daemon which supports SMUX protocol, Quagga provides routing protocol
+		MIBs. Furthermore Quagga supports OSPFAPI, a API interface to the OSPF LSDB. It supports
+		inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The
+		Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF
+		routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood
+		service state information into the routing domain
+	</longdescription>
+	<use>
+		<flag name="bgpclassless">
+			Apply unofficial patch to enable classless prefixes for BGP. Patch and information to be found
+			at http://hasso.linux.ee/doku.php/english:network:quagga
+		</flag>
+		<flag name="fpm">
+			Enable Forwarding Plane Manager support
+		</flag>
+		<flag name="multipath">
+			Enable multipath routes support for any number of routes
+		</flag>
+		<flag name="nhrpd">
+			Build Next Hop Resolution Protocol daemon
+		</flag>
+		<flag name="ospfapi">
+			Enable OSPFAPI support for client applications accessing the OSPF link state database
+		</flag>
+		<flag name="pam">
+			Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Quagga Virtual Terminal Interface
+			Shell (vtysh); if the readline USE flag is disabled, this flag is ignored
+		</flag>
+		<flag name="protobuf">
+			Enable support for <pkg>dev-libs/protobuf</pkg>
+		</flag>
+		<flag name="readline">
+			Enable support for <pkg>sys-libs/readline</pkg> to provide the Quagga Virtual Terminal
+			Interface Shell (vtysh)
+		</flag>
+		<flag name="tcp-zebra">
+			Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain
+			sockets are chosen otherwise
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/quagga/quagga-1.1.1.ebuild b/net-misc/quagga/quagga-1.1.1.ebuild
new file mode 100644
index 000000000000..0cf903443f32
--- /dev/null
+++ b/net-misc/quagga/quagga-1.1.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+
+inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd user
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
+HOMEPAGE="http://quagga.net/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ~s390 sparc x86"
+
+IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra"
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	protobuf? ( dev-libs/protobuf-c:0= )
+	readline? (
+		sys-libs/readline:0=
+		pam? ( sys-libs/pam )
+	)
+	snmp? ( net-analyzer/net-snmp )
+	!elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/gawk
+	sys-devel/libtool:2"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
+)
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
+You have to create config files in /etc/quagga before
+starting one of the daemons.
+
+You can pass additional options to the daemon by setting the EXTRA_OPTS
+variable in their respective file in /etc/conf.d"
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	# Classless prefixes for BGP
+	# http://hasso.linux.ee/doku.php/english:network:quagga
+	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
+
+	eapply "${PATCHES[@]}"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# do not build PDF docs
+	export ac_cv_prog_PDFLATEX=no
+	export ac_cv_prog_LATEXMK=no
+
+	econf \
+		--enable-exampledir=/usr/share/doc/${PF}/samples \
+		--enable-irdp \
+		--enable-isisd \
+		--enable-isis-topology \
+		--enable-pimd \
+		--enable-user=quagga \
+		--enable-group=quagga \
+		--enable-vty-group=quagga \
+		--with-cflags="${CFLAGS}" \
+		--with-pkg-extra-version="-gentoo" \
+		--sysconfdir=/etc/quagga \
+		--localstatedir=/run/quagga \
+		--disable-static \
+		$(use_enable caps capabilities) \
+		$(usex snmp '--enable-snmp' '' '' '') \
+		$(use_enable !elibc_glibc pcreposix) \
+		$(use_enable tcp-zebra) \
+		$(use_enable doc) \
+		$(usex multipath $(use_enable multipath) '' '=0' '') \
+		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
+		$(use_enable readline vtysh) \
+		$(use_with pam libpam) \
+		$(use_enable protobuf) \
+		$(use_enable ipv6 ripngd) \
+		$(use_enable ipv6 ospf6d) \
+		$(use_enable ipv6 rtadv)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	readme.gentoo_create_doc
+
+	keepdir /etc/quagga
+	fowners root:quagga /etc/quagga
+	fperms 0770 /etc/quagga
+
+	# Path for PIDs before first reboot should be created here, bug #558194
+	dodir /run/quagga
+	fowners quagga:quagga /run/quagga
+	fperms 0770 /run/quagga
+
+	# Install systemd-related stuff, bug #553136
+	systemd_dotmpfilesd "${FILESDIR}/systemd/quagga.conf"
+	systemd_dounit "${FILESDIR}/systemd/zebra.service"
+
+	# install zebra as a file, symlink the rest
+	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
+
+	for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd); do
+		dosym zebra /etc/init.d/${service}
+		systemd_dounit "${FILESDIR}/systemd/${service}.service"
+	done
+
+	use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
+
+	insinto /etc/logrotate.d
+	newins redhat/quagga.logrotate quagga
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/quagga/quagga-1.2.0-r2.ebuild b/net-misc/quagga/quagga-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..6897c5f9eac8
--- /dev/null
+++ b/net-misc/quagga/quagga-1.2.0-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+
+inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd user
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
+HOMEPAGE="http://quagga.net/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+
+IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra"
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	nhrpd? ( net-dns/c-ares:0= )
+	protobuf? ( dev-libs/protobuf-c:0= )
+	readline? (
+		sys-libs/readline:0=
+		pam? ( sys-libs/pam )
+	)
+	snmp? ( net-analyzer/net-snmp )
+	!elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/gawk
+	sys-devel/libtool:2"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
+)
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
+You have to create config files in /etc/quagga before
+starting one of the daemons.
+
+You can pass additional options to the daemon by setting the EXTRA_OPTS
+variable in their respective file in /etc/conf.d"
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	# Classless prefixes for BGP
+	# http://hasso.linux.ee/doku.php/english:network:quagga
+	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
+
+	eapply "${PATCHES[@]}"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# do not build PDF docs
+	export ac_cv_prog_PDFLATEX=no
+	export ac_cv_prog_LATEXMK=no
+
+	econf \
+		--enable-exampledir=/usr/share/doc/${PF}/samples \
+		--enable-irdp \
+		--enable-isisd \
+		--enable-isis-topology \
+		--enable-pimd \
+		--enable-user=quagga \
+		--enable-group=quagga \
+		--enable-vty-group=quagga \
+		--with-cflags="${CFLAGS}" \
+		--with-pkg-extra-version="-gentoo" \
+		--sysconfdir=/etc/quagga \
+		--localstatedir=/run/quagga \
+		--disable-static \
+		$(use_enable caps capabilities) \
+		$(usex snmp '--enable-snmp' '' '' '') \
+		$(use_enable !elibc_glibc pcreposix) \
+		$(use_enable fpm) \
+		$(use_enable tcp-zebra) \
+		$(use_enable doc) \
+		$(usex multipath $(use_enable multipath) '' '=0' '') \
+		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
+		$(use_enable readline vtysh) \
+		$(use_with pam libpam) \
+		$(use_enable nhrpd) \
+		$(use_enable protobuf) \
+		$(use_enable ipv6 ripngd) \
+		$(use_enable ipv6 ospf6d) \
+		$(use_enable ipv6 rtadv)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	readme.gentoo_create_doc
+
+	keepdir /etc/quagga
+	fowners root:quagga /etc/quagga
+	fperms 0770 /etc/quagga
+
+	# Path for PIDs before first reboot should be created here, bug #558194
+	dodir /run/quagga
+	fowners quagga:quagga /run/quagga
+	fperms 0770 /run/quagga
+
+	# Install systemd-related stuff, bug #553136
+	systemd_dotmpfilesd "${FILESDIR}/systemd/quagga.conf"
+	systemd_dounit "${FILESDIR}/systemd/zebra.service"
+
+	# install zebra as a file, symlink the rest
+	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
+
+	for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd) $(use nhrpd && echo nhrpd); do
+		dosym zebra /etc/init.d/${service}
+		systemd_dounit "${FILESDIR}/systemd/${service}.service"
+	done
+
+	use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
+
+	insinto /etc/logrotate.d
+	newins redhat/quagga.logrotate quagga
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/quagga/quagga-1.2.1.ebuild b/net-misc/quagga/quagga-1.2.1.ebuild
new file mode 100644
index 000000000000..3f1ebb529833
--- /dev/null
+++ b/net-misc/quagga/quagga-1.2.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+
+inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd tmpfiles user
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
+HOMEPAGE="http://quagga.net/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ppc ~s390 ~sparc x86"
+
+IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra"
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	nhrpd? ( net-dns/c-ares:0= )
+	protobuf? ( dev-libs/protobuf-c:0= )
+	readline? (
+		sys-libs/readline:0=
+		pam? ( sys-libs/pam )
+	)
+	snmp? ( net-analyzer/net-snmp )
+	!elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/gawk
+	sys-devel/libtool:2"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
+)
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
+You have to create config files in /etc/quagga before
+starting one of the daemons.
+
+You can pass additional options to the daemon by setting the EXTRA_OPTS
+variable in their respective file in /etc/conf.d"
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	# Classless prefixes for BGP
+	# http://hasso.linux.ee/doku.php/english:network:quagga
+	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
+
+	eapply "${PATCHES[@]}"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# do not build PDF docs
+	export ac_cv_prog_PDFLATEX=no
+	export ac_cv_prog_LATEXMK=no
+
+	econf \
+		--enable-exampledir=/usr/share/doc/${PF}/samples \
+		--enable-irdp \
+		--enable-isisd \
+		--enable-isis-topology \
+		--enable-pimd \
+		--enable-user=quagga \
+		--enable-group=quagga \
+		--enable-vty-group=quagga \
+		--with-cflags="${CFLAGS}" \
+		--with-pkg-extra-version="-gentoo" \
+		--sysconfdir=/etc/quagga \
+		--localstatedir=/run/quagga \
+		--disable-static \
+		$(use_enable caps capabilities) \
+		$(usex snmp '--enable-snmp' '' '' '') \
+		$(use_enable !elibc_glibc pcreposix) \
+		$(use_enable fpm) \
+		$(use_enable tcp-zebra) \
+		$(use_enable doc) \
+		$(usex multipath $(use_enable multipath) '' '=0' '') \
+		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
+		$(use_enable readline vtysh) \
+		$(use_with pam libpam) \
+		$(use_enable nhrpd) \
+		$(use_enable protobuf) \
+		$(use_enable ipv6 ripngd) \
+		$(use_enable ipv6 ospf6d) \
+		$(use_enable ipv6 rtadv)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	readme.gentoo_create_doc
+
+	keepdir /etc/quagga
+	fowners root:quagga /etc/quagga
+	fperms 0770 /etc/quagga
+
+	# Install systemd-related stuff, bug #553136
+	dotmpfiles "${FILESDIR}/systemd/quagga.conf"
+	systemd_dounit "${FILESDIR}/systemd/zebra.service"
+
+	# install zebra as a file, symlink the rest
+	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
+
+	for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd) $(use nhrpd && echo nhrpd); do
+		dosym zebra /etc/init.d/${service}
+		systemd_dounit "${FILESDIR}/systemd/${service}.service"
+	done
+
+	use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
+
+	insinto /etc/logrotate.d
+	newins redhat/quagga.logrotate quagga
+}
+
+pkg_postinst() {
+	# Path for PIDs before first reboot should be created here, bug #558194
+	tmpfiles_process quagga.conf
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
new file mode 100644
index 000000000000..1b9166d8dc6d
--- /dev/null
+++ b/net-misc/r8168/Manifest
@@ -0,0 +1,6 @@
+AUX r8168-8.044.02-linux-4.11.patch 1025 SHA256 414c4ceac0957b500e175696594bb8ec85c59da26ee736f7757a2b39fae0f4b2 SHA512 ecde1267124554fc3a964b1e72000a0af5b551f40c2ad0c8f4a6e487f70ca35ce8aef13cf139466ce0040750995f0aaa833a956b41548762d5df6aaf9547edb1 WHIRLPOOL 754c1191dd2d5ed55a45a8e2ffb7070a3894fc826b4083d49650b9b46bd4309fc04c2d10a68a217d3d51160d7c5dde18a87576d5d8c633491dc44a833cef2951
+DIST r8168-8.044.02.tar.bz2 95880 SHA256 ad3cd1becb35efab52ed11e0326c1108806c55c62fd2b5e1cf7eaa749fb75027 SHA512 d7e4fd73ee4f17440613b78163777fc0b9e472490a900fdf8e66c4e16f413cc01f49991a68c7bfb19ddf9577e706d0410ff7c8e85ced53e9740e69efda729512 WHIRLPOOL 6fc45e7a2ada3cf184d5c16a7c5bc5349bec7d6f45932c74dd281bf2383f82a9ec3353a5f623f97d9338f65b846b5fa12aece0b7fc9b36cdf7d59d8b22cfcef7
+EBUILD r8168-8.044.02.ebuild 767 SHA256 2c03a5e4b52bcd1594d064225f6924e40d854db4d47942c69c8882a78c4eae55 SHA512 95d90ef205878653f5c64f872daba715e29680fa291f5b7f1e3acba27b9e1199eac9542af054499a1437771bb2c0d4b36462edd0e696035de17ab33d64aa6d93 WHIRLPOOL 4df4fff37896a717cef095f56d3e278dc038397ed01a82cfc671ff77e8d1e117cb01523fedac6e92400abebc57ed24c7083c36ae5fefd2671794002dd4aee5c0
+MISC ChangeLog 3092 SHA256 44648cd238cf62f80ebfed4396e3eab0fc001ef32adcd8b14f24544acff58183 SHA512 6d285adee928ad417c4eac0c0cd483f47394864371fddd12c440c6319843ca8efafd29309a38963196cd3062eaec7f4c9d940aea5376f79d63e19ec05ec259d1 WHIRLPOOL 7543a63025b6c89fc7a8b48b32dfa1c6f509e18334dd6b2fb126a6f6b249042075b6b94263e9713a130e572320c58caa25f8300bdd438eec0ba67d916b42743b
+MISC ChangeLog-2015 4087 SHA256 ba34ae987d39ab6072d01d699818e108a5eafa4a0d286b126b5482fe943e3848 SHA512 3bb92eacb7deecca4b5d8be81a2cb6f312fdec3b861296804a5a36f611eb76b65cf671bf67200b0d1ee721528a061ac205209a41a545b859eadcc577839e9b07 WHIRLPOOL 8dcc5caf6c5b923282c59a65c97d43f01b957ba54a66ea401597678ee04925b68c9af54aed325abe6e65cfe3217e793a0c14b83c2818d1f748f6e65fc4085fcc
+MISC metadata.xml 484 SHA256 d757fb9f38ee945084a118b00fcf5c6b40fbe1fbf4967bc51650305dfcf15b2a SHA512 7abfc4933b44ad4365a455892cc10ef3797827f87db77e8b8349e19f6d77922bf9c3c094e5f5c29694bc240e43ac72e88daf3acc3ed8d63ffd4b90554fe9e67e WHIRLPOOL a533a59aa94463ca4c17fd65e5f78e2a8b7a5b012321603bbb546edbdb10888b3db3415ac0ea75b83ad9bbc88cf6193224dabe2288616da16becdf74f54eb007
diff --git a/net-misc/r8168/files/r8168-8.044.02-linux-4.11.patch b/net-misc/r8168/files/r8168-8.044.02-linux-4.11.patch
new file mode 100644
index 000000000000..ba1dd372dfab
--- /dev/null
+++ b/net-misc/r8168/files/r8168-8.044.02-linux-4.11.patch
@@ -0,0 +1,27 @@
+diff a/src/r8168.h b/src/r8168.h
+--- a/src/r8168.h	2017-01-11 14:19:18.000000000 +0800
++++ b/src/r8168.h	2017-05-02 21:18:54.541652414 +0800
+@@ -36,6 +36,10 @@
+ #include "r8168_realwow.h"
+ #include "r8168_fiber.h"
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
++#include <linux/sched/signal.h>
++#endif
++
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+ #if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)
+ #define vlan_tx_tag_present skb_vlan_tag_present
+diff a/src/r8168_n.c b/src/r8168_n.c
+--- a/src/r8168_n.c	2017-01-11 14:18:43.000000000 +0800
++++ b/src/r8168_n.c	2017-05-02 21:20:57.488644205 +0800
+@@ -25732,7 +25732,9 @@
+                         if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
+                                 rtl8168_rx_skb(tp, skb);
+ 
++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(4, 10, 0))
+                         dev->last_rx = jiffies;
++#endif
+                         RTLDEV->stats.rx_bytes += pkt_size;
+                         RTLDEV->stats.rx_packets++;
+                 }
diff --git a/net-misc/r8168/metadata.xml b/net-misc/r8168/metadata.xml
new file mode 100644
index 000000000000..31b4221e42ea
--- /dev/null
+++ b/net-misc/r8168/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<longdescription>Official Realtek r8168 linux driver. The following cards are currently supported:
+RTL8111B RTL8168B RTL8111 RTL8168 RTL8111C RTL8111CP RTL8111D(L) RTL8168C
+RTL8111DP RTL8111E RTL8168E RTL8111F RTL8411</longdescription>
+</pkgmetadata>
diff --git a/net-misc/r8168/r8168-8.044.02.ebuild b/net-misc/r8168/r8168-8.044.02.ebuild
new file mode 100644
index 000000000000..4822eb150790
--- /dev/null
+++ b/net-misc/r8168/r8168-8.044.02.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod eutils
+
+DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
+HOMEPAGE="http://www.realtek.com.tw"
+SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0009-${P}.tar.bz2 -> ${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+MODULE_NAMES="r8168(net:${S}/src)"
+BUILD_TARGETS="modules"
+
+CONFIG_CHECK="!R8169"
+ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-linux-4.11.patch
+)
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README
+}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
new file mode 100644
index 000000000000..e481a56502c0
--- /dev/null
+++ b/net-misc/rabbitmq-server/Manifest
@@ -0,0 +1,12 @@
+AUX rabbitmq-script-wrapper 1855 SHA256 993ac37f3ec0fe75c20ddbfedfc2e282ec7fbbcfe8a58df8a95852de1cd80720 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab WHIRLPOOL dc0d0a7aabac4cb50cc44c4dae697fc58477fbd42307339394d0befd2b8d8c206bd21d3c047d6ca526464708f28cc6d50b8110da8757d0f036c98e00348aea34
+AUX rabbitmq-server.init-r3 638 SHA256 a1b15926db75e6297a5e0ae475500ea247dcce22ec1373f38bd4728de2d25936 SHA512 fa6c7293c11190b1f59eef23c4a3de00666e32451f695f1a7f686f01bb92055a0c2afae565d9106e852e6b77a71661c364eacb36e2d39dfb8d175d8f0eab98b9 WHIRLPOOL 7f3160e7e033ad3dfd12ec911012b950ebb39071af7d423e3c93a6c16b00d6694e8a5d5f047fc8ebfcdbfb52b7bed3b9e017284fb2d28dc8217c90c288d3c614
+AUX rabbitmq.service 314 SHA256 a1444878e941541cc413b9a7c50057e1374bddf858eccf64c2abbbcf0f04e882 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457 WHIRLPOOL 96061d6907e6b888eea9a05b9b4a4bafc641708e754eef61f57b6cb2490c4d50f5580fe52c0fe55d71819ef3cda9492d623c6e82ec33e1c577c52c7d9b0c16f3
+DIST rabbitmq-server-3.6.10.tar.xz 1426900 SHA256 0f478950a3e27b6b3b5aa57098eaf91822321d716a9b0bc30a4084a2c283394c SHA512 64e618e51ab259463029ad75b981dbf64687515e52d19854f225d4c68077e683ef56f0f6bb92cbbf91f140bc829d905473d687d083d12f36dd2cdfab3defaed6 WHIRLPOOL 9515b3d8cecf66e2e7e9848b4001ef4f60a71b6e4e29091770a168de70df3c3015cfe1153c3c33598432a8994cb74696650a5126d325bea99dadd78ada76dfc4
+DIST rabbitmq-server-3.6.5.tar.xz 2923164 SHA256 9550433ca8aaf5130bf5235bb978c44d3c4694cbd09d97114b3859f4895788ec SHA512 50751a25b39a96a8b0665c9316d8a603050807597f932e0b3cc74f63fbd73a5668865ad7e7c58de5bef80295a5a3c472731446e4e07c530812a6275703ce2388 WHIRLPOOL 0b9d0b796b06463e7162a1f72dc242eec92013ff145b87a5d3524c274059dfeaec23c453c7105fc5b69e270c68116b77fcc7f9eb5a42c087fe78a2b77a364f9b
+DIST rabbitmq-server-3.6.9.tar.xz 1422316 SHA256 2df4f09860167de803f592a45792f3f83533bd97acdd7e18569c5bafcf2e470f SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662 WHIRLPOOL af674e8e555b6ee94f72f5d09d795f3a53f41ec9cf7a00ecefa3a418935742cc568319b82735da2ef9374e64b41ecf89bf234d02be0e66dce4d4aff0b82f3d77
+EBUILD rabbitmq-server-3.6.10.ebuild 2862 SHA256 8f209c80cd5bf3ca1a8bd7c869470f9d1320f4a4f0d4e7c7c6667ff071e84939 SHA512 30b2b5abea99f3f7d277c73135ebcfa15e592650dfd5b7815c81824efc495e3d3fcdeb350e3fba5d6e465a73d844230ff46da2083c580819146b8548361ca0a5 WHIRLPOOL 3d5c5c6804d55b4156fdaddfc1c8fe3e5f301437235343f9b7d41eb089c4cc6b8164028720a24bf87c049c0e0fe2f38c60588eb572b282f746da31d2418bf44c
+EBUILD rabbitmq-server-3.6.5.ebuild 2784 SHA256 f5244a685d4a98b0b43f0769d42b361c174666c1e43da5ecde0f812c92f17c6c SHA512 e56a01c1d4c0cc7537fdd680387a845c0077c744fa29faf73777d258b8d7399233ccf58bc5368a10c5949ed9685a4fc14c9778a43bd03a98564451b0028b584e WHIRLPOOL da5f7793fc3f4d937384c50612c00151e440b1d3c717986a547ec537ccee11b5aa5811f0091dd29acbf888eaa1524bcde7ebce08a4ec5c1917b92c1d7457fb4e
+EBUILD rabbitmq-server-3.6.9.ebuild 2861 SHA256 4a0e3b55ae099d77c5c0017820f9e212b272937a2e3c18797d75e4c0c6b5737e SHA512 d3bbb35338e57667d2dbf6a2524e9bafdbfbb7195f1af53c6a4cca0c15c320092607e43ba7c1a18cbd3568fbcfc261a85e35e0efcb05814c864a6deddeaa0501 WHIRLPOOL 50299ded32d29f4336f40a4a6001dc5a2f619c81b2a009554ea4fac7f3ce8126fc39bdaa812052d13c361c9648f227a851797304ce6a808a6faeb6f75de48979
+MISC ChangeLog 4923 SHA256 f9d6c91ff43982646a66e386ecf8096ec13a05d118335143959297889d29d86d SHA512 bb0db708d4948042fb50adc991ae49868c11db7788e8e21bb8ae85fe1d237a0552b9afe184cfa57198ed00bf6f9793d2fc575744bd0d7b0f6222e89465e68ca5 WHIRLPOOL a0f679867374f75a84ee82bd025211cbb5b2a8b44e990bf33f084917fa0e9f8822c11d59a365b5ca3ce955e938e0f80bf2dd1d3edf00240334b3edf9f39abbf1
+MISC ChangeLog-2015 9325 SHA256 909f07a4b271e41482d034bd4da6b8939dd3023bb4eeb2fb9912e3248d35d3be SHA512 68317f1c63f79a38c282dd4f45964198e5f4977f58b856fb4aef2feabadefd5cc0a756f29edd64b2a1b00c0ca94fc28ab466e54d97a7d291cc289132050c086f WHIRLPOOL 5882a7ce7855b9b436ed63bed531009095eef28af3e466678fba8899d725b355004e67da3524bd4f657346174651c3d2298e20c6698aee5ff2de2998dfade1a7
+MISC metadata.xml 243 SHA256 1446624bfa571e6b512e5cf6df92ad4773a91dd5066b852d48b6629df20dd42d SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701 WHIRLPOOL e55b1ed28253d63931acbabcf8c0e2a7e88c8bb61d1fe9cbf4795ca3aae755749b7a4a01d3fcf4d7461dfe60c9a2e5a06a68549f016d021440d22653ddf7d6b8
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper b/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper
new file mode 100644
index 000000000000..23f3d75a42cf
--- /dev/null
+++ b/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper
@@ -0,0 +1,54 @@
+#!/bin/sh
+##   The contents of this file are subject to the Mozilla Public License
+##   Version 1.1 (the "License"); you may not use this file except in
+##   compliance with the License. You may obtain a copy of the License at
+##   http://www.mozilla.org/MPL/
+##
+##   Software distributed under the License is distributed on an "AS IS"
+##   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+##   License for the specific language governing rights and limitations
+##   under the License.
+##
+##   The Original Code is RabbitMQ.
+##
+##   The Initial Developers of the Original Code are LShift Ltd,
+##   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+##
+##   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+##   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+##   Technologies LLC, and Rabbit Technologies Ltd.
+##
+##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Ltd. Portions created by Cohesive Financial Technologies LLC are
+##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+##   (C) 2007-2009 Rabbit Technologies Ltd.
+##
+##   All Rights Reserved.
+##
+##   Contributor(s): ______________________________________.
+##
+
+# Escape spaces and quotes, because shell is revolting.
+CMDLINE=""
+for arg in "$@" ; do
+	# Escape quotes in parameters, so that they're passed through cleanly.
+	arg=$(sed -e 's/"/\\"/g' <<-END
+		$arg
+		END
+	)
+	CMDLINE="${CMDLINE} \"${arg}\""
+done
+
+cd /var/lib/rabbitmq
+
+SCRIPT=`basename $0`
+
+if [ `id -u` = 0 ] ; then
+    su rabbitmq -s /bin/sh -c "/usr/libexec/rabbitmq/${SCRIPT} ${CMDLINE}"
+else
+    /usr/libexec/rabbitmq/${SCRIPT}
+    echo -e "\nOnly root should run ${SCRIPT}\n"
+    exit 1
+fi
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
new file mode 100644
index 000000000000..fb7c194aa94f
--- /dev/null
+++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use dns epmd
+}
+
+start() {
+	ebegin "Starting RabbitMQ"
+	/usr/sbin/rabbitmq-server -detached >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err
+	/usr/sbin/rabbitmqctl status | sed -n 's/[^p]*pid,\([0-9]*\)[^0-9]*/\1/p' > /var/run/rabbitmq.pid
+	/usr/sbin/rabbitmqctl -q wait /var/run/rabbitmq.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping RabbitMQ"
+	/usr/sbin/rabbitmqctl stop /var/run/rabbitmq.pid >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
+	eend $?
+}
diff --git a/net-misc/rabbitmq-server/files/rabbitmq.service b/net-misc/rabbitmq-server/files/rabbitmq.service
new file mode 100644
index 000000000000..9264b406713f
--- /dev/null
+++ b/net-misc/rabbitmq-server/files/rabbitmq.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=RabbitMQ daemon
+
+[Service]
+Type=simple
+ExecStart=/usr/libexec/rabbitmq/rabbitmq-server
+ExecStop=/usr/libexec/rabbitmq/rabbitmqctl stop
+WorkingDirectory=/var/lib/rabbitmq
+User=rabbitmq
+Group=rabbitmq
+StandardOutput=syslog
+StandardError=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/rabbitmq-server/metadata.xml b/net-misc/rabbitmq-server/metadata.xml
new file mode 100644
index 000000000000..69bc0ccc3d1f
--- /dev/null
+++ b/net-misc/rabbitmq-server/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ultrabug@gentoo.org</email>
+		<name>Ultrabug</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.10.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.10.ebuild
new file mode 100644
index 000000000000..5a8de0fe6be5
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.10.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/erlang-18[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/include plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do
+		exeinto /usr/libexec/rabbitmq
+		doexe deps/rabbit/scripts/${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.xml
+	dodoc deps/rabbit/README
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	dodir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "http://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.5.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.5.ebuild
new file mode 100644
index 000000000000..d8095794d6f1
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+RDEPEND="dev-lang/erlang[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r ebin include plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do
+		exeinto /usr/libexec/rabbitmq
+		doexe scripts/${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	doman docs/*.[15]
+	dodoc README
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	dodir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "http://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild
new file mode 100644
index 000000000000..d57de986cabb
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/erlang-18[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/include plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do
+		exeinto /usr/libexec/rabbitmq
+		doexe deps/rabbit/scripts/${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.xml
+	dodoc deps/rabbit/README
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	dodir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "http://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
new file mode 100644
index 000000000000..9349fd11f92a
--- /dev/null
+++ b/net-misc/radvd/Manifest
@@ -0,0 +1,17 @@
+AUX radvd-1.9.1.init 1541 SHA256 5bebd1c96801dd66a24b8660e0871e13037f335f3f9849b4d25fb9fa988e0f45 SHA512 1c2bef4f39c14b4244f10b5ad5a5bebeba62bf3f60da78511151713d0f29a03a2736055f84bbcd18f0b3a5dd3fb02accb81ed078105b84ca34d0dca931348d65 WHIRLPOOL 85a17c1b8a96c9b59ede8afb0f363366a3ae7633f4bf5449f1963a1eebb65bea7f89dfa67ed0993d5a349755bbc3b23bb42738fd559b67af164b844a00a2fb33
+AUX radvd-2.15.init 1537 SHA256 857439b4461d11e59c67bc6b6f656cbd9be00553933e58cc8e8daa1f352408b4 SHA512 cd3a6527d7b323266748cf674090419e89dc153daf883601604d040fceb55850d551e44371ba383a2bb98adaf361311969d1eea94a9f3ec1bf8c11aad54aac8e WHIRLPOOL 72279dd26e358fbbb7878e51b177bf9d03d266d58ebce6a9712e9394f3eb0259fbe72bdf459fb1fc346b3905d7d8f519df0e38fbc11de7b2eca26a8f51ce18b8
+AUX radvd.conf 337 SHA256 d5380f18d0f0b0fe896c83f4fb40891c988bd433a0a23f5aa518212289e64b88 SHA512 303a79c6e60293571f5cc868ba36f48a98658be8b6a9596c007461cbef2775d7deb67950fdacb3f37765cffdda164bc386e23bbb512cbabebd5173245841e401 WHIRLPOOL 3fcbec8ca205a9a358dd166659bbc8331d82845410490782ddb142ec68167657864890cf4a1dec4aa6ecb6c97d1e06ebeecf97055dd5ce3e94f4a337917cc699
+AUX radvd.service 603 SHA256 2a97c07b26b64da2eaa7e98631a50c5f822a01c51145b020ee11a87acc1e1011 SHA512 3371d18e71ddb7672e929152d9f93201b49c1ce08c77d59cbcac7654362690a9ab97db08519f5fbe210738595aa52f30f5972cacca988b9274e2218c21bc7dd2 WHIRLPOOL 5dcf1f9e8a379bf3e7059f15640963e462f0968b26c941d06cd5d7e66a80fc1af2c786a44590ff8e1cc2037dcfa001ca122c26f8f691680d7b7f6d7c9de9c07f
+AUX radvd.tmpfilesd 30 SHA256 da69653b29db8af0f757d9f968882db566c4284a4cc9d7d29516d4c82dd463bb SHA512 d126bc90083e0f8aefda8cbd3cd01ecc9beb0eb05713c2d9fb5315bc10337d927b3c9e52c390e35799d1421078b365793772a712c33028be35280cd083cf65c3 WHIRLPOOL 1a9b3438b9f80503ab2c26fff46aa95aa1b86c181ebda643c133ffb31ae9e81c77f75f263e45b8e226d0fab556be90cbcbf8e774ccd154f2ad34cd888f3928b6
+DIST radvd-2.14.tar.gz 211461 SHA256 46d31c05daea11c3d1e3dc092997d3631b3bc72b20a4f279b05304b83dbd7aa8 SHA512 8fdfd776f998b82e9dcbb29a13e44b1ba060f2e4b03bae0167549fb58731f16e80e980f9636e0d7614270b8e6457779ac044b433c5c5d26d9fb72ea9e2d3cb02 WHIRLPOOL 6f2974c4e9d689052b36885c2b82425e346bdd7fd3a928a650f2c71debc7cd5e3c13504759fb5cec20641f4e6fdf35ce6a83fe3023f6efa00efff3da84b01954
+DIST radvd-2.15.tar.gz 214256 SHA256 83dd770595e6182757fd652cfc46ee462b73d8d34ba0848a1d481c4d51143607 SHA512 51ed457814f32750f915e22556c739d0a574af6318d469ae77c42fb7dfce8752edc2b70e3dd910d46c6198a5a81e4be4611dd4e379920488f4d4427cda0a7ea0 WHIRLPOOL 3b8d9436b6c37088f7af0de06e12ef93a05ab2b71df0617e63d6ee106b336a22dfad3df07e6c0301da5bf4d8a646a2c2ce2a50d9ca991f541c51ce35ebb2b187
+DIST radvd-2.16.tar.gz 213901 SHA256 fe2d81b00120215b244749bdbb234579a059e71cc6d54bcdc56c68ae8f0c2e35 SHA512 7e4f882acca7b754cf452a710cef847150bc6da35a8e6c18f35764ec0dceffc5ec7e98008faed5e9e39754894fb72066a1a00da0e4b8b9b55b1d56f024a887f8 WHIRLPOOL ab544ecaca598ccf01c578bf517b465b7445ffa1233778fa5be32ca2db34ce483c6e52fcd5e80deff3e6619f172ae5bb95910eee45b2ba6bb954a586546ea33a
+DIST radvd-2.17.tar.gz 214937 SHA256 53757e7f2164899e1145482f1ae91829600a6e2f6fec29cfb3b350a3bb45bd5d SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132 WHIRLPOOL fdd0a9fbe306a6f761e3260071c7557bb3c0b164fb139bce8d9403bc97f087069f96077eb5f2dc92594a0b1e91eca1062ac817610f66c1402cb660703ee3fa12
+EBUILD radvd-2.14.ebuild 1706 SHA256 ff8790adf9ad6c003fddd45f5768da6117d57d20d5226537b7590dd47a3539bb SHA512 8d0035cb5309556841e87769b6839ded82e0fa17b7664eb7a732c8cc31561ceb0482d2ffe687ff80fc65110e9e6ec6753152c99b9ab6a7722324734137b989b8 WHIRLPOOL 255cdaf68c303a684e8c27d6f05496ecec7a660d0ce847398109f8aa8c5ed57a49ce0f5a7360653ae6eb3ebcfb3e92f973b68d5ec43a1c9ebbb3b175cc203400
+EBUILD radvd-2.15-r1.ebuild 1611 SHA256 6065e220dbdc0696ecc939289e5c01429a3885ee04d62527b1f211a1286fc42a SHA512 e3308079562df0696c5832ae6e6d5b2d70ca7e11a0c618516493b46606e2cacca244b0d63673823cd1bc7508395b966c89e495783b65f2301b69d037a1ce90d7 WHIRLPOOL bad69e787779d9c0d56f957c2a025d807bc9838aa40c10b09b52e788acf954022639cfe4e293387a6369dfd87adfc0031da04501b325ca09aedd5a0be917c90b
+EBUILD radvd-2.16.ebuild 1703 SHA256 36fc006e7f000959908372facf37fb615c56b6c0bca310dcaf7c8c2b4928d8e7 SHA512 34806e03c4fbd9e0d319c7149e4b72b081436a1a97ff7bdb29c0f089cce0da947bb4c606e489718197505240e77625c7ad489afe6f7ac9fa12013fdaa0f13b6a WHIRLPOOL b5f70bf68359c7f70193d924a1930bb7865d9307760d8804478e57f0f6f4f27172d31ab2c2a72b5185594c19bbd292587849ad1246d07275d049457b8c37fefb
+EBUILD radvd-2.17-r1.ebuild 1581 SHA256 3fadf90676f01805b607cae31745f8005892697ed0a9243a9ecd1d521931795e SHA512 f23f892f0058900a277557d899acbb4fa9b1d80250c9f22a30ec39abc8f18fd8a2a4fec1e2bba286e06a4588b628c8d30d660b9adcf5495c2eb29de28e7a41e4 WHIRLPOOL c079f68396c345c9158537548d013d0313a8331a45b6295fc65cd8739c2075b39267acd30e8ff05cc85dab668a0b5b09de8fc7c508b72b1add3090c27e9e802b
+EBUILD radvd-2.17.ebuild 1703 SHA256 36fc006e7f000959908372facf37fb615c56b6c0bca310dcaf7c8c2b4928d8e7 SHA512 34806e03c4fbd9e0d319c7149e4b72b081436a1a97ff7bdb29c0f089cce0da947bb4c606e489718197505240e77625c7ad489afe6f7ac9fa12013fdaa0f13b6a WHIRLPOOL b5f70bf68359c7f70193d924a1930bb7865d9307760d8804478e57f0f6f4f27172d31ab2c2a72b5185594c19bbd292587849ad1246d07275d049457b8c37fefb
+MISC ChangeLog 6649 SHA256 07fc1f9fb14e7469c8e9381fecd3d3233223dddf1584199eec900ffdf6cb9dd8 SHA512 07921ed184f455c6fb2e188bccaee8a5db54a3141432e39661671b78010773132c04bd6053b58b2d815fbabfcb71acc422f0f63bc69fb9f2f3650b0503b04ac1 WHIRLPOOL e71a3982a8ece5a6a49edbc6792de8f07f84b33b0602c2ef54a7aa3c8df6eb156fe0f2f3fec0fe3890ee8035eee242e1b5d7ac7a9807568233fc4a705acd380f
+MISC ChangeLog-2015 17563 SHA256 80c549ebab66ad96ad575cd79b43ffb286d1f3bec0434f97b53c9cc1aa07b131 SHA512 c8960da10a1d6baaec4218b5c01fcc2a1abf5377afdfd9a22256b9039676bb5bf5b04ec7bd9075f6205722627f0be54af36be0bb65ad53e7808ad882dcbb5b27 WHIRLPOOL 5de9a9c7c5ccd5982f83c1257b097d8a3196424ef26f6eb28c3c38c9ec218deb6b9daccad0881c6d4572ec491c74a869d608a31438fbfa0b7e5916d0281177a2
+MISC metadata.xml 358 SHA256 bec35a0e8930b15060537b1503c650195adff19b2474a3fd2999ca4978e7060f SHA512 3d5a0cff9bc15adc735715969e1d5e5dbb88d1b938f12291b5e1f2b63e5eead0e598b6abb71a740867551f28a50567c4006a77fde240603aded2d956ad784485 WHIRLPOOL 18ea7b32b08d1febdf810d0d9af5aa37b477bdbce484caa59452e0f70bd9883c401b43cda0f86d4cfe23d103eead6db0385db6a2f60e2e678e582526861d10fd
diff --git a/net-misc/radvd/files/radvd-1.9.1.init b/net-misc/radvd/files/radvd-1.9.1.init
new file mode 100644
index 000000000000..cea880730008
--- /dev/null
+++ b/net-misc/radvd/files/radvd-1.9.1.init
@@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CONFIGFILE=/etc/radvd.conf
+PIDFILE=/var/run/radvd/radvd.pid
+SYSCTL_FORWARD=net.ipv6.conf.all.forwarding
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -f "${CONFIGFILE}" ]; then
+		eerror "Configuration file ${CONFIGFILE} not found"
+		return 1
+	fi
+
+	if ! /usr/sbin/radvd -c -C "${CONFIGFILE}" ; then
+		eerror "Configuration file ${CONFIGFILE} failed test"
+		return 1
+	fi
+
+	checkpath -d -o radvd:radvd ${PIDFILE%/*}
+}
+
+start() {
+	if [ "${FORWARD}" != "no" ]; then
+		ebegin "Enabling IPv6 forwarding"
+		sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null
+		eend $?
+	fi
+
+	checkconfig || return 1
+
+	ebegin "Starting IPv6 Router Advertisement Daemon"
+	start-stop-daemon --start --exec /usr/sbin/radvd \
+		--pidfile "${PIDFILE}" \
+		-- -C "${CONFIGFILE}" -p "${PIDFILE}" -u radvd ${OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping IPv6 Router Advertisement Daemon"
+	start-stop-daemon --stop --exec /usr/sbin/radvd --pidfile "${PIDFILE}"
+	eend $?
+
+	if [ "${FORWARD}" != "no" ]; then
+		ebegin "Disabling IPv6 forwarding"
+		sysctl -w "${SYSCTL_FORWARD}=0" > /dev/null
+		eend $?
+	fi
+}
+
+reload() {
+	if [ "${FORWARD}" != "no" ]; then
+		ebegin "Enabling IPv6 forwarding"
+		sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null
+		eend $?
+	fi
+
+	checkconfig || return 1
+
+	ebegin "Reloading IPv6 Router Advertisement Daemon"
+	start-stop-daemon --signal HUP \
+		--exec /usr/sbin/radvd --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/net-misc/radvd/files/radvd-2.15.init b/net-misc/radvd/files/radvd-2.15.init
new file mode 100644
index 000000000000..2c96cca422dd
--- /dev/null
+++ b/net-misc/radvd/files/radvd-2.15.init
@@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CONFIGFILE=/etc/radvd.conf
+PIDFILE=/run/radvd/radvd.pid
+SYSCTL_FORWARD=net.ipv6.conf.all.forwarding
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -f "${CONFIGFILE}" ]; then
+		eerror "Configuration file ${CONFIGFILE} not found"
+		return 1
+	fi
+
+	if ! /usr/sbin/radvd -c -C "${CONFIGFILE}" ; then
+		eerror "Configuration file ${CONFIGFILE} failed test"
+		return 1
+	fi
+
+	checkpath -d -o radvd:radvd ${PIDFILE%/*}
+}
+
+start() {
+	if [ "${FORWARD}" != "no" ]; then
+		ebegin "Enabling IPv6 forwarding"
+		sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null
+		eend $?
+	fi
+
+	checkconfig || return 1
+
+	ebegin "Starting IPv6 Router Advertisement Daemon"
+	start-stop-daemon --start --exec /usr/sbin/radvd \
+		--pidfile "${PIDFILE}" \
+		-- -C "${CONFIGFILE}" -p "${PIDFILE}" -u radvd ${OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping IPv6 Router Advertisement Daemon"
+	start-stop-daemon --stop --exec /usr/sbin/radvd --pidfile "${PIDFILE}"
+	eend $?
+
+	if [ "${FORWARD}" != "no" ]; then
+		ebegin "Disabling IPv6 forwarding"
+		sysctl -w "${SYSCTL_FORWARD}=0" > /dev/null
+		eend $?
+	fi
+}
+
+reload() {
+	if [ "${FORWARD}" != "no" ]; then
+		ebegin "Enabling IPv6 forwarding"
+		sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null
+		eend $?
+	fi
+
+	checkconfig || return 1
+
+	ebegin "Reloading IPv6 Router Advertisement Daemon"
+	start-stop-daemon --signal HUP \
+		--exec /usr/sbin/radvd --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/net-misc/radvd/files/radvd.conf b/net-misc/radvd/files/radvd.conf
new file mode 100644
index 000000000000..6ba8f65b12a0
--- /dev/null
+++ b/net-misc/radvd/files/radvd.conf
@@ -0,0 +1,10 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Extra options to pass to radvd
+OPTIONS=""
+
+# Set this to "no" to tell the init script NOT to set up IPv6 forwarding
+# using /proc/sys/net/ipv6/conf/all/forwarding
+# Only change this if you know what you're doing!
+FORWARD="yes"
diff --git a/net-misc/radvd/files/radvd.service b/net-misc/radvd/files/radvd.service
new file mode 100644
index 000000000000..b496267f293b
--- /dev/null
+++ b/net-misc/radvd/files/radvd.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Router advertisement daemon for IPv6
+Documentation=man:radvd(8)
+After=network.target
+
+[Service]
+Type=forking
+ExecStartPre=/usr/sbin/radvd --configtest
+ExecStart=/usr/sbin/radvd --username radvd --logmethod stderr --debug 0
+ExecReload=/usr/sbin/radvd --configtest ; \
+           /bin/kill -HUP $MAINPID
+CPUSchedulingPolicy=idle
+PIDFile=/run/radvd/radvd.pid
+RuntimeDirectory=radvd
+CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE  CAP_NET_RAW
+PrivateTmp=yes
+PrivateDevices=yes
+ProtectSystem=full
+ProtectHome=yes
+NoNewPrivileges=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/radvd/files/radvd.tmpfilesd b/net-misc/radvd/files/radvd.tmpfilesd
new file mode 100644
index 000000000000..26f203d1aaa7
--- /dev/null
+++ b/net-misc/radvd/files/radvd.tmpfilesd
@@ -0,0 +1 @@
+d	/run/radvd	0755 radvd radvd
diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml
new file mode 100644
index 000000000000..8307f5e2d4f5
--- /dev/null
+++ b/net-misc/radvd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/radvd/radvd-2.14.ebuild b/net-misc/radvd/radvd-2.14.ebuild
new file mode 100644
index 000000000000..866364355569
--- /dev/null
+++ b/net-misc/radvd/radvd-2.14.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit systemd user eutils readme.gentoo
+
+DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
+HOMEPAGE="http://v6web.litech.org/radvd/"
+SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 hppa ppc sparc x86 ~x86-fbsd"
+IUSE="kernel_FreeBSD selinux test"
+
+CDEPEND="dev-libs/libdaemon"
+DEPEND="${CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-radvd )
+"
+DOCS=( CHANGES README TODO radvd.conf.example )
+
+pkg_setup() {
+	enewgroup radvd
+	enewuser radvd -1 -1 /dev/null radvd
+
+	# force ownership of radvd user and group (bug #19647)
+	[[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
+}
+
+src_configure() {
+	econf --with-pidfile=/var/run/radvd/radvd.pid \
+		--disable-silent-rules \
+		$(use_with test check)
+}
+
+src_install() {
+	default
+
+	dohtml INTRO.html
+
+	newinitd "${FILESDIR}"/${PN}-1.9.1.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd  "${FILESDIR}"/${PN}.tmpfilesd ${PN}.conf
+
+	if use kernel_FreeBSD ; then
+		sed -i -e \
+			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
+			"${D}"/etc/init.d/${PN} || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
+See ${ROOT}usr/share/doc/${PF} for an example.
+
+grsecurity users should allow a specific group to read /proc
+and add the radvd user to that group, otherwise radvd may
+segfault on startup."
diff --git a/net-misc/radvd/radvd-2.15-r1.ebuild b/net-misc/radvd/radvd-2.15-r1.ebuild
new file mode 100644
index 000000000000..fee5035e0f35
--- /dev/null
+++ b/net-misc/radvd/radvd-2.15-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit systemd user eutils readme.gentoo-r1
+
+DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
+HOMEPAGE="http://v6web.litech.org/radvd/"
+SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="kernel_FreeBSD selinux test"
+
+CDEPEND="dev-libs/libdaemon"
+DEPEND="${CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-radvd )
+"
+DOCS=( CHANGES README TODO radvd.conf.example )
+
+pkg_setup() {
+	enewgroup radvd
+	enewuser radvd -1 -1 /dev/null radvd
+}
+
+src_configure() {
+	econf --with-pidfile=/run/radvd/radvd.pid \
+		--disable-silent-rules \
+		--with-systemdsystemunitdir=no \
+		$(use_with test check)
+}
+
+src_install() {
+	default
+
+	dohtml INTRO.html
+
+	newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd  "${FILESDIR}"/${PN}.tmpfilesd ${PN}.conf
+
+	if use kernel_FreeBSD ; then
+		sed -i -e \
+			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
+			"${D}"/etc/init.d/${PN} || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
+See ${ROOT}usr/share/doc/${PF} for an example.
+
+grsecurity users should allow a specific group to read /proc
+and add the radvd user to that group, otherwise radvd may
+segfault on startup."
diff --git a/net-misc/radvd/radvd-2.16.ebuild b/net-misc/radvd/radvd-2.16.ebuild
new file mode 100644
index 000000000000..86b02def5e1e
--- /dev/null
+++ b/net-misc/radvd/radvd-2.16.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user eutils readme.gentoo-r1 tmpfiles
+
+DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
+HOMEPAGE="http://v6web.litech.org/radvd/"
+SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="kernel_FreeBSD selinux test"
+
+CDEPEND="dev-libs/libdaemon"
+DEPEND="${CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-radvd )
+"
+DOCS=( CHANGES README TODO radvd.conf.example )
+
+pkg_setup() {
+	enewgroup radvd
+	enewuser radvd -1 -1 /dev/null radvd
+}
+
+src_configure() {
+	econf --with-pidfile=/run/radvd/radvd.pid \
+		--disable-silent-rules \
+		--with-systemdsystemunitdir=no \
+		$(use_with test check)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${PF}/html
+	doins INTRO.html
+
+	newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd  "${FILESDIR}"/${PN}.tmpfilesd ${PN}.conf
+
+	if use kernel_FreeBSD ; then
+		sed -i -e \
+			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
+			"${D}"/etc/init.d/${PN} || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
+See ${ROOT}usr/share/doc/${PF} for an example.
+
+grsecurity users should allow a specific group to read /proc
+and add the radvd user to that group, otherwise radvd may
+segfault on startup."
diff --git a/net-misc/radvd/radvd-2.17-r1.ebuild b/net-misc/radvd/radvd-2.17-r1.ebuild
new file mode 100644
index 000000000000..ffd9ad165f0a
--- /dev/null
+++ b/net-misc/radvd/radvd-2.17-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user eutils readme.gentoo-r1
+
+DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
+HOMEPAGE="http://v6web.litech.org/radvd/"
+SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="kernel_FreeBSD selinux test"
+
+CDEPEND="dev-libs/libdaemon"
+DEPEND="${CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-radvd )
+"
+DOCS=( CHANGES README TODO radvd.conf.example )
+
+pkg_setup() {
+	enewgroup radvd
+	enewuser radvd -1 -1 /dev/null radvd
+}
+
+src_configure() {
+	econf --with-pidfile=/run/radvd/radvd.pid \
+		--disable-silent-rules \
+		--with-systemdsystemunitdir=no \
+		$(use_with test check)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${PF}/html
+	doins INTRO.html
+
+	newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	if use kernel_FreeBSD ; then
+		sed -i -e \
+			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
+			"${D}"/etc/init.d/${PN} || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
+See ${ROOT}usr/share/doc/${PF} for an example.
+
+grsecurity users should allow a specific group to read /proc
+and add the radvd user to that group, otherwise radvd may
+segfault on startup."
diff --git a/net-misc/radvd/radvd-2.17.ebuild b/net-misc/radvd/radvd-2.17.ebuild
new file mode 100644
index 000000000000..86b02def5e1e
--- /dev/null
+++ b/net-misc/radvd/radvd-2.17.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user eutils readme.gentoo-r1 tmpfiles
+
+DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
+HOMEPAGE="http://v6web.litech.org/radvd/"
+SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="kernel_FreeBSD selinux test"
+
+CDEPEND="dev-libs/libdaemon"
+DEPEND="${CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-radvd )
+"
+DOCS=( CHANGES README TODO radvd.conf.example )
+
+pkg_setup() {
+	enewgroup radvd
+	enewuser radvd -1 -1 /dev/null radvd
+}
+
+src_configure() {
+	econf --with-pidfile=/run/radvd/radvd.pid \
+		--disable-silent-rules \
+		--with-systemdsystemunitdir=no \
+		$(use_with test check)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${PF}/html
+	doins INTRO.html
+
+	newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd  "${FILESDIR}"/${PN}.tmpfilesd ${PN}.conf
+
+	if use kernel_FreeBSD ; then
+		sed -i -e \
+			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
+			"${D}"/etc/init.d/${PN} || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
+See ${ROOT}usr/share/doc/${PF} for an example.
+
+grsecurity users should allow a specific group to read /proc
+and add the radvd user to that group, otherwise radvd may
+segfault on startup."
diff --git a/net-misc/rancid-git/Manifest b/net-misc/rancid-git/Manifest
new file mode 100644
index 000000000000..93c3393801c2
--- /dev/null
+++ b/net-misc/rancid-git/Manifest
@@ -0,0 +1,8 @@
+AUX rancid-2.3.8-buildsystem.patch 1741 SHA256 6addb41b560b1cfa74e9aa4c526ea7622f5809310ae749505763e510b5ea0388 SHA512 2ce1befcd4898654958e8a961156a6eda95da319d98ca66c9cb216ab46b80166571146b631a699be5702d5bb7baa8301b570fe82fb89ba8096a941807005f9ab WHIRLPOOL e10781cc3e9bd8dad3d2ec970b3def5893d2411bf2bc0e929d6803292c2b928efbb9d9e0f8fd62a8113219f96b9a59d174eeeab2db06972509978c8332fc4d2b
+AUX rancid-2.3.8-config.patch 1241 SHA256 66cb3e28127b2e8336cf315b5004bd6ea1d83a4af803f89fd535b9af450fbcbf SHA512 abad6758dbe89eacf566b5cc931749ed9667ec7f7e824a8091f5a02edfeacb4497b1dfc5444ae41f5652a479791c585e4625b8877e710f460698a8bb2cccce9c WHIRLPOOL 271911b9c89a3fa7aa2d3b078bc832b1eff85343770b4f73352615ab53c1c9b4eb28827dfd17b10b9eba7bcb651c846f39f20f14506ec82dc8a8671a29ea3379
+AUX rancid-2.3.8-mailprefix.patch 5878 SHA256 1703c25a50667c3f979010e883da8a83d540a551922716c0e4de09b3a4bdbbf3 SHA512 c01cdaafd599c8b1559b158ba0999c1e79c40dc4c8f6c0f5aa284225a5903ba967b742cee7d81f2edeb07c6e7e344c1208c018421c023a7f678204c647f3e8bd WHIRLPOOL 9e0d0c22c24386231aa029a0e5e1bf78df56bd75558f8c12aabcee5a2ab75ef25b21569334318351f700eb55cec0ef3d7864f65eb87d12035aebb9e3766c2df5
+DIST rancid-git-2.3.8.tar.gz 388121 SHA256 c90c80fb25354c6d7a8ae7c4137ca96625338a8cbe6ad5756b073e0d4f257b31 SHA512 14a4fa097a31e2772d83e72cdcfb5488bf3e1c69e8065286c52eb554a392eb4257a0dc38fad5d79819fb417e699fb4e2c265ef5cfbf018418d9550eb653fa551 WHIRLPOOL 513c5f4ee27fd84ce12dff145652802350a00e9c9f9d3e5b5fb906a3f03d617cc73459dd658586dd5f81e21e7eca3220ba77890a59c4b06fc928fae3f0b6c123
+EBUILD rancid-git-2.3.8.ebuild 3164 SHA256 b93daaa92d821c30f8b580bb950f88ff127a5283ee0a3411531a04b79243f0a0 SHA512 8f87a0a3b17b45caaa993f34c10c01872bffab07370f04d5b352d06842f263e335c338d02da32113f8e1237b303ebae92798bd9beced96bb0b15d3e24588c7ae WHIRLPOOL 5cebc56183772259c55395f0a57cbe4f9cf13d11dda247d29538baa496395e72b75bcbd3ef38a17a5f9c6097792e3d42b0b8c60491dbdd84eb9b1c1397880081
+MISC ChangeLog 2781 SHA256 439fb656a57a4972f033434c7645708ead1d39e551ac5ca00d7ba19a9c708b5b SHA512 7a18cb524d810f67f0aad2d3ac167129cb99ea97638f39a89af0d0bcc2dcadfe73e7b95c633956d0143128d3713df1d9cfa35fa7a794e7fc075c0be8a753efc3 WHIRLPOOL 62712c23c954e4b40e61fd2fa2aae017930613e364d26d3d34835510cae1dd43086c93602d049e685cf7c22c79a4b6c62be17a3e1caff9e8ecaf121438050e9a
+MISC ChangeLog-2015 674 SHA256 0ad73025fef3cebad9b82aa1ad48d5a74f39a1dc282c49872814df95890982de SHA512 dc6b3d5ba3bb119c6e3b8aff6d1d41aaf4f81eead82d0b18f056e67074b1c0fd7a0611d171f25b8734759d3355a4ccb4b2307f2b686ba3da700ce2b321ad98a7 WHIRLPOOL f9e7031a1d8d036a396b9ca5445bd6b59ba16edc07b8ac7543e0165c2c66ecebb8462b05fa36ed17acc85a93d30f181a05c09e66d50c72601be06af33c7cc9ed
+MISC metadata.xml 413 SHA256 3821fdf9f972ad65163c485ea93a20f5c1d4334f6f18f66d4a560590a18d342a SHA512 887715c012718cea48bf69565b4c5f7e3f89567c6996f971add6ff83bc8776157cef639cc6893c311c8599c363d1184a1cf8a7df3c1bf5eab6a8ac5fa3386ca0 WHIRLPOOL 2b27ffc0887fd29f5849ffcb511336a2f8ecfd06b467b0d5e14eac5846ee1e3cb8b38ba830e57a9b552e31910e923142ce2161400b7852b66cbc2c5b03681522
diff --git a/net-misc/rancid-git/files/rancid-2.3.8-buildsystem.patch b/net-misc/rancid-git/files/rancid-2.3.8-buildsystem.patch
new file mode 100644
index 000000000000..4a06b5c63723
--- /dev/null
+++ b/net-misc/rancid-git/files/rancid-2.3.8-buildsystem.patch
@@ -0,0 +1,64 @@
+--- rancid-2.3.8/configure.in
++++ rancid-2.3.8/configure.in
+@@ -17,7 +17,7 @@
+ dnl default install location
+ AC_PREFIX_DEFAULT(/usr/local/rancid)
+ 
+-dnl AM_MAINTAINER_MODE()
++AM_MAINTAINER_MODE()
+ 
+ dnl AC_CONFIG_SUBDIRS(util)
+ 
+@@ -35,7 +35,6 @@
+ 
+ # compiler specifics
+ AC_PROG_CC
+-AM_C_PROTOTYPES
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
+@@ -212,7 +212,7 @@
+ # is good enough -- if we can't find GNU tar, we don't really care.
+ AC_CHECK_PROGS(TAR, gnutar gtar tar)
+ 
+-AC_CHECK_PROGS(AUTOMAKE, automake)
++dnl AC_CHECK_PROGS(AUTOMAKE, automake)
+ 
+ dnl locate perl 5 and expect.
+ AC_PROG_INSTALL
+--- rancid-2.3.8/Makefile.am
++++ rancid-2.3.8/Makefile.am
+@@ -24,7 +24,7 @@
+ 
+ @SET_MAKE@
+ 
+-pkgdata_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
++dist_doc_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
+ EXTRA_DIST = BUGS Todo configure install-sh \
+ 	mkinstalldirs Makefile.in Todo $(pkgdata_DATA)
+ #DIST_COMMON = 
+--- rancid-2.3.8/share/Makefile.am
++++ rancid-2.3.8/share/Makefile.am
+@@ -50,8 +50,9 @@
+ 
+ pkgdata_SCRIPTS= rancid-cvspurge rtrfilter downreport
+ dist_pkgdata_SCRIPTS=getipacctg
+-dist_pkgdata_DATA=README.misc cisco-load.exp cisco-reload.exp \
+-	index.html lgnotes.html
++dist_pkgdata_DATA=cisco-load.exp cisco-reload.exp
++dist_doc_DATA=README.misc
++dist_html_DATA=index.html lgnotes.html
+ 
+ EXTRA_DIST = rancid-cvspurge.in rancid.spec rtrfilter.in downreport.in
+ 
+--- rancid-2.3.8/etc/Makefile.am
++++ rancid-2.3.8/etc/Makefile.am
+@@ -48,7 +48,7 @@
+ #AUTOMAKE_OPTIONS=foreign no-dependencies
+ AUTOMAKE_OPTIONS=foreign
+ 
+-pkgdata_DATA= lg.conf.sample rancid.conf.sample
++dist_doc_DATA= lg.conf.sample rancid.conf.sample
+ EXTRA_DIST= $(pkgdata_DATA:%=%.in)
+ 
+ CLEANFILES= $(pkgdata_DATA)
diff --git a/net-misc/rancid-git/files/rancid-2.3.8-config.patch b/net-misc/rancid-git/files/rancid-2.3.8-config.patch
new file mode 100644
index 000000000000..f39f28382da8
--- /dev/null
+++ b/net-misc/rancid-git/files/rancid-2.3.8-config.patch
@@ -0,0 +1,33 @@
+--- etc/rancid.conf.sample.in
++++ etc/rancid.conf.sample.in
+@@ -42,7 +42,10 @@
+ RCSSYS=@RCSSYS@; export RCSSYS
+ #
+ # if ACLSORT is NO, access-lists will NOT be sorted.
+-#ACLSORT=YES; export ACLSORT
++#
++#Gentoo - changing default to NO because access-list order matters in most instances
++#and many people expect to use rancid as a backup system
++ACLSORT=NO; export ACLSORT
+ #
+ # if NOPIPE is set, temp files will be used instead of a cmd pipe during
+ # collection from the router(s).
+@@ -50,10 +53,16 @@
+ #
+ # FILTER_PWDS determines which passwords are filtered from configs by the
+ # value set (NO | YES | ALL).  see rancid.conf(5).
+-#FILTER_PWDS=YES; export FILTER_PWDS
++#
++#Gentoo - changing default to ALL; diffs are emailed and even the most secure
++#password hashes on most routers are easily brute-forceable with modern systems
++FILTER_PWDS=ALL; export FILTER_PWDS
+ #
+ # if NOCOMMSTR is set, snmp community strings will be stripped from the configs
+-#NOCOMMSTR=YES; export NOCOMMSTR
++#
++#Gentoo - changing default to YES; diffs are emailed and SNMP communities
++#can be just as dangerous as passwords
++NOCOMMSTR=YES; export NOCOMMSTR
+ #
+ # How many times failed collections are retried (for each run) before
+ # giving up.  Minimum: 1
diff --git a/net-misc/rancid-git/files/rancid-2.3.8-mailprefix.patch b/net-misc/rancid-git/files/rancid-2.3.8-mailprefix.patch
new file mode 100644
index 000000000000..171a380679dc
--- /dev/null
+++ b/net-misc/rancid-git/files/rancid-2.3.8-mailprefix.patch
@@ -0,0 +1,178 @@
+--- rancid-2.3.8/bin/Makefile.am
++++ rancid-2.3.8/bin/Makefile.am
+@@ -96,8 +96,6 @@
+ 	-e 's,@PERLV\@,$(PERLV),g' \
+ 	-e 's,@PERLV_PATH\@,$(PERLV_PATH),g' \
+ 	-e 's,@LG_PING_CMD\@,$(LG_PING_CMD),g' \
+-	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
+-	-e 's,@MAILPLUS\@,$(MAILPLUS),g' \
+ 	-e 's,@PACKAGE\@,$(PACKAGE),g' \
+ 	-e 's,@SVN_FSTYPE\@,$(SVN_FSTYPE),g' \
+ 	-e 's,@VERSION\@,$(VERSION),g' \
+--- rancid-2.3.8/bin/control_rancid.in
++++ rancid-2.3.8/bin/control_rancid.in
+@@ -118,8 +118,8 @@
+ fi
+ 
+ # the receipient(s) of diffs & mail options
+-mailrcpt=${mailrcpt:-"@MAILPLUS@${GROUP}${MAILDOMAIN}"}; export mailrcpt
+-adminmailrcpt=${adminmailrcpt:-"@ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"};
++mailrcpt=${mailrcpt:-"${MAILPREFIX}${GROUP}${MAILDOMAIN}"}; export mailrcpt
++adminmailrcpt=${adminmailrcpt:-"${ADMINMAILPREFIX}${GROUP}${MAILDOMAIN}"};
+ export adminmailrcpt
+ set | grep MAILHEADERS= > /dev/null 2>&1
+ if [ $? -ne 0 ] ; then
+--- rancid-2.3.8/bin/rancid-run.in
++++ rancid-2.3.8/bin/rancid-run.in
+@@ -147,7 +147,7 @@
+ 	    if [ -s $TMPDIR/.$GROUP.old ]
+ 	    then
+ 		(
+-		  echo "To: @ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"
++		  echo "To: ${ADMINMAILPREFIX}${GROUP}${MAILDOMAIN}"
+ 		  echo "Subject: rancid hung - $GROUP"
+ 		  echo "Precedence: bulk"
+ 		  echo ""
+--- rancid-2.3.8/configure.in
++++ rancid-2.3.8/configure.in
+@@ -163,46 +163,6 @@
+ AC_SUBST(SVN_FSTYPE)
+ rd_cv_RCSSYS=$RCSSYS
+ 
+-# Check for a preference for using mail addresses like rancid+group
+-# instead of the standard rancid-group
+-AC_MSG_CHECKING([whether mail addresses should be in the rancid+ form])
+-AC_ARG_ENABLE(mail-plus,
+-	AS_HELP_STRING([--enable-mail-plus], [enable mail to rancid+ addresses, instead of rancid-]),
+-[if test "$enable_mail_plus" = yes; then
+-    AC_MSG_RESULT(yes)
+-    MAILPLUS="rancid+"
+-    AC_SUBST(MAILPLUS)
+-else
+-    AC_MSG_RESULT(no)
+-    MAILPLUS="rancid-"
+-    AC_SUBST(MAILPLUS)
+-fi],
+-[AC_MSG_RESULT(no)
+-    MAILPLUS="rancid-"
+-    AC_SUBST(MAILPLUS)
+-])
+-rd_cv_MAILPLUS=$MAILPLUS
+-
+-# Check for a preference for using mail addresses like rancid+admin-group
+-# instead of the standard rancid-admin-group
+-AC_MSG_CHECKING([whether admin mail addresses should be in the rancid-admin+ form])
+-AC_ARG_ENABLE(adminmail-plus,
+-	AS_HELP_STRING([--enable-adminmail-plus], [enable mail to rancid-admin+ addresses, instead of rancid-admin-]),
+-[if test "$enable_adminmail_plus" = yes; then
+-    AC_MSG_RESULT([rancid-admin+])
+-    ADMINMAILPLUS="rancid-admin+"
+-    AC_SUBST(ADMINMAILPLUS)
+-else
+-    AC_MSG_RESULT([${MAILPLUS}admin-])
+-    ADMINMAILPLUS="${MAILPLUS}admin-"
+-    AC_SUBST(ADMINMAILPLUS)
+-fi],
+-[AC_MSG_RESULT([${MAILPLUS}admin-])
+-    ADMINMAILPLUS="${MAILPLUS}admin-"
+-    AC_SUBST(ADMINMAILPLUS)
+-])
+-rd_cv_ADMINMAILPLUS=$ADMINMAILPLUS
+-
+ AC_PATH_PROG(DIRNAME,dirname,no)
+ 
+ # locate GNU diff (one supporting the -u option)
+--- rancid-2.3.8/etc/rancid.conf.sample.in
++++ rancid-2.3.8/etc/rancid.conf.sample.in
+@@ -71,6 +71,21 @@
+ # The number of devices to collect simultaneously.
+ #PAR_COUNT=5; export PAR_COUNT
+ #
++# Define the prefixes for regular and administrative email groups
++# configuration diffs will be emailed to {MAILPREFIX}{GROUPNAME}
++# eg. rancid-routers
++# problems/errors will be emailed to {ADMINMAILPREFIX}{GROUPNAME}
++# eg. rancid-admin-routers
++# 
++MAILPREFIX="rancid-"; export MAILPREFIX
++ADMINMAILPREFIX="rancid-admin-"; export ADMINMAILPREFIX
++#
++# To use a delimiter-based system instead of email aliases,
++# comment the above 2 lines and uncomment the following two lines:
++#MAILPREFIX="rancid+"; export MAILPREFIX
++#ADMINMAILPREFIX="rancid-admin+"; export ADMINMAILPREFIX
++#
++#
+ # list of rancid groups
+ #LIST_OF_GROUPS="sl joebobisp"
+ # more groups...
+--- rancid-2.3.8/man/Makefile.am
++++ rancid-2.3.8/man/Makefile.am
+@@ -79,9 +79,7 @@
+ 	-e 's,@bindir\@,$(bindir),g' \
+ 	-e 's,@localstatedir\@,$(localstatedir),g' \
+ 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
+-	-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+-	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
+-	-e 's,@MAILPLUS\@,$(MAILPLUS),g'
++	-e 's,@pkgdatadir\@,$(pkgdatadir),g'
+ 
+ lg.conf.5: Makefile $(srcdir)/lg.conf.5.in
+ 	rm -f lg.conf.5 lg.conf.5.tmp; \
+--- rancid-2.3.8/man/rancid.conf.5.in
++++ rancid-2.3.8/man/rancid.conf.5.in
+@@ -81,6 +81,19 @@
+ are always filtered (e.g.: Alteon passwords).
+ .\"
+ .TP
++.B MAILPREFIX
++Sets the mail prefix that is used to generate group emails. Configuration 
++diffs are emailed to an address of the form {MAILPREFIX}{GROUPNAME}
++eg. rancid-routers
++.sp
++Default: rancid-
++.B ADMINMAILPREFIX
++Sets the mail prefix that is used to generate admin group emails.
++problems/errors are emailed to an address of the form 
++{ADMINMAILPREFIX}{GROUPNAME}
++eg. rancid-admin-routers
++.sp
++Default: rancid-admin-
+ .B LIST_OF_GROUPS
+ Defines a list of group names of routers separated by white-space.  These
+ names become the directory names in $BASEDIR which contain the data
+@@ -104,10 +117,10 @@
+ .sp
+ .in +1i
+ .nf
+-@MAILPLUS@uofo:            frank
+-@ADMINMAILPLUS@uofo:      joe,bob
+-@MAILPLUS@usfs:            frank
+-@ADMINMAILPLUS@usfs:      joe,bob
++rancid-uofo:            frank
++rancid-admin-uofo:      joe,bob
++randid-usfs:            frank
++rancid-admin-usfs:      joe,bob
+ .fi
+ .sp
+ .in -1i
+@@ -129,7 +142,7 @@
+ .B MAILDOMAIN
+ Define the domain part of addresses for administrative and diff e-mail.
+ The value of this variable is simply appended to the normal mail addresses.
+-For example @MAILPLUS@usfs@example.com, if
++For example rancid-usfs@example.com, if
+ .B MAILDOMAIN
+ had been set to "@example.com".
+ .\"
+--- rancid-2.3.8/share/downreport.in
++++ rancid-2.3.8/share/downreport.in
+@@ -73,7 +73,7 @@
+ 
+ for GROUP in $LIST_OF_GROUPS; do
+   (
+-    echo "To: @MAILPLUS@admin-$GROUP"
++    echo "To: ${ADMINMAILPREFIX}$GROUP"
+     echo "Subject: Down router report - $GROUP"
+     echo "$MAILHEADERS" | awk '{gsub(/\\n/,"\n");print;}'
+     echo ""
diff --git a/net-misc/rancid-git/metadata.xml b/net-misc/rancid-git/metadata.xml
new file mode 100644
index 000000000000..4db7e6baf41b
--- /dev/null
+++ b/net-misc/rancid-git/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="git">Enable git (version control system) support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">dotwaffle/rancid-git</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/rancid-git/rancid-git-2.3.8.ebuild b/net-misc/rancid-git/rancid-git-2.3.8.ebuild
new file mode 100644
index 000000000000..5e09d068be48
--- /dev/null
+++ b/net-misc/rancid-git/rancid-git-2.3.8.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils readme.gentoo user
+
+DESCRIPTION="New Cisco confIg Differ with git extensions and support for colorized emails!"
+HOMEPAGE="https://dotwaffle.github.com/rancid-git"
+#SRC_URI="ftp://ftp.shrubbery.net/pub/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/dotwaffle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-4"
+
+SLOT="0"
+RESTRICT="mirror"
+KEYWORDS="~amd64 ~x86"
+IUSE="+git cvs subversion"
+REQUIRED_USE="^^ ( git cvs subversion )"
+
+# app-arch/par is blocker, due to bug #455838
+DEPEND="!app-arch/par
+	dev-lang/perl
+	dev-lang/tcl:0=
+	dev-tcltk/expect
+	sys-apps/diffutils
+	git? ( dev-vcs/git )
+	cvs? ( dev-vcs/cvs )
+	subversion? ( dev-vcs/subversion )
+	|| (
+		net-misc/netkit-telnetd
+		net-misc/telnet-bsd
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P/-git}-mailprefix.patch
+	epatch "${FILESDIR}"/${P/-git}-config.patch
+	epatch "${FILESDIR}"/${P/-git}-buildsystem.patch
+
+	# respect CFLAGS, bug #455840
+	sed -i -e '/^CFLAGS/d' bin/Makefile.am || die 'sed on bin/Makefile.am failed'
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var/${PN} \
+		--enable-conf-install \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		$(use_with subversion svn fsfs) \
+		$(use_with git)
+}
+
+src_install() {
+	default
+
+	if use subversion ; then
+		sed -e 's/^RCSSYS=cvs/RCSSYS=svn/' \
+			-i "${D}"/etc/rancid.conf || die
+	fi
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}/var/rancid/.cloginrc\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_src_install
+}
+
+pkg_preinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash "${EPREFIX}"/var/rancid ${PN}
+
+	keepdir /var/${PN}{,/logs}
+	touch 	"${ED}"/var/${PN}/.cloginrc
+
+	fperms ug=rwX,o= /var/${PN}/{,logs,.cloginrc}
+	fowners ${PN}:${PN} /var/${PN}/{,logs,.cloginrc}
+}
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Micro-HOWTO on how to get running:
+
+1) Modify MAILPREFIX, ADMINMAILPREFIX, and LIST_OF_GROUPS
+in /etc/rancid.conf:
+MAILPREFIX=\"rancid-\"
+ADMINMAILPREFIX=\"rancid-admin-\"
+LIST_OF_GROUPS=\"routers switches\"
+
+2) Setup email aliases for rancid:
+you will need to define mail aliases for {MAILPREFIX}{GROUP}
+and {ADMINMAILPREFIX}{GROUP} for each group you defined above
+How to do this depends on your mailserver
+
+3) Run rancid-cvs as the rancid user to initialise directories and
+repositories; eg. su -c /usr/bin/rancid-cvs - rancid
+Note the command is the same even if you are using subversion
+
+4) Populate /var/rancid/{GROUPNAME}/router.db with nodes
+see man 5 router.db for detailed formatting information
+
+5) Populate /var/rancid/.cloginrc with credentials
+see /usr/share/rancid/cloginrc.sample for an example
+
+6) Test clogin access with: clogin -f /var/rancid/.clogin hostname
+
+7) Add a cronjob for the rancid user to regularly call rancid-run
+eg: run crontab -u rancid -e and add the lines below
+# run rancid once an hour
+0 * * * *	/usr/bin/rancid-run
+# cleanup old logfiles generated by rancid once a day
+50 23 * * *	/usr/bin/find /var/rancid/logs -type f -mtime +2 -exec rm {} \;
+"
diff --git a/net-misc/rancid/Manifest b/net-misc/rancid/Manifest
new file mode 100644
index 000000000000..483a8f3c8797
--- /dev/null
+++ b/net-misc/rancid/Manifest
@@ -0,0 +1,8 @@
+AUX rancid-2.3.8-buildsystem.patch 1741 SHA256 6addb41b560b1cfa74e9aa4c526ea7622f5809310ae749505763e510b5ea0388 SHA512 2ce1befcd4898654958e8a961156a6eda95da319d98ca66c9cb216ab46b80166571146b631a699be5702d5bb7baa8301b570fe82fb89ba8096a941807005f9ab WHIRLPOOL e10781cc3e9bd8dad3d2ec970b3def5893d2411bf2bc0e929d6803292c2b928efbb9d9e0f8fd62a8113219f96b9a59d174eeeab2db06972509978c8332fc4d2b
+AUX rancid-2.3.8-config.patch 1241 SHA256 66cb3e28127b2e8336cf315b5004bd6ea1d83a4af803f89fd535b9af450fbcbf SHA512 abad6758dbe89eacf566b5cc931749ed9667ec7f7e824a8091f5a02edfeacb4497b1dfc5444ae41f5652a479791c585e4625b8877e710f460698a8bb2cccce9c WHIRLPOOL 271911b9c89a3fa7aa2d3b078bc832b1eff85343770b4f73352615ab53c1c9b4eb28827dfd17b10b9eba7bcb651c846f39f20f14506ec82dc8a8671a29ea3379
+AUX rancid-2.3.8-mailprefix.patch 5878 SHA256 1703c25a50667c3f979010e883da8a83d540a551922716c0e4de09b3a4bdbbf3 SHA512 c01cdaafd599c8b1559b158ba0999c1e79c40dc4c8f6c0f5aa284225a5903ba967b742cee7d81f2edeb07c6e7e344c1208c018421c023a7f678204c647f3e8bd WHIRLPOOL 9e0d0c22c24386231aa029a0e5e1bf78df56bd75558f8c12aabcee5a2ab75ef25b21569334318351f700eb55cec0ef3d7864f65eb87d12035aebb9e3766c2df5
+DIST rancid-2.3.8.tar.gz 379908 SHA256 44e44c87a22968d5229c01d60aa46960da023a24846eef43f9e3c8d70fd5b3fb SHA512 cd071670e160f2e8268e676ae92b0d982719a2bc306aef3ef8fdbbaae398854178613eee2a139f206e799eba6c0b49dce2094db69ea57ef938e5d0c2c294a3cc WHIRLPOOL 69fbc3eef603888cfafcb5ddd445da68da4d1ca15509b1f8938de09379f9f613063487fd836f18abeffcba7d6b83b5bc2dde74825e7a263b3109dabb36f3d045
+EBUILD rancid-2.3.8.ebuild 3035 SHA256 edcd60202c94eebbb1cb3b841816b0f17f18aca7c1e41839548971c7b23bd95d SHA512 b5d74ea75f21903bf77cbec3fbc81afc3e61ddf41e6c5342967dc21387f398bd8fb5dbd6856d5f557635a8e8997149a1b0e60fa15a3e2e512581dfe86bdbdbbe WHIRLPOOL 21f2a3816b7a58d7e9c39be412b9fbd6506df5e37123f5a6bdf3b29272e92650a768f23553c6bb78b6095d13c3883a8eee861df1bf8afe7cbfb99cbbb9a484e7
+MISC ChangeLog 3074 SHA256 60cea6e28d189ed2a1d04939d5459dae7cc708c9aa7b587f3597e7f6aeca8a33 SHA512 82ce120155b65e0f77346612e2283ee6f6bc1f51cf1baa271bae97ec24bc28605cc946da86ffa438760a1cabc01c74da698dda51f7790c4c36c6c6e2e437c54a WHIRLPOOL 9ae806fbcc01f99aa393f18afc91d152b7c356398eeecd5387c6a1cfe71a78a7d2cc481fb9267c683d635e1427be442f4ae86ce1ae631b55ed0440e2cf93af6e
+MISC ChangeLog-2015 1429 SHA256 881838d0d992ab4af106882d7475da00649e34949e1367895c61ea6cae86e105 SHA512 a07cf605add49174481011ea5c9f090da0b645daca051c9d7c262f6b172c86433a557569a8cd6d3e79dad9bcfeaff71c305f77a5a106745a0e89a6131868f705 WHIRLPOOL baa70b4c1035608a29729af1df8af3bf466ff82b9546a877a07c166de26976fcb62a861607043f32e37ac59609a5ab718ad13bc052ffc68a49b40fab808724ac
+MISC metadata.xml 239 SHA256 2a0c6a6922ad5c1460d3525cf24e302d4b3435d9c7d619a7c43605d0bbdf70c1 SHA512 be29819db58c3ddb7212a488f9965de11cb5d84223ccae9458e968425296d3ef0f93f20edf7b4ab8a4dda6c166c4104c8b615c82feac5d87b3364a88de591a45 WHIRLPOOL 36f4ad69c7deb9b7aaf9c1125165227d4de9d101a25fd6b38f9ce362245ac9456e96ae039728042cf8741e8ff0e8e0f56d5772ed85de1c4efdbe917b12b465bb
diff --git a/net-misc/rancid/files/rancid-2.3.8-buildsystem.patch b/net-misc/rancid/files/rancid-2.3.8-buildsystem.patch
new file mode 100644
index 000000000000..4a06b5c63723
--- /dev/null
+++ b/net-misc/rancid/files/rancid-2.3.8-buildsystem.patch
@@ -0,0 +1,64 @@
+--- rancid-2.3.8/configure.in
++++ rancid-2.3.8/configure.in
+@@ -17,7 +17,7 @@
+ dnl default install location
+ AC_PREFIX_DEFAULT(/usr/local/rancid)
+ 
+-dnl AM_MAINTAINER_MODE()
++AM_MAINTAINER_MODE()
+ 
+ dnl AC_CONFIG_SUBDIRS(util)
+ 
+@@ -35,7 +35,6 @@
+ 
+ # compiler specifics
+ AC_PROG_CC
+-AM_C_PROTOTYPES
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
+@@ -212,7 +212,7 @@
+ # is good enough -- if we can't find GNU tar, we don't really care.
+ AC_CHECK_PROGS(TAR, gnutar gtar tar)
+ 
+-AC_CHECK_PROGS(AUTOMAKE, automake)
++dnl AC_CHECK_PROGS(AUTOMAKE, automake)
+ 
+ dnl locate perl 5 and expect.
+ AC_PROG_INSTALL
+--- rancid-2.3.8/Makefile.am
++++ rancid-2.3.8/Makefile.am
+@@ -24,7 +24,7 @@
+ 
+ @SET_MAKE@
+ 
+-pkgdata_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
++dist_doc_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
+ EXTRA_DIST = BUGS Todo configure install-sh \
+ 	mkinstalldirs Makefile.in Todo $(pkgdata_DATA)
+ #DIST_COMMON = 
+--- rancid-2.3.8/share/Makefile.am
++++ rancid-2.3.8/share/Makefile.am
+@@ -50,8 +50,9 @@
+ 
+ pkgdata_SCRIPTS= rancid-cvspurge rtrfilter downreport
+ dist_pkgdata_SCRIPTS=getipacctg
+-dist_pkgdata_DATA=README.misc cisco-load.exp cisco-reload.exp \
+-	index.html lgnotes.html
++dist_pkgdata_DATA=cisco-load.exp cisco-reload.exp
++dist_doc_DATA=README.misc
++dist_html_DATA=index.html lgnotes.html
+ 
+ EXTRA_DIST = rancid-cvspurge.in rancid.spec rtrfilter.in downreport.in
+ 
+--- rancid-2.3.8/etc/Makefile.am
++++ rancid-2.3.8/etc/Makefile.am
+@@ -48,7 +48,7 @@
+ #AUTOMAKE_OPTIONS=foreign no-dependencies
+ AUTOMAKE_OPTIONS=foreign
+ 
+-pkgdata_DATA= lg.conf.sample rancid.conf.sample
++dist_doc_DATA= lg.conf.sample rancid.conf.sample
+ EXTRA_DIST= $(pkgdata_DATA:%=%.in)
+ 
+ CLEANFILES= $(pkgdata_DATA)
diff --git a/net-misc/rancid/files/rancid-2.3.8-config.patch b/net-misc/rancid/files/rancid-2.3.8-config.patch
new file mode 100644
index 000000000000..f39f28382da8
--- /dev/null
+++ b/net-misc/rancid/files/rancid-2.3.8-config.patch
@@ -0,0 +1,33 @@
+--- etc/rancid.conf.sample.in
++++ etc/rancid.conf.sample.in
+@@ -42,7 +42,10 @@
+ RCSSYS=@RCSSYS@; export RCSSYS
+ #
+ # if ACLSORT is NO, access-lists will NOT be sorted.
+-#ACLSORT=YES; export ACLSORT
++#
++#Gentoo - changing default to NO because access-list order matters in most instances
++#and many people expect to use rancid as a backup system
++ACLSORT=NO; export ACLSORT
+ #
+ # if NOPIPE is set, temp files will be used instead of a cmd pipe during
+ # collection from the router(s).
+@@ -50,10 +53,16 @@
+ #
+ # FILTER_PWDS determines which passwords are filtered from configs by the
+ # value set (NO | YES | ALL).  see rancid.conf(5).
+-#FILTER_PWDS=YES; export FILTER_PWDS
++#
++#Gentoo - changing default to ALL; diffs are emailed and even the most secure
++#password hashes on most routers are easily brute-forceable with modern systems
++FILTER_PWDS=ALL; export FILTER_PWDS
+ #
+ # if NOCOMMSTR is set, snmp community strings will be stripped from the configs
+-#NOCOMMSTR=YES; export NOCOMMSTR
++#
++#Gentoo - changing default to YES; diffs are emailed and SNMP communities
++#can be just as dangerous as passwords
++NOCOMMSTR=YES; export NOCOMMSTR
+ #
+ # How many times failed collections are retried (for each run) before
+ # giving up.  Minimum: 1
diff --git a/net-misc/rancid/files/rancid-2.3.8-mailprefix.patch b/net-misc/rancid/files/rancid-2.3.8-mailprefix.patch
new file mode 100644
index 000000000000..171a380679dc
--- /dev/null
+++ b/net-misc/rancid/files/rancid-2.3.8-mailprefix.patch
@@ -0,0 +1,178 @@
+--- rancid-2.3.8/bin/Makefile.am
++++ rancid-2.3.8/bin/Makefile.am
+@@ -96,8 +96,6 @@
+ 	-e 's,@PERLV\@,$(PERLV),g' \
+ 	-e 's,@PERLV_PATH\@,$(PERLV_PATH),g' \
+ 	-e 's,@LG_PING_CMD\@,$(LG_PING_CMD),g' \
+-	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
+-	-e 's,@MAILPLUS\@,$(MAILPLUS),g' \
+ 	-e 's,@PACKAGE\@,$(PACKAGE),g' \
+ 	-e 's,@SVN_FSTYPE\@,$(SVN_FSTYPE),g' \
+ 	-e 's,@VERSION\@,$(VERSION),g' \
+--- rancid-2.3.8/bin/control_rancid.in
++++ rancid-2.3.8/bin/control_rancid.in
+@@ -118,8 +118,8 @@
+ fi
+ 
+ # the receipient(s) of diffs & mail options
+-mailrcpt=${mailrcpt:-"@MAILPLUS@${GROUP}${MAILDOMAIN}"}; export mailrcpt
+-adminmailrcpt=${adminmailrcpt:-"@ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"};
++mailrcpt=${mailrcpt:-"${MAILPREFIX}${GROUP}${MAILDOMAIN}"}; export mailrcpt
++adminmailrcpt=${adminmailrcpt:-"${ADMINMAILPREFIX}${GROUP}${MAILDOMAIN}"};
+ export adminmailrcpt
+ set | grep MAILHEADERS= > /dev/null 2>&1
+ if [ $? -ne 0 ] ; then
+--- rancid-2.3.8/bin/rancid-run.in
++++ rancid-2.3.8/bin/rancid-run.in
+@@ -147,7 +147,7 @@
+ 	    if [ -s $TMPDIR/.$GROUP.old ]
+ 	    then
+ 		(
+-		  echo "To: @ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"
++		  echo "To: ${ADMINMAILPREFIX}${GROUP}${MAILDOMAIN}"
+ 		  echo "Subject: rancid hung - $GROUP"
+ 		  echo "Precedence: bulk"
+ 		  echo ""
+--- rancid-2.3.8/configure.in
++++ rancid-2.3.8/configure.in
+@@ -163,46 +163,6 @@
+ AC_SUBST(SVN_FSTYPE)
+ rd_cv_RCSSYS=$RCSSYS
+ 
+-# Check for a preference for using mail addresses like rancid+group
+-# instead of the standard rancid-group
+-AC_MSG_CHECKING([whether mail addresses should be in the rancid+ form])
+-AC_ARG_ENABLE(mail-plus,
+-	AS_HELP_STRING([--enable-mail-plus], [enable mail to rancid+ addresses, instead of rancid-]),
+-[if test "$enable_mail_plus" = yes; then
+-    AC_MSG_RESULT(yes)
+-    MAILPLUS="rancid+"
+-    AC_SUBST(MAILPLUS)
+-else
+-    AC_MSG_RESULT(no)
+-    MAILPLUS="rancid-"
+-    AC_SUBST(MAILPLUS)
+-fi],
+-[AC_MSG_RESULT(no)
+-    MAILPLUS="rancid-"
+-    AC_SUBST(MAILPLUS)
+-])
+-rd_cv_MAILPLUS=$MAILPLUS
+-
+-# Check for a preference for using mail addresses like rancid+admin-group
+-# instead of the standard rancid-admin-group
+-AC_MSG_CHECKING([whether admin mail addresses should be in the rancid-admin+ form])
+-AC_ARG_ENABLE(adminmail-plus,
+-	AS_HELP_STRING([--enable-adminmail-plus], [enable mail to rancid-admin+ addresses, instead of rancid-admin-]),
+-[if test "$enable_adminmail_plus" = yes; then
+-    AC_MSG_RESULT([rancid-admin+])
+-    ADMINMAILPLUS="rancid-admin+"
+-    AC_SUBST(ADMINMAILPLUS)
+-else
+-    AC_MSG_RESULT([${MAILPLUS}admin-])
+-    ADMINMAILPLUS="${MAILPLUS}admin-"
+-    AC_SUBST(ADMINMAILPLUS)
+-fi],
+-[AC_MSG_RESULT([${MAILPLUS}admin-])
+-    ADMINMAILPLUS="${MAILPLUS}admin-"
+-    AC_SUBST(ADMINMAILPLUS)
+-])
+-rd_cv_ADMINMAILPLUS=$ADMINMAILPLUS
+-
+ AC_PATH_PROG(DIRNAME,dirname,no)
+ 
+ # locate GNU diff (one supporting the -u option)
+--- rancid-2.3.8/etc/rancid.conf.sample.in
++++ rancid-2.3.8/etc/rancid.conf.sample.in
+@@ -71,6 +71,21 @@
+ # The number of devices to collect simultaneously.
+ #PAR_COUNT=5; export PAR_COUNT
+ #
++# Define the prefixes for regular and administrative email groups
++# configuration diffs will be emailed to {MAILPREFIX}{GROUPNAME}
++# eg. rancid-routers
++# problems/errors will be emailed to {ADMINMAILPREFIX}{GROUPNAME}
++# eg. rancid-admin-routers
++# 
++MAILPREFIX="rancid-"; export MAILPREFIX
++ADMINMAILPREFIX="rancid-admin-"; export ADMINMAILPREFIX
++#
++# To use a delimiter-based system instead of email aliases,
++# comment the above 2 lines and uncomment the following two lines:
++#MAILPREFIX="rancid+"; export MAILPREFIX
++#ADMINMAILPREFIX="rancid-admin+"; export ADMINMAILPREFIX
++#
++#
+ # list of rancid groups
+ #LIST_OF_GROUPS="sl joebobisp"
+ # more groups...
+--- rancid-2.3.8/man/Makefile.am
++++ rancid-2.3.8/man/Makefile.am
+@@ -79,9 +79,7 @@
+ 	-e 's,@bindir\@,$(bindir),g' \
+ 	-e 's,@localstatedir\@,$(localstatedir),g' \
+ 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
+-	-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+-	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
+-	-e 's,@MAILPLUS\@,$(MAILPLUS),g'
++	-e 's,@pkgdatadir\@,$(pkgdatadir),g'
+ 
+ lg.conf.5: Makefile $(srcdir)/lg.conf.5.in
+ 	rm -f lg.conf.5 lg.conf.5.tmp; \
+--- rancid-2.3.8/man/rancid.conf.5.in
++++ rancid-2.3.8/man/rancid.conf.5.in
+@@ -81,6 +81,19 @@
+ are always filtered (e.g.: Alteon passwords).
+ .\"
+ .TP
++.B MAILPREFIX
++Sets the mail prefix that is used to generate group emails. Configuration 
++diffs are emailed to an address of the form {MAILPREFIX}{GROUPNAME}
++eg. rancid-routers
++.sp
++Default: rancid-
++.B ADMINMAILPREFIX
++Sets the mail prefix that is used to generate admin group emails.
++problems/errors are emailed to an address of the form 
++{ADMINMAILPREFIX}{GROUPNAME}
++eg. rancid-admin-routers
++.sp
++Default: rancid-admin-
+ .B LIST_OF_GROUPS
+ Defines a list of group names of routers separated by white-space.  These
+ names become the directory names in $BASEDIR which contain the data
+@@ -104,10 +117,10 @@
+ .sp
+ .in +1i
+ .nf
+-@MAILPLUS@uofo:            frank
+-@ADMINMAILPLUS@uofo:      joe,bob
+-@MAILPLUS@usfs:            frank
+-@ADMINMAILPLUS@usfs:      joe,bob
++rancid-uofo:            frank
++rancid-admin-uofo:      joe,bob
++randid-usfs:            frank
++rancid-admin-usfs:      joe,bob
+ .fi
+ .sp
+ .in -1i
+@@ -129,7 +142,7 @@
+ .B MAILDOMAIN
+ Define the domain part of addresses for administrative and diff e-mail.
+ The value of this variable is simply appended to the normal mail addresses.
+-For example @MAILPLUS@usfs@example.com, if
++For example rancid-usfs@example.com, if
+ .B MAILDOMAIN
+ had been set to "@example.com".
+ .\"
+--- rancid-2.3.8/share/downreport.in
++++ rancid-2.3.8/share/downreport.in
+@@ -73,7 +73,7 @@
+ 
+ for GROUP in $LIST_OF_GROUPS; do
+   (
+-    echo "To: @MAILPLUS@admin-$GROUP"
++    echo "To: ${ADMINMAILPREFIX}$GROUP"
+     echo "Subject: Down router report - $GROUP"
+     echo "$MAILHEADERS" | awk '{gsub(/\\n/,"\n");print;}'
+     echo ""
diff --git a/net-misc/rancid/metadata.xml b/net-misc/rancid/metadata.xml
new file mode 100644
index 000000000000..d04de4894ede
--- /dev/null
+++ b/net-misc/rancid/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/rancid/rancid-2.3.8.ebuild b/net-misc/rancid/rancid-2.3.8.ebuild
new file mode 100644
index 000000000000..300c3ef0e190
--- /dev/null
+++ b/net-misc/rancid/rancid-2.3.8.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils readme.gentoo user
+
+DESCRIPTION="Really Awesome New Cisco confIg Differ"
+HOMEPAGE="http://www.shrubbery.net/rancid/"
+SRC_URI="http://http.debian.net/debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-4"
+
+SLOT="0"
+RESTRICT="mirror"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cvs subversion"
+
+REQUIRED_USE="^^ ( cvs subversion )"
+
+# app-arch/par is blocker, due to bug #455838
+DEPEND="
+	!app-arch/par
+	dev-lang/perl
+	dev-lang/tcl:0=
+	dev-tcltk/expect
+	sys-apps/diffutils
+	cvs? ( dev-vcs/cvs )
+	subversion? ( dev-vcs/subversion )
+	|| (
+		net-misc/netkit-telnetd
+		net-misc/telnet-bsd
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-mailprefix.patch
+	epatch "${FILESDIR}"/${P}-config.patch
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+	# respect CFLAGS, bug #455840
+	sed -i -e '/^CFLAGS/d' bin/Makefile.am || die 'sed on bin/Makefile.am failed'
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var/${PN} \
+		--enable-conf-install \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		$(use subversion && echo "--with-svn=fsfs")
+}
+
+src_install() {
+	default
+
+	if use subversion ; then
+		sed -e 's/^RCSSYS=cvs/RCSSYS=svn/' \
+			-i "${D}"/etc/rancid.conf || die
+	fi
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}/var/rancid/.cloginrc\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_src_install
+}
+
+pkg_preinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash "${EPREFIX}"/var/rancid ${PN}
+
+	keepdir /var/${PN}{,/logs}
+	touch 	"${ED}"/var/${PN}/.cloginrc
+
+	fperms ug=rwX,o= /var/${PN}/{,logs,.cloginrc}
+	fowners ${PN}:${PN} /var/${PN}/{,logs,.cloginrc}
+}
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Micro-HOWTO on how to get running:
+
+1) Modify MAILPREFIX, ADMINMAILPREFIX, and LIST_OF_GROUPS
+in /etc/rancid.conf:
+MAILPREFIX=\"rancid-\"
+ADMINMAILPREFIX=\"rancid-admin-\"
+LIST_OF_GROUPS=\"routers switches\"
+
+2) Setup email aliases for rancid:
+you will need to define mail aliases for {MAILPREFIX}{GROUP}
+and {ADMINMAILPREFIX}{GROUP} for each group you defined above
+How to do this depends on your mailserver
+
+3) Run rancid-cvs as the rancid user to initialise directories and
+repositories; eg. su -c /usr/bin/rancid-cvs - rancid
+Note the command is the same even if you are using subversion
+
+4) Populate /var/rancid/{GROUPNAME}/router.db with nodes
+see man 5 router.db for detailed formatting information
+
+5) Populate /var/rancid/.cloginrc with credentials
+see /usr/share/rancid/cloginrc.sample for an example
+
+6) Test clogin access with: clogin -f /var/rancid/.clogin hostname
+
+7) Add a cronjob for the rancid user to regularly call rancid-run
+eg: run crontab -u rancid -e and add the lines below
+# run rancid once an hour
+0 * * * *	/usr/bin/rancid-run
+# cleanup old logfiles generated by rancid once a day
+50 23 * * *	/usr/bin/find /var/rancid/logs -type f -mtime +2 -exec rm {} \;
+"
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
new file mode 100644
index 000000000000..6000e66779a4
--- /dev/null
+++ b/net-misc/rclone/Manifest
@@ -0,0 +1,6 @@
+DIST rclone-1.36.tar.gz 14013564 SHA256 a573b70e3aeb355b943dddd6ae9375386fc21bf12dfba601d8d7280f97c4c884 SHA512 589b5e2370244b5609d1ec8245f9f5f5cf58d6a2d507768db2cfc5a5b882f7d277d797fd0068b904538f3700e1751df03a21697d5295c83a2bf01a78d0ac6b13 WHIRLPOOL aa75c6c32cdcebd79ecf79abd03b4dc0205517808eb232a9655e8ae3da327cd62ad7183f4e0b0f6b7b52649c0c5058fdc2b57bc7b31b7dffb05e8a1508307d5c
+DIST rclone-1.37.tar.gz 37684683 SHA256 a74e284d2368f6fb8e4ac654a31b9b1328ac6078acd3446c9a892cd4bcbe8660 SHA512 683c88c04aa3d6f7057937c431bc56b20c9218c3a01f8baa4fb63ed716a0a3397855c1a9bf485041354bc6696f54f670b5cd9945c0465b4dc65595a9f606427b WHIRLPOOL c43709f66f0de6e66f073e34e4896707db0b91cf556cc225bdc22b7195c92e5777fbf7dc6983d57bcb11cab825ec7c222e0f75c6e52949a68fe5a7b4e43da1ff
+EBUILD rclone-1.36.ebuild 649 SHA256 5030efbfd59058359c1817c80328c6be92c5977f59933e0231be948154b6bd68 SHA512 a1e84507ede33b5c53cce142c3f01b3ec8e907c1d5f54757734d0bc4bdf56ff8fb7510dd1ab8ae3f142e2f9851ee34cbcce1d1ea3433d0a4c13d51b4ab2e8845 WHIRLPOOL 2f09593d98d60d3ad5b29c3f5f99af61218648fa1ef45d2f85b2e5f0e0ffc1eb934d0f3650ed6851e06b281f7b19783db1d9688ea3a15db9edc976283fa2ef29
+EBUILD rclone-1.37.ebuild 649 SHA256 5030efbfd59058359c1817c80328c6be92c5977f59933e0231be948154b6bd68 SHA512 a1e84507ede33b5c53cce142c3f01b3ec8e907c1d5f54757734d0bc4bdf56ff8fb7510dd1ab8ae3f142e2f9851ee34cbcce1d1ea3433d0a4c13d51b4ab2e8845 WHIRLPOOL 2f09593d98d60d3ad5b29c3f5f99af61218648fa1ef45d2f85b2e5f0e0ffc1eb934d0f3650ed6851e06b281f7b19783db1d9688ea3a15db9edc976283fa2ef29
+EBUILD rclone-9999.ebuild 649 SHA256 5030efbfd59058359c1817c80328c6be92c5977f59933e0231be948154b6bd68 SHA512 a1e84507ede33b5c53cce142c3f01b3ec8e907c1d5f54757734d0bc4bdf56ff8fb7510dd1ab8ae3f142e2f9851ee34cbcce1d1ea3433d0a4c13d51b4ab2e8845 WHIRLPOOL 2f09593d98d60d3ad5b29c3f5f99af61218648fa1ef45d2f85b2e5f0e0ffc1eb934d0f3650ed6851e06b281f7b19783db1d9688ea3a15db9edc976283fa2ef29
+MISC metadata.xml 247 SHA256 476881b53a1d153f1c3c21b5e7b81ca4d704b7b868aa58eef6a2faa531aabb5d SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46 WHIRLPOOL 2225cc6e12a88d99aca5e7b1a986bc808e64840a95fa9cfba2b21f841eb1619c8c86170d0701c3088bc9acac4cdb86467dd85f36e5315b635dcfed348b289bc8
diff --git a/net-misc/rclone/metadata.xml b/net-misc/rclone/metadata.xml
new file mode 100644
index 000000000000..76f45cdee0f4
--- /dev/null
+++ b/net-misc/rclone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/rclone/rclone-1.36.ebuild b/net-misc/rclone/rclone-1.36.ebuild
new file mode 100644
index 000000000000..0c936bdca50e
--- /dev/null
+++ b/net-misc/rclone/rclone-1.36.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build
+EGO_PN="github.com/ncw/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/net-misc/rclone/rclone-1.37.ebuild b/net-misc/rclone/rclone-1.37.ebuild
new file mode 100644
index 000000000000..0c936bdca50e
--- /dev/null
+++ b/net-misc/rclone/rclone-1.37.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build
+EGO_PN="github.com/ncw/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/net-misc/rclone/rclone-9999.ebuild b/net-misc/rclone/rclone-9999.ebuild
new file mode 100644
index 000000000000..0c936bdca50e
--- /dev/null
+++ b/net-misc/rclone/rclone-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build
+EGO_PN="github.com/ncw/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
new file mode 100644
index 000000000000..a1cc540b83b8
--- /dev/null
+++ b/net-misc/rdate/Manifest
@@ -0,0 +1,8 @@
+AUX rdate-confd 509 SHA256 fdc01f6e200f41896bff49ef7c59ea1a44601a63a33931b64fc1f2354f037e3f SHA512 1ebc27949cf5c68828e00cacb20644b6c6b0e833c23b4f9e31144f0e47c10daa06b82909198227cdc7018939cbae09f2fe53de69aa84c8b9a8ecb0ab9eaf1f8f WHIRLPOOL fb5b85d97044f22ccd8ee30881d4c6c4e0c87f04194f7e70d9cb6aaf94ddcca5f1c7939ab9ce2aa8ef63d40bd86a0e7cb74450c32ac6243fba26b719be73b75c
+AUX rdate-initd-1.4-r3 525 SHA256 77ab29222c1c30f764979cbdd01d1318d68d8d21e27bf603f2e3c11e6448a8f1 SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157 WHIRLPOOL 744bea47c459c03059a0b76338be3888fc134b5808f91772ae2ce7019d4ae032fa795dd78237854b2a2a016c52e1dabaebfb22c4759f76dfb2857e15de992694
+DIST rdate-1.4.tar.gz 11500 SHA256 c8b4a026fa13f22bffe96fe0800b6ac67de72e9f62dfe5b74f1910a9179da4ee SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996 WHIRLPOOL 31f048ebaeabde6776beae972d44e2454b1903563939e8a233f5ceb8d9c04f082bae01d390854b060a52cfa19bc82d9caa93bf5c79b9343b7f9283806ac7e8bd
+EBUILD rdate-1.4-r3.ebuild 748 SHA256 114408d767e752bd815cef98ad3ebe63f1cc536b74d4ca8035ccc424aacead31 SHA512 08d8bf74a21ad924a47a5afff83427fdec727feb8f298f4709ab25ed061841c9ca9e54eb8624ebb61436e8ddd127b4815527814d9d574e607d888b5fb4c98ba2 WHIRLPOOL c514409a751cd095c3dca66f3bb4de40d6d17330ada8f72a50fc997845010ed8fb062db9cc1f88535bb89bc2a4f27c2c34575ddc1474df52a7757ec848f1e4cb
+EBUILD rdate-1.4-r4.ebuild 806 SHA256 1d69383639ffe208b20ef62717a0af82024481677947857470e903870f58b985 SHA512 1b917278e3874586f7d94b702da7fc9d9f85e5354e5e30f9216f876644b326402ec36d719e4cc6b7e3bf6a2f1ac1fafaab682d6fbe01378969ff2206a5b037e3 WHIRLPOOL 5d3d6d841a57c51e69ec192df0f0fc52e056e4e6ab296b864ee665fba79fab337bc1b5f23a4d46ca17ca4cb30d0df3497345e42e032e157540e18ba912a788b8
+MISC ChangeLog 2408 SHA256 b31b81df49178687210c12fdfea68b9fec6d86d91eace85f0e8674774d6525ef SHA512 46687c3ad4bda84e075490ba4bc47e596a543d2e9815c0865888933dfa56603706f7e0f388fc17f553c3db368a73f4851494a1c929eee4eb8a3b42aaf2a112ca WHIRLPOOL b38e96f3df8d2fb0320d0f82bff29763db61c06b263cb2dea26fd505d9da351300a92cdf321cc9dd75ad525b4e06a9a2ab67031ac1d8a6969508c4c0b81a11bb
+MISC ChangeLog-2015 8066 SHA256 d936b611b58f6c48d5c1e33292e2431f4bc08914d2005d2098a6233860d75a72 SHA512 83827a07e7ac3b6024bba67fd146a3e8c643978a42129b3927861b74ad34e92c0f72a889a4cea60627635d51dfbc870c59c9981828f7a52e3773f82033f72f88 WHIRLPOOL 906689effdb8866965edb4587d3a4c57dc5fa02d7dea7ce4f611442fa41e9569fe2dd9556efa78d60622a0194d290c561386a90f562bee4a6ec238e7ba6e7a68
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
diff --git a/net-misc/rdate/files/rdate-confd b/net-misc/rdate/files/rdate-confd
new file mode 100644
index 000000000000..0dd38cb6ecd5
--- /dev/null
+++ b/net-misc/rdate/files/rdate-confd
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# the NTP server to get the date from
+RDATE_SERVER="pool.ntp.org"
+
+# Options to pass to rdate
+# "-s" is mandatory to set the system time, and 
+# is passed regardless of this variable.
+RDATE_OPTS="-u"
+
+# How long to wait (in seconds) before giving up.
+# Useful for when you boot and DNS/internet isn't
+# really available but you have your net interface
+# come up with say a static IP.
+RDATE_TIMEOUT=10
diff --git a/net-misc/rdate/files/rdate-initd-1.4-r3 b/net-misc/rdate/files/rdate-initd-1.4-r3
new file mode 100644
index 000000000000..25ac67dc5236
--- /dev/null
+++ b/net-misc/rdate/files/rdate-initd-1.4-r3
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	before cron
+	need net
+	use dns
+}
+
+checkconfig() {
+	if [ -z "${RDATE_SERVER}" ] ; then
+		eerror "Please edit /etc/conf.d/rdate"
+		eerror "I need to know what server to use!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	ebegin "Setting clock via rdate"
+	/usr/bin/rdate -s ${RDATE_OPTS} -t ${RDATE_TIMEOUT} ${RDATE_SERVER} > /dev/null
+	eend $? "Failed to set clock"
+}
diff --git a/net-misc/rdate/metadata.xml b/net-misc/rdate/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/net-misc/rdate/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 type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/rdate/rdate-1.4-r3.ebuild b/net-misc/rdate/rdate-1.4-r3.ebuild
new file mode 100644
index 000000000000..c38d98978ffa
--- /dev/null
+++ b/net-misc/rdate/rdate-1.4-r3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
+HOMEPAGE="http://www.apps.ietf.org/rfc/rfc868.html"
+SRC_URI="ftp://people.redhat.com/sopwith/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="ipv6"
+
+DEPEND=""
+
+src_compile() {
+	use ipv6 && append-cppflags "-DINET6"
+	emake RCFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" || die
+}
+
+src_install(){
+	emake -j1 prefix="${D}/usr" install || die "make install failed"
+	newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate
+	newconfd "${FILESDIR}"/rdate-confd rdate
+}
diff --git a/net-misc/rdate/rdate-1.4-r4.ebuild b/net-misc/rdate/rdate-1.4-r4.ebuild
new file mode 100644
index 000000000000..3a0fc636df3e
--- /dev/null
+++ b/net-misc/rdate/rdate-1.4-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit flag-o-matic
+
+DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
+HOMEPAGE="http://www.apps.ietf.org/rfc/rfc868.html"
+SRC_URI="ftp://people.redhat.com/sopwith/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="ipv6"
+
+DEPEND=""
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS=/d' \
+		-e '/^rdate: /,+1d' \
+		-e '/\tinstall/s:\([^ ]\+\)$:$(DESTDIR)&:' \
+		Makefile || die "Sed failed!"
+}
+
+src_compile() {
+	use ipv6 && append-cppflags "-DINET6"
+	tc-export CC
+	emake
+}
+
+src_install(){
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate
+	newconfd "${FILESDIR}"/rdate-confd rdate
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
new file mode 100644
index 000000000000..c5f55fcf13db
--- /dev/null
+++ b/net-misc/rdesktop/Manifest
@@ -0,0 +1,10 @@
+AUX rdesktop-1.6.0-sound_configure.patch 799 SHA256 71db62d88e3c3bf5cbfceeddeb33958b2f24980ab3d7734511f13fd48a43e119 SHA512 d2f5cf974b042ca752fc5f114c7f3c87647cbf757c986bf163b183b19a1072942c413827331f74847f4cd5b3aa1d91a0a1f609fca8440ff0dd791a44ab74b888 WHIRLPOOL c1988ebf1e32a76df3e7b9ab1898c0ee66edb6a75cd0ec7b84fa1311025147bd8e7368a5bd61ded9af664a6057535f4b8bfce43d343e8707944ffe8d3243f722
+AUX rdesktop-1.7.0-libao_crash.patch 494 SHA256 0366402ca2319059d658004834d2189e38b89676bef654238439d0ed1b90c3cb SHA512 65477259452d78cadfe73679b70a7fde2486d2ec3dcacc3248174dc5869a62f7de97b9823801ce8c98dd956c2f92032076691b2f8820b05cbcd52fca4605f8ce WHIRLPOOL 61a96267378ad324a9187234bee680ba1336511d10f375fdea59a9cdf756e73a3160c3a4f6df9aa73c4d136503461f4a3f0295fb8a8ef8ea265841076fb2ce90
+AUX rdesktop-1.8.3-xrandr_configure.patch 647 SHA256 7ee48e138eca5917ca3b4b5a875caad890e21193ae335b12aa4a8ea175bf4636 SHA512 a0ef25458c2468b472a606e12502c1867cb06cb69f10e077f774396cd17f80af51ee2748385b203b63fb11280f8849cd70cc9d87dcc0ed2165e10597eb92cfa3 WHIRLPOOL fa0a2058fc97eb7bdc50606a474e7b3895670ce469c07024381955aa800bdfec8b88e75abd4a1adaed351e5f60a00dbb8b3478fd6f97d2a4086d478d8c9b28ee
+DIST rdesktop-1.8.3.tar.gz 320212 SHA256 88b20156b34eff5f1b453f7c724e0a3ff9370a599e69c01dc2bf0b5e650eece4 SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d WHIRLPOOL 24d12882ab04fe535fea6e59b78df2e8c23634703ab13bb385446a6e8c49703ca7344053cf1f6bbc4fecc04ce21354a9e5d3a0261b3d3c015289c2ec3b8af8c3
+EBUILD rdesktop-1.8.3-r1.ebuild 1854 SHA256 5254d8e4a6911a9f71d1ef7b9a7fe0e0fde96d767b222419c4958ea29f4c509e SHA512 4c70505726e22fba07d333ccea0bdf6a8364d04bded7df577839f1300d585f490f0774ac3810fad0cd39b3410d76d199439eb600700c48f4d5878a08036800c7 WHIRLPOOL efdb30df9418ef1eec7599fe100f3d2b3219c69cc9df71418a1c1e3e636b09aa83d1872ab95a48783a5cd1c66c00016b5937876fb07c03a2b28a8acede01b57c
+EBUILD rdesktop-1.8.3-r2.ebuild 1907 SHA256 54f9192ee3df62dfdaf7829df6e59521a8d6d59293890d74b458b4b54782514f SHA512 599d6900a1fd58c137abcba8e9c3651e8937b9414d63377bd29291367b9586ae7d71ec95c2261c35a4a78bc5d6895df78f9e63da9392f549f71c8d0d6b93fea2 WHIRLPOOL 0dfca935a238ae04b6c3a0f2999a802d3d0c281fc49f94d3e9206e9d146a357b89d0273af6a6e449104783475441607167294e38fc71a05c94677286acadf81c
+EBUILD rdesktop-1.8.3.ebuild 1814 SHA256 d01b32e26c56820da8c5102852cae35b5b8efa8635176e91ce92ff7338238001 SHA512 fb0ae6e70dd092e8e27499e9dab31a3c0bb86085e1c7a2b0f6e8b225c02ce09570f7b87a603dd8a23f3b473ad04917c38f3213cba2c0a55afa439c80707534a9 WHIRLPOOL 800f44f5e15fe05cad668a7435fc68924b4a1aaba1f9c52b89327ae06643792c3950de9867310f221190f7dd6b8714e062808cfdb2e9016c6b054e9ee39a3e2b
+MISC ChangeLog 3934 SHA256 2b3cbc1010f61e37929b25b6748f4175e64007938d607875cec0b58728d38a02 SHA512 79a9babb3a242464688d16332fbd8d34c6725441637780f9493f3389817fec45df84de81b15962c7d304efce6eddffe93ea9cce0eac34b8915093496de55feca WHIRLPOOL 5152f69da1673d71bee49575399e606975e48e8390ca77836d0b17a0ae8c9d65c93a77a4cec82f34286d96eb6b8e6d1ea67351a4ebbe1ba051d4b550048fbae0
+MISC ChangeLog-2015 23375 SHA256 1ea0ea03753896a2a538542ff44fc2da59f181460151efb55d1ce44dbc9baddd SHA512 db78d2a6d30903dec5eea6dba37ec0a2b5d75195b63c3b6a8ac4e86b6d2e499539b299adfabae39f738121472f04cf4fa49e61f4748c96bbdb902227b287af9f WHIRLPOOL 1a09be0e31c84f1ccdca49017f6557a688efc5f40f0e304c242130a4b9fc976ab49062cb14bb1dba9e50ebe2bf759422600c975c8c899ab7210012393fac9e76
+MISC metadata.xml 932 SHA256 e37418e005d6c88cb0c7756d5c28d7af04240dfd020ffad47e76abc9b6226dff SHA512 b9be53b9e3f386055e9e92bdb73dfe7ab761ee39af5c9edeef82cf54ce067d802a850eaf8a629bb3159446b66eadaa6dc2301c0eb17ffbd655a6171fc5290edc WHIRLPOOL 680a75289a26b89d9201cbc19a2f62ae8d8b0d07714c82312d3ec31f206e3bf939d88fc449a958c91100ea47c42b5e45cebc1f301661233e6a96f10b3729406d
diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
new file mode 100644
index 000000000000..8e64ba8b48cb
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
@@ -0,0 +1,15 @@
+--- configure.ac.orig	2009-06-30 10:35:14.000000000 +0200
++++ configure.ac	2009-06-30 11:35:10.000000000 +0200
+@@ -228,7 +228,11 @@
+ if test -n "$PKG_CONFIG"; then
+     PKG_CHECK_MODULES(LIBAO, ao, [HAVE_LIBAO=1], [HAVE_LIBAO=0])
+     PKG_CHECK_MODULES(ALSA, alsa, [HAVE_ALSA=1], [HAVE_ALSA=0])
+-    PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
++    AC_ARG_WITH(libsamplerate,
++        [  --without-libsamplerate disable libsamplerate support])
++    if test "x$with_libsamplerate" != "xno"; then
++        PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
++    fi
+     if test x"$HAVE_LIBSAMPLERATE" = "x1"; then
+         AC_DEFINE(HAVE_LIBSAMPLERATE)
+         if test x"$static_libsamplerate" = "xyes"; then
diff --git a/net-misc/rdesktop/files/rdesktop-1.7.0-libao_crash.patch b/net-misc/rdesktop/files/rdesktop-1.7.0-libao_crash.patch
new file mode 100644
index 000000000000..3afb9b2b0f23
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.7.0-libao_crash.patch
@@ -0,0 +1,18 @@
+--- rdpsnd_libao.c.orig	2010-11-29 14:55:31.124907038 +0100
++++ rdpsnd_libao.c	2010-11-29 14:55:51.708464083 +0100
+@@ -76,6 +76,7 @@
+ 	format.channels = 2;
+ 	format.rate = 44100;
+ 	format.byte_format = AO_FMT_NATIVE;
++	format.matrix = NULL;
+ 
+ 
+ 	o_device = ao_open_live(default_driver, &format, NULL);
+@@ -115,6 +116,7 @@
+ 	format.channels = pwfx->nChannels;
+ 	format.rate = 44100;
+ 	format.byte_format = AO_FMT_NATIVE;
++	format.matrix = NULL;
+ 
+ 	if (o_device != NULL)
+ 		ao_close(o_device);
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch
new file mode 100644
index 000000000000..f57a86b4315b
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch
@@ -0,0 +1,17 @@
+--- configure.ac.orig	2015-09-14 11:27:54.974472081 +0200
++++ configure.ac	2015-09-14 11:34:37.729155044 +0200
+@@ -151,9 +151,12 @@
+ AC_SUBST(CREDSSPOBJ)
+ 
+ # xrandr
+-if test -n "$PKG_CONFIG"; then
+-    PKG_CHECK_MODULES(XRANDR, xrandr, [HAVE_XRANDR=1], [HAVE_XRANDR=0])
++AC_ARG_WITH([xrandr], AS_HELP_STRING([--without-xrandr], [Build without Xrandr library (default: true)]))
++AS_IF([test "x$with_xrandr" != "xno"], [
++    if test -n "$PKG_CONFIG"; then
++        PKG_CHECK_MODULES(XRANDR, xrandr, [HAVE_XRANDR=1], [HAVE_XRANDR=0])
+ fi
++])
+ if test x"$HAVE_XRANDR" = "x1"; then
+     CFLAGS="$CFLAGS $XRANDR_CFLAGS"
+     LIBS="$LIBS $XRANDR_LIBS"
diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
new file mode 100644
index 000000000000..f1f3b0c0a220
--- /dev/null
+++ b/net-misc/rdesktop/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <longdescription>
+An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
+</longdescription>
+  <use>
+    <flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag>
+    <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
+	<flag name="xrandr">Enable XRandR window extension support</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">rdesktop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..58b4e48064e3
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND=">=dev-libs/openssl-0.9.6b:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( net-libs/libgssglue )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-libs/libXt"
+
+src_prepare() {
+	# Prevent automatic stripping
+	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
+	sed -i -e "s:${strip}::" Makefile.in \
+		|| die "sed failed in Makefile.in"
+
+	# Automagic dependencies
+	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	epatch "${FILESDIR}"/${P}-xrandr_configure.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/HACKING doc/TODO doc/keymapping.txt
+}
diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild
new file mode 100644
index 000000000000..285f1c5dbdc6
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( net-libs/libgssglue )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-libs/libXt"
+
+src_prepare() {
+	# Prevent automatic stripping
+	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
+	sed -i -e "s:${strip}::" Makefile.in \
+		|| die "sed failed in Makefile.in"
+
+	# Automagic dependencies
+	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	epatch "${FILESDIR}"/${P}-xrandr_configure.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/HACKING doc/TODO doc/keymapping.txt
+}
diff --git a/net-misc/rdesktop/rdesktop-1.8.3.ebuild b/net-misc/rdesktop/rdesktop-1.8.3.ebuild
new file mode 100644
index 000000000000..4f0e7a9ccffa
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND=">=dev-libs/openssl-0.9.6b
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( net-libs/libgssglue )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-libs/libXt"
+
+src_prepare() {
+	# Prevent automatic stripping
+	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
+	sed -i -e "s:${strip}::" Makefile.in \
+		|| die "sed failed in Makefile.in"
+
+	# Automagic dependency on libsamplerate
+	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	# bug #280923
+	epatch "${FILESDIR}"/${PN}-1.7.0-libao_crash.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/HACKING doc/TODO doc/keymapping.txt
+}
diff --git a/net-misc/redir/Manifest b/net-misc/redir/Manifest
new file mode 100644
index 000000000000..ebb3193b41f4
--- /dev/null
+++ b/net-misc/redir/Manifest
@@ -0,0 +1,6 @@
+AUX redir-2.2.1-include.patch 272 SHA256 565ffded37e95083439cb5cd603af390d8f622ca0a325fd7161c37f37959101d SHA512 b30607a0cbb55d5963512535b8ad519f1f97c1fef751c7fc01ab2515124bb8b7232107bddb888b56ae320dd350353f02da1bcd24d76780ffa9bfdc2ec3710dd9 WHIRLPOOL d526f8bc81239f1d3b02ab6df6b850eae20f3ada6f679781f197ce0432b555890645bdb4e84b0f2fff55e7b876a2e134ecdf4621d3d2df585f13917303283b48
+DIST redir-2.2.1.tar.gz 42247 SHA256 7ea504f835338e448f674ca8637512f511bf74538418ad43ab39039017090e6c SHA512 1e311e9ca81bcd7baec26f22634e43b2881873c80ef58a21aa5807d00ff5298227d2d4882a7cc1e218e55a19e64cf0634f2bef417bb89733ae0b3e23942be423 WHIRLPOOL 08154801b5c080a7633ef674a820488c18e18ca5773bd383ad41e5174bd41823e66e339b1452919bff2768bd462bb906173c5d703e902e8e1261aeb0f6109e4c
+EBUILD redir-2.2.1.ebuild 731 SHA256 59253b14e4d9f7854390d765cada840845d2f1ce838f0b4d22f932b98e711714 SHA512 02324f67b96d590e4d5220d3e63e1cfb37a9800ab778aa62384f4f8481581d27ab5e108b354f7eaa9a2d34f15bc9fcb4512806bf36b77669d163874319b8faa0 WHIRLPOOL 826a5cc0a4023a631a362fff416db661cff96c44fbac304000fcea3a292dc2bd08b8d62e7b0fead467b83d4dec50d0ac5f77e313e8d5a3eff6965aa28dfcbb4e
+MISC ChangeLog 2599 SHA256 3416c68aac34744a35cd7fa2262c9f3c8d57930a8e39ce492f4317a979bc355a SHA512 5b98daa47556d5e22d3ec6de10afd8502cf3bba3ab0ddcaf6c70355ba42f645a4cefca8d97461af65e1f9dd88c597337afa89ad1318a0fe42772493ab30e0cf1 WHIRLPOOL 1bb8e843b8f4d3061a01fc1c9c9a12aa9c1c36440113e5e5bf0ac892c1b0f2cf62096722f03af90fa83c87b4c01190a73b8e4fbb4799dde556485efdfbf742ef
+MISC ChangeLog-2015 1738 SHA256 b0916ff194c6b10672a2d694f91aa3f27b9d639db6838280b4af3f363fbe0081 SHA512 e0ba4d08fbcd4a2d06a924cf10da6c31a88460c3b28103a8068dc742d20419aed131e1cec58ae3b171dc2c23ee9eed04b20522ba574cecbb782b7856db3548a1 WHIRLPOOL b8dc457111c4f80caa502089bf837388819cd6da3f7ab721d0e3de2f9deca7fbfe309cf18b0f9792e7b13fbb514b55f2742fbd8666e866f4f5145094617a727c
+MISC metadata.xml 433 SHA256 9202e65c919d2cdf585d8a8d9e4e3ca4f669bd7875d0966b92b46e46d9da7ca6 SHA512 2ec5ad5a293b5be4802f72a51039ff53d9db84548a666556b45d48534da31bed8e7dc19ba70e71cd7e229ba68a764120c4f625fdb1b3afb9b1b5e9e91df4546d WHIRLPOOL a3f189798d0b580efc6224b372639b368139e65c8d12f750a6d658c88da81517b4595fe57b81ff1faf0c9c6b129619130c9b30b96cb2413491609c7d021d5f13
diff --git a/net-misc/redir/files/redir-2.2.1-include.patch b/net-misc/redir/files/redir-2.2.1-include.patch
new file mode 100644
index 000000000000..5fea475d31a0
--- /dev/null
+++ b/net-misc/redir/files/redir-2.2.1-include.patch
@@ -0,0 +1,10 @@
+--- redir-2.2.1/redir.c.orig	1999-12-26 21:50:06.000000000 +0100
++++ redir-2.2.1/redir.c	2009-10-23 15:01:26.000000000 +0200
+@@ -78,6 +78,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <errno.h>
++#include <time.h>
+ 
+ #ifdef USE_TCP_WRAPPERS
+ #include <tcpd.h>
diff --git a/net-misc/redir/metadata.xml b/net-misc/redir/metadata.xml
new file mode 100644
index 000000000000..6b92650506ba
--- /dev/null
+++ b/net-misc/redir/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>brendan@horan.hk</email>
+		<name>Brendan Hhoran</name>
+		<description>Proxy maintainer, to be assigned all bugs</description>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/redir/redir-2.2.1.ebuild b/net-misc/redir/redir-2.2.1.ebuild
new file mode 100644
index 000000000000..bb9c59ba7ec4
--- /dev/null
+++ b/net-misc/redir/redir-2.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Redir is a port redirector"
+HOMEPAGE="http://sammy.net/~sammy/hacks/"
+SRC_URI="http://sammy.net/~sammy/hacks/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~hppa ~mips sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_configure() {
+	epatch "${FILESDIR}/${P}-include.patch"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || \
+		die "emake failed"
+}
+
+src_install() {
+	dobin redir || die "dobin failed"
+	newman redir.man redir.1 || die "doman failed"
+	dodoc CHANGES README transproxy.txt || die "dodoc failed"
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
new file mode 100644
index 000000000000..77d3b1d28a09
--- /dev/null
+++ b/net-misc/remmina/Manifest
@@ -0,0 +1,9 @@
+DIST remmina-1.2.0_rc16.tar.gz 1008438 SHA256 edb347f9e4d0a2e682f7ffd22caa364b477653a1aca31d1c1922a86d81df4995 SHA512 a6d2fb95a3fc68ee7ce4c8205c775cbc7bb83fa2f90b68d04f355b4ca8b4d0956a29ecbc028260c432b55c582802e9f243ad62426212d9fd0f02f7e50a56856f WHIRLPOOL a5d136e1abaeafcc1ad070c400a0c7456e29d1406ea3542add5eb36c4cb1e32cedf0a2bac855298a5e1e703e19774d007ec70c822c49ec13a9f565123b33181d
+DIST remmina-1.2.0_rc19.tar.gz 864828 SHA256 e5a5bc76caf78f873030e0fe9709a2981c9900cfd153775309e358fb783840a3 SHA512 4cc834376392f3bc31a0c695df69d516679cddfefcbba95a7c71be25e8216a0429e0573dadbe72fd1a3bee2b1fd1847ae3618f2ba5ce3896a1b52769f1f87394 WHIRLPOOL 216c63599d851acb684fa5a92864f30f707c628c17f7be96eea48ab557b5104554a736792da70a117d4be2ffc4aedb9abe7a27f7495a4e504e3475ad547ae4bd
+DIST remmina-1.2.0_rc20.tar.gz 1016674 SHA256 5663105735600cfe5dbbcd62e64ffb27bb6587e1035b04b2b63a32a98d25ef30 SHA512 096cbb9cf45e911466a6123eead727d45365ee434bf371603733de4e7ab9b445ce67019f2a66d45fe33aecab4d163f6f31ca38811adadc125494f8575fa3a64a WHIRLPOOL b3b218c32e46516f80f637dd8fefc59c16ed437b24b0d7a20336ee90b5364e29e618dfb1705de31341b3dfd0220df3ff38021f782e57127b193f6b58193b761e
+EBUILD remmina-1.2.0_rc16-r1.ebuild 1987 SHA256 30f663885a1b1445d73bcf2eddf4d85b7849a6133cef5a48b55acd4a2e4c114a SHA512 8301d870a34688124dafbd9199c5364ab9fe7d3b4439e0d3fd62258bb64d89544b212ecd73dcb194ddbee17d8aa7308e09182f127bc74319c5ee27ac7c7627ce WHIRLPOOL 78a68b2640c79b49b550ae0350e399a831c8b5296b4df75ce0ebbc68fb13ccdd345ecb154b1e5b1321b0a1d4043da741ae13eb2e9d7364849fe8b2ba7d23b4a7
+EBUILD remmina-1.2.0_rc19.ebuild 1917 SHA256 13c1105f0bd4d23be4cca821ae81f16a32f86af93bd47683729f25e807fa35fd SHA512 3312e56870c95d24962805d2fa7bc6bab8d31b52f69650501ba7c25deec47ddddfd93aa8fffb4dfcad931744c1a48b63f361286a89235286044645e79660688c WHIRLPOOL 7b40e3cef3d7bc85e2d2ebad679107308814f0cd1c06509c6101247226ab2cb1d43c1306b52d3c7f6e3cf7d363796b70b1771dc05e6ae5cf9e2d1cf08f90ccc2
+EBUILD remmina-1.2.0_rc20.ebuild 1917 SHA256 13c1105f0bd4d23be4cca821ae81f16a32f86af93bd47683729f25e807fa35fd SHA512 3312e56870c95d24962805d2fa7bc6bab8d31b52f69650501ba7c25deec47ddddfd93aa8fffb4dfcad931744c1a48b63f361286a89235286044645e79660688c WHIRLPOOL 7b40e3cef3d7bc85e2d2ebad679107308814f0cd1c06509c6101247226ab2cb1d43c1306b52d3c7f6e3cf7d363796b70b1771dc05e6ae5cf9e2d1cf08f90ccc2
+MISC ChangeLog 7914 SHA256 4cd426f03bede791325c1b418f3cd0f0741aa13290cbbc7b43b6e9eec8c8aa6c SHA512 432595f86ba602b39daa9fb421c4113a534e3f04e1de6cf2c0c36f2dde817e68e655c74d5485c16861593c1adcb616065b96d881715fd4abb7b4c02f4c3c1b40 WHIRLPOOL 77f28921d4bcafd53a7e34020f6c08246d372b066696ad7fddcf96eda25a9eba3a0eab444e509ae3b2a81c54fbe8b4a9c016e989f418632b0e3af673757c893c
+MISC ChangeLog-2015 9985 SHA256 eab7fd33caffb1587ad50d8e4b5045d3ae8838d43c3bcab12d6a501889ae878b SHA512 9f8975961cbcf0d454e866619682c5443921db015ad5df0869666c379a558f4e241555a4d75be93fcaaad9e7a9c27cca833db4e870640e84d466d7fc7ff52776 WHIRLPOOL 2b8d6b906e127ebe13bbd3c308a0704d96ea3cc481ccab62366565656a4c434171daddb85a18e0e38abdebc311a327d2374123cda2ed8456a1a3514facca5552
+MISC metadata.xml 1246 SHA256 a3dcd2337b18f953e5f388ae9b80611ac0f78be5fbeec90b08a7cfcbea16c2d9 SHA512 4116cdb618584c5b95ff0330fb9c9efad2736cafcf4e3622fd074d5026f1adc5b7ab8e420188bc3a689b31cc285318db953bfa66c54b7fe91de242136787a5d8 WHIRLPOOL ea28c105a203978b44ea8aad120ca0f3754f1fe3a21d0ec414808dbfd1d63ba57b39c7f6409539114c6072a79303bf5f9d2cc9fe6754e891675a7995dce6dd26
diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
new file mode 100644
index 000000000000..360035e45c81
--- /dev/null
+++ b/net-misc/remmina/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sir.suriv@gmail.com</email>
+		<name>Diogo Pereira</name>
+		<description>Proxy maintainer. Assign bugs to him.</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Remmina is a remote desktop client written in GTK+, aiming to be
+		useful for system administrators and travellers, who need to work
+		with lots of remote computers in front of either large monitors or
+		tiny netbooks. Remmina supports multiple network protocols in an
+		integrated and consistant user interface.
+		Currently RDP, VNC, SPICE, NX, XDMCP and SSH are supported.
+	</longdescription>
+	<use>
+		<flag name="spice">Support connecting to SPICE-enabled virtual machines</flag>
+		<flag name="ssh">Enable support for SSH/SFTP protocol; see also 'vte'</flag>
+		<flag name="telepathy">Enable telepathy support</flag>
+		<flag name="webkit">Enable a user survey using net-libs/webkit-gtk</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">FreeRDP/Remmina</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/remmina/remmina-1.2.0_rc16-r1.ebuild b/net-misc/remmina/remmina-1.2.0_rc16-r1.ebuild
new file mode 100644
index 000000000000..77c68d9a74e3
--- /dev/null
+++ b/net-misc/remmina/remmina-1.2.0_rc16-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils
+
+MY_PV="${PV//_rc/-rcgit.}"
+
+DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
+HOMEPAGE="http://remmina.org/"
+SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy webkit zeroconf"
+
+RDEPEND="
+	dev-libs/glib:2
+	net-libs/libvncserver
+	x11-libs/libxkbfile
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	virtual/freedesktop-icon-theme
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( ~net-misc/freerdp-2.0.0_pre20160722 )
+	gnome-keyring? ( app-crypt/libsecret )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/Remmina-${MY_PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_FREERDP=$(usex rdp freerdp)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_SURVEY=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DGTK_VERSION=3
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/remmina/remmina-1.2.0_rc19.ebuild b/net-misc/remmina/remmina-1.2.0_rc19.ebuild
new file mode 100644
index 000000000000..da10825a7c66
--- /dev/null
+++ b/net-misc/remmina/remmina-1.2.0_rc19.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils
+
+MY_PV="${PV//_rc/-rcgit.}"
+
+DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
+HOMEPAGE="http://remmina.org/"
+SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy zeroconf"
+
+RDEPEND="
+	dev-libs/glib:2
+	net-libs/libvncserver
+	x11-libs/libxkbfile
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	virtual/freedesktop-icon-theme
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_pre20161219 )
+	gnome-keyring? ( app-crypt/libsecret )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/Remmina-${MY_PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_FREERDP=$(usex rdp freerdp)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DGTK_VERSION=3
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/remmina/remmina-1.2.0_rc20.ebuild b/net-misc/remmina/remmina-1.2.0_rc20.ebuild
new file mode 100644
index 000000000000..da10825a7c66
--- /dev/null
+++ b/net-misc/remmina/remmina-1.2.0_rc20.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils
+
+MY_PV="${PV//_rc/-rcgit.}"
+
+DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
+HOMEPAGE="http://remmina.org/"
+SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy zeroconf"
+
+RDEPEND="
+	dev-libs/glib:2
+	net-libs/libvncserver
+	x11-libs/libxkbfile
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	virtual/freedesktop-icon-theme
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_pre20161219 )
+	gnome-keyring? ( app-crypt/libsecret )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/Remmina-${MY_PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_FREERDP=$(usex rdp freerdp)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DGTK_VERSION=3
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/rinetd/Manifest b/net-misc/rinetd/Manifest
new file mode 100644
index 000000000000..c612748eb135
--- /dev/null
+++ b/net-misc/rinetd/Manifest
@@ -0,0 +1,6 @@
+AUX rinetd.rc 368 SHA256 464be560d2fca723950db22f31d0a39335ce1778de1e1f101f0016b7c8271037 SHA512 ee8ba6827b7d53a388a72f1fecdf38c0c6efd5b1cc54219c8c764e5cd073cfb5a3c1ba284520973aa2f219267a38b604162fde612f47b28f949d07fc84ddfdae WHIRLPOOL d798afde63371786e15e7f2919745c3d6f6ef8b103cb6565f549c28e43f78fb68f88ea4db2991c37e1fd1061d2ada20831ef4dcbc702c62a88ed965f4c3a177d
+DIST rinetd.tar.gz 115541 SHA256 0c68d27c5bd4b16ce4f58a6db514dd6ff37b2604a88b02c1dfcdc00fc1059898 SHA512 b6ddb496b4542ad46aacaef4b2241b16b9ee43f2f6761a18a4813d83a0a9db23fbd73a554393dcf01ae7350e8b6662571414ca6f93a949ce4effbbeddc198606 WHIRLPOOL 212e67691aa502d562ced0ce7ebc540064a604de4a2879f07cbcccc20892b6635009526ccd318a2d201e74882844090bad004917894ebe26e26ad027589a8690
+EBUILD rinetd-0.62-r2.ebuild 689 SHA256 5e6b71249384c1ff477dd11fcf1b1238daca97f6d15fa92c70477c9bf6a14b61 SHA512 1560b667fdd382e08474db6b5eb6a51186e18bc4f343c85c491e9472fc3d9abf3ed275cccddd5bce6aaec39cbdf94bb6e33f968893065c18fe60177b077101ae WHIRLPOOL 893b65d49172e41621245e059a150d5d8a068bf4de130de0d61bbda1dfbc3d82fc62bb7f20c034637e4da438a2ba5829fc08baac826e1ec87729b3ec3f3eb754
+MISC ChangeLog 2940 SHA256 bda810ebecd172fda707db676903068c5752c98dd58ee8648faa345041d93a90 SHA512 4c256101c55e85601c5f8e44c76885d3366b8e0eb2cb6aa92048af57bd40eba5485e3b87e058c5a3a3ffefe06fee24a1f3e4fe4b5aeb9e031c6d4f2de9619ef0 WHIRLPOOL 8cff3a2cf7fba81b57a0bfebed022420e8f79703b7bf15888c8f95323dd30f2b87491595b42523e9021536af38655f393f1b24494b2dd4bd0aca45148cfece44
+MISC ChangeLog-2015 1323 SHA256 7282fb695cc796a33ffe3359e2671106f43c56c5ab1253c8225c4f4ec20ee826 SHA512 48e3ee42465ad35bdb199b521e557b2d10d2f8aa18bee44fba2ad691fc65e83749c22c188959dfbc4f0e954bc36760bd640abaee3c1414a38edbcf889c86644b WHIRLPOOL 30908f3808a7fc8374e0daec1ab035f3d9ed5b777d247fcd9079c83eef7b02985bccf3979ac8860d826d64cd4dcf3663ee63f09b1bdb37cf3c01f305bb090e95
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/rinetd/files/rinetd.rc b/net-misc/rinetd/files/rinetd.rc
new file mode 100644
index 000000000000..abdb04755702
--- /dev/null
+++ b/net-misc/rinetd/files/rinetd.rc
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting rinetd"
+	/usr/sbin/rinetd
+	eend $?
+}
+
+stop() {
+	local ret
+	ebegin "Stopping rinetd"
+	start-stop-daemon --stop --pidfile /var/run/rinetd.pid
+	ret=$?
+	rm -f /var/run/rinetd.pid
+	eend ${ret}
+}
diff --git a/net-misc/rinetd/metadata.xml b/net-misc/rinetd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/rinetd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/rinetd/rinetd-0.62-r2.ebuild b/net-misc/rinetd/rinetd-0.62-r2.ebuild
new file mode 100644
index 000000000000..7a1cac341228
--- /dev/null
+++ b/net-misc/rinetd/rinetd-0.62-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="redirects TCP connections from one IP address and port to another"
+HOMEPAGE="http://www.boutell.com/rinetd/"
+SRC_URI="http://www.boutell.com/rinetd/http/rinetd.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
+	sed -i -e "s:gcc:$(tc-getCC) \$(CFLAGS) \$(LDFLAGS):" Makefile
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dosbin rinetd
+	newinitd "${FILESDIR}"/rinetd.rc rinetd
+	doman rinetd.8
+	dodoc CHANGES README index.html
+}
diff --git a/net-misc/ris-linux/Manifest b/net-misc/ris-linux/Manifest
new file mode 100644
index 000000000000..e195f8c36470
--- /dev/null
+++ b/net-misc/ris-linux/Manifest
@@ -0,0 +1,8 @@
+AUX binlsrv.confd 90 SHA256 6406706adacbe1dcfa106afa012fd6c1ec81834d51931248022529333ab609ba SHA512 82ba3c67e5a4df2092bc4abc7ad27d70f3a315551ac871d3019f0c37e7aa6360893dfcf615def300963d1a48e66f19da79aec2444fc366fb1ee6e19ecdd3c8d0 WHIRLPOOL 8bf6352d8421b8a2eb30677dbcd375e880c4d3ee28ed39a09a3f0fa501d5aabc5ff61121798801b0c9876e76232b9df5dd8693bc2e762ae7d7579b2dfc1e95a7
+AUX binlsrv.initd 775 SHA256 650ec091e938672da2276a0abe3e3f313c098a9584f369b608e66403082391b4 SHA512 2555500d462907daa6c6027b30fb67a32d453dd611ee5a9e71e5ed8cdd2943dbb5ebc0c1ce7de7ce70f0c1158afe475a56156da4ca611c8bd30ea5b95d546419 WHIRLPOOL bf6b0db6a0f1d2e23fbe3444e9ec9a0802163293844afeb4727d573a4530c6b6062e32f2634365404999dc9553635092541b5f9da18502b48427ac63528e55f6
+AUX setup.py 204 SHA256 67d2ac20a5ec88a2ebcaae642a49a36485eaea318ec75d4fb6aade5199592953 SHA512 a2e3482ae7d4cec63230d0e787c6ff6af8fc749d84aa74de51152bc5f8aa5f9d29b6578a82141fdbc15c61786d7e8a9cfdd14b885d5ed2b62f30033548a4f240 WHIRLPOOL 5f63b0d9543e8a57c49d10dd34c9dbcab4a86dc3f635bdb9f0b57cf6892039a35abb49067db362340fb36385532cf0cb3499d9a8953ca09007f7471eb0128e64
+DIST ris-linux-0.4.tar.gz 21634 SHA256 196c7441f498154d1ae41ef4f1e5107296b7de39f345c763ccce2e913432ae19 SHA512 e9eea14b45c060844e22dc3baa9cd15e7d202bcb3cb8b069b084115b05c0700bd563ed6322d675eee9baf72e8d530429d0c3137386377b6785ebc9007dbfd040 WHIRLPOOL 4607b013c46c4e657f3cac8c4a3bace495b3a7810059af2e5dda3cde04c984444cfe5074a1f86cfce48bd6546c6db79251c74f0bd97fe69744e041fbfea36989
+EBUILD ris-linux-0.4-r1.ebuild 790 SHA256 4ebdc6c53311e808b146de4376325028c45453dba4625f91fdbe7408e50830a8 SHA512 dad19b76fa6bfb7a5bd30c7a9f3b7df62b84804325fb4fe61e118d61e680f5597df6502cfb727671354eaf852a4f25cdb34292841d2b587d5c8390c0c7a6e406 WHIRLPOOL 9622b315d72780882a7fbbd123b8bbd7fff584afe06584679badc280cf5e1649e1726f81ca13fcdc668dcd1b071375cb2cdd7b70ee5d90eea2e0f580bdb05364
+MISC ChangeLog 2377 SHA256 8feda16dc80f81d7766651a0fc8e77deab4877dcaba5aa5c2035882d177c3b61 SHA512 fcc7c8e067b533ecd5341336dcbee6bfa2541f6047b99b807133b478927e46935c1e136060ec231e0ce59727e9c85f22af6bba72918a4c5d0f301bc3545163ea WHIRLPOOL 80f022fcf4b5cffe66f97cfb1d2e6053dc2d2c25878555d550efa8320118e2ecaa88cb8b6c05404b958980ae6a773f3e81ec519f2cfd4248be88daafc5fb571c
+MISC ChangeLog-2015 749 SHA256 d0eecd5e84d38a74fa982e9637f0fe102cd8012f4f60bb9a7ef0f248c7f7dfd7 SHA512 659072f631f741f0c515a45b91fd23dd311664a0296734e82f2b054cd31dee11efb3babf9a85e6d86b7acf8aee51d8d878857b348094a10a06ce890b7d8fc573 WHIRLPOOL 07366709a1bfa4c714063f13aa1dfcdfe80e73ab7068523280f34090a9c419b2d1cb93cdcd7f08058d620d004953eed35bb08899d87a70335beb749a6b548f25
+MISC metadata.xml 217 SHA256 f9a93190de2192c1681405ee6c3a7fc40f08c31fd1b80ecc61ad3cd990fc2f90 SHA512 892fa1b0f9fef66cd02147277c70b886bfef9d36817e024d35216a14bd1a2bd640ffb8d6f57bed87cd06b7c4cce17eb3c8fe4255cdc62972b551c73509c0dfe7 WHIRLPOOL 5a313d57f3e859bd9ebe7b03cdb1cff1892096b07e29096f6f6f2b62e746118e4017552e7bed4cb6e01d9eb5d4601b190340ce12da7d21c824b9fec88c75597f
diff --git a/net-misc/ris-linux/files/binlsrv.confd b/net-misc/ris-linux/files/binlsrv.confd
new file mode 100644
index 000000000000..2e6ed9f9090f
--- /dev/null
+++ b/net-misc/ris-linux/files/binlsrv.confd
@@ -0,0 +1,2 @@
+#Specify here path to directory with 'devlist.cache' file
+INFILE_PATH="/var/lib/ris/binl"
diff --git a/net-misc/ris-linux/files/binlsrv.initd b/net-misc/ris-linux/files/binlsrv.initd
new file mode 100644
index 000000000000..f247a39db4ed
--- /dev/null
+++ b/net-misc/ris-linux/files/binlsrv.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting binlsrv"
+	if [ -z "$INFILE_PATH" ]; then
+		eerror "Path to devlist.cache not set, please set \$INFILE_PATH in /etc/conf.d/binlsrv"
+		return 1
+	fi
+	if [ ! -e "$INFILE_PATH/devlist.cache" ]; then
+		eerror "devlist.cache not generated, please make it with infparser.py"
+	fi
+
+	start-stop-daemon --start -i --exec /usr/bin/binlsrv.py --background \
+		--make-pidfile --pidfile /var/run/binlsrv.pid --chdir "$INFILE_PATH" \
+		--stdout /var/log/binlsrv.log
+	
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping binlsrv"
+	start-stop-daemon --stop -i --exec /usr/bin/binlsrv.py --pidfile /var/run/binlsrv.pid
+	eend $?
+}
\ No newline at end of file
diff --git a/net-misc/ris-linux/files/setup.py b/net-misc/ris-linux/files/setup.py
new file mode 100644
index 000000000000..0873f2512c99
--- /dev/null
+++ b/net-misc/ris-linux/files/setup.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+
+setup(
+    name = 'ris-linux',
+    version = 'VERSION',
+    scripts = [ 'binlsrv.py', 'decode.py', 'infparser.py', 'fixloader.py', 'modldr.py' ]
+)
diff --git a/net-misc/ris-linux/metadata.xml b/net-misc/ris-linux/metadata.xml
new file mode 100644
index 000000000000..8f93e4dab3d6
--- /dev/null
+++ b/net-misc/ris-linux/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 type="person">
+	<email>maksbotan@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/ris-linux/ris-linux-0.4-r1.ebuild b/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
new file mode 100644
index 000000000000..7d7a4e50dfbf
--- /dev/null
+++ b/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="BINL server to doing Windows(r) RIS"
+HOMEPAGE="http://oss.netfarm.it/guides/pxe.php"
+SRC_URI="http://oss.netfarm.it/guides/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	|| ( net-ftp/atftp net-ftp/tftp-hpa )
+	net-misc/dhcp
+	net-fs/samba
+	sys-boot/syslinux"
+
+python_prepare_all(){
+	sed "s:VERSION:${PV}:" "${FILESDIR}"/setup.py > "${S}"/setup.py
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}"/binlsrv.initd binlsrv
+	newconfd "${FILESDIR}"/binlsrv.confd binlsrv
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
new file mode 100644
index 000000000000..6a4deea4693b
--- /dev/null
+++ b/net-misc/rsync/Manifest
@@ -0,0 +1,11 @@
+AUX rsyncd.conf-3.0.9-r1 449 SHA256 e3da1a057081b9089dede95873d6f413d63870fea67246081a6a90725cfd098b SHA512 8d51b452be88820c38639aa833490a001abc2edba03133441000634c2ec090d243598b0932fc11abdf1286afdab02eb6532df2b28a48bfde781c3a8b61fe8c6f WHIRLPOOL ae2b5dc507362ebc10a27973ac8e74b9983da50abbcb3ab33324da76ec70fe30c1cb49d1f7103c7b752d7cf6732a4bf8112c1763f2e9b9da669178925198716c
+AUX rsyncd.conf.d 149 SHA256 de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3 WHIRLPOOL ac5098df8772c66d4d8070fbefe0194d8c44345d14a547f2cd59737f2dcb2023b59285117b07bbc2d711302f7736dd761d5e5498913c1878c3512d9fb5d5e36e
+AUX rsyncd.init.d-r1 247 SHA256 fc6240c77448d36cf3255e6c264737a6ce69424b5b62d0986eb322c4d8a1a85b SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a WHIRLPOOL cd5186d0754f51c1f0298cba332c571d0dbcfea1840a7dfef7139bfb835694bd550362c57ec2be19b15fa30f554303b65eae09a7a709cd3800648d53156d927c
+AUX rsyncd.logrotate 105 SHA256 eb54100686a253d4d14c9c67fcc20f92d88c0616692bffea899c6a8f8f980c7c SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5 WHIRLPOOL 6c6a712ccb0934b5746640f8a52bc5a341fbf2f1b492fe709a8ea7b330048ffa405e1b785f3ca59a460a688330e6a43cb9fd7fca8838ba52214b5d0603adcc59
+AUX rsyncd.service 206 SHA256 e4396236f554cb57eed133370dd74ff79ea495f5d7535734bc736b716931fb00 SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 WHIRLPOOL 7ea8a774c4b22cc631b86f54ca6bf5e1dabe5d837072b491eb2638e44afd67dc57e7372fbbf26a6214417c7da32521a48c0fddfafb4c9a4249fc35d1271c8651
+AUX rsyncd.xinetd-3.0.9-r1 194 SHA256 17162f014242c9d5003578bed44b89cd2dc4f0ce2a200ac1facaa10a9aac8692 SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 WHIRLPOOL 733f734e70d0c74ab6e472e656b8c83ddf816dca7e6c1130b999c2579713740db9362e5d517d0a8cf792b6859fd16d363f43ea8b531388f7abe93dcc1380ae42
+DIST rsync-3.1.2.tar.gz 892724 SHA256 ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b WHIRLPOOL ba793bfc7f0bdd70dba812a4a782c6ed703c7e83e2d04ca714e67e6153b31f6fc49e224ef7622bf5abb1e0ba0f633bc88b2640548028944b5dfa0443ae8c585e
+EBUILD rsync-3.1.2.ebuild 2837 SHA256 d5b77b2bb2cf7cf193bb9c508e5dc202557306887361c9ce195197de350c2217 SHA512 98e3d25b057aeaafda5671aff05fd43ad9670814c4c087b0c1f020027c12d988352169b3197b89f338c690b76384a0185ea9e8623054a75ea5cc81021f1919e1 WHIRLPOOL 9ec9d3b0467dfdd2acc1bd978a1de4350a47b4ca2c4af346bdb7dddd5ca0ba3bec0bff80d941bc32c1f2e426d6e99a56219b7e96dfdbc45b0eba3c6547927294
+MISC ChangeLog 5878 SHA256 f0322d72d76c1694bf9cedea6aa1974632fa923e96796866105f4675f4807814 SHA512 2867072a12b3ccbaac4541752f35b6377f42e981d5ae683da10c94107b58440787a28a593d81e8c6b3c4f77620d1c28ffe2888a98ec6753cf606d9a4cdd4d836 WHIRLPOOL 54c25e67f2f3dea9bbbacd805a9078e604ec5576bd690554a1b162a2315deeb5efdb2453d98efc5a073424df736be193cbaaba268aa7467172a2afe5fecc2f33
+MISC ChangeLog-2015 33945 SHA256 e9e1a4a05400f058f5bb7f33eee548ab322dff34570082ac63f0c32f349aada8 SHA512 57cd87723516841f3e87f0d88a9b73d0920e7a65f7a35816cfa568a9f54844224664c94acfb27faa7295c0aacda9a6a1d7131372918c40cead089c28290339b9 WHIRLPOOL 1cb3950f7deb2ff2c9c86968922ce6852ad0f75a36d2a284090bc82f1f014b01b9813e5bc3e93c1f1e55848e2de1ffa251b6f1cafb2bb03242678d6fbb1fb673
+MISC metadata.xml 449 SHA256 33ff0e734b8f06b27285c4e7fe353cc3928055610d307ef6c72d578373869aa1 SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920 WHIRLPOOL dc7937d53349c9d0fad18445a9dd397b7b85ce7a27a1692e3dc4a44285ec130444b4109f0f096038cbff06d02fcb79ad32be7f1df37693ce507061653e95df22
diff --git a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
new file mode 100644
index 000000000000..20dcf3afdc15
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
@@ -0,0 +1,15 @@
+# /etc/rsyncd.conf
+
+# Minimal configuration file for rsync daemon
+# See rsync(1) and rsyncd.conf(5) man pages for help
+
+# This line is required by the /etc/init.d/rsyncd script
+pid file = @GENTOO_PORTAGE_EPREFIX@/run/rsyncd.pid
+use chroot = yes
+read only = yes
+
+# Simple example for enabling your own local rsync server
+#[gentoo-portage]
+#	path = @GENTOO_PORTAGE_EPREFIX@/usr/portage
+#	comment = Gentoo Portage tree
+#	exclude = /distfiles /packages
diff --git a/net-misc/rsync/files/rsyncd.conf.d b/net-misc/rsync/files/rsyncd.conf.d
new file mode 100644
index 000000000000..c3d897ed2f2e
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.conf.d
@@ -0,0 +1,5 @@
+# /etc/conf.d/rsyncd: config file for /etc/init.d/rsyncd
+
+# see man pages for rsync or run `rsync --help`
+# for valid cmdline options
+#RSYNC_OPTS=""
diff --git a/net-misc/rsync/files/rsyncd.init.d-r1 b/net-misc/rsync/files/rsyncd.init.d-r1
new file mode 100644
index 000000000000..243e107b5407
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.init.d-r1
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/rsync"
+command_args="--daemon ${RSYNC_OPTS}"
+pidfile="/var/run/${SVCNAME}.pid"
+
+depend() {
+	use net
+}
diff --git a/net-misc/rsync/files/rsyncd.logrotate b/net-misc/rsync/files/rsyncd.logrotate
new file mode 100644
index 000000000000..34bcf72d210c
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.logrotate
@@ -0,0 +1,9 @@
+/var/log/rsync.log {
+	compress
+	maxage 365
+	rotate 7
+	size=+1024k
+	notifempty
+	missingok
+	copytruncate
+}
diff --git a/net-misc/rsync/files/rsyncd.service b/net-misc/rsync/files/rsyncd.service
new file mode 100644
index 000000000000..a2c1de0add1f
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=rsync daemon
+After=networking.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/rsync --daemon --no-detach
+StandardOutput=syslog
+StandardError=syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1 b/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1
new file mode 100644
index 000000000000..90d07f0710ba
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1
@@ -0,0 +1,10 @@
+service rsync
+{
+	socket_type = stream
+	protocol    = tcp
+	wait        = no
+	user        = root
+	server      = @GENTOO_PORTAGE_EPREFIX@/usr/bin/rsync
+	server_args = --daemon
+	disable     = yes
+}
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
new file mode 100644
index 000000000000..148a18e18adc
--- /dev/null
+++ b/net-misc/rsync/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:samba:rsync</remote-id>
+	</upstream>
+	<use>
+		<flag name="stunnel">Provide helper scripts for using rsync via &gt;=net-misc/stunnel-4</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/rsync/rsync-3.1.2.ebuild b/net-misc/rsync/rsync-3.1.2.ebuild
new file mode 100644
index 000000000000..16e2176a9d0d
--- /dev/null
+++ b/net-misc/rsync/rsync-3.1.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="http://rsync.samba.org/"
+SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
+[[ "${PV}" = *_pre* ]] && SRC_URI="http://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} != *_pre ]] ; then
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="acl examples iconv ipv6 static stunnel xattr"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+	>=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+S=${WORKDIR}/${P/_/}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	econf \
+		--without-included-popt \
+		$(use_enable acl acl-support) \
+		$(use_enable xattr xattr-support) \
+		$(use_enable ipv6) \
+		$(use_enable iconv) \
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+	touch proto.h-tstamp #421625
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+	dodoc NEWS OLDNEWS README TODO tech_report.tex
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-client
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		exeinto /usr/share/rsync
+		doexe support/*
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+}
diff --git a/net-misc/rwbs/Manifest b/net-misc/rwbs/Manifest
new file mode 100644
index 000000000000..039edef191f6
--- /dev/null
+++ b/net-misc/rwbs/Manifest
@@ -0,0 +1,7 @@
+AUX rwbs.conf 1221 SHA256 3707aee8e68fa329be8cde6e466a2ac1142bc11a40568c53e83167f5435b878a SHA512 3f09b8684a05a1954bec2a2064ec6d6e0a2b6ad51e5a9b63198089c53cb3b87093986f1f28c48bd5fb6aa287bdab6a40510eb0e65f8f0b45539eea87c63829f4 WHIRLPOOL e00c8e84b38d5f778f0ec3ed011d198afcbb7299612e532c08afcbac1aa906d0cd9a2c6c247b50c6fc82246ec4b4c7b6c54d6887453dde558382dfa9770e3b79
+AUX rwbs.rc 454 SHA256 18bef92e9a7e70040db716074b1763c6f100f6273141c2f1b90bb4673a7d6256 SHA512 520f17f8e3393cc767f30e5e7d5cc5dad23a8747c4a6c5d9a541cfccff1eea93381dcb114ad355558121c8aca2ec8b942014076c3485a253350b6a685782cc35 WHIRLPOOL b67cadcb9365da205089ca3be0faab19647b63c9e87db807e1d4032bf10e9018bc972f937ddf81496bd34c22de26d16fab6064c434473e5e6da157d4c897c5a6
+DIST rwbs_Linux_0_27.tar.gz 365489 SHA256 dcf1568c6d5ce3f49f3b1f92fc67f0f9a4abb3905a3b13fb0a818b2c091d3ab0 SHA512 131aa275015fe032462d2848fbefc9b1949fccb605663203c2d7b4cf32ed0351f10368e5458af7d54e8b251ae8539febd3bd57c7b5df146770161aba3ba90959 WHIRLPOOL 61b9489547498d3c8c862120d76fc37c300b502a834c192ca9677d6b89a709bafb3cf76a5959320402d6fc60c9171304015fe85074074fda014d3eca687d50d5
+EBUILD rwbs-0.27-r2.ebuild 836 SHA256 32838eb3ef3a0191ab54bf836a60e9f180b3a01303f89051ac9715b833dd1c7e SHA512 9bb955de47e49995aa761d837a914b8c34165020dcdbc914ec662b248d1fef6c8a39df568fd7263f2903dc8c3277e88bed42970d51166e4c3215b243c28c13cf WHIRLPOOL dc42e12ba5c4bb0fd549838814568e704bc291f8cf473ad8e1a39c08432a30b1eacb3abb633be7c0fe0a8865f3178ee8d067e3f9553a7aedcbf743e52e044e6f
+MISC ChangeLog 2942 SHA256 176451929f7466090ed19e134f6148e753fa9f25f5bbc0efc01bfb7c8044542d SHA512 69925df6c5a42b6dab9649b5ad6f7e2f74ba7c59a9af5e6307ef73e51f02a8f14302c68593443614793ec4208b329d6c8ddbce7db5514a047588122567018db9 WHIRLPOOL cefc009aff2901d90c83282d187e613135b676f81fd03113909bb36434ca721a6321539e58c2b1519919b53011e1ff0609d07b7264a6a9ad18a643420c624ebe
+MISC ChangeLog-2015 1567 SHA256 a4488a42342b0aebb59f5033581b78ddaf306eed4715f2a7c8b1a7aa4741be7e SHA512 410e92ac0bb597d5db5df5cf5b46a270acfdbdb9f7e6b9739c787bb11fbdda7e5ebdd35dc1ff451681dbbb084ace95695b413f2d878f886570f306385c63e850 WHIRLPOOL 6684380155bba844502238169ac0dd0c507a5514eec0523bf5a8d7c34ff769c4223965bde59180c555221ea85036673c34eb26716f321df656d104715d890568
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/rwbs/files/rwbs.conf b/net-misc/rwbs/files/rwbs.conf
new file mode 100644
index 000000000000..09541e48f14c
--- /dev/null
+++ b/net-misc/rwbs/files/rwbs.conf
@@ -0,0 +1,21 @@
+# Roger Wilco base station configuration
+#
+# $ rwbs --help reads:
+# usage: ./rwbs [-b(ackwardcompat)] [-t(est)] [-s(tatic)] [-p <passwd>] [-u <udpport>] [-x <connectspeed>] [$
+#    connectspeed is an integer measuring the allocated broadcast
+#     capacity for the channel host.  The recommended value is 1.
+#     Higher values will cause the RWBS to use its additional broadcast capacity
+#     to help relay transmissions, at the expense of scalability.
+#   the b(ackwardcompat) option tells RWBS to appear as a "user" on the
+#     channel.  Mark I users will prefer this, but not Mark Ia users.
+#   The s(tatic) option indicates that a client asking to join a
+#     non-existent named channel should be turned away with an error.
+#     rather than being hosted on a dynamically-created channel.
+#   hostname is what your station's name will be in the Roger Wilco Channel Tab.
+#     For instance, if you used -n "Clan Hurt", Roger Wilco users will see
+#     an entry in the Channel window named "Clan Hurt Base"
+#   If the -t(est) flag is used, the base station echoes transmissions
+#     when there is just one other party on the channel.
+
+# Specify whatever options you want on this line
+RWBS_OPTS='-n "Gentoo Linux"'
diff --git a/net-misc/rwbs/files/rwbs.rc b/net-misc/rwbs/files/rwbs.rc
new file mode 100644
index 000000000000..280e2d258a24
--- /dev/null
+++ b/net-misc/rwbs/files/rwbs.rc
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting Roger Wilco base station"
+	start-stop-daemon --start --quiet --exec /opt/bin/rwbs -b \
+		-- \${RWBS_OPTS} >>/var/log/rwbs 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Roger Wilco base station"
+	start-stop-daemon --stop --quiet --exec /opt/bin/rwbs > /dev/null 2>&1
+	eend $?
+}
diff --git a/net-misc/rwbs/metadata.xml b/net-misc/rwbs/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/rwbs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/rwbs/rwbs-0.27-r2.ebuild b/net-misc/rwbs/rwbs-0.27-r2.ebuild
new file mode 100644
index 000000000000..d89840ef568c
--- /dev/null
+++ b/net-misc/rwbs/rwbs-0.27-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Roger Wilco base station"
+HOMEPAGE="http://rogerwilco.gamespy.com/"
+SRC_URI="http://games.gci.net/pub/VoiceOverIP/RogerWilco/rwbs_Linux_0_27.tar.gz"
+
+SLOT="0"
+LICENSE="Resounding GPL-2"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+# Everything is statically linked
+DEPEND=""
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/bin/rwbs"
+
+src_install() {
+	dodoc README.TXT CHANGES.TXT
+	exeinto /opt/bin
+	doexe rwbs run_rwbs
+
+	# Put distribution into /usr/share/rwbs
+	insinto /usr/share/rwbs/
+	doins "${S}"/anotherpersonjoined "${S}"/helloandwelcome \
+		"${S}"/ifucanhearthis "${S}"/invitetestxmit "${S}"/join?.rwc \
+		"${S}"/plsstartagame "${S}"/thisisatestmsg
+
+	newconfd "${FILESDIR}"/rwbs.conf rwbs
+	newinitd "${FILESDIR}"/rwbs.rc rwbs
+}
diff --git a/net-misc/rwhoisd/Manifest b/net-misc/rwhoisd/Manifest
new file mode 100644
index 000000000000..e072621a5f09
--- /dev/null
+++ b/net-misc/rwhoisd/Manifest
@@ -0,0 +1,10 @@
+AUX rwhoisd 280 SHA256 e561589202783dc562c263e61b4f81247e42c3f359ac41e9f1aa52d03206aa66 SHA512 cd278c6dd828d7f07c50147e5dedad7cf8c8e44926b4717fec442b91d891838b59f61dc2a51968df5b4b1dfe181958148a9a7f9e93e65fc815b69c6219dabd6d WHIRLPOOL b1d635b22f6707aa6c458700cfb733c70885c481ea5b0454b5642e46d4a92ef02a0cb9daf55c46bc70c3ae012be075afedabf1d3977779559f91b560841a4a41
+AUX rwhoisd-destdir-1.5.9.5.patch 1007 SHA256 402dcf51c2735f3f2dc956373c939154cce7b9955cf3e4c36bbaacc0bf5e7c8f SHA512 9fc08f639cd087c1cbbc3139eb648fc4afed1c8aa299fcec867c3938a773e8c0ca9b1be40acdc61026ded1f012df9eea2bb713ec1207464f1cd66d215c2fa221 WHIRLPOOL 7508fbba3d72486d0a859f7ade65132184d7972106c412ea8be46821458bad87889e938fe16ae44c711ec6a76c55321d6df372f01314901a0d75aff049970069
+AUX rwhoisd.conf 154 SHA256 977db3d945ba6862b4161256a0cd2bce92f181246e3945d64f8e44a78de8b974 SHA512 882d93ddf72f6a909ab6a33a6f5026e35f52ae025a9e4653cc0449c4b0ab1b2fda5799e1b44b19c620eb98337270a7a1c1eb9cff66af49832adf9726f4713bb8 WHIRLPOOL 4150fb3a5e357540ca3f1be4cc876287a5b9b9d08be31cd785d2d6edf2f6bb4fdab2b0c5b79a5a775cb335b49d422c0c7df54d01503371ccc7cfad997789c69f
+DIST rwhoisd-1.5.9.5.tar.gz 491600 SHA256 832da8faff58070fcc8685c67375dcced3b6bb225ffbe3542dd6052add61cf92 SHA512 d9227cd700cb14e0c83003c7a8dff43f859eba58390f4ba74b03c58fe629bcc9e8a39f2aaf7ce9b55aa4f17f43fc54fed9ba05a29bcbe1df5fc1340202d7b04c WHIRLPOOL ba6f7741462468d8f9e933c69f576c2204ede70b0315486df1885afa2a45755c32b7e4170df7792c2aa6516f51c39eb01495ba8cec453f676265817fff8cecb2
+DIST rwhoisd-1.5.9.6.tar.gz 491955 SHA256 c1768d2414bca88f10acc2e50a23288a21176416ddfe697ee4326636c0b062f7 SHA512 ab5674d9ed9f9c5fc00b2859b1336c766c546ca067ddf9d3863a0728c6d0eac11be3a9cd22dce8c25999ed8c8e5377e6da4aa1252e396d5b3c8e959794903c52 WHIRLPOOL 4933df098968598fb7e988cfc114b0048d96d3ddce460b5ed92ee321f405e30cfb3bcb93264be4623c955c454723f9c45336be75dbf36b315c88396c69b40b23
+EBUILD rwhoisd-1.5.9.5-r3.ebuild 892 SHA256 fdfe5116b5927bf3100e69af94a84db5713991ec6f159675f9414c97082ce516 SHA512 ba47902133b686606c3aa64571ca7d9bf8530201971fe7f8abd750714dced074e4365e2c2418238f88b62bc3a40884462cd67e6a44d56d8b756f5ba0b9df40a0 WHIRLPOOL eede462e2d2aedaa676ca926966806eec59ee3e4c2efbe8317acef1c1428d7e8b1193286a28e3da628b6b69f6e85f4a16969e047983eb4fd6835ea6093d7925d
+EBUILD rwhoisd-1.5.9.6.ebuild 873 SHA256 685c508120c15e36fd3f473cf77e75729a678c108c4f8cd9c336168c23c070fb SHA512 8959505ad0dff653851c312c6be15302163d5ba0b9190ec339a9f6180f2ccd838d5e520018463a0fb0b94567d9722ec2a06fdff3950e17444d40e6ab724acf67 WHIRLPOOL 4009f5c787bb961328805c3ce49f3567d9cedb02a19ae071c4eee0fc646c2d18d7414c3edbeada54f5c0d689847224593d80a566baa4c4eeecc2b21297562295
+MISC ChangeLog 3020 SHA256 1493e886f3d60b49d7c34e0d55e44e8a7e2781c63dbab36e0a08d14e6a47d0ae SHA512 caafa0a40077533fe2e82d1b83fee68210da378ebb419f6ff4bbecccf570989497d83701423c132f35aaa1be633ca79d84f9f413201494f0deb36c5357ca6595 WHIRLPOOL c0c4ca744323368196032690fc749c00f17742973fdc7b31a3314050d1498e42c1dfe21e73b3f1d8fa9e5eb9f805f6a6d69313f69cc609fd1bea1d560cbc0aed
+MISC ChangeLog-2015 1569 SHA256 d002f4094aec270cc07e66b0c2458594f3af4094a52c21b797ca1b1f5d57179d SHA512 3d6aab923ef3191457fdbd29e78555db2de2454dd8475a3cad5ed58a8d8c437b924ef10da574de1f1010b10ea8bc8823fc9fa7ab8b8237d44a431bfdb7e1466c WHIRLPOOL 39d392e6bb0081d01a75673602430a374c76889adbaafab849c5ccd8f6c29771f7d40090f76e5ac0527983cf9327fbf933954493409372990201ceff5ec8b200
+MISC metadata.xml 225 SHA256 0acfe9892935de316181c7b1b1d10e759f27ad33afd741015b31a3ce351ae6ad SHA512 0b610f2ab50e3c82c7e3fb9bbe1af0ce84851de95ad8b8caec506e4d8260e3bd64995e7d51d447c29bbd4696285a67d14fc1f10ceab9185e4501802986e27980 WHIRLPOOL b1b95cd871b82227b82dc206207bbf9283c34c591919d1b814877574a86d9a25798298340f81c86afa5dbeefbcd08380e017cbd2abaf281aecf01188b2579377
diff --git a/net-misc/rwhoisd/files/rwhoisd b/net-misc/rwhoisd/files/rwhoisd
new file mode 100644
index 000000000000..f6978f662e27
--- /dev/null
+++ b/net-misc/rwhoisd/files/rwhoisd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+	use logger
+}
+
+start() {
+	ebegin "Starting rwhoisd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/rwhoisd -- ${RWHOISD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping rwhoisd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/rwhoisd
+	eend $?
+}
diff --git a/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch b/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
new file mode 100644
index 000000000000..6cd6b28f2e51
--- /dev/null
+++ b/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
@@ -0,0 +1,39 @@
+--- a/tools/rwhois_repack/Makefile.in
++++ b/tools/rwhois_repack/Makefile.in
+@@ -52,9 +52,9 @@
+ # procedural
+ 
+ install:
+-	if [ ! -d $(exec_prefix) ]; then mkdir $(exec_prefix); fi
+-	if [ ! -d $(bindir) ]; then mkdir $(bindir); fi
+-	$(INSTALL) rwhois_repack $(bindir)
++	if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir $(DESTDIR)$(exec_prefix); fi
++	if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir $(DESTDIR)$(bindir); fi
++	$(INSTALL) rwhois_repack $(DESTDIR)$(bindir)
+ 
+ uninstall:
+	$(RM) $(bindir)/rwhois_repack
+
+--- a/sample.data/Makefile.in
++++ b/sample.data/Makefile.in
+@@ -10,7 +10,7 @@
+ prefix      = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir      = $(exec_prefix)/bin
+-etcdir      = $(exec_prefix)/etc
++etcdir      = /etc
+ 
+ srcdir	    = @srcdir@
+ VPATH       = @srcdir@
+
+--- a/sample.data/Makefile.in
++++ b/sample.data/Makefile.in
+@@ -17,7 +17,7 @@
+ 
+ DESTDIR =
+ 
+-RWHOIS_ROOT_DIR = $(DESTDIR)$(etcdir)/rwhoisd/samples
++RWHOIS_ROOT_DIR = $(DESTDIR)/var/rwhoisd/samples
+ 
+ FILES = \
+         a.com \
diff --git a/net-misc/rwhoisd/files/rwhoisd.conf b/net-misc/rwhoisd/files/rwhoisd.conf
new file mode 100644
index 000000000000..eb32d26d55ed
--- /dev/null
+++ b/net-misc/rwhoisd/files/rwhoisd.conf
@@ -0,0 +1,7 @@
+# configuration file for /etc/init.d/rwhoisd
+
+OPTS="-c /etc/rwhoisd/rwhoisd.conf"
+
+# Pass any additional options to rwhoisd here.
+
+RWHOISD_OPTS="${OPTS}"
diff --git a/net-misc/rwhoisd/metadata.xml b/net-misc/rwhoisd/metadata.xml
new file mode 100644
index 000000000000..d15ef5a13193
--- /dev/null
+++ b/net-misc/rwhoisd/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>rwhois server from ARIN</longdescription>
+</pkgmetadata>
diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild
new file mode 100644
index 000000000000..0ff7fbf1072d
--- /dev/null
+++ b/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic user
+
+DESCRIPTION="ARIN rwhois daemon"
+HOMEPAGE="http://projects.arin.net/rwhois/"
+SRC_URI="http://projects.arin.net/rwhois/ftp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+
+pkg_setup() {
+	enewgroup rwhoisd
+	enewuser rwhoisd -1 -1 /var/rwhoisd rwhoisd
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-destdir-${PV}.patch
+	append-cflags -DNEW_STYLE_BIN_SORT
+}
+
+src_compile() {
+	emake -C common
+	emake -C regexp
+	emake -C mkdb
+	default
+}
+
+src_install () {
+	default
+	doinitd "${FILESDIR}"/rwhoisd
+	newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd
+}
+
+pkg_postinst () {
+	einfo "Please make sure to set the userid in rwhoisd.conf to rwhoisd."
+	einfo "It is highly inadvisable to run rwhoisd as root."
+}
diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild
new file mode 100644
index 000000000000..e08fd625c8a6
--- /dev/null
+++ b/net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic user
+
+DESCRIPTION="ARIN rwhois daemon"
+HOMEPAGE="http://projects.arin.net/rwhois/"
+SRC_URI="https://github.com/arineng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+S=${WORKDIR}/${P}/${PN}
+
+pkg_setup() {
+	enewgroup rwhoisd
+	enewuser rwhoisd -1 -1 /var/rwhoisd rwhoisd
+}
+
+src_compile() {
+	append-cflags -DNEW_STYLE_BIN_SORT
+
+	emake -C common
+	emake -C regexp
+	emake -C mkdb
+
+	default
+}
+
+src_install () {
+	default
+
+	doinitd "${FILESDIR}"/rwhoisd
+	newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd
+}
+
+pkg_postinst () {
+	einfo "Please make sure to set the userid in rwhoisd.conf to rwhoisd."
+	einfo "It is highly inadvisable to run rwhoisd as root."
+}
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
new file mode 100644
index 000000000000..aba3990e5d8b
--- /dev/null
+++ b/net-misc/rygel/Manifest
@@ -0,0 +1,7 @@
+DIST rygel-0.32.1.tar.xz 3977648 SHA256 94300e7349e7d161fc8b2d42cd4d5ac4d161362b81f58f126abd98d000f9d2c8 SHA512 55aaed85a44496792bf9bc34d150f1f9d79b7c440da4351c730580200cc7e3a19f378dd93fdf2ab5b4c19cd793a25481c2bf15f3e7043595e6971eca983f0767 WHIRLPOOL c1947bcd4b29a29a8405a83ffd43393060825069cab0230a1819e8e4f11601e672e9ef26e88986ad39386f6fb0080e952e52810f90d491f77eae3a806bbb2afd
+DIST rygel-0.34.0.tar.xz 3997364 SHA256 fbb2d46cbe4e750df6610b4c66b2278f06d1f71a257c7903e676ccb394dad418 SHA512 90e582f42e73376bbe6b06f33d44c6a70969961728dc512523bcc578b5b7c3f826cb425b469ade87d3fdf82117309f8589c30b1cdd8ba74cc14424c7f2efdb21 WHIRLPOOL f9a083f555460c4bedfa2df4943b2886c2aba3cb9f10944685361395484951bf7e5ec14d04c3dbaedc0f6071e05803e62a58667f192b5ff417fcebe5016d2c40
+EBUILD rygel-0.32.1.ebuild 2473 SHA256 6f4ce9dc7988bb446b98bbca440264c5911459bdaa27e9b0bb103c17c1f67337 SHA512 8388da9196641fa5dc2e744546634718b7e733e80b6eb338828d693f5a1789416355db295da6da3b9ecd9af072b30df1d43e0b48adec9d120c87c9336557fd89 WHIRLPOOL ea065f455d29d235e1ecd9c0a5253c46e67016f59afa65c77ee30f498c39b08921f4251a03c8f4a69d520b942cfc68e15d073220a71eab4603895677253f9206
+EBUILD rygel-0.34.0.ebuild 2771 SHA256 a558e80448ce4f1a60131c5e808753e46dd9b42d63906d0e19452ba7f85ed950 SHA512 1caa6463fd6e48da1c6ec0986c68404822d9dcfa1733f64056506c9b4275c70d5fd053d8a32930d6365f7f6a566617b5b09049865dfd45b085cb927a98dcecb3 WHIRLPOOL 140ecda38dc6153c6c1e264c29e07afcc023dce96c7e79b641456990bc4d6a2c0170b06bb2f52d861dbd997b06101e0b2c02bd84aba9bd017952efce92677ea7
+MISC ChangeLog 5722 SHA256 cf490b5cf9b541cd397d08f23a2619b4139ccaa290e11639d8d84a741975d6e7 SHA512 176077a3b5a2bb41cc605f9002a953696348ecb7d3b6d754299bdf384d8f3101a2119836d271d5aadab479777f087fcce651d3e56b89ace10a747c99d9ff2e39 WHIRLPOOL f0e241bf1be2da7477bb9a07844faf0817a50f587ab7d8a001520f741533d4923b11aab5fbacd3d0cd522c852021d029ccbbb5f6773c95684b283a8bfa71f8d2
+MISC ChangeLog-2015 10062 SHA256 4e59b14d7b5785f05e8c36e115d3028021ced00cf08ba262672618599de00046 SHA512 6971567514e6d6f9c490bd305ce89ee1d885acc01e38f3796549abc0fe8e65b5e0ebea4417fa0221102f889aedde01dde8b314b4591719a435f65918b43e67a8 WHIRLPOOL eb1d73ee0ecb8328bda0ae11a64d4c69fa61eb4ad0ea8c17f09d979ecfccba5024e99c24bb64e49e3aa13b199fe3c6703fd45a0fbd6923a80aff80ac94447430
+MISC metadata.xml 431 SHA256 fae15f307b4b3bf9f2f8ec9c463689cdfa5fd6083e8b956143c81bbe681b714d SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce WHIRLPOOL bd119316b08a04f5664a5ec3c65167bea7ec803047a680861805932bee7c017ab27f6b05775ccb6aa68c98a33526219c7355b543af0971b8a14ce7337f1c6d59
diff --git a/net-misc/rygel/metadata.xml b/net-misc/rygel/metadata.xml
new file mode 100644
index 000000000000..359230bd52f1
--- /dev/null
+++ b/net-misc/rygel/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="tracker">Install dependencies for the tracker plugin</flag>
+    <flag name="transcode">Install dependencies for transcoding support</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/rygel/rygel-0.32.1.ebuild b/net-misc/rygel/rygel-0.32.1.ebuild
new file mode 100644
index 000000000000..3a2cff597a19
--- /dev/null
+++ b/net-misc/rygel/rygel-0.32.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 systemd versionator virtualx
+
+DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="X +introspection +sqlite tracker test transcode"
+
+# The deps for tracker? and transcode? are just the earliest available
+# version at the time of writing this ebuild
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8:0.8
+	>=dev-libs/libxml2-2.7:2
+	>=media-libs/gupnp-dlna-0.9.4:2.0
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmediaart-0.7:2.0
+	media-plugins/gst-plugins-soup:1.0
+	>=net-libs/gssdp-0.13
+	>=net-libs/gupnp-0.20.14
+	>=net-libs/gupnp-av-0.12.8
+	>=net-libs/libsoup-2.44:2.4
+	>=sys-apps/util-linux-2.20
+	x11-misc/shared-mime-info
+	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
+	sqlite? (
+		>=dev-db/sqlite-3.5:3
+		dev-libs/libunistring:=
+		x11-libs/gdk-pixbuf:2
+	)
+	tracker? ( >=app-misc/tracker-0.16:= )
+	transcode? (
+		media-libs/gst-plugins-bad:1.0
+		media-plugins/gst-plugins-twolame:1.0
+		media-plugins/gst-plugins-libav:1.0
+	)
+	X? ( >=x11-libs/gtk+-3:3 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+# Maintainer only
+#   app-text/docbook-xsl-stylesheets
+#	>=dev-lang/vala-0.22
+#   dev-libs/libxslt
+
+src_configure() {
+	# We set xsltproc because man pages are provided by upstream
+	# and we do not want to regenerate them automagically.
+	gnome2_src_configure \
+		XSLTPROC=$(type -P false) \
+		--enable-gst-launch-plugin \
+		--with-media-engine=gstreamer \
+		--enable-nls \
+		--with-systemduserunitdir=$(systemd_get_userunitdir) \
+		$(use_enable introspection) \
+		$(use_enable sqlite media-export-plugin) \
+		$(use_enable sqlite lms-plugin) \
+		$(use_enable test tests) \
+		$(use_enable tracker tracker-plugin) \
+		$(use_with X ui)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.28.2-r1 ${v}; then
+			elog "This version stops forcing the automatical starting of"
+			elog "rygel as upstream pretends. This way, it will honor the"
+			elog "user settings at Sharing section in gnome-control-center."
+			elog "If you desire to keep getting rygel autostarting always"
+			elog "you will need to configure your desktop to do it."
+			break
+		fi
+	done
+}
diff --git a/net-misc/rygel/rygel-0.34.0.ebuild b/net-misc/rygel/rygel-0.34.0.ebuild
new file mode 100644
index 000000000000..034de1e2366e
--- /dev/null
+++ b/net-misc/rygel/rygel-0.34.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 systemd versionator virtualx
+
+DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +introspection +sqlite tracker test transcode"
+
+# The deps for tracker? and transcode? are just the earliest available
+# version at the time of writing this ebuild
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8:0.8
+	>=dev-libs/libxml2-2.7:2
+	>=media-libs/gupnp-dlna-0.9.4:2.0
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmediaart-0.7:2.0
+	media-plugins/gst-plugins-soup:1.0
+	>=net-libs/gssdp-0.13
+	>=net-libs/gupnp-0.20.14
+	>=net-libs/gupnp-av-0.12.8
+	>=net-libs/libsoup-2.44:2.4
+	>=sys-apps/util-linux-2.20
+	x11-misc/shared-mime-info
+	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
+	sqlite? (
+		>=dev-db/sqlite-3.5:3
+		dev-libs/libunistring:=
+		x11-libs/gdk-pixbuf:2
+	)
+	tracker? ( >=app-misc/tracker-0.16:= )
+	transcode? (
+		media-libs/gst-plugins-bad:1.0
+		media-plugins/gst-plugins-twolame:1.0
+		media-plugins/gst-plugins-libav:1.0
+	)
+	X? ( >=x11-libs/gtk+-3:3 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+# Maintainer only
+#   app-text/docbook-xsl-stylesheets
+#	>=dev-lang/vala-0.22
+#   dev-libs/libxslt
+
+src_prepare() {
+	# Disable test triggering call to gst-plugins-scanner which causes
+	# sandbox issues when plugins such as clutter are installed
+	sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
+		-i tests/rygel-playbin-renderer-test.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# We set xsltproc because man pages are provided by upstream
+	# and we do not want to regenerate them automagically.
+	gnome2_src_configure \
+		XSLTPROC=$(type -P false) \
+		--enable-gst-launch-plugin \
+		--with-media-engine=gstreamer \
+		--enable-nls \
+		--with-systemduserunitdir=$(systemd_get_userunitdir) \
+		$(use_enable introspection) \
+		$(use_enable sqlite media-export-plugin) \
+		$(use_enable sqlite lms-plugin) \
+		$(use_enable test tests) \
+		$(use_enable tracker tracker-plugin) \
+		$(use_with X ui)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.28.2-r1 ${v}; then
+			elog "This version stops forcing the automatical starting of"
+			elog "rygel as upstream pretends. This way, it will honor the"
+			elog "user settings at Sharing section in gnome-control-center."
+			elog "If you desire to keep getting rygel autostarting always"
+			elog "you will need to configure your desktop to do it."
+			break
+		fi
+	done
+}
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
new file mode 100644
index 000000000000..1d7f5a73e24e
--- /dev/null
+++ b/net-misc/s3cmd/Manifest
@@ -0,0 +1,7 @@
+DIST s3cmd-1.6.1.tar.gz 102431 SHA256 4675794f84d8744ee3d35873d180f41c7b2116895ccbe2738a9bc552e1cf214e SHA512 0b1e3cf839144b24e42974f973a8ae97e9b4c79df3a40e38f61cc4b5284ea41a1fcbdc9dd45ff2b402915acb1ffc908a1e1c45c12f93243211ef2349c9acf70b WHIRLPOOL b470138448c589a89823e452bf3ea3e3801acf03d3cd01d152706557411db49db1714d633416b42fc9046d2a6bf6508363446cc881afb7e7b843c0bd8e60f93f
+DIST s3cmd-2.0.0.tar.gz 115290 SHA256 bf2a50802f1031cba83e99be488965803899d8ab0228c800c833b55c7269cd48 SHA512 77723c5fb20792b5202f689dcbd73025e3c8abdb4e2d773d4e653fb04935057bd49928d3ec40f3e3bab4b13af481ff7979d429dfff94f0cc10e5e3ba3ba1a0d9 WHIRLPOOL a1e2a50cf71b89e86482265a9b863de568ab50b6f251d93e464d869018ffd564217ebba96026dddeaefe6c567ce8da087b26d9ef4b8a8d7b18d3dd31c54e0c6a
+EBUILD s3cmd-1.6.1.ebuild 564 SHA256 2fd163557e3740af7f0eb96c68f65c727904868ddd017b91cb67e6ce87b7da1e SHA512 e472d51d34e7a92d75f424106151500883558c786889b4ef92e59df193ec6e66a428384c901cd18171fb3405e43e5101ff91f7a0f0473e8effe7b20ce9b878dd WHIRLPOOL 27cbbc588045db516f1a6107d54f203c5c8bcac4cbea5b4758a2a20b3f4f1b79a54742ba041d2ff3a6b15de413f1b8327612b655d6a5fa0af5a451495a0e8d3f
+EBUILD s3cmd-2.0.0.ebuild 588 SHA256 938f9393a560e1f49ceb70268c254223ff9bbdde286e6a1da6f9b24b589965d3 SHA512 372c9733ca5faeccd8ec0c41a1d1b2e35f5b4d1dada67ebda596fa40e289b79a249ae220c83e90da4c7fdd6604346b70e3549d5b54ec9c09f36b0b27584c6a51 WHIRLPOOL 77e3661037ff43093ce6ae9aa27c308c8832bb5afce191975431b9f913be732f0fdeeef354321e7ffc21142e363c7cdae5b6c8d28f056ea31c1b63e20753af83
+MISC ChangeLog 4010 SHA256 2d6bd2c307f5bba564b2edcac7b0d155c1f14e883d1969ab43a2993ce69aeba7 SHA512 2d705189f5313938bf5d17f8fb8cd6e22d0f1b713a3a6072448e3c0e2888e58bdb355221864c53203366348cf1213bc6b0c03078b40b8c75148f4526238c31af WHIRLPOOL 751bce75356001225d24557a67d582976053ec69ebad3fdc11ed68a947aba56c1623e7bb30ce4d4acc1c43bd7f0c8f44720e7f60e2bce4b930c68fb4c72dc98c
+MISC ChangeLog-2015 4059 SHA256 22ee1dbb547cdac78298502de7c2b48a44f06ac03e7472a67503176dd1f728c1 SHA512 5fb57277a2e31151b0a983d76a00625e85165f56ea304ea4cca2881fbadd4246e45322eced685ef1895d9d7cb19483e1f16425e15ef0b264891ab1d02ebe52e8 WHIRLPOOL d0752f160728e7745b64b6cffa3a6bd79e822dca34b889b085d938fba154e5a1e540952405c25d75494830fe1114075a9df0ab570317da948bb6b5573f357d33
+MISC metadata.xml 826 SHA256 f20b98a524ea65f22ac12802af5fe953069095eb6181a1fac129715b55ea689f SHA512 9a6167170c1de55845ea44db9f899b0083d2283e9a64021aa2125e0106af279532bdae9bb1d7626452740325ad407ce3649a3839d019f9634d0ec7bf96960e28 WHIRLPOOL 8de3a7d0a7146f1c07b0cf0ad134336d01e366fcd8325dd2f2ab05b7f20fb43812047b3e4303a93d2e6a50beec4b95b0c3b5f5ccb9bfe67dae1366b6998f9568
diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
new file mode 100644
index 000000000000..4f4064682784
--- /dev/null
+++ b/net-misc/s3cmd/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>brendan@horan.hk</email>
+    <name>Brendan Horan</name>
+    <description>Proxy maintainer, assign bugs</description>
+  </maintainer>
+  <maintainer type="person">
+    <email>igor@itesten.com</email>
+    <name>Igor Testen</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>titanofold@gentoo.org</email>
+    <name>Aaron W. Swenson</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    Command line client for Amazon S3.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">s3tools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/s3cmd/s3cmd-1.6.1.ebuild b/net-misc/s3cmd/s3cmd-1.6.1.ebuild
new file mode 100644
index 000000000000..acafa8124728
--- /dev/null
+++ b/net-misc/s3cmd/s3cmd-1.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Command line client for Amazon S3"
+HOMEPAGE="http://s3tools.org/s3cmd"
+SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]"
+
+S="$WORKDIR/${P/_/-}"
diff --git a/net-misc/s3cmd/s3cmd-2.0.0.ebuild b/net-misc/s3cmd/s3cmd-2.0.0.ebuild
new file mode 100644
index 000000000000..39f8572f5a19
--- /dev/null
+++ b/net-misc/s3cmd/s3cmd-2.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}}  )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Command line client for Amazon S3"
+HOMEPAGE="http://s3tools.org/s3cmd"
+SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~arm64 ~amd64 ~x86 ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]"
+
+S="$WORKDIR/${P/_/-}"
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
new file mode 100644
index 000000000000..e88cbe5fc6e5
--- /dev/null
+++ b/net-misc/s6-networking/Manifest
@@ -0,0 +1,9 @@
+DIST s6-networking-2.2.1.0.tar.gz 85242 SHA256 5d8150d7413b335693c6e63092381dd0866b1b6f95662a2cbae5ec17ca449ab0 SHA512 33085e2a855079ab046b6f851b4dc15801012dc1a353a1254508c6c9da9e45da4f7e2b62e16ab1d0a41d42b424bebe7b362860f68f3be0f9eba37b7a15817633 WHIRLPOOL e76817f4803dfff8e85efbc3f70c050ca88fd5046863abc2832d3e8d7765840e5e91e443f7ce96b66bde0d6697e4764b1b820d04eaf981e958eabc5b30107442
+DIST s6-networking-2.3.0.0.tar.gz 86538 SHA256 1a21d6f3e29eaa50a8de8cddd1e60372fb36c024f2a0c1afc4c9b704b4e3e6dd SHA512 ca247f3926d790e388347c610ae10fdb3e7be48d8381b9178223c470258b264315997f627b6ddcc508f08ba83e9212f386041b92dbaa3ad576c4e37f205a0c91 WHIRLPOOL ba77c93b90bb7928b54e87cb2e196f94eb4c24cb4adc885dd3f40d000bfc839e28b8a7ee021f162c70441abdc0d526f0d0a2ea3e086d823bbe02c58e012f71d6
+DIST s6-networking-2.3.0.1.tar.gz 86602 SHA256 67c4beab39377b60bb996000a336c764adf4b5456c0283a8fd27657b15e9c6d6 SHA512 d0f2367a916d578e02ed8b482c73e62c59eed60cf08f98d6294b12fd7aa046b2fe18294b0243a59a05a9ec1a082e8e9398d6e89145edcb2b1022fa90e7197da2 WHIRLPOOL d99ace6bd459abc8db2a527e3f5fefaf5ec943251665567cf2d37359134492ad5a5ed1088ab7e280ac24bf1df3b3f6d69e6bf95e92b4992489613c31889f4a00
+DIST s6-networking-2.3.0.2.tar.gz 85977 SHA256 d81968756abbcecde6a872c89d82f643cd621a0c295c2c57650705dbe875481a SHA512 c99afd9bdbd5003f57de8f88f091971f0269cd8efee5791c3c4aa90ad34b978d0f57724d4128e9d20d6a40d731853bb4bdaa76dd860f975ff7f84a56b0050256 WHIRLPOOL 17222c4e90dd95a8f8cc4234d66f56c71a871d0e154bad3c0d590f07f85f8c97aed4d5b2de915302b301e03c95dad7fc5420c4ce747a5c8d2cc0bd61f00a8df1
+EBUILD s6-networking-2.2.1.0.ebuild 1751 SHA256 c8fdf86435bf8051fdc22449b97c22ee99a7c288973f1337106c63cade218b80 SHA512 cfe54a54531bf7973e4662bd959f09a00d9b035441d27e8e090e9655ff4eef2944a7f2e4dd891d89f55be6914acb65ca563412f84be7010aace961773597b6e2 WHIRLPOOL 8e1d0de752464279917e1ea5acc5eca48ec0874148620ab807b1d14fc3decfcc9941c850c2a631433de84f0d20a830fbf44b0ecc2497baeead56c1dc64b7dff3
+EBUILD s6-networking-2.3.0.0.ebuild 1753 SHA256 8a97dc6d5fd34abe9c8543cbb772730ce7cc308638ed1d63e1735397b26a374a SHA512 5b2eec21351fca3f52591de27b43384072660600a1a2ed8d770a4ab7d9b7bbf8775eb9eb3a93465413c3ff97edcc5aee5e6184cde2594b7bda61d8d8d0f99687 WHIRLPOOL 3d2f95bb68df0a2c401cff9f9a1fac16bde6c5dcb79489341789057d4da87120c4103d2bf9cacc09967e5fe3345522fecc3605ec18cec2935f6127c4b82884d5
+EBUILD s6-networking-2.3.0.1.ebuild 1892 SHA256 4c0952ec2807ce2ec27d03d6c3314a52a51d6499bae519fc14fc32092e63214b SHA512 eeeab3720e156047bb034a9d135bc23207c770ec293fce59d736c19651cd2dd4ac8aff7b125e4fcf8a04c929d8fed1cfc84a1d73e725a7bcef9df0ff7b5cb257 WHIRLPOOL 91c019efdb8fa724de88ec0de9010ccd5964ff765935c0e0d38de3960ba13160317ab2d9c5bdef9d2d3daf3e2f55e9e8dd41d653c9eaf801f53734aa5dd20858
+EBUILD s6-networking-2.3.0.2.ebuild 1892 SHA256 ecdb4e2ebf048139f9d303cebd2017ff2d4da4fb7c4698207745fe3107d93137 SHA512 26539e1976690200ff1882ae1fe761f45c670ac2192234d1a920d644a397be8144ee000100a43086ed19add9a5d403bee021f85b2be3badff1e3e2e67b60f76c WHIRLPOOL e9143a194da93689e8b65434c5e4161a389a5ba66c1b2b397cf6ae71bb5a51731245078e469db7a7a72c40bce782238acc5f4d850a8aff37b789b03639afebf3
+MISC metadata.xml 750 SHA256 911ae22d5aeb11a453a840dc39b3cc68f236568cc22c3955062b3e6e25af6cd7 SHA512 75cfc47bfa5d8ea7f62fb48adcb0c946e1fa6b256f89b4a2e9a037053da5ed2e7139a1872f2933dd48194dc794903dff2314e6ac228c1a63ac7b7c80c0d1c82f WHIRLPOOL 9cd66fbc06956a409347382a4d613ac42f5e82755a08832b3e61b6bd6716bd91ee057d986de8494dc395b34fe6fb3cff22c5205c953c5bc275f638d3d8ba3a0d
diff --git a/net-misc/s6-networking/metadata.xml b/net-misc/s6-networking/metadata.xml
new file mode 100644
index 000000000000..179bb46bd2aa
--- /dev/null
+++ b/net-misc/s6-networking/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		s6-networking is a suite of small networking utilities for Unix systems.
+		It includes command-line client and server management, TCP access
+		control, privilege escalation across UNIX domain sockets, IDENT protocol
+		management and clock synchronization. Optionally, it also includes
+		command-line TLS/SSL tools for secure communications.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/s6-networking/s6-networking-2.2.1.0.ebuild b/net-misc/s6-networking/s6-networking-2.2.1.0.ebuild
new file mode 100644
index 000000000000..9a34540a55ab
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.2.1.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="suite of small networking utilities for Unix systems"
+HOMEPAGE="http://www.skarnet.org/software/s6-networking/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.2.0.0[static-libs]
+		>=dev-libs/skalibs-2.4.0.2[static-libs]
+		>=net-dns/s6-dns-2.1.0.0[static-libs]
+		>=sys-apps/s6-2.4.0.0[static-libs]
+		ssl? ( >=dev-libs/libressl-2.4.4[static-libs] )
+	)
+	!static? (
+		>=dev-lang/execline-2.2.0.0[static=]
+		>=dev-libs/skalibs-2.4.0.2
+		>=net-dns/s6-dns-2.1.0.0[static=]
+		>=sys-apps/s6-2.4.0.0[static=]
+		ssl? ( >=dev-libs/libressl-2.4.4 )
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.2.0.0:=[!static?]
+	>=sys-apps/s6-2.4.0.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.4.0.2:=
+		>=net-dns/s6-dns-2.1.0.0:=
+		ssl? ( >=dev-libs/libressl-2.4.4:= )
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/s6-dns \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable ssl ssl libressl) \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-misc/s6-networking/s6-networking-2.3.0.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.0.ebuild
new file mode 100644
index 000000000000..5418be09f4a8
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.3.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.0[static-libs]
+		>=dev-libs/skalibs-2.5.0.0[static-libs]
+		>=net-dns/s6-dns-2.2.0.0[static-libs]
+		>=sys-apps/s6-2.5.0.0[static-libs]
+		ssl? ( >=dev-libs/libressl-2.4.5[static-libs] )
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.0[static=]
+		>=dev-libs/skalibs-2.5.0.0
+		>=net-dns/s6-dns-2.2.0.0[static=]
+		>=sys-apps/s6-2.5.0.0[static=]
+		ssl? ( >=dev-libs/libressl-2.4.5 )
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.0:=[!static?]
+	>=sys-apps/s6-2.5.0.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.5.0.0:=
+		>=net-dns/s6-dns-2.2.0.0:=
+		ssl? ( >=dev-libs/libressl-2.4.5:= )
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/s6-dns \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable ssl ssl libressl) \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-misc/s6-networking/s6-networking-2.3.0.1.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.1.ebuild
new file mode 100644
index 000000000000..ce24c644ece7
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.3.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.1[static-libs]
+		>=dev-libs/skalibs-2.5.1.0[static-libs]
+		>=net-dns/s6-dns-2.2.0.0[static-libs]
+		>=sys-apps/s6-2.5.1.0[static-libs]
+		ssl? ( >=dev-libs/libressl-2.4.5[static-libs] )
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.1[static=]
+		>=dev-libs/skalibs-2.5.1.0
+		>=net-dns/s6-dns-2.2.0.0[static=]
+		>=sys-apps/s6-2.5.1.0[static=]
+		ssl? ( >=dev-libs/libressl-2.4.5 )
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.1:=[!static?]
+	>=sys-apps/s6-2.5.1.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.5.1.0:=
+		>=net-dns/s6-dns-2.2.0.0:=
+		ssl? ( >=dev-libs/libressl-2.4.5:= )
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/s6-dns \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable ssl ssl libressl) \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
new file mode 100644
index 000000000000..c8544a93760d
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.2[static-libs]
+		>=dev-libs/skalibs-2.6.0.0[static-libs]
+		>=net-dns/s6-dns-2.2.0.1[static-libs]
+		>=sys-apps/s6-2.6.1.0[static-libs]
+		ssl? ( >=dev-libs/libressl-2.4.5[static-libs] )
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.2[static=]
+		>=dev-libs/skalibs-2.6.0.0
+		>=net-dns/s6-dns-2.2.0.1[static=]
+		>=sys-apps/s6-2.6.1.0[static=]
+		ssl? ( >=dev-libs/libressl-2.4.5 )
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.2:=[!static?]
+	>=sys-apps/s6-2.6.1.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.0.0:=
+		>=net-dns/s6-dns-2.2.0.1:=
+		ssl? ( >=dev-libs/libressl-2.4.5:= )
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/s6-dns \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable ssl ssl libressl) \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-misc/samplicator/Manifest b/net-misc/samplicator/Manifest
new file mode 100644
index 000000000000..98c99de8c90c
--- /dev/null
+++ b/net-misc/samplicator/Manifest
@@ -0,0 +1,10 @@
+AUX samplicator.8 2278 SHA256 bb36a0df436fc0db4c53bb9d832f88f9c1c4c1331e7babcaef96ee9aacaf9dd4 SHA512 008d797b15fa217d5e6eaed2923ddb1abe580fd8d1092309d3295c75667cde8d15e35b39827827c8cabd5e988f70846cb5e58f673eef5be59f6b874ea400b2c0 WHIRLPOOL b3a46c99fa8fd5024fe6cc11268fc720f8f6dd1248fe1ccc73ee0c78d8381cadb78f80a2bb9e2bee8f9f414c56f45d999643916201c0f88978d86f1908fd9cce
+AUX samplicator.confd 199 SHA256 dc777a834e22a3093dc18cbb9e93c132a266a562882b11d703b41e1f1a447f9f SHA512 6c9240d821fabd23f5a7e7dd3762b17622c8a45b137112bb376ec4f1b52b03c34f4bed76801be20e34dc1045923e24722bb515d974bd06bcc8d19dc20925e691 WHIRLPOOL d993c18d5899eb78565042ba0b672c19f173359af69bc07e6a52a386a948829f77b2cf76322c7dd16580615c2ec11afc7572d7052bdde5c97102f05eb122c052
+AUX samplicator.initd 988 SHA256 e351da31a352cad9092ee5687c33368c51e952a6a607375cc0bc70bfc61e7643 SHA512 7bb9ebdb7d4b50d0df4827926b2ee6f9aaba0b63f841f6cb62d1dc2dcdf517e5a8e155813dab33e846270b9cb589c82e47ac293b4ab6482e504955856c68bc99 WHIRLPOOL dee636b908dd4b8a139e47388858a095bcf1de7a1e3aa5956d1a4fd1ad67b421b58c79ddf03b21afc28914b009694d4c5065e821f7e86a35530c24231884d03c
+DIST samplicator-1.3.6.tar.gz 87901 SHA256 d5af47be6fc6cdbd9b5d116c65a92c6b9fd546df1c9cd61c831b5b85eb1f2742 SHA512 a4023344ec911d3dc6992ddce139e6f1c86a67bd9948a3f92a995dc26aeda1753becea4b0f5d9ad45a06d628029bffc0a77c28fbd277da9faf42100c01d55f31 WHIRLPOOL c499abfe21ed1d8062ab8fad1b6ae87a45217a797f8997588bf6aa8acd2b743dac4e9d5df965208ffd999dd7fa59e7e413956a2ddb5f86cdbac77de854ff9737
+DIST samplicator-1.3.8rc1.tar.gz 109870 SHA256 5536622b409cf570a2326e2b4a1eac403eb6d9f05295450100d5176da1ec4e47 SHA512 9f688baff07f885a0ad58974374cdf6b66a5aeaeb01fbf38f431ebaaf160b38e37fae7c511f0fe388b10fa91d0bf4505c765556f55a2c6753a57d3df3b8b3306 WHIRLPOOL fd736a7bbe493b7432fe30be83d7058050f0afe9611f43e6e6df34d363a06c6cb377dde8ac84952b86c1a79ff8906bc093d60c9a1e0bf08f06916d2b0aa79aa7
+EBUILD samplicator-1.3.6.ebuild 1536 SHA256 0e8b15aa2ad1904d279408d0ce8364612339aa2e6efb5b1915f9524193a752fb SHA512 56b2e1796150961f6e9b30894de3ad5310a0a40e7e185f98a90c46b1706412b8610fa9b3fd819609e6996a2fd54dd254ff1c4c116432d69d36735741209ef3da WHIRLPOOL 7bf734c237c043142fe2bd96a504a5c7d44eb4c3bff4fb7a3b2c502e19e0ec852ddd83c1d1a8016b55fa7771e7db1cfa5d484043d0c0348222c248ae7395870a
+EBUILD samplicator-1.3.8_rc1.ebuild 1601 SHA256 f78249cd4a455ff013bd5c407e014e421be34b6946e6e16ef944e28f56c556e9 SHA512 9985e45f3e47dfdcd7998b2980b3be0d3cc86d0870c8f2581e87c6140cd88ab0b78f91af672abf002cd14ca4a937a1f36d9a6a0f9335e70e354b8a5a599706cc WHIRLPOOL aaf18f94cfbfcb8bbea9869a41e4868ba757248d80adad3d44ca4109365555d12068dd273a3d9d9eecdd30fa4c529e086efd2e6d75693fc8655e910d904d3e85
+MISC ChangeLog 3838 SHA256 39ed5f917bdfe16cb6a9297509ce61030a67fddf7fd8476584d704b56708faf9 SHA512 43c66e1694ef4b5b0a7efb2d5c37895580498e683d99d27f8d5772764506891743f43a41991ca8663f1109da2cc3429e7038a10a202563c84f7e7d3e66e4931e WHIRLPOOL dd07ae9f8ea45afc0c24f1026d2542d5daaeb7f72ff79239ed713c39c649b74ecfd4433b15ec74bdb4756e595b1775a63151cd3d4216c26fe40d458090f76e8e
+MISC ChangeLog-2015 1053 SHA256 821de12673ae48b37ec90049cfa2112c6adc7f40ae37b98e507679ca64637301 SHA512 c0bbddc927cc36bee7fe75e42e97af31a2c969baa5fe7edbfbeef90136a36c98f00c5e41a304d0b529ceb9bc4be2f7e8ccc5cde7f744bc0ae6975b83e75c63c8 WHIRLPOOL cc1116a04222d74c5220d96ba091ae4863ca560e4408c57ed736676f5f1502ffa6e07be9895f4944841a6621a12ec3e0efa9acfa12b63d034e21db04faad68e4
+MISC metadata.xml 893 SHA256 3ca15db76d3c44640b2a805f60c63a9643e0671478f2470abdaba2977021c86f SHA512 5bd96527dea29dd156d355e351c3b6b27d359aef72beb8b218907c4b53e04377e3d03ed1f43fad1dfe79292719ef74f4768060cbc534324dd5058950d7cc659d WHIRLPOOL e8eaeefa9f5624e1ce371137e487a6d10e4d95139b13c101c0e8ab8e0dca2dcecf6f933675827a012550c392d81270be5b94ad45cd86c3f2dd5cee85ac40dd37
diff --git a/net-misc/samplicator/files/samplicator.8 b/net-misc/samplicator/files/samplicator.8
new file mode 100644
index 000000000000..1ddef2407238
--- /dev/null
+++ b/net-misc/samplicator/files/samplicator.8
@@ -0,0 +1,86 @@
+.TH samplicator 8 "February 25, 2013" "" "samplicator"
+.SH NAME
+.B samplicator
+\- UDP packets forwarder and duplicator
+.SH SYNOPSIS
+.B samplicator
+.RB [ \-p
+.IR port ]
+.RB [ \-s
+.IR address ]
+.RB [ \-d
+.IR level ]
+.RB [ \-b
+.IR size ]
+.RB [ \-n ]
+.RB [ \-S ]
+.RB [ \-x
+.IR delay ]
+.RB [ \-c
+.IR config ]
+.RB [ \-f ]
+.RB [ \-h ]
+.RB A.B.C.D[/\fIport\fP[/\fIfreq\fP][,\fIttl\fP]]
+.SH DESCRIPTION
+.B samplicator
+is simple program listens for UDP datagrams (NetFlow, sFlow, SNMP Trap, Syslog)
+on a network port, and sends copies of these datagrams on to a set of destinations.
+Optionally, it can perform sampling, i.e. rather than forwarding every packet,
+forward only 1 in N. Another option is that it can "spoof" the IP source address,
+so that the copies appear to come from the original source, rather than the relay.
+.SH OPTIONS
+The following command-line options are accepted by the server:
+.IP "\-p \fIport\fP"
+UDP port to accept flows on. Default \- 2000.
+.IP "\-s \fIaddress\fP"
+interface address to accept flows on. Default \- any.
+.IP "\-d \fIlevel\fP"
+debug level
+.IP "\-b \fIsize\fP"
+set socket buffer size. Default \- 65536.
+.IP \-n
+don't compute UDP checksum (leave at 0)
+.IP \-S
+maintain (spoof) source addresses
+.IP "\-x \fIdelay\fP"
+transmit delay in microseconds
+.IP "\-c \fIconfig\fP"
+specify a config file to read
+.IP \-f
+fork program into background
+.IP \-h
+print this usage message and exit
+.IP A.B.C.D
+is the receiver's IP address
+.IP "\fIport\fP"
+is the UDP port to send to. Default \- 2000.
+.IP "\fIfreq\fP"
+is the sampling rate. Default \- 1.
+.IP "\fIttl\fP"
+is the sending packets TTL value. Default \- 64.
+.SH CONFIG
+A.B.C.D[/E.F.G.H]: receiver
+.IP A.B.C.D
+is the senders IP address
+.IP E.F.G.H
+is a mask to apply to the sender. Default \- 255.255.255.255.
+.IP receiver
+is the IP address of receiver
+.SH NOTES
+.B samplicator
+currently only supports IPv4.
+.PP
+Receivers specified on the command line will get all packets, those specified in the
+.IR config
+will get only packets with a matching source.
+
+.SH FILES
+.B
+/usr/sbin/samplicate
+
+.SH AUTHOR
+.B samplicator
+was originally written by Simon Leinen <simon.einen@gmail.com>.
+.PP
+This manual page was written by Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua>
+for Gentoo Linux (and may be used by others)
\ No newline at end of file
diff --git a/net-misc/samplicator/files/samplicator.confd b/net-misc/samplicator/files/samplicator.confd
new file mode 100644
index 000000000000..3f38ccc9887b
--- /dev/null
+++ b/net-misc/samplicator/files/samplicator.confd
@@ -0,0 +1,8 @@
+# Config file for /etc/init.d/samplicator
+
+# Various options.
+# run `samplicator -h` for valid cmdline options
+OPTS="-f -S -p 2000"
+
+# Receiver config file
+#CONFIG="-c /etc/samplicator/receiver.conf"
\ No newline at end of file
diff --git a/net-misc/samplicator/files/samplicator.initd b/net-misc/samplicator/files/samplicator.initd
new file mode 100644
index 000000000000..0260192c3ee1
--- /dev/null
+++ b/net-misc/samplicator/files/samplicator.initd
@@ -0,0 +1,39 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+NAME=${SVCNAME##*.}
+if [ -n "${NAME}" -a "${SVCNAME}" != "samplicator" ]; then
+    PID="/run/samplicator.${NAME}.pid"
+    PNAME=$(echo ${RC_SVCNAME} | sed 's/\..*//g')
+    CONF_DEFAULT="/etc/conf.d/samplicator.${NAME}"
+else
+    PID="/run/samplicator.pid"
+    PNAME=${RC_SVCNAME}
+    CONF_DEFAULT="/etc/conf.d/samplicator"
+fi
+CONF=${CONF:-${CONF_DEFAULT}}
+EXEC=${EXEC:-/usr/bin/samplicate}
+
+depend() {
+        need net
+        provide samplicator
+}
+
+start() {
+        ebegin "Starting samplicator"
+        start-stop-daemon --start --quiet --background --make-pidfile --pidfile ${PID} --exec ${EXEC} -- ${OPTS} ${CONFIG}
+        eend $?
+}
+
+start_post() {
+        pgrep -n $(echo ${PNAME} | sed 's/or/e/') > ${PID}
+}
+
+stop() {
+        ebegin "Stopping samplicator"
+        start-stop-daemon --stop --quiet --pidfile ${PID}
+        rm -f ${PID}
+        eend $?
+}
+
diff --git a/net-misc/samplicator/metadata.xml b/net-misc/samplicator/metadata.xml
new file mode 100644
index 000000000000..37fecb38f2e4
--- /dev/null
+++ b/net-misc/samplicator/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+This small program receives UDP datagrams on a given port, and resends
+those datagrams to a specified set of receivers. In addition, a
+sampling divisor N may be specified individually for each receiver,
+which will then only receive one in N of the received packets.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sleinen/samplicator</remote-id>
+		<bugs-to>mailto:simon.leinen@gmail.com</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/samplicator/samplicator-1.3.6.ebuild b/net-misc/samplicator/samplicator-1.3.6.ebuild
new file mode 100644
index 000000000000..52905b78ec33
--- /dev/null
+++ b/net-misc/samplicator/samplicator-1.3.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="UDP packets forwarder and duplicator"
+HOMEPAGE="https://github.com/sleinen/${PN}"
+SRC_URI="https://github.com/sleinen/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+pkg_setup() {
+	# Add samplicator group and user to system
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /etc/${PN} ${PN}
+}
+
+src_install() {
+	# Install and copy documentation
+	default
+
+	# Install Gentoo init script and its config
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	# Install manual page
+	doman "${FILESDIR}"/${PN}.8
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "Don't specify the receiver on the command line, because it will get all packets."
+	ewarn "Instead of this, specify it in a config file; defined in such way it will only get packets with a matching source."
+	ewarn ""
+
+	einfo "For every receiver type create a file in directory /etc/${PN} (see example below)"
+	einfo "and specify the path to it in variable CONFIG of the corresponding initscript config file in /etc/conf.d/"
+	einfo ""
+	einfo "Receiver config examples: "
+	einfo ""
+	einfo "    /etc/${PN}/netflow:"
+	einfo "    10.0.0.0/255.0.0.0:1.1.1.1/9996 2.2.2.2/9996 3.3.3.3/9996"
+	einfo ""
+	einfo "    /etc/${PN}/syslog:"
+	einfo "    10.0.0.0/255.255.0.0:2.2.2.2/514 3.3.3.3/514"
+	einfo ""
+	einfo "    /etc/${PN}/snmp:"
+	einfo "    10.0.0.0/255.255.255.255:3.3.3.3/162"
+}
diff --git a/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild b/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
new file mode 100644
index 000000000000..91ac19d6e813
--- /dev/null
+++ b/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+inherit user
+
+DESCRIPTION="UDP packets forwarder and duplicator"
+HOMEPAGE="https://github.com/sleinen/${PN}"
+SRC_URI="https://github.com/sleinen/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# Add samplicator group and user to system
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /etc/${PN} ${PN}
+}
+
+src_install() {
+	# Install and copy documentation
+	default
+
+	# Install Gentoo init script and its config
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	# Install manual page
+	doman "${FILESDIR}"/${PN}.8
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "Don't specify the receiver on the command line, because it will get all packets."
+	ewarn "Instead of this, specify it in a config file; defined in such way it will only get packets with a matching source."
+	ewarn ""
+
+	einfo "For every receiver type create a file in directory /etc/${PN} (see example below)"
+	einfo "and specify the path to it in variable CONFIG of the corresponding initscript config file in /etc/conf.d/"
+	einfo ""
+	einfo "Receiver config examples: "
+	einfo ""
+	einfo "    /etc/${PN}/netflow:"
+	einfo "    10.0.0.0/255.0.0.0:1.1.1.1/9996 2.2.2.2/9996 3.3.3.3/9996"
+	einfo ""
+	einfo "    /etc/${PN}/syslog:"
+	einfo "    10.0.0.0/255.255.0.0:2.2.2.2/514 3.3.3.3/514"
+	einfo ""
+	einfo "    /etc/${PN}/snmp:"
+	einfo "    10.0.0.0/255.255.255.255:3.3.3.3/162"
+}
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
new file mode 100644
index 000000000000..c4bdcf96a139
--- /dev/null
+++ b/net-misc/scponly/Manifest
@@ -0,0 +1,7 @@
+AUX scponly-4.8-gcc4.4.0.patch 571 SHA256 bf89c4b56552654140c93b5cf3090370c24ee20e5870f0cf0df76218e52e15b2 SHA512 2e215ab2c39bb0550345725d3d509354be88144000072e5e14eda9f0ecb1bcc4c418e76d9db85ef6d6568962efc4472fe28d855e15adfe2bc5ba78c69d293a12 WHIRLPOOL 9853aa544070fae241e48da11821adccfb87d7229330dd01d72ccc097ae2f9bc57385d1d1739c8e9f2c5e4fbdcd7820ebdf8a18a74129ca4a57a067ff4956dbd
+AUX scponly-4.8-rsync.patch 7838 SHA256 bfab1408ad8cfdfd8fc7f9b583c57a5c6b73be36cb3955db46e4c892acd7e55e SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8 WHIRLPOOL b5114140169e4937f45b52b34db8de37aa03685a1810b47fcc1f7f20136f500551e2673ac8396d6c059b78b47028730f901cee208500939454e3333eb2fe5eba
+DIST scponly-4.8.tgz 101687 SHA256 1693dd678355749c5d9e48ecdd4628dbfe71d82955afde950ee8d88b5adc01cf SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b WHIRLPOOL 31ed4fda62484dbaa6eb678635a916db3e191ab98bb7ed0e7f6e794ef7d0dac0251e51bf7e627d48c00b17d550ce6dc0ed196fdfa3c2379ca7feec5544b200ba
+EBUILD scponly-4.8-r5.ebuild 6849 SHA256 b019e13236a0e88854f3c59d7bcf59c1544af872e4496b0a540a6e740ef04fa3 SHA512 a055d2699afa7a7d55a022a748ceb661beeaa5ccf59a9ad99d0a429930da3ac3fea9c7d87f131f76d69cf591fe189b50b25d8b42a9c2bcc73cfe2220d6dd1aaa WHIRLPOOL 029a8e6b5d3b9288663cddcc4f68b23ebe208778efbe71c6a3e3ecb9cc47faa47ac5c03f1f0a551c3b81a380ab835aecb6ac70481ca2dbc5945fabc0dd86433e
+MISC ChangeLog 2593 SHA256 c552ea9442e4b6250ec5ff3565b0f2d3d4737d73f848e9370ef0b4255b0cc772 SHA512 453d93e4261e62fd3a57b3cc8851cee9186d3c91adb3bd0a646d9e3943f00c4e63764c69e4fd54f73f5d98649709ce042dba754fc4a56d561e14c22c340565ba WHIRLPOOL 158717d5560822e9669de41698b59d718556dbd0fc2f7d1feda468215696c7511c02fd59c2629775e216e7ffbbee3b841784b04889cbd754308eae99046ad302
+MISC ChangeLog-2015 8674 SHA256 2ed92598aa1083b9cf7a1efae52ac5fd6489230e2b6dde7ca5278c0644fd827e SHA512 2f111af972a3b390ed4c5756984d1017db5a171e49d24d3a35559fe7a9fae6839c612d7cc128de8187da71c7c66c0f4e239803917a17aef319364c448de31ed2 WHIRLPOOL 287f7ba8e861194bc0e2b8c91ebc6f070916e0a39e210bf5d662c08d8aac639a201c65d0a914466597b40a35b76cec2a5d0aece84f7baa51189906c754f0594b
+MISC metadata.xml 1443 SHA256 c9cb81eb63124e2e17d95d134049441613abecc17ffe86f503a91da97fbea8d8 SHA512 b44a26ac0944e8b0b99bfd62a21684b9846a52e416a2874a1af9bbcdf270ff337dd26a55a24c6b4dd131ba51ef3b7b40e1375478a14049392782a5adbb1fed07 WHIRLPOOL 94dbff63a7f0ea5194495fdb8a9de55c448cf98b6c4c48e15e8ccceeb2ce676f27bd019dae598d66f81d9d9e437f2c8dfa55e76299ce43c10e9c54de76f46835
diff --git a/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch b/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch
new file mode 100644
index 000000000000..d08ce28b93b5
--- /dev/null
+++ b/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch
@@ -0,0 +1,15 @@
+--- helper.c.orig	2009-05-11 00:33:08.000000000 -0600
++++ helper.c	2009-05-11 00:39:59.000000000 -0600
+@@ -259,11 +259,11 @@
+ 							PROG_RSYNC, logstamp());
+ 						return 1;
+ 				}
+ #endif /* RSYNC_COMPAT */
+ 
+-#elif /* HAVE_GETOPT */
++#else /* HAVE_GETOPT */
+ 				/*
+ 				 * make sure that processing doesn't continue if we can't validate a rsync check
+ 				 * and if the getopt flag is set.
+ 				 */
+ 				syslog(LOG_ERR, "a getopt() argument check could not be performed for %s, recompile scponly without support for %s or rebuild scponly with getopt", av[0], av[0]);
diff --git a/net-misc/scponly/files/scponly-4.8-rsync.patch b/net-misc/scponly/files/scponly-4.8-rsync.patch
new file mode 100644
index 000000000000..40ca5e44f215
--- /dev/null
+++ b/net-misc/scponly/files/scponly-4.8-rsync.patch
@@ -0,0 +1,212 @@
+diff -Naur scponly-4.8.orig/CHANGELOG scponly-4.8/CHANGELOG
+--- scponly-4.8.orig/CHANGELOG	2008-01-15 15:26:13.000000000 +0900
++++ scponly-4.8/CHANGELOG	2009-03-18 21:29:48.000000000 +0900
+@@ -1,3 +1,9 @@
++CVS
++	Update the SECURITY document to include a reference to /etc/popt and ~/.popt as
++		they relate to rsync.
++	Fix for rsync-3.0 which now uses a short -e option, with an optional argument as
++		a server side option indicating protocol compatibility.
++
+ scponly v4.8 - jan 14 2008
+ 	fix support for quota and passwd when running within the chroot (exec pre-chroot)
+ 	disallow rsync and svnserve from being run as daemons that listen on a port
+diff -Naur scponly-4.8.orig/SECURITY scponly-4.8/SECURITY
+--- scponly-4.8.orig/SECURITY	2008-01-15 15:26:13.000000000 +0900
++++ scponly-4.8/SECURITY	2009-03-18 21:29:48.000000000 +0900
+@@ -28,6 +28,10 @@
+ 
+ 	  svn, svnserve, rsync, and unison
+ 
++	  Note specifically that rsync uses popt for parsing command line arguments
++	  and popt explicitly checks /etc/popt and $HOME/.popt for aliases. Thus,
++	  users can likely bypass argument checking for rsync.
++
+ 4) Make sure that all files required for the chroot have the IMMUTABLE and
+    UNDELETABLE bits set.  Other bits might also be prudent. See: man 1 chattr.
+ 
+@@ -39,13 +43,16 @@
+    ~/.ssh, ~/.unison, ~/.subversion
+ 
+    NOTE: depending on file permissions in the above, ssh, unison, and
+-   subversion may not work correctly.
++   subversion may not work correctly.  Also note that the location of the
++   above directories is sometimes system dependent, so please check the
++   documentation specific to your system.
+ 
+ 7) Make sure that every directory the users have write permissions to are
+    on a filesystem that is mounted NODEV, NOEXEC.  Eg. Make sure that they
+    cannot execute files that they have permissions to upload.  They should
+    also not need permissions to create any devices.  If the user can't execute
+-   any files that he has access to upload, then you need not worry about the
++   any files that he has access to upload and the executable files on the
++   system are not considered harmful, then you need not worry about the
+    security problems referencing svn/svnserve above!
+ 
+ 8) Monitor your logs!  If you start to see something funny, odd, or strange in
+diff -Naur scponly-4.8.orig/helper.c scponly-4.8/helper.c
+--- scponly-4.8.orig/helper.c	2008-01-15 15:26:13.000000000 +0900
++++ scponly-4.8/helper.c	2009-03-18 21:29:48.000000000 +0900
+@@ -6,17 +6,15 @@
+ #include <sys/types.h>	/* for stat, getpwuid */
+ #include <sys/stat.h>	/* for stat */
+ #include <unistd.h>	/* for exit, access, getpwuid, execve, getopt */
+-#ifdef HAVE_GETOPT_H
+-#include <getopt.h> /* for getopt */
+-#endif
+ #include <errno.h>	/* for debugging */
+ #include <pwd.h>	/* to get username for config parsing */
+ #include <time.h>	/* time */
+ #include <libgen.h>	/* basename */
+ #include <stdlib.h>	/* realloc */
+ #include <syslog.h>
+-#include "scponly.h"
++
+ #include "config.h"
++#include "scponly.h" /* includes getopt */
+ 
+ #ifdef HAVE_GLOB
+ #include <glob.h>	/* for glob() */
+@@ -26,6 +24,11 @@
+ #endif
+ #endif
+ 
++#ifdef RSYNC_COMPAT
++#define RSYNC_ARG_SERVER 0x01
++#define RSYNC_ARG_EXECUTE 0x02
++#endif
++
+ #define MAX(x,y)	( ( x > y ) ? x : y )
+ #define MIN(x,y)	( ( x < y ) ? x : y )
+ 
+@@ -164,6 +167,13 @@
+ 	int			ch;
+ 	int			ac=0;
+ 	int			longopt_index = 0;
++#ifdef RSYNC_COMPAT
++	/* 
++	 * bitwise flag: 0x01 = server, 0x02 = -e.
++	 * Thus 0x03 is allowed and 0x01 is allowed, but 0x02 is not allowed
++	 */
++	int			rsync_flags = 0; 
++#endif /* RSYNC_COMPAT */
+ 
+ 	while (cmdarg != NULL)
+ 	{
+@@ -207,7 +217,7 @@
+ 				 *	otherwise, try a glibc-style reset of the global getopt vars
+ 				 */
+ 				optind=0;
+-#endif
++#endif /* HAVE_OPTRESET */
+ 				/*
+ 				 *	tell getopt to only be strict if the 'opts' is well defined
+ 				 */
+@@ -216,28 +226,49 @@
+ 					
+ 					debug(LOG_DEBUG, "getopt processing returned '%c' (%s)", ch, logstamp());
+ 					
++#ifdef RSYNC_COMPAT
++					if (exact_match(cmdarg->name, PROG_RSYNC) && (ch == 's' || ch == 'e')) {
++						if (ch == 's')
++							rsync_flags |= RSYNC_ARG_SERVER;
++						else
++							/* -e */
++							rsync_flags |= RSYNC_ARG_EXECUTE;
++						debug(LOG_DEBUG, "rsync_flags are now set to: %0x", rsync_flags);
++					}
++					else
++#endif /* RSYNC_COMPAT */
++
+ 					/* if the character is found in badarg, then it's not a permitted option */
+ 					if (cmdarg->badarg != NULL && (strchr(cmdarg->badarg, ch) != NULL))
+ 					{
+ 						syslog(LOG_ERR, "option '%c' or a related long option is not permitted for use with %s (arg was %s) (%s))", 
+-							ch, cmdarg->name, optarg, logstamp());
++							ch, cmdarg->name, (optarg!=NULL ? optarg : "<NULL>"), logstamp());
+ 						return 1;
+ 					}
+ 					else if (cmdarg->strict && ch == '?')
+ 					{
+ 						syslog(LOG_ERR, "an unrecognized option was encountered while processing cmd %s (arg was %s) (%s))", 
+-							cmdarg->name, optarg, logstamp());
++							cmdarg->name, (optarg!=NULL ? optarg : "<NULL>"), logstamp());
+ 						return 1;
+ 					}
+ 				}
+-#elif
++#ifdef RSYNC_COMPAT
++				/* it's not safe if the execute flag was set and server was not set */
++				if ((rsync_flags & RSYNC_ARG_EXECUTE) != 0 && (rsync_flags & RSYNC_ARG_SERVER) == 0) {
++						syslog(LOG_ERR, "option 'e' is not allowed unless '--server' is also set with cmd %s (%s)", 
++							PROG_RSYNC, logstamp());
++						return 1;
++				}
++#endif /* RSYNC_COMPAT */
++
++#elif /* HAVE_GETOPT */
+ 				/*
+ 				 * make sure that processing doesn't continue if we can't validate a rsync check
+ 				 * and if the getopt flag is set.
+ 				 */
+ 				syslog(LOG_ERR, "a getopt() argument check could not be performed for %s, recompile scponly without support for %s or rebuild scponly with getopt", av[0], av[0]);
+ 				return 1;
+-#endif
++#endif /* HAVE_GETOPT */
+ 			}
+ 			else
+ 			/*
+diff -Naur scponly-4.8.orig/scponly.c scponly-4.8/scponly.c
+--- scponly-4.8.orig/scponly.c	2008-01-15 15:28:24.000000000 +0900
++++ scponly-4.8/scponly.c	2009-03-18 21:29:48.000000000 +0900
+@@ -91,16 +91,18 @@
+ 
+ #ifdef RSYNC_COMPAT
+ struct option rsync_longopts[] = {
++	/* options we need to know about that are safe */
++	{"server",			0,	0,		(int)'s'},
+ 	/* I use 'e' for val here because that's what's listed in cmd_arg_t->badarg  */
+-	{"rsh", 			1,	0,		(int)'e'},
++	{"rsh", 			1,	0,		(int)'r'},
+ 	/* the following are disabled because they use daemon mode */
+-	{"daemon",			0,	0,		(int)'e'},
+-	{"rsync-path",		1,	0,		(int)'e'},
+-	{"address",			1,	0,		(int)'e'},
+-	{"port",			1,	0,		(int)'e'},
+-	{"sockopts",		1,	0,		(int)'e'},
+-	{"config",			1,	0,		(int)'e'},
+-	{"no-detach",		0,	0,		(int)'e'},
++	{"daemon",			0,	0,		(int)'d'},
++	{"rsync-path",		1,	0,		(int)'d'},
++	{"address",			1,	0,		(int)'d'},
++	{"port",			1,	0,		(int)'d'},
++	{"sockopts",		1,	0,		(int)'d'},
++	{"config",			1,	0,		(int)'d'},
++	{"no-detach",		0,	0,		(int)'d'},
+ 	{ NULL,				0,	NULL,	0 },
+ 	};
+ #endif
+@@ -157,7 +159,7 @@
+ 	{ PROG_SCP, 		1, 				1,				"SoF",			"dfl:prtvBCc:i:P:q1246S:o:F:", empty_longopts },
+ #endif
+ #ifdef RSYNC_COMPAT
+-	{ PROG_RSYNC, 		1, 				0,				"e",			"e:",			rsync_longopts },
++	{ PROG_RSYNC, 		1, 				0,				"rde",			"e::",			rsync_longopts },
+ #endif	
+ #ifdef UNISON_COMPAT	
+ 	{ PROG_UNISON, 		0, 				0,				"-rshcmd",		NULL, 			empty_longopts },
+diff -Naur scponly-4.8.orig/scponly.h scponly-4.8/scponly.h
+--- scponly-4.8.orig/scponly.h	2008-01-15 15:26:13.000000000 +0900
++++ scponly-4.8/scponly.h	2009-03-18 21:29:48.000000000 +0900
+@@ -1,6 +1,9 @@
+ #include <stdio.h>	/* FILENAME_MAX */
+-#include <getopt.h> /* struct option */ 
+-#include "config.h"
++#include "config.h" /* include before most other files */
++
++#ifdef HAVE_GETOPT_H
++#include <getopt.h> /* for struct option for getopt */
++#endif
+ 
+ #define MAX_USERNAME 32
+ #define MAX_REQUEST (1024)		/* any request exceeding this is truncated */
diff --git a/net-misc/scponly/metadata.xml b/net-misc/scponly/metadata.xml
new file mode 100644
index 000000000000..cc5fae365f3a
--- /dev/null
+++ b/net-misc/scponly/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		scponly is an alternative 'shell' (of sorts) for system administrators
+		who would like to provide access to remote users to both read and write
+		local files without providing any remote execution priviledges.
+		Functionally, it is best described as a wrapper to the tried and true
+		ssh suite of applications.
+	</longdescription>
+	<use>
+		<flag name="rsync">Enables rsync compatibility with potential security risks</flag>
+		<flag name="unison">Enables Unison compatibility with potential security risks</flag>
+		<flag name="subversion">Enables Subversion compatibility with potential security risks</flag>
+		<flag name="winscp">Enables WinSCP 2.0 compatibility with potential security risks</flag>
+		<flag name="scp">Enables scp compatibility with potential security risks</flag>
+		<flag name="sftp">Enables SFTP compatibility</flag>
+		<flag name="gftp">Enables gFTP compatibility</flag>
+		<flag name="quota">Enables quota compatibility</flag>
+		<flag name="passwd">Enables passwd compatibility</flag>
+		<flag name="logging">Enables SFTP logging compatibility</flag>
+		<flag name="wildcards">Enables wildcard processing with potential security risks</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">scponly</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/scponly/scponly-4.8-r5.ebuild b/net-misc/scponly/scponly-4.8-r5.ebuild
new file mode 100644
index 000000000000..8a119ed2a587
--- /dev/null
+++ b/net-misc/scponly/scponly-4.8-r5.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib readme.gentoo toolchain-funcs user
+
+DESCRIPTION="A tiny pseudoshell which only permits scp and sftp"
+HOMEPAGE="http://www.sublimation.org/scponly/"
+SRC_URI="mirror://sourceforge/scponly/${P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="+sftp scp winscp gftp rsync unison subversion wildcards quota passwd logging"
+REQUIRED_USE="
+	|| ( sftp scp winscp rsync unison subversion )
+"
+
+RDEPEND="
+	sys-apps/sed
+	net-misc/openssh
+	quota? ( sys-fs/quota )
+	rsync? ( net-misc/rsync )
+	subversion? ( dev-vcs/subversion )
+"
+DEPEND="${RDEPEND}"
+
+myuser="scponly"
+myhome="/home/${myuser}"
+mysubdir="/pub"
+
+DOC_CONTENTS="
+	You might want to run\n
+	emerge --config =${CATEGORY}/${PF}\n
+	\nto setup the chroot. Otherwise you will have to setup chroot manually
+	Please read the docs in /usr/share/doc/${PF} for more informations, also
+	the SECURITY file.
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-rsync.patch"
+	# bug #269242
+	epatch "${FILESDIR}/${P}-gcc4.4.0.patch"
+}
+
+src_configure() {
+	CFLAGS="${CFLAGS} ${LDFLAGS}" econf \
+		--with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \
+		--disable-restrictive-names \
+		--enable-chrooted-binary \
+		--enable-chroot-checkdir \
+		$(use_enable winscp winscp-compat) \
+		$(use_enable gftp gftp-compat) \
+		$(use_enable scp scp-compat) \
+		$(use_enable sftp sftp) \
+		$(use_enable quota quota-compat) \
+		$(use_enable passwd passwd-compat) \
+		$(use_enable rsync rsync-compat) \
+		$(use_enable unison unison-compat) \
+		$(use_enable subversion svn-compat) \
+		$(use_enable subversion svnserv-compat) \
+		$(use_enable logging sftp-logging-compat) \
+		$(use_enable wildcards wildcards)
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHOR BUILDING-JAILS.TXT CHANGELOG CONTRIB README SECURITY TODO
+
+	# don't compress setup-script, so it is usable if necessary
+	insinto /usr/share/doc/${PF}/chroot
+	doins setup_chroot.sh config.h
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	# two slashes ('//') are used by scponlyc to determine the chroot point.
+	enewgroup "${myuser}"
+	enewuser "${myuser}" -1 /usr/sbin/scponlyc "${myhome}//" "${myuser}"
+
+	readme.gentoo_print_elog
+}
+
+pkg_config() {
+	# pkg_postinst is based on ${S}/setup_chroot.sh.
+
+	einfo "Collecting binaries and libraries..."
+
+	# Binaries launched in sftp compat mode
+	if has_version "=${CATEGORY}/${PF}[sftp]" ; then
+		BINARIES="/usr/$(get_libdir)/misc/sftp-server"
+	fi
+
+	# Binaries launched by vanilla- and WinSCP modes
+	if has_version "=${CATEGORY}/${PF}[scp]" || \
+		has_version "=${CATEGORY}/${PF}[winscp]" ; then
+		BINARIES="${BINARIES} /usr/bin/scp /bin/ls /bin/rm /bin/ln /bin/mv"
+		BINARIES="${BINARIES} /bin/chmod /bin/chown /bin/chgrp /bin/mkdir /bin/rmdir"
+	fi
+
+	# Binaries launched in WinSCP compatibility mode
+	if has_version "=${CATEGORY}/${PF}[winscp]" ; then
+		BINARIES="${BINARIES} /bin/pwd /bin/groups /usr/bin/id /bin/echo"
+	fi
+
+	# Rsync compatability mode
+	if has_version "=${CATEGORY}/${PF}[rsync]" ; then
+		BINARIES="${BINARIES} /usr/bin/rsync"
+	fi
+
+	# Unison compatability mode
+	if has_version "=${CATEGORY}/${PF}[unison]" ; then
+		BINARIES="${BINARIES} /usr/bin/unison"
+	fi
+
+	# subversion cli/svnserv compatibility
+	if has_version "=${CATEGORY}/${PF}[subversion]" ; then
+		BINARIES="${BINARIES} /usr/bin/svn /usr/bin/svnserve"
+	fi
+
+	# passwd compatibility
+	if has_version "=${CATEGORY}/${PF}[passwd]" ; then
+		BINARIES="${BINARIES} /bin/passwd"
+	fi
+
+	# quota compatibility
+	if has_version "=${CATEGORY}/${PF}[quota]" ; then
+		BINARIES="${BINARIES} /usr/bin/quota"
+	fi
+
+	# build lib dependencies
+	LIB_LIST=$(ldd ${BINARIES} | sed -n 's:.* => \(/[^ ]\+\).*:\1:p' | sort -u)
+
+	# search and add ld*.so
+	for LIB in /$(get_libdir)/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 \
+		/usr/libexec/ld.so /$(get_libdir)/ld-linux*.so.2 /usr/libexec/ld-elf.so.1; do
+		[ -f "${LIB}" ] && LIB_LIST="${LIB_LIST} ${LIB}"
+	done
+
+	# search and add libnss_*.so
+	for LIB in /$(get_libdir)/libnss_{compat,files}*.so.*; do
+		[ -f "${LIB}" ] && LIB_LIST="${LIB_LIST} ${LIB}"
+	done
+
+	# create base dirs
+	if [ ! -d "${myhome}" ]; then
+		einfo "Creating ${myhome}"
+		install -o0 -g0 -m0755 -d "${myhome}"
+	else
+		einfo "Setting owner for ${myhome}"
+		chown 0:0 "${myhome}"
+	fi
+
+	if [ ! -d "${myhome}/etc" ]; then
+		einfo "Creating ${myhome}/etc"
+		install -o0 -g0 -m0755 -d "${myhome}/etc"
+	fi
+
+	if [ ! -d "${myhome}/$(get_libdir)" ]; then
+		einfo "Creating ${myhome}/$(get_libdir)"
+		install -o0 -g0 -m0755 -d "${myhome}/$(get_libdir)"
+	fi
+
+	if [ ! -e "${myhome}/lib" ]; then
+		einfo "Creating ${myhome}/lib"
+		ln -snf $(get_libdir) "${myhome}/lib"
+	fi
+
+	if [ ! -d "${myhome}/usr/$(get_libdir)" ]; then
+		einfo "Creating ${myhome}/usr/$(get_libdir)"
+		install -o0 -g0 -m0755 -d "${myhome}/usr/$(get_libdir)"
+	fi
+
+	if [ ! -e "${myhome}/usr/lib" ]; then
+		einfo "Creating ${myhome}/usr/lib"
+		ln -snf $(get_libdir) "${myhome}/usr/lib"
+	fi
+
+	if [ ! -d "${myhome}${mysubdir}" ]; then
+		einfo "Creating ${myhome}${mysubdir} directory for uploading files"
+		install -o${myuser} -g${myuser} -m0755 -d "${myhome}${mysubdir}"
+	fi
+
+	# create /dev/null (Bug 135505)
+	if [ ! -e "${myhome}/dev/null" ]; then
+		install -o0 -g0 -m0755 -d "${myhome}/dev"
+		mknod -m0777 "${myhome}/dev/null" c 1 3
+	fi
+
+	# install binaries
+	for BIN in ${BINARIES}; do
+		einfo "Install ${BIN}"
+		install -o0 -g0 -m0755 -d "${myhome}$(dirname ${BIN})"
+		if [ "${BIN}" = "/bin/passwd" ]; then  # needs suid
+			install -p -o0 -g0 -m04711 "${BIN}" "${myhome}/${BIN}"
+		else
+			install -p -o0 -g0 -m0755 "${BIN}" "${myhome}/${BIN}"
+		fi
+	done
+
+	# install libs
+	for LIB in ${LIB_LIST}; do
+		einfo "Install ${LIB}"
+		install -o0 -g0 -m0755 -d "${myhome}$(dirname ${LIB})"
+		install -p -o0 -g0 -m0755 "${LIB}" "${myhome}/${LIB}"
+	done
+
+	# create ld.so.conf
+	einfo "Creating /etc/ld.so.conf"
+	for LIB in ${LIB_LIST}; do
+		dirname ${LIB}
+	done | sort -u | while read DIR; do
+		if ! grep 2>/dev/null -q "^${DIR}$" "${myhome}/etc/ld.so.conf"; then
+			echo "${DIR}" >> "${myhome}/etc/ld.so.conf"
+		fi
+	done
+	ldconfig -r "${myhome}"
+
+	# update shells
+	einfo "Updating /etc/shells"
+	grep 2>/dev/null -q "^/usr/bin/scponly$" /etc/shells \
+		|| echo "/usr/bin/scponly" >> /etc/shells
+
+	grep 2>/dev/null -q "^/usr/sbin/scponlyc$" /etc/shells \
+		|| echo "/usr/sbin/scponlyc" >> /etc/shells
+
+	# create /etc/passwd
+	if [ ! -e "${myhome}/etc/passwd" ]; then
+		(
+			echo "root:x:0:0:root:/:/bin/sh"
+			sed -n "s|^\(${myuser}:[^:]*:[^:]*:[^:]*:[^:]*:\).*|\1${mysubdir}:/bin/sh|p" /etc/passwd
+		) > "${myhome}/etc/passwd"
+	fi
+
+	# create /etc/group
+	if [ ! -e "${myhome}/etc/group" ]; then
+		(
+			echo "root:x:0:"
+			sed -n "s|^\(${myuser}:[^:]*:[^:]*:\).*|\1|p" /etc/group
+		) > "${myhome}/etc/group"
+	fi
+}
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
new file mode 100644
index 000000000000..ffd1f974bd32
--- /dev/null
+++ b/net-misc/seafile-client/Manifest
@@ -0,0 +1,6 @@
+AUX seafile-client-select-qt5.patch 807 SHA256 6cff52377ddbc806e655a2d460eb98954f4852fba982eed8525a4fedcfe7f5e3 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41 WHIRLPOOL 01c216c113a18ecbe3321aa672ac010b8af60188f30c9973df6fc5982e160479f93448f0f125ca32f05476e1a1e0dc82eff70ed23e43bc699d6a9453bb901c67
+DIST seafile-client-6.0.7.tar.gz 2192384 SHA256 3212acab89ec3cee1508dd37826303447b7a738232e455b44ffc1a29d3c48baf SHA512 4baa15d454a9c937c9ae944b2bcc6b549fc41a1558e40578a273497ccb120a9131580f2b5db047ce6d7e0503105bd0fa5312e823ab475241fb07f5ba0021224f WHIRLPOOL b5b4595038c237a01d3421411047b99dc3189708dfd2cb0de90fe7b113a791d946fc4c65434ff8dc9996684b38aeda11b2a776a81cd5b12b2d88d69cde372a4a
+DIST seafile-client-6.1.0.tar.gz 2246388 SHA256 6d1d9fdb238cdd8514f2aa22e81cbab7a4b178807e68883a7f8c29afd232369b SHA512 c6e3191afcaa833876c24690566be36ccc94e7a333c94f78df9201f23a3eed37397641e237e63b70cdc413ed6dc5683737d2eefa5c2c628b5e207bef1176b0d5 WHIRLPOOL 4e0ff1711cbe1447fd14734488cca65cdacce095efd92f9702ad6ea7f6ccd95af1525d179318029fc90dca54c478fa53c4f7b64854481f32620e5b20d90d611c
+EBUILD seafile-client-6.0.7.ebuild 1244 SHA256 a72ab48615f14f8f5b4864e95fcae2c8d19340e6208659d3c40b56ac8bdcd0db SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b WHIRLPOOL 7559925cf04bed9161d6a2f6ecad5bd79ad160e68121dc38cfb8a23f7cb776dc14d6048d940f487002f7577d0004c32e1eb6a1eed59df6d7f65d9cfb820f579a
+EBUILD seafile-client-6.1.0.ebuild 1244 SHA256 a72ab48615f14f8f5b4864e95fcae2c8d19340e6208659d3c40b56ac8bdcd0db SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b WHIRLPOOL 7559925cf04bed9161d6a2f6ecad5bd79ad160e68121dc38cfb8a23f7cb776dc14d6048d940f487002f7577d0004c32e1eb6a1eed59df6d7f65d9cfb820f579a
+MISC metadata.xml 515 SHA256 6ae2f3be1d08115d5cee6fcb9aa1eed60a7402e26c54d018d9fd355f19f85354 SHA512 80554cfef46d79142fa4a00b3f84ea3ba55ddad45d9b0bb08f76302581e9268f51e16e7ac20de15241fdf1d8765fc515c49a41a14bedea0dae3844e7f7f4ecb6 WHIRLPOOL 53231f43efc1b6bc5933877731f82a375378bc596f4b3250f3254c356815774fab63bbf3b09f984ca08a4e428ac4d2b8f0549f4d1e0f6a6ce4b36b8079d02d01
diff --git a/net-misc/seafile-client/files/seafile-client-select-qt5.patch b/net-misc/seafile-client/files/seafile-client-select-qt5.patch
new file mode 100644
index 000000000000..ed48dcf47573
--- /dev/null
+++ b/net-misc/seafile-client/files/seafile-client-select-qt5.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4261fba..24fbbda 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -158,11 +158,8 @@ SET(QT_VERSION_MAJOR 5)
+ # have to keep using QtWebKit on windows because QtWebEngine can't be
+ # compiled in msys2/mingw (QtWebEnigne is based on chrome, which has to be
+ # compiled with MSVC.)
+-FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe)
+-EXECUTE_PROCESS(COMMAND
+-    bash -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'"
+-    OUTPUT_VARIABLE DETECTED_QT_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
++FIND_PACKAGE(Qt5Core)
++SET(DETECTED_QT_VERSION ${Qt5Core_VERSION})
+ MESSAGE("qt5 version: ${DETECTED_QT_VERSION}")
+ IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)
+     ADD_DEFINITIONS(-DSEAFILE_USE_WEBKIT)
diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml
new file mode 100644
index 000000000000..8f3f704edc2e
--- /dev/null
+++ b/net-misc/seafile-client/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>moschlar@metalabs.de</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">haiwen/seafile-client</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/seafile-client/seafile-client-6.0.7.ebuild b/net-misc/seafile-client/seafile-client-6.0.7.ebuild
new file mode 100644
index 000000000000..69b7bcb82bb7
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-6.0.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+
+RDEPEND="net-libs/libsearpc
+	=net-libs/ccnet-${PV}
+	=net-misc/seafile-${PV}
+	>=dev-libs/libevent-2.0
+	>=dev-libs/jansson-2.0
+	dev-libs/openssl:0=
+	dev-db/sqlite:3
+
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtdbus:5
+	shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-qt/qttest:5 )"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-select-qt5.patch"
+	cmake-utils_src_prepare
+	if use shibboleth ; then
+		if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
+			sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/seafile-client/seafile-client-6.1.0.ebuild b/net-misc/seafile-client/seafile-client-6.1.0.ebuild
new file mode 100644
index 000000000000..69b7bcb82bb7
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-6.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+
+RDEPEND="net-libs/libsearpc
+	=net-libs/ccnet-${PV}
+	=net-misc/seafile-${PV}
+	>=dev-libs/libevent-2.0
+	>=dev-libs/jansson-2.0
+	dev-libs/openssl:0=
+	dev-db/sqlite:3
+
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtdbus:5
+	shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-qt/qttest:5 )"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-select-qt5.patch"
+	cmake-utils_src_prepare
+	if use shibboleth ; then
+		if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
+			sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
new file mode 100644
index 000000000000..93f28484b597
--- /dev/null
+++ b/net-misc/seafile/Manifest
@@ -0,0 +1,5 @@
+DIST seafile-6.0.7.tar.gz 823384 SHA256 e563eade01330bf679f3e6b9f0202b198170cdd8ec80642d9fb670b3a5cda793 SHA512 ec33fbb6b925d4be9b89140d75287115e09f570654946aff994eb50d2ca46e233005b8e0e917682822806d0b5fd70cb9b8a728bb0fd09d124adaadaf3efc849a WHIRLPOOL 8abb588994f06f4d167e1ca55a0e67c742ae7e089a96eb6a438a26fcc59e21b917444e0a8dcb4d099318af79f618a2af2d0a81d3459918ecb2f768b788a11b1f
+DIST seafile-6.1.0.tar.gz 823289 SHA256 06871c6b2ecf27c5c87329b5be03b5aba37cf7c6a4cc81867d3d8451c4ecfb0f SHA512 ccf2c66288093da7a00c24d019a1d765c6072485584d045b0d7acec4faee3448f52448113976eaf63950b1feda2c08d8ebda274f3178ca8ca6c643a822dde3fa WHIRLPOOL 4175bf1df72b83b6eb06e085c9191fe743a2a4310aea929da993c95b69eccab040f072fe4eed968e55783c5151601bbddfc8830815c95b855cfefa5185c3016b
+EBUILD seafile-6.0.7.ebuild 955 SHA256 d92b8e68496d92ab575ed6d7c74e9dcfae26b49d8d416e08658e5230690ff4ad SHA512 57e1abde70f6f9c75070d206c49975ee2433cb7318c266a5e5e42732deb29b47b3c3b9d0f2cc61da192820a397540220e3a538169fb48d869ab86b7f7c4321ba WHIRLPOOL c7f78ee6ba93a0db164abc51b480e868432b903736074e35c1788178de0938efcb15857dc4b4b6a0a67fdd4d70f73bb15c34db0f0612b535167c2855466c9595
+EBUILD seafile-6.1.0.ebuild 955 SHA256 d92b8e68496d92ab575ed6d7c74e9dcfae26b49d8d416e08658e5230690ff4ad SHA512 57e1abde70f6f9c75070d206c49975ee2433cb7318c266a5e5e42732deb29b47b3c3b9d0f2cc61da192820a397540220e3a538169fb48d869ab86b7f7c4321ba WHIRLPOOL c7f78ee6ba93a0db164abc51b480e868432b903736074e35c1788178de0938efcb15857dc4b4b6a0a67fdd4d70f73bb15c34db0f0612b535167c2855466c9595
+MISC metadata.xml 416 SHA256 27526eabf238e6384f6821ff8765372cb3b640ae85cd7e0ad2f9d360b0d75f71 SHA512 e4d42b41560e43e00c0892649631a8f9a2114c95a2dda910b30bb4784c110a46f7effd1af0f09fcefcc7cf9287d5da8dfc51b69dfefc3e7d328387a842a6b000 WHIRLPOOL a2e47736ce8ea2a668f2ea27016302a3c99474d978a4d2bdc95961ff600ad273b7881e050eb0997014913d05a86137b9ccdc9bdae0649e0c4ef3f750282c6ce9
diff --git a/net-misc/seafile/metadata.xml b/net-misc/seafile/metadata.xml
new file mode 100644
index 000000000000..c3dc18cdb7be
--- /dev/null
+++ b/net-misc/seafile/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>moschlar@metalabs.de</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">haiwen/seafile</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/seafile/seafile-6.0.7.ebuild b/net-misc/seafile/seafile-6.0.7.ebuild
new file mode 100644
index 000000000000..1317706f5e46
--- /dev/null
+++ b/net-misc/seafile/seafile-6.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libsearpc[${PYTHON_USEDEP}]
+	=net-libs/ccnet-${PV}[${PYTHON_USEDEP}]
+	>=dev-libs/glib-2.16.0:2
+	>=dev-libs/libevent-2.0
+	>=dev-libs/jansson-2.2.1
+	>=sys-libs/zlib-1.2.0
+	>=net-misc/curl-7.17
+	dev-libs/openssl:0=
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	default
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
diff --git a/net-misc/seafile/seafile-6.1.0.ebuild b/net-misc/seafile/seafile-6.1.0.ebuild
new file mode 100644
index 000000000000..1317706f5e46
--- /dev/null
+++ b/net-misc/seafile/seafile-6.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libsearpc[${PYTHON_USEDEP}]
+	=net-libs/ccnet-${PV}[${PYTHON_USEDEP}]
+	>=dev-libs/glib-2.16.0:2
+	>=dev-libs/libevent-2.0
+	>=dev-libs/jansson-2.2.1
+	>=sys-libs/zlib-1.2.0
+	>=net-misc/curl-7.17
+	dev-libs/openssl:0=
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	default
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
diff --git a/net-misc/secpanel/Manifest b/net-misc/secpanel/Manifest
new file mode 100644
index 000000000000..bb247c2134f1
--- /dev/null
+++ b/net-misc/secpanel/Manifest
@@ -0,0 +1,5 @@
+DIST secpanel-0.6.1.tgz 51417 SHA256 d70a0e7fe3f0d64b4fd6e9d9bd726999e72b367705e28a2980d94a5d45e1bbb7 SHA512 9cb654c1aa1fbb81c948b95194bc6198df0e3411e39bef09156d516c5ed2980ea364dc2f60e1549e6224e738a6bdeee26fa8e091aa3ba2d8e1f1fd2cc59c4ce1 WHIRLPOOL 5cb23761d43120888622b409eaaad638fb7aae4c32a4822db4ab5baac0e909aff18596c01a5ac6bea461717d58dd208cde4c53c7cff215c2b5ae9859f48e2d9d
+EBUILD secpanel-0.6.1-r1.ebuild 1233 SHA256 1d68e806e013aee5527cf6e033d2b0e4301f2f41a47498372e81388ceae98864 SHA512 c11245a0c0917efbf47105fbf40a696df70469b1f7bd26ebc7f7dc1cb653254a12c7c11b1d34577e8e4d7edc4df0f2fa8b0cd13c324fb063479736edcff67a76 WHIRLPOOL 8a0d3e9dd71b172961b9e7781fe94cd88657522dfea4a2ceaccf51706e82be582b691d99a9e91bbea51a4c5d7924ecb9ff67c1a7fa3226a3929a0a0a3762fdaa
+MISC ChangeLog 2179 SHA256 e567a7a01ca831037368d7c1aa286dbb898a47ab110f2fe00bb0e81a3208765d SHA512 a74cf1992c555aaa42f090446fee3054621c55fa60a8b24209ba59e3383cfb3f4c4b9237588ec372dd6bbe1b632ff5bbeeb78fc2d53b797eac62f53bcee989fb WHIRLPOOL 21337786260b1fb54c0d319013067a56b58e171907c0e9fd598cc4ac69487b1dc1ceeb20b385d672d4e90c3d75d7fb97551fa90fc4f5a591654120f96041efdc
+MISC ChangeLog-2015 2850 SHA256 2e6b688add58560fc2ae3894dbc12be8b93c8694dc9de80f1a718d068040f54f SHA512 db8ada60563ea3f72691de158cab45502a92df769ab584e96fc7e0fd5f86ee6e50d26a77d7783146a9907ff0c66612ccc974db7ca7ba999eecb5cfa21a4d72da WHIRLPOOL eb790218820b0b0d74688c175db126dac141c9b4fd17420d2214af5b99dabab3aa2db7439e35df3bfc856f980934898423842a136ea14d4148541521652abd6f
+MISC metadata.xml 499 SHA256 78811fb323779c91c7e799f880f1209d4a288d7255d04734d93180f21b3c134a SHA512 a1fdac19839b1b04a73dae93e202c7b17916f0fadcc07653182c2928b4abee4fcafa64ea9faca2237a5cfac4cc2522b2139012b835720a7b01650e01022b0eed WHIRLPOOL 2de94e1b6f4f25dec187e58f2f5115145ba6135fdbf8c012185334c69d6e67d130c36ff4cdb7180e10148ba4f06605d235434c687bad12f873d2e6f84bcad424
diff --git a/net-misc/secpanel/metadata.xml b/net-misc/secpanel/metadata.xml
new file mode 100644
index 000000000000..15e1a0cb3d07
--- /dev/null
+++ b/net-misc/secpanel/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription lang="en">
+		SecPanel serves as a graphical user interface for managing and running
+		SSH (Secure Shell) and SCP (Secure Copy) connections.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">secpanel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/secpanel/secpanel-0.6.1-r1.ebuild b/net-misc/secpanel/secpanel-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..e504942af286
--- /dev/null
+++ b/net-misc/secpanel/secpanel-0.6.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+DESCRIPTION="Graphical frontend for managing and running SSH and SCP connections"
+HOMEPAGE="http://themediahost.de/secpanel/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 sparc x86"
+IUSE="gif"
+
+DEPEND="!gif? ( virtual/imagemagick-tools )"
+
+RDEPEND="virtual/ssh dev-lang/tk"
+
+S=${WORKDIR}/usr/local
+
+src_prepare() {
+	# install arch indep stuff in /usr/share instead of /usr/lib*
+	sed -i -e '/set libdir/s:../lib:../share:' bin/secpanel || die
+
+	# fix the version
+	sed -i -e "/set spversion/s:0.6.0:${PV}:" bin/secpanel || die
+
+	# optionally remove gifs...
+	if ! use gif; then
+		einfo "Setting secpanel to use PPM images"
+		sed -i -e 's/\.gif/\.ppm/g' bin/secpanel || die
+
+		einfo "Converting all GIF images to PPM format..."
+		for i in $(find lib/secpanel/images -name "*.gif") ; do
+			einfo "convert ${i} => ${i//.gif/.ppm}"
+			convert "${i}" "ppm:${i//.gif/.ppm}" || die
+			rm -v "${i}" || die
+		done
+	fi
+}
+
+src_install() {
+	dobin bin/secpanel || die
+
+	insinto /usr/share/secpanel
+	doins -r lib/secpanel/{*.{tcl,config,profile,wait,txt,sh},images,spdistkey} || die
+}
diff --git a/net-misc/selfdhcp/Manifest b/net-misc/selfdhcp/Manifest
new file mode 100644
index 000000000000..65d32f392022
--- /dev/null
+++ b/net-misc/selfdhcp/Manifest
@@ -0,0 +1,6 @@
+AUX selfdhcp-0.2a-buffer-overflow.patch 576 SHA256 6c05dec7fb57efeea0cfe3fe7eb7605dd9914fa3dc23fb9065875e7e4eaa613d SHA512 c0e6315d316d4cfca150c31edc7bfa613b0089580bba5ae67c3023b501558b943b68cccb24e95aece9b6b2fe26b4c63bcce75d9e743fc19f5c90b2fade7004b4 WHIRLPOOL f2cda1ca26f5d5cb2da84b6637387f8e5200672e7008b7ca609fe845c7e88f9663e89364abb540ea7f8a409229e36d2a930b5dc6b90ec821678985973260d6ef
+DIST selfdhcp-0.2a.tar.bz2 162803 SHA256 b60d37b288eee05dcaf6b14b1bba184726ec2e3af6dddfdad78f0627878ec8b6 SHA512 3ffb8a6115502c201b37a6c4179f498d4847d469f5d271dd9408d7fe5714d1ebe10428c890d8ab943a6753f3fbc650730139a78b1f71c9972739ea4b886a53bf WHIRLPOOL 830e040d3fb7c0650ed1052cb768e243b7568489f312941fb28fb743f0fbac134b003e83c10358d88202e48deb4b8a318f3efa2442575c8951640491b1164bb6
+EBUILD selfdhcp-0.2a-r1.ebuild 651 SHA256 bd1c4b9d32273ce4bfb21ba3f3c741ff0ac05b39c6a6565f880981ebbf0c6b09 SHA512 f9c9fcc7b8718431248f796b8e3661fb7d23c0a4f0430616b7414d37b72969026693e113a08df537cd54747611c720ed0a9f2406c2aef6900ac1c0dd5b9b4c29 WHIRLPOOL 327918093febf6446bde925be1738f23b4a50e9c6a4f4eec3526af853d61ece897c0eecafca32eef6ca7863347d5adfd7247e13ee1e808f953e4f741a4591be8
+MISC ChangeLog 2575 SHA256 07af490c6e4a860081ee0945e624a19e973f2d32ddadc5c93bd08e94295b712a SHA512 03e5f6f0156111c11bdf93f53fa47b02ecda790cd79e4250e495bbb5d7892141bcd772b182bcd7114252c5bd0bbbd4ac49f21855127837eeea465d35f8045f77 WHIRLPOOL 26f82504ed14afcbb8e451860fb05d7dff96a8e9e6410adb0bdb129001861f4fe6ffeb28efca491dae57e73985beab3a43911e5eb6332b1233e384382243771b
+MISC ChangeLog-2015 1628 SHA256 083e84172498b710022369f12b5e5f8120e173b39dfde6371f0748956c0c398c SHA512 6ab0259dd209acef6cb3d37a51b39ec2b02a12abbdc1dedd8854fc87e37546c3e4ab8b891b7683c3f0f0655bbbba004adda535923bf334c74325ab12670244d0 WHIRLPOOL fc1ceb7d14ac59e7f62af03c8aec79d56f027333c1e4fd968a4e3d3c21accf32aab7f0ef69a6df89fc4970e827d2e70bcc5431e319d951262a4807ca63fa53aa
+MISC metadata.xml 245 SHA256 34af463513ad3d17391334fb4af8b46cc04a9d2c0dae71eecfab628d095c9c3c SHA512 7ce707fd04933e9ba4300c1dc0fa1af0f184cc6b736c470d23ade7e6f8993cd7e7b21dd0c6d0fa513e88c131d24bb008005e78ec2093d76823ab7a693cda2d50 WHIRLPOOL 5429c3e099757b4ad6457ee85627f7879b9e735f73e8183f8643f9d89b87c36cc537dca60c6cde2690d6cd68bb52d071de7fcdab8490c78ca6299356facf20e5
diff --git a/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch b/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch
new file mode 100644
index 000000000000..6f99f7dea895
--- /dev/null
+++ b/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch
@@ -0,0 +1,11 @@
+--- selfdhcp-0.2a.orig/src/selfdhcp_profiles.c	2004-08-02 18:10:36.000000000 -0400
++++ selfdhcp-0.2a/src/selfdhcp_profiles.c	2011-01-29 11:54:29.132199679 -0500
+@@ -345,7 +345,7 @@
+ 	{
+ 	  key = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1);
+ 	  err_msg (DBG_PROG, "xml element \"%s\"", (char *) key);
+-	  strncpy (netconf_buff.domainname, (char *) key, 49);
++	  strncpy (netconf_buff.domainname, (char *) key, sizeof(netconf_buff.domainname)-1);
+ 	  netconf_buff.what_is_set &= NETADDR;
+ 	  err_msg (DBG_INFO, "read domain name \"%s\"",
+ 		   netconf_buff.domainname);
diff --git a/net-misc/selfdhcp/metadata.xml b/net-misc/selfdhcp/metadata.xml
new file mode 100644
index 000000000000..845c399a6f4a
--- /dev/null
+++ b/net-misc/selfdhcp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">selfdhcp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/selfdhcp/selfdhcp-0.2a-r1.ebuild b/net-misc/selfdhcp/selfdhcp-0.2a-r1.ebuild
new file mode 100644
index 000000000000..537ef2f6d90f
--- /dev/null
+++ b/net-misc/selfdhcp/selfdhcp-0.2a-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="a small stealth network autoconfigure software"
+HOMEPAGE="http://selfdhcp.sourceforge.net"
+SRC_URI="mirror://sourceforge/selfdhcp/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/popt
+	dev-libs/libxml2
+	>=net-libs/libnet-1.0.2
+	net-libs/libpcap"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-buffer-overflow.patch"
+}
+
+src_configure() {
+	econf --sysconfdir=/etc --sbindir=/sbin
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/net-misc/sendfile/Manifest b/net-misc/sendfile/Manifest
new file mode 100644
index 000000000000..c8709d62fae4
--- /dev/null
+++ b/net-misc/sendfile/Manifest
@@ -0,0 +1,6 @@
+AUX sendfiled 311 SHA256 7efa6cbce68ecaccdd601181e41cd86a973fdc8cd13c72987043513f6fcf2ee2 SHA512 4e09fd7ad4d527f23dba533824c053c433807b117f776d3aac91ef786e95d195bda152a804c4efc95ad0b2b18fb6b4970dcd701a90072870cbdd89e203326a09 WHIRLPOOL f6badb8430d6d826018de1d7b05d2f80efdb964915630edbc8f63503a0c0e78209621956128cace72df95f08e040e43709da5cada696b5a5f57613a32e6a435d
+DIST sendfile-2.1b.tar.gz 342757 SHA256 f16aefa718a6201933d1f2cf6947b91db838cfd4e7fce885fa9f0d4ac997b9de SHA512 c5dbe6286af13e53a5c8de92eb177cfe07b449cf7e0b3d7c911518ae9823536673e338e3c64297e106845ce4aaeaec113af75ce28e8b73b31b4e4d898f905381 WHIRLPOOL 904acf226d5af7b897e65c53bc7875f67d98a7597f4aae648fafc6de2f02a7ab165b65a7528f3760d64070c58a5a0809d06832cd13fce01a35a5511934bc8ae5
+EBUILD sendfile-2.1b-r1.ebuild 1452 SHA256 bc4c3651091743a372d2f941f27d13ceafc11c29e125a7f6409f52b94757757b SHA512 dc44289b56d9a6f6175d8a812d21ab1568d561375e3c93e87ad0195f2c7f07d56bc84d9ed292430af3adad12952a3f62aebba89a1fa6c0beb33a743647b07d8f WHIRLPOOL d2bafc1821a483efac65501dde41fd39d8c76d5dd7b984f96c3e5b5305ad0b19d79e0c0d720e883e8f9991f4720758f4d771fb5705bcb185a34f736d17ffc148
+MISC ChangeLog 2547 SHA256 2cde8335d4e4e131ddf0c91674ba2e5129f28d8e992c5f4fccc8db8af9b0f382 SHA512 98a72d89f7cd35a29cb01a044bf3b29c92bb615ecb9959495bf5991cf026c71435662ba949113ba10338f75f9571d81abdad6b98845da1554978c2eba0dc66ab WHIRLPOOL ea18fd2c9e1658e7877246aee7093dbcf56ecf0ff4b34f57b8b40b364b5f3e5afdcd107ab8f1b0b1b67272da4d19a78e9dcea4fa3ef1ce27879477103ea3a363
+MISC ChangeLog-2015 1751 SHA256 f1902eaf3772c18a7d05ce230711ed5301b3e6ed00e14d7a5384524367390be2 SHA512 de650c57136bef64e17c48591f4caf2ba326a6de72f5a132e8c2dd1b01b245747125a88d060066c44a27e9d8f200ee34f16e6d742d6841bf00579a5cac84e8f8 WHIRLPOOL ab5cff66221ca95a3b73843ce09d54738c06f94435c4ea207c7fd97e0ce3dd0e48f80551e722d94674d24887fd326c5e8921c2807dea8335dcb0c0723cdb42f9
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/sendfile/files/sendfiled b/net-misc/sendfile/files/sendfiled
new file mode 100644
index 000000000000..335887c4b9c8
--- /dev/null
+++ b/net-misc/sendfile/files/sendfiled
@@ -0,0 +1,11 @@
+service saft
+{
+	socket_type     = stream
+	protocol    	= tcp
+	wait            = no
+	user            = root
+	server          = /usr/sbin/sendfiled
+    #the following is required, even for local host communications.
+    #only_from      = 127.0.0.1 
+	disable         = yes #change this to actually run sendfiled
+}
diff --git a/net-misc/sendfile/metadata.xml b/net-misc/sendfile/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/sendfile/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/sendfile/sendfile-2.1b-r1.ebuild b/net-misc/sendfile/sendfile-2.1b-r1.ebuild
new file mode 100644
index 000000000000..65d8fda6c0d6
--- /dev/null
+++ b/net-misc/sendfile/sendfile-2.1b-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="SAFT implementation for asynchronous sending of files in the Internet"
+HOMEPAGE="http://fex.rus.uni-stuttgart.de/saft/sendfile.html"
+SRC_URI="http://fex.rus.uni-stuttgart.de/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="virtual/inetd"
+
+src_compile() {
+	./makeconfig \
+		"CFLAGS=\"${CFLAGS}\" \
+		CC=$(tc-getCC) \
+		LDFLAGS=\"${LDFLAGS}\" \
+		BINDIR=/usr/bin \
+		MANDIR=/usr/share/man \
+		CONFIG=/etc/sendfile \
+		SERVERDIR=/usr/sbin" || die "./makeconfig failed"
+
+	make all || die "make all failed"
+}
+
+src_install() {
+	into /usr
+	dosbin src/sendfiled
+	dobin etc/check_sendfile src/sendfile src/sendmsg src/receive src/fetchfile
+	dobin src/utf7encode src/wlock etc/sfconf etc/sfdconf
+	dosym /usr/bin/utf7encode /usr/bin/utf7decode
+
+	dodir /etc/sendfile
+	dodir /var/spool/sendfile
+	dodir /var/spool/sendfile/LOG
+	dodir /var/spool/sendfile/OUTGOING
+	fperms 0700 /var/spool/sendfile/LOG
+	fperms 1777 /var/spool/sendfile/OUTGOING
+
+	insinto /etc/sendfile
+	doins etc/sendfile.deny etc/sendfile.cf
+
+	insinto /etc/xinetd.d
+	doins "${FILESDIR}/sendfiled" || die
+
+	doman doc/sendmsg.1 doc/sendfile.1 doc/receive.1 doc/fetchfile.1
+
+	dodoc doc/AUTHORS doc/ChangeLog doc/README* doc/THANKS
+}
+
+pkg_postinst() {
+	einfo "To start the sendfile daemon you have to start xinetd"
+}
diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest
new file mode 100644
index 000000000000..3a9f168ce50f
--- /dev/null
+++ b/net-misc/ser2net/Manifest
@@ -0,0 +1,12 @@
+AUX ser2net-2.7-b230400.diff 754 SHA256 14fe4d7817f3c202317a401f69141dff3f4d1c4eb13a8b357bff685b94b17b38 SHA512 47f369b23c6f75421ed143abb75a0d9b46e7ca1ee2c59f17e6d75f98bb61d9fdf4e0792367e732ad60fb0f6804af6f316b291d7743d7807df8192bbdef3363ca WHIRLPOOL 1269a8aaf4fd521293689023ce0c3ba3fc0f497e06110d097a3d64225c73226e97c71be83f6aa95aa84247c65242efbd0034f18e1e3b4e28623c6543ed8287ea
+AUX ser2net.confd 879 SHA256 3058368970e77b8b7fcf6fca9f3530b683d9e9c27c431531f8566dde01dab849 SHA512 15054f7aa604f93bd5a54c2bb96c9a3168905be5ace50bcd2ebeeaf9dc9ae19426388e6118e9e4850125349090ee29542c24487e64c349593a76366be4a5e501 WHIRLPOOL addb450a10b026ef4003ee05a7b1c4dba7c294750d6daefd885d537636d31352d529f73df6cac7693ba940b41fc6294bad0f92cf30bf8265450494c4ed2bbcd4
+AUX ser2net.initd 1528 SHA256 c3154e77c1ff875891e5ed97d1b164661ed44f5a3d297f6f70d5bbcba9a88270 SHA512 d98032d8de463d2023f087106ff68367077dcd4680c673e41e50e42c91578925c72f741508e2b36b0711478e9bc12c61efef76d57c578bc726950c9d6fd2f5c3 WHIRLPOOL 138228edd22ae6cb5bef10373640ff8cf287e06db3fb3d5f847b80ec680b78525b962a8b6f06cd8b38024140893c5865023e285f10e808c0e7d2b39fa92fb354
+DIST ser2net-2.10.0.tar.gz 364322 SHA256 98f6193225338e25f35302fef5e1f16688693ed43e7b3c3e9e09187eb54547ac SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10 WHIRLPOOL 34ed707308c71d5969e653e01f61e047f17669d34e15807675af11f4356cb77fe18d4f4d9041a449c3c2686c2d1dde0f928ea73e3936967a2db5d91838b41ecc
+DIST ser2net-2.7.tar.gz 355064 SHA256 620265d5d4a59714dbb8645d1698a34135077c735e018ef040d57e7d3a621088 SHA512 39ee99031fad45ea8eeeb9e8bec343e8d6bd58c818f56ec01a05c50ef6d8ed845c6521a6d4a306671ed26959bd2df5c0b29a6b4399103815923cf958c1891c16 WHIRLPOOL 1bb875c7603aaf6ef811dfe6404797a1e9ec152d7b1fa70c26c84e341ad7ade11674bf6e0d0edd978a43189c2f0a5757a7809b4a33d0bd0fd1d5e143452ecac5
+DIST ser2net-2.9.1.tar.gz 357820 SHA256 fdee1e69903cf409bdc6f32403a566cbc6006aa9e2a4d6f8f12b90dfd5ca0d0e SHA512 9fd0efc853993b70c0c632a7059df7a04c832f85491194c49dd8b384e1bb1a576ed9cfe28088cc181a2f7084c88dc6ef6dabbc4ead5ad9339a7becebaa6fb8e7 WHIRLPOOL 0601f3d7d15abbbe25dd3970d3e78f289efd399ba8723b53589e956ed1d8a3a7c9dec9197b26527331e7ad5ffbb8042852d1d4fb36fb500d93ccf736cd25acbf
+EBUILD ser2net-2.10.0.ebuild 628 SHA256 dc5a9d4b10eb68069b11bd452873c78e90802ffd81790db7e904f5fae3de4fbd SHA512 5e789763072adba021dab5e10b5be926b8f6108097eef98e3cb1912b4199d8a1f30bca2309b792f676849fa7da00f278f53106f6cb4b166ee73cefddc1f022c5 WHIRLPOOL efa7ab68621eb82ed37001750d1c7558ba039495a97fd5bd3f3aaf1082f1c51c28b7b4d1a4c544cb8286ea6b4dca8924029cc93040d91eb47a5a7003bc8f41de
+EBUILD ser2net-2.7-r1.ebuild 847 SHA256 be09f42b882ad8457421dbc5e52ad1f3306d227efa8e11131bf39ba3b32b7fbb SHA512 f2acf54587c7791b9516db5488eaef6f5fba022a5d43ab6451dae3fda14a190dde790eba2ebce0d1bac488eeb4a90e0496663b243f19d80b5422a3f9583a7345 WHIRLPOOL a8ac79b6259668477d5bce30e5d9c74c7bd752d3e3cae745b5768958c11e7522e010ce4c82410097fe5eb05b687af88f03f2d4825c5212fc9694e1acf2360337
+EBUILD ser2net-2.9.1.ebuild 626 SHA256 d97a441ecff9c4c2423cb024b1f43e74bf92f673223f3fd168e174a9159236a1 SHA512 5c401b1795a2b2a46af9af947891702d1074a8edc6f3e252874531b8325d1a0474871e5f35a2c3684a4d311c06cda74fa57ffc66594fcd7c7d010e52e8ae90c3 WHIRLPOOL 6cbfdede269beb7fccf3a31271c310682b785efa08cdffa6308f7946fe0785c519dabfa1dcdadd7dd3007c6a95b0644079f6edc7ddfddc66ed6c2fbc1dbeb8b4
+MISC ChangeLog 2906 SHA256 0d5557ad7fa334d9839c86df9f22286452dd25e9678ea9fcf7b922f058c6d650 SHA512 92eae2561f0cb8ed5dfac0c500d1bced5b3c4f64ce3b834d683e1c50ebf80eb809187016fb1c76f1ccdba64089670e08e0a144dd8653f09cebaa02c977cfb009 WHIRLPOOL 24403c0c6bb8ecfd4db7cfa2cacddca634d391376ac66f0768b6330c64fbd0db6a337b6c13ab144384c0c0ca829f1c21b5e4e8bd0d5acef72d1be90025d82cbd
+MISC ChangeLog-2015 5280 SHA256 b327b46f50639920cf1cd7c65a988ca4504d6c149765716fa2242416c0ddde20 SHA512 acd2e9673d6e9c9e01a9d901c13249db7342d2df51e9ab64b15cbeee622f1a2a2479c8dce0d249d2f1f755a3d00285b21505811adfe64d879a5a6a96ad60f196 WHIRLPOOL 35f7da17473839ed2e7332aebc49806b71a1571f704b1c1b8ef9b060668af6eedf541d4ac7dfb9085e3689e55738ebd57cb8e56b794e7e6d7b609098fe6820c6
+MISC metadata.xml 439 SHA256 2c28b96b96df9063d4c4d0298de4347d32be0bdf344457ca296641fef465f1fc SHA512 0d8110b7553fc097bc3a6a33bf3f8cfff7046ded71379ae1aaf6f9e49b3b459e2121969c68a245d95e4f163a63adf0630844f8626a901b8b7bff41729c2c76f0 WHIRLPOOL b627c03dfe94139697dacdf89303090fa4d7575764d376e665d45f46ab4a320ef6b3d8e5f436e194e4f8863df8a91f735302ba73096a5342a301297c5e383459
diff --git a/net-misc/ser2net/files/ser2net-2.7-b230400.diff b/net-misc/ser2net/files/ser2net-2.7-b230400.diff
new file mode 100644
index 000000000000..5e567c118eac
--- /dev/null
+++ b/net-misc/ser2net/files/ser2net-2.7-b230400.diff
@@ -0,0 +1,20 @@
+--- ser2net-2.7.orig/devcfg.c	2009-10-23 14:23:25.000000000 +0200
++++ ser2net-2.7/devcfg.c	2012-07-17 21:03:49.708603108 +0200
+@@ -113,6 +113,9 @@
+ 	} else if (strcmp(pos, "115200") == 0) {
+ 	    cfsetospeed(termctl, B115200);
+ 	    cfsetispeed(termctl, B115200);
++	} else if (strcmp(pos, "230400") == 0) {
++	    cfsetospeed(termctl, B230400);
++	    cfsetispeed(termctl, B230400);
+ 	} else if (strcmp(pos, "1STOPBIT") == 0) {
+ 	    termctl->c_cflag &= ~(CSTOPB);
+ 	} else if (strcmp(pos, "2STOPBITS") == 0) {
+@@ -190,6 +193,7 @@
+     case B38400: str = "38400"; break;
+     case B57600: str = "57600"; break;
+     case B115200: str = "115200"; break;
++    case B230400: str = "230400"; break;
+     default: str = "unknown speed";
+     }
+     return str;
diff --git a/net-misc/ser2net/files/ser2net.confd b/net-misc/ser2net/files/ser2net.confd
new file mode 100644
index 000000000000..c66685159348
--- /dev/null
+++ b/net-misc/ser2net/files/ser2net.confd
@@ -0,0 +1,27 @@
+# Config file for /etc/init.d/ser2net
+
+# Set the configuration file to one other than the default of /etc/ser2net.conf
+#
+#CONFIG_FILE="/etc/ser2net.conf"
+
+# Enables the control port and sets the TCP port to listen to for the control port.
+# A port number may be of the form [host,]port, such as 127.0.0.1,2000 or localhost,2000.
+# If this is specified, it will only bind to the IP address specified for the port.
+# Otherwise, it will bind to all the addresses on the machine.
+#
+#CONTROL_PORT=""
+
+# Cisco IOS uses a different mechanism for specifying the baud rates than the mechanism
+# described in RFC2217. This option sets the IOS version of setting the baud rates.
+# The default is RFC2217s.
+#
+#CISCO_IOS="yes"
+
+# Enable or disable UUCP locking (default=yes)
+#
+#UUCP_LOCKS="no"
+
+# see the ser2net(8) manual page for additional options you can configure here
+#
+#EXTRA_OPTS=""
+
diff --git a/net-misc/ser2net/files/ser2net.initd b/net-misc/ser2net/files/ser2net.initd
new file mode 100644
index 000000000000..3ce489bd1ff1
--- /dev/null
+++ b/net-misc/ser2net/files/ser2net.initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Serial to network proxy (${RC_SVCNAME#*.})"
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command="/usr/sbin/ser2net"
+name="${RC_SVCNAME}"
+
+extra_started_commands="reload"
+description_reload="Reread configuration file and make the appropriate changes"
+start_stop_daemon_args="--quiet --exec ${command} --name ${name} --pidfile ${pidfile}"
+
+depend() {
+	use logger
+	need net
+}
+
+config_check() {
+	command_args="${EXTRA_OPTS}"
+	CONFIG_FILE_DEFAULT="/etc/ser2net.conf"
+
+	yesno "${CISCO_IOS:-no}" && command_args="${SER2NET_OPTS} -b"
+	yesno "${UUCP_LOCKS:-yes}" || command_args="${command_args} -u"
+	[ -z "${CONFIG_FILE}" ] && CONFIG_FILE="${CONFIG_FILE_DEFAULT}"
+	[ -n "${CONTROL_PORT}" ] && command_args="${command_args} -p ${CONTROL_PORT}"
+	[ "${CONFIG_FILE}" != "${CONFIG_FILE_DEFAULT}" ] && command_args="${command_args} -c ${CONFIG_FILE}"
+
+	if [ ! -f "${CONFIG_FILE}" ]; then
+		eerror "Please create ${CONFIG_FILE}"
+		eerror "Sample conf: ${CONFIG_FILE_DEFAULT}.dist"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	config_check || return ${?}
+	ebegin "Starting ${description}"
+	start-stop-daemon --start ${start_stop_daemon_args} -- ${command_args} -P "${pidfile}"
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping ${description}"
+	start-stop-daemon --stop ${start_stop_daemon_args}
+	eend ${?}
+}
+
+reload() {
+	ebegin "Reloading ${description}"
+	start-stop-daemon --signal HUP ${start_stop_daemon_args}
+	eend ${?}
+}
diff --git a/net-misc/ser2net/metadata.xml b/net-misc/ser2net/metadata.xml
new file mode 100644
index 000000000000..730186acfd0b
--- /dev/null
+++ b/net-misc/ser2net/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>brendan@horan.hk</email>
+		<name>Brendan Horan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ser2net</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/ser2net/ser2net-2.10.0.ebuild b/net-misc/ser2net/ser2net-2.10.0.ebuild
new file mode 100644
index 000000000000..dedcff7d474b
--- /dev/null
+++ b/net-misc/ser2net/ser2net-2.10.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Serial To Network Proxy"
+SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/ser2net"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}"
+
+IUSE="tcpd"
+
+src_configure() {
+	econf $(use_with tcpd tcp-wrappers) --with-uucp-locking
+}
+
+src_install () {
+	default
+
+	insinto /etc
+	newins ${PN}.conf ${PN}.conf.dist
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
diff --git a/net-misc/ser2net/ser2net-2.7-r1.ebuild b/net-misc/ser2net/ser2net-2.7-r1.ebuild
new file mode 100644
index 000000000000..06e6708100e1
--- /dev/null
+++ b/net-misc/ser2net/ser2net-2.7-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit base autotools
+
+DESCRIPTION="Serial To Network Proxy"
+SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/ser2net"
+
+KEYWORDS="~amd64 ppc x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}"
+
+IUSE="tcpd"
+
+PATCHES=( "${FILESDIR}/${P}-b230400.diff" )
+DOCS=( "AUTHORS" "NEWS" "README" "ChangeLog" )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myopts="$(use_with tcpd tcp-wrappers) --with-uucp-locking"
+	econf ${myopts} || die "econf failed"
+}
+
+src_install () {
+	base_src_install
+	insinto /etc
+	newins ${PN}.conf ${PN}.conf.dist
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
diff --git a/net-misc/ser2net/ser2net-2.9.1.ebuild b/net-misc/ser2net/ser2net-2.9.1.ebuild
new file mode 100644
index 000000000000..315fc015e035
--- /dev/null
+++ b/net-misc/ser2net/ser2net-2.9.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Serial To Network Proxy"
+SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/ser2net"
+
+KEYWORDS="~amd64 ppc x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}"
+
+IUSE="tcpd"
+
+src_configure() {
+	econf $(use_with tcpd tcp-wrappers) --with-uucp-locking
+}
+
+src_install () {
+	default
+
+	insinto /etc
+	newins ${PN}.conf ${PN}.conf.dist
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
diff --git a/net-misc/sgopherd/Manifest b/net-misc/sgopherd/Manifest
new file mode 100644
index 000000000000..74213e9d2da1
--- /dev/null
+++ b/net-misc/sgopherd/Manifest
@@ -0,0 +1,5 @@
+DIST sgopherd-17.09.tar.gz 8855 SHA256 025fdced4e9a0d11e549aa579f9586e6a973c10eec528ffd949f633b087192cb SHA512 7f3ef37d5ec08d21e7945f0327ea50697237461f717a2ce3c5a0fe9c077effe26710013725a59a184564e028f249f7b53087752410600da0f8feaf9cd1b9c7dc WHIRLPOOL 4765eda55013499cdda69ce8b3cdca36eee06f70e4701c58660dcb334a6c2baea20fac55f2684807bac3ecd5150039d45c99fb1b4dffec85651b2883b27f75b2
+EBUILD sgopherd-17.09.ebuild 881 SHA256 99549e7f73077b2120ae90b49be6d1ad4945051f9c85f74bb3b3b896b03a2c34 SHA512 5097bae8034d6cb3eb680dc42956880dcf38dad2afc460ce5281dcc54999e6fa70b3e4a1cb9f83bac377be19f4e11933d6f3e986bee98f0edb7e11d38a35aa1c WHIRLPOOL 583195facd860175faa407775d56f85f3277cabdc8237d5bd47f74aff260a55e34aa450c9fd9a6b32a2481843350cbfe85ce4e246aebccaa1b89b840b95fd5f0
+MISC ChangeLog 2179 SHA256 724c5f25feed6f11a62784928819b582bf09c8c6dfe055f7ab7006037eabc6e3 SHA512 6b5a2af703f5c235dc2f9184f14511e71a241458d99588040ae25ef8815b694bd2ade1a5136aaf3476a61834cc1a1556121e5383c974de3b8306e07500a28662 WHIRLPOOL c2c62f0c8fce99162b9e990241804eabfc117ec850dac874b16b55f802939db6e43d08b7a8d2fb7b40acd9d848e7d37307172488bf632490b260f85000f09cb9
+MISC ChangeLog-2015 349 SHA256 47c0d8d125090164a0c5254266cbd573189bae4f4cdbf0ee407de9ac687ba333 SHA512 af1780b813f9e0cfbfe3af75a3ee56919268a725fc1fe91a7bea7d6429924c878cd6078e8d75b784cb63581af9693204551ca55ec5f713fc99bda66fe3b342d5 WHIRLPOOL bba64efb79121a8baf31f8534d8441baa1b1f895f667d291519f8e0c48dd9262eba1ec22a0e53f445ece9759151b13baab765a394d9583bb4180d73c93e93b90
+MISC metadata.xml 325 SHA256 78e253c5dc29b255d262e89cc9453edde12a1ab838b2ffa9b2991c8fc7b1fddd SHA512 b0da1cc0212383ff00849f6c9b3cf1e96713d1db19e21711cb8147b43ac8dc696fbfb5ff4703f8b25f73f051c25d3f05dd3e59bf229528cc0a6652b57c2b19ef WHIRLPOOL ca948ba1b2745943035eff6e0acbf80e544f4402b82a0c9bd7c8150dbdbbbb4a116befa7e3aec1f8c9921ac8844e4a5d25310b62c29e601e1ee2be6950897698
diff --git a/net-misc/sgopherd/metadata.xml b/net-misc/sgopherd/metadata.xml
new file mode 100644
index 000000000000..aa3406196cb1
--- /dev/null
+++ b/net-misc/sgopherd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vain/sgopherd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/sgopherd/sgopherd-17.09.ebuild b/net-misc/sgopherd/sgopherd-17.09.ebuild
new file mode 100644
index 000000000000..742b26b78b00
--- /dev/null
+++ b/net-misc/sgopherd/sgopherd-17.09.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Small Gopher Server written in GNU Bash"
+HOMEPAGE="https://github.com/vain/sgopherd"
+SRC_URI="https://github.com/vain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	sys-apps/sed
+	sys-apps/xinetd"
+
+src_prepare() {
+	# Set default user to run sgopherd
+	sed -i -e '/user/s/http/nobody/' xinetd/xinetd-example.conf || die 'sed failed'
+
+	eapply_user
+}
+
+src_install() {
+	dodoc README
+	doman man8/"${PN}".8
+	dobin "${PN}"
+	insinto /etc/xinetd.d
+	newins xinetd/xinetd-example.conf "${PN}"
+	# TODO: add installation of systemd-related files
+}
+
+pkg_postinst() {
+	elog "${PN} can be launched through xinetd"
+	elog "Configuration options are in /etc/xinetd.d/${PN}"
+}
diff --git a/net-misc/shigofumi/Manifest b/net-misc/shigofumi/Manifest
new file mode 100644
index 000000000000..95bcc9ff7095
--- /dev/null
+++ b/net-misc/shigofumi/Manifest
@@ -0,0 +1,6 @@
+DIST shigofumi-0.3.tar.bz2 312184 SHA256 e6d8e4bc68ef512a73238a49342d00e44ab72649b436d5658d4e1fa0237f70ec SHA512 ef7b2894cfa217b713865c4fe24cc985b4ff963df4a5005bda06f03b3c7f358b318e68a136328787fe2dfbb8b1623fe2b2ceb9fbbd20be7f243fa79ace1b0210 WHIRLPOOL 6a64c14035deba56fba30494ae22778ec4131db4c07ec8c206137bd1d25b0691a6b6aca325d875a1d22869e855fe2cbbc564a370d235c73d3c929061cfd908d3
+EBUILD shigofumi-0.3.ebuild 994 SHA256 e7d3cb625c5564af3ffe4727a352ca01cbcb9f83206bff358dd9df827a6bb545 SHA512 e93f379872fb9cfc57ce44c2fb246fc82cad662e92620c01966a2898a320821a506430f7990423929af54fe55f01d693c648d907a2ff22bfba152846e1636ab8 WHIRLPOOL bec2c80775337a8cbf97c58146772ad9241bdf465b14f78adecb83a5ca646db5781a11db352ce3232ade3ef9799e6472d9ebc31a0aba018e043f068f71927c2d
+EBUILD shigofumi-9999.ebuild 994 SHA256 e7d3cb625c5564af3ffe4727a352ca01cbcb9f83206bff358dd9df827a6bb545 SHA512 e93f379872fb9cfc57ce44c2fb246fc82cad662e92620c01966a2898a320821a506430f7990423929af54fe55f01d693c648d907a2ff22bfba152846e1636ab8 WHIRLPOOL bec2c80775337a8cbf97c58146772ad9241bdf465b14f78adecb83a5ca646db5781a11db352ce3232ade3ef9799e6472d9ebc31a0aba018e043f068f71927c2d
+MISC ChangeLog 2578 SHA256 2a4aac5046392de39ac77c602a1f6c51399eb761283e0cbd8b6c48099817ed72 SHA512 49d28982160b55f2e60d15e57635bb227e2b94477c8ab5c57f6215782b1bb34da7916b454701d593746f14f79937c1ba1cca589bd8ee88cae6e5302111dc5b2b WHIRLPOOL 5e962423c9d3a460ea51aec3212abc93ec7d026be0ddf34c5ec470440eeb1c15dad18f404a784fbd67b625c5950a6abf0195901357e2a84209ed7ba74dcbf7c6
+MISC ChangeLog-2015 1711 SHA256 d75f3d4c82dd1db9e20abdee64cd08ebf56628984f21897eff8d024a419f9eb9 SHA512 68cbd3795456395d86f36052feb00e3395fb965dd3306e0216040c41078ea583503c1dba2c6e9a51729ca9e1e1e5a295d1205139c8a9aaf2f9763c4a844fee49 WHIRLPOOL 5718dfd200a2623ea167270826546ea17238f767d97da4047a54fedb0488dcdc0b340ef1c725fd4ef7aec9396ff7ae894a6db726976b3efd5d853130c1bf24c0
+MISC metadata.xml 350 SHA256 1571576c5d681dfea988fa43324fe9117c2fd914ecdc758960ca4f1e6ed2f5cf SHA512 6e0cfef97580b12bf5fa6ccf822b9983fd0ec4170f4b25a011a9a17e7398bdeb1aa9726351dc4fd0bb0d3f981a76aa644d316ab5c01d302639d6ba144394b59c WHIRLPOOL 36ffc3b81d20bf3bb1b9abdd97c10d5bdc9673eb2ae41a019fda81b95ee0fe12fca4aee7b9e9d5ae1a850ca5dc441877ae7cbfcf10bf78689ed887795e4c87ad
diff --git a/net-misc/shigofumi/metadata.xml b/net-misc/shigofumi/metadata.xml
new file mode 100644
index 000000000000..bc53c55a8a93
--- /dev/null
+++ b/net-misc/shigofumi/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+	This is command line oriented client for ISDS (Informační systém datových
+	schránek / Data Box Information System) based on libisds library.
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/shigofumi/shigofumi-0.3.ebuild b/net-misc/shigofumi/shigofumi-0.3.ebuild
new file mode 100644
index 000000000000..c70a620f58f0
--- /dev/null
+++ b/net-misc/shigofumi/shigofumi-0.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI='git://repo.or.cz/shigofumi.git'
+WANT_AUTOMAKE="1.11"
+inherit base
+[[ ${PV} = 9999* ]] && inherit git-2 autotools
+
+DESCRIPTION="Command line client for ISDS"
+HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~mips ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug doc nls xattr"
+
+RDEPEND="dev-libs/confuse
+	dev-libs/libxml2
+	sys-libs/readline
+	>=net-libs/libisds-0.7"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+	nls? ( sys-devel/gettext )"
+
+DOCS=( NEWS README AUTHORS ChangeLog )
+
+src_prepare() {
+	[[ ${PV} = 9999* ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fatalwarnings \
+		$(use_enable debug) \
+		$(use_enable doc) \
+		$(use_enable nls) \
+		$(use_enable xattr)
+}
diff --git a/net-misc/shigofumi/shigofumi-9999.ebuild b/net-misc/shigofumi/shigofumi-9999.ebuild
new file mode 100644
index 000000000000..c70a620f58f0
--- /dev/null
+++ b/net-misc/shigofumi/shigofumi-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI='git://repo.or.cz/shigofumi.git'
+WANT_AUTOMAKE="1.11"
+inherit base
+[[ ${PV} = 9999* ]] && inherit git-2 autotools
+
+DESCRIPTION="Command line client for ISDS"
+HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~mips ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug doc nls xattr"
+
+RDEPEND="dev-libs/confuse
+	dev-libs/libxml2
+	sys-libs/readline
+	>=net-libs/libisds-0.7"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+	nls? ( sys-devel/gettext )"
+
+DOCS=( NEWS README AUTHORS ChangeLog )
+
+src_prepare() {
+	[[ ${PV} = 9999* ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fatalwarnings \
+		$(use_enable debug) \
+		$(use_enable doc) \
+		$(use_enable nls) \
+		$(use_enable xattr)
+}
diff --git a/net-misc/shmux/Manifest b/net-misc/shmux/Manifest
new file mode 100644
index 000000000000..5cf08586756f
--- /dev/null
+++ b/net-misc/shmux/Manifest
@@ -0,0 +1,9 @@
+AUX shmux-1.0.2-tinfo.patch 317 SHA256 0312de389ba71b8a1e4a42e9d1ea1ccd23a04192f1ce801cd406967fe6392049 SHA512 9b94a75ca7ce2b6dce7f39dbbca47ffd6c90c6388623eb5e39ddffd4f9b2cf36f124031c4c50ea9ff46ad6174ff2c97804e2fdded5303c94088edd037f7275a3 WHIRLPOOL 52511325d103a6b57403fb6409178ed63e200136fe14e7567d9f79ba337faa7a53131ab7a0ccab04f3bf08ae71e0736c9c21f0afaee7fedb0162cb0a5df842da
+DIST shmux-1.0.2.tgz 110473 SHA256 0886aaca4936926d526988d85df403fa1679a60c355f1be8432bb4bc1e36580f SHA512 d114678827d4fc203f0d18b4a4e02f8b56efdf490df0aef32756a020c755b387468a88fea7266249445a862d7ed9374640432e5807fa57bca5a7d559d7e67a8a WHIRLPOOL 1159c35470e131c4001bde349bc0f31bd533e787ab9d5c6f50904139e80696cba5b32ab02cc5486ea7f10c71495f3e9ee55175fc6384c3c5c919cc6526bd6f1b
+DIST shmux-1.0.tgz 81096 SHA256 d97b2d7f01b32a4a92a87df4320249228da55d9ff0ae8c0e6319c131a0404782 SHA512 970ba7972f90c99aa201ee9caae904c039da5084d870d621fcbe3b91a86fd979f35665400210105ebc712b6117f0640fc6c2702c901c467491cac860fa4d2181 WHIRLPOOL 0413be894bb52a91058f5c201bf41fd932fa52fa479d47be43b0061418ad412ef7637394d29d11c5a47e5a4dec87e128afe4a40c86c734abf96ea6d9f48fbadc
+EBUILD shmux-1.0.2-r1.ebuild 685 SHA256 d95fc79e065ce25404a3eec20490bdcf6df43ed77100e889b5846ea1ef5e2c75 SHA512 e4860d3ea08b44237177f8ec4164ce7486fb6d017eec96a678bcaa4d46c5ddbe267d150368af0e9bcb1b2ba8bcdc424f282563499f4f70fee03e4903ab824a78 WHIRLPOOL 9df1476b2c05108730053f7b623e63b481fda19fa2b054d80fe09a3699684ac5c79a5c09e17bd1db7fab0c1773fe5a4e972159890e652cd4410226727ed739e9
+EBUILD shmux-1.0.2.ebuild 670 SHA256 21dddef0f2f8a12dc9b69d59fd05710a6bb134ed728c607fd8ee9c43a78d8bf8 SHA512 3d43dcbc1a57e38ad72726cc3c4465c6265cad9aa53c6e75501fd704672d3ce94f2cef52d7b3f0174f6f8e6f2f744c58625a0b78c2cd830231985aaf035aec3c WHIRLPOOL e8e75d580e8098eab55430bc9ccee6cd66a550b5c3fac722f88c8f1c12d936c945e2f70b9b6776c162919dc78eabd70492b98865b73cf48858b54f5f761f0a6b
+EBUILD shmux-1.0.ebuild 678 SHA256 72f715abd9bb215303fb30bb7c29c0f87b22c4ca2de476fb2460639d9af1c414 SHA512 68b00cb1d8846c5f3590e405964c5f4eeeceeac7aae339348ef73303b29f18c952b8245bae4ce7a6ddb4ba819508d0a7b2c057170da9dec150b60cc9cd135c1a WHIRLPOOL 0a5c4c64181001b6ba2dbc395a45ef416613ccfe3a9b2a4daaa60c0f283285950e3d22e78fb76c981972a29c1b70c6738270e3ba8ae9ee715174d8764c740231
+MISC ChangeLog 2248 SHA256 6d3ac00e9abc1bb1fa36947d425bb7ff52dd531e13feccf13f6c38fbc5f8927e SHA512 8cb0deabd68c556643def83f6f4aa8698d60461c842b4d4b8a44273c486234c91870f8ca6b2538d75e0a650b9baa7f21899a79ea7c90c951cf6d962e3ac44890 WHIRLPOOL 0f36ad1cc5a5b990d3e350637b002a55becaa2c14bbbda9e5c1d13782748816e798b676e791b842f07d68eba95515ff1821fcf1bf916f0174d7d93b2c8a4f7bd
+MISC ChangeLog-2015 4404 SHA256 2729bb06a0157e31562a5f8c810ab387acde53bd23484d2b90107599122d1ffd SHA512 938c4f566d2358ba248fb5bfdff5ea48e37666a6a5ab285ad1cac4ca156e0b385d21f3ecc766537098b56f7855efff6d589403b7c52f0e3fe809bdbac6e4bd19 WHIRLPOOL 88deed6466ba9704e4d2651808bcd9df33fada0e73a695fb730363af948ab417263c74fd96f4ecb992588dcf1f7a0abff1e4db89d0378386f1e4de6f4083a674
+MISC metadata.xml 746 SHA256 29cce0d7fc12332fa8fe629e33a7cd2ed8dcb94e8587679ba8447163a1dfd740 SHA512 fbe14dee902994deaa7df5f5ff551f171437bea3cf1c772633023a534835e7c99bd714fed9bde6acaa5e6ba0321739323a0b6eb1579947be1f4eb4beec8f8915 WHIRLPOOL a502ce2d54d11ce2ee550208f749f5e31dc1a0c7567ffe5c4c25b18f6303cb1365f86720e45588daa3ebf2e959b3fd6de781808623f5bbf8dd88cb567038bd68
diff --git a/net-misc/shmux/files/shmux-1.0.2-tinfo.patch b/net-misc/shmux/files/shmux-1.0.2-tinfo.patch
new file mode 100644
index 000000000000..802d5973bdc7
--- /dev/null
+++ b/net-misc/shmux/files/shmux-1.0.2-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,7 +27,7 @@
+ fi
+ 
+ # Checks for libraries.
+-AC_SEARCH_LIBS([tgetent], [termcap curses ncurses])
++AC_SEARCH_LIBS([tgetent], [termcap tinfo curses ncurses])
+ AC_SEARCH_LIBS([basename], [gen])
+ if test "x$with_pcre" != "xno"; then
+    AC_SEARCH_LIBS([pcre_compile], [pcre], ,
diff --git a/net-misc/shmux/metadata.xml b/net-misc/shmux/metadata.xml
new file mode 100644
index 000000000000..bb9f6a6873ed
--- /dev/null
+++ b/net-misc/shmux/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>alicef@gentoo.org</email>
+	<name>Alice Ferrazzi</name>
+</maintainer>
+<longdescription>
+shmux is program for executing the same command on many hosts in parallel.
+For each target, a child process is spawned by shmux, and a shell on the
+target obtained one of the supported methods: rsh, ssh, or sh. The output
+produced by the children is received by shmux and either (optionally)
+output in turn to the user, and/or written to files for later processing.
+The list of targets may either be specified on the command line or be read
+from the standard input.
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/shmux/shmux-1.0.2-r1.ebuild b/net-misc/shmux/shmux-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..39ebd0040cc8
--- /dev/null
+++ b/net-misc/shmux/shmux-1.0.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="run the same command across many hosts in parallel"
+HOMEPAGE="http://web.taranis.org/shmux/"
+SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
+
+LICENSE="shmux"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="pcre"
+RESTRICT="test"
+
+RDEPEND="
+	pcre? ( dev-libs/libpcre )
+	sys-libs/ncurses:0=
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/awk"
+
+PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
+
+DOCS=( CHANGES )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with pcre)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/net-misc/shmux/shmux-1.0.2.ebuild b/net-misc/shmux/shmux-1.0.2.ebuild
new file mode 100644
index 000000000000..ec93d10109d4
--- /dev/null
+++ b/net-misc/shmux/shmux-1.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools eutils
+
+DESCRIPTION="Program for executing the same command on many hosts in parallel"
+HOMEPAGE="http://web.taranis.org/shmux/"
+SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
+
+LICENSE="shmux"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="pcre"
+RESTRICT="test"
+
+RDEPEND="
+	pcre? ( dev-libs/libpcre )
+	sys-libs/ncurses
+"
+DEPEND="${RDEPEND}
+	virtual/awk"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with pcre)
+}
+
+src_install() {
+	dobin src/shmux
+	doman shmux.1
+	dodoc CHANGES
+}
diff --git a/net-misc/shmux/shmux-1.0.ebuild b/net-misc/shmux/shmux-1.0.ebuild
new file mode 100644
index 000000000000..38327b1a0241
--- /dev/null
+++ b/net-misc/shmux/shmux-1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Program for executing the same command on many hosts in parallel"
+HOMEPAGE="http://web.taranis.org/shmux/"
+SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
+
+LICENSE="shmux"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="pcre"
+RESTRICT="test"
+
+RDEPEND="
+	pcre? ( dev-libs/libpcre )
+	sys-libs/ncurses
+"
+DEPEND="${RDEPEND}
+	virtual/awk"
+
+src_compile() {
+	econf $(use_with pcre) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin src/shmux || die "dobin failed"
+	doman shmux.1 || die "doman failed"
+	dodoc CHANGES || die "dodoc failed"
+}
diff --git a/net-misc/shout/Manifest b/net-misc/shout/Manifest
new file mode 100644
index 000000000000..1bceaa90a3c2
--- /dev/null
+++ b/net-misc/shout/Manifest
@@ -0,0 +1,9 @@
+AUX implicitdecls.patch 294 SHA256 d6682eb4eae810502736dc56d5bd6f9eb1d12a1eada0bd8ae1ef25c2ae268e35 SHA512 e2f18ef4dd46725d8d023121045c25214b777b6ad699027fda8d0af84e284cb53f72b877a562935d056e7321523e9e65ed3d1dddd9491160ca5c8ee68831a70a WHIRLPOOL 1e9e413e22e0a0045e79f4034f87706b87b8af0e20ef5baf8754c72ce7b745e5c3f171bb8bca105239889dcad414146f37d221aa15c12eadfc2fa9a2b13611cc
+AUX ldflags.patch 653 SHA256 9318a544d3606c07107f30edbe44409aac9e0f8a7038aa024cd95b021882f34f SHA512 33a91c02e2b8dd9c1f2e44e6dc6f9bf3264a159ffb33451a5f800a2b15ba47dac0744a73cf5a18be8fe33531ad4cecb2149a2c765a8d9abb8cd07be549855a2e WHIRLPOOL 628d24d050cc694b86de56b945c63728f158f9410a97a375e4d2397679797be19fd60adc990faa0c31d72fd68d9c66086563c1ac824400764fcc2276bdc2e927
+AUX shout-0.8.0-overflow.patch 705 SHA256 87d74ca4f7bf82e3110a087f2111002afe23796ed60736db8c7ea40f1f1e45ef SHA512 ab1dde236c3edd4b17550511277762dbdc6cce05830a67429d958176ac4e494c3c16f88f15bb897714f37bb4979295c27353fed8c11681616d027c6c40b1609b WHIRLPOOL 7774a0993ce49611a9c7af4e2e34daf3f516b2b3edbe1f06e8fbcf8a3cd402ab112f59ec48cd3258f1f4df8f1f787ffc7f3a8b455f433f5aa2aa282f7168e68b
+AUX variables.diff 1142 SHA256 45b05676eb7f85040111d0f4778e15648ba0b54b6812482a8336eab84707536d SHA512 abe393346b791fcc4cdb57a17c4410bbc967777c1f6d5bf0339618b6592e615000f49262ac907e5d83ea7c0837074923f719089d5a35f4aa0a1bf90dab9b6e36 WHIRLPOOL 572211aaf81134295c44fe2832e049136010609c5ef531e0df773b13df969640c1bdfe28ddda2b14e04aedb6a37f044fdeb446be565d618ae8bcbb01dc4c61cc
+DIST shout-0.8.0.tar.gz 66394 SHA256 7b36712730c370f7d25271ca93291f9055bb90ee3052e7aec33b5dae205d8227 SHA512 95ee62071ce4dc7f624213d4eaf10d029b0a2e3ff030e7236656fc5387045be34a6f08ee778c4e8e77fed9b4ee8f60c191a369921b3079c3183cc650b77b3565 WHIRLPOOL 60129ebc7a9080b6ed6c12bbbc6cf16980c5c2c6b3a7a240bd2a7f45c2ef44a90624619c2c1ee47e8a36d8cfbba7261d40c3c377c88988cba444edc7310d41fd
+EBUILD shout-0.8.0-r2.ebuild 1001 SHA256 822427b18cddd5f991f09addc284ec40b14cfbe0753b8b975b505b4493f473f0 SHA512 03e730ffb5cb8d33dfbc8029be18f058b3d1ef1d62c0de4db6f3ada08a5665c4b72552b6195288bec902f5828978cf8485ba4b9fbe8b9512f4880187e2d54fbb WHIRLPOOL d9c3c65223de2218aa0ee2f2bb8f43d6b5691931895338db5357f770585ef1237dc7a70a0f0952083d09357bb1d8422706a2ad87d58684689fbba7de76203fcd
+MISC ChangeLog 2539 SHA256 0e09c22fa2605dcd34282bd57a86395cf9917c82c1ef0c18f9b41e819a382847 SHA512 283608db1e8424f9c8a40a86a826b3f89d1c095fc94349821f278ba44590377013243240067dc775907ed6a47d6286d4bc2982a6ad1db23f3f207365ecd236b7 WHIRLPOOL 331c981efe3707d559eaf1dbb821e558516427f7ccd14578ad5de74580c72a9380f1182b5b28a3df92533dbea6d3a347736730f74d41dba20ec167edf448f668
+MISC ChangeLog-2015 2675 SHA256 e9ec1f6db89472c2b043c125be11e747454a83f055cf34f4fe62b723398cb6ce SHA512 7be91e5cb5d67b9bab9446df9195099b09a081f08a6d85d3e8f0444ac907a104349255453568e0567a0d30874ad0029cb5b745c827eba142b91aa398fa300e75 WHIRLPOOL 31d9f8448d7e2c4ccd7c8cb1194fa159e8b320423c8143902fb53654f39c2401b2ae951a7df30b4bb479e763f0d3abfb401239d21570829c9db9fa6d1fbcddcb
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/net-misc/shout/files/implicitdecls.patch b/net-misc/shout/files/implicitdecls.patch
new file mode 100644
index 000000000000..b7a6999f121e
--- /dev/null
+++ b/net-misc/shout/files/implicitdecls.patch
@@ -0,0 +1,12 @@
+Index: shout-0.8.0/sock.c
+===================================================================
+--- shout-0.8.0.orig/sock.c
++++ shout-0.8.0/sock.c
+@@ -25,6 +25,7 @@
+ #include <arpa/inet.h>
+ #include <sys/time.h>
+ #include <unistd.h>
++#include <string.h>
+ #endif /* !win32 */
+ 
+ #include "sock.h"
diff --git a/net-misc/shout/files/ldflags.patch b/net-misc/shout/files/ldflags.patch
new file mode 100644
index 000000000000..3d049d98d318
--- /dev/null
+++ b/net-misc/shout/files/ldflags.patch
@@ -0,0 +1,21 @@
+Index: shout-0.8.0/Makefile.in
+===================================================================
+--- shout-0.8.0.orig/Makefile.in
++++ shout-0.8.0/Makefile.in
+@@ -2,7 +2,6 @@
+ 
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+-LDFLAGS = @LIBS@
+ 
+ SHELL=/bin/sh
+ 
+@@ -26,7 +25,7 @@ COMPILE_CFLAGS=$(CFLAGS) $(DEFS) 
+ all: shout
+ 
+ shout: shout.c rand.o mpeg.o configfile.o sock.o util.o
+-	$(CC) $(COMPILE_CFLAGS) -o shout shout.c rand.o mpeg.o configfile.o sock.o util.o $(LDFLAGS)
++	$(CC) $(COMPILE_CFLAGS) $(LDFLAGS) -o shout shout.c rand.o mpeg.o configfile.o sock.o util.o @LIBS@
+ 
+ configfile.o: configfile.c
+ 	$(CC) $(COMPILE_CFLAGS) -c -o configfile.o configfile.c
diff --git a/net-misc/shout/files/shout-0.8.0-overflow.patch b/net-misc/shout/files/shout-0.8.0-overflow.patch
new file mode 100644
index 000000000000..a1292423ce4b
--- /dev/null
+++ b/net-misc/shout/files/shout-0.8.0-overflow.patch
@@ -0,0 +1,26 @@
+diff --git a/shout.c b/shout.c
+index 0a1bded..00bae8d 100644
+--- a/shout.c
++++ b/shout.c
+@@ -441,7 +441,7 @@ post_config ()
+ 			perror ("fopen");
+ 			px_shutdown (44);
+ 		}
+-		my_snprintf (pid, BUFSIZE, "%d\n", (int) getpid ());
++		my_snprintf (pid, 30, "%d\n", (int) getpid ());
+ 		fputs (pid, fp);
+ 		fclose (fp);
+ 	}
+diff --git a/sock.c b/sock.c
+index 4a67c00..3b4e539 100644
+--- a/sock.c
++++ b/sock.c
+@@ -81,7 +81,7 @@ sock_connect (char *hostname, int port)
+ 			sock_close (sockfd);
+ 			return -1;
+ 		}
+-		memcpy (&server.sin_addr, &sin.sin_addr, sizeof (sin));
++		memcpy (&server.sin_addr, &sin.sin_addr, sizeof (sin.sin_addr));
+ 	} else {
+ 		host = gethostbyname (hostname);
+ 		if (host == NULL) {
diff --git a/net-misc/shout/files/variables.diff b/net-misc/shout/files/variables.diff
new file mode 100644
index 000000000000..afaefbcb2cad
--- /dev/null
+++ b/net-misc/shout/files/variables.diff
@@ -0,0 +1,45 @@
+diff -urN shout-0.8.0/Makefile.in shout-0.8.0-modified/Makefile.in
+--- shout-0.8.0/Makefile.in	Thu Apr 20 02:31:50 2000
++++ shout-0.8.0-modified/Makefile.in	Tue Jul 23 19:14:36 2002
+@@ -9,11 +9,11 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+-prefix = @prefix@/icecast
+-exec_prefix = @prefix@
+-bindir = @BINDIR@
+-etcdir = @ETCDIR@
+-logdir = @LOGDIR@
++prefix = /usr
++exec_prefix = /usr
++bindir = /usr/bin
++etcdir = /etc/shout
++logdir = /var/log/shout
+ 
+ DEFS = -I. @DEFS@
+
+--- shout-0.8.0/configure	2000-04-20 09:41:45.000000000 +0200
++++ shout-0.8.0/configure	2004-07-17 17:17:40.000000000 +0200
+@@ -532,20 +532,10 @@
+         prefix=$prefix
+ fi
+ 
+-if test "x$enable_fsstd" = "xyes"; then
+         echo "FSSTD ENABLED"
+         BINDIR="/usr/bin"
+-        ETCDIR="/etc/icecast"
+-        LOGDIR="/var/log/icecast"
+-else
+-        echo "FSSTD DISABLED"
+-        BINDIR="${prefix}/icecast/bin"
+-        ETCDIR="${prefix}/icecast/etc"
+-        LOGDIR="${prefix}/icecast/log"
+-fi
+-
+-
+-
++        ETCDIR="/etc/shout"
++        LOGDIR="/var/log/shout"
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
diff --git a/net-misc/shout/metadata.xml b/net-misc/shout/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/net-misc/shout/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/shout/shout-0.8.0-r2.ebuild b/net-misc/shout/shout-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..d41c78ca8166
--- /dev/null
+++ b/net-misc/shout/shout-0.8.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Shout is a program for creating mp3 stream for use with icecast or shoutcast"
+HOMEPAGE="http://www.icecast.org"
+SRC_URI="http://icecast.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~ppc sparc x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/variables.diff \
+		"${FILESDIR}"/ldflags.patch \
+		"${FILESDIR}"/implicitdecls.patch \
+		"${FILESDIR}"/${P}-overflow.patch
+	rm -f sock.o
+	sed -i -e "s/-ansi//" configure
+}
+
+src_compile() {
+	tc-export CC
+	econf --sysconfdir=/etc/shout \
+		--localstatedir=/var
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	keepdir /var/log/shout
+	fowners root:audio /var/log/shout
+	fperms 775 /var/log/shout
+	fperms 755 /etc/shout
+	fperms 644 /etc/shout/shout.conf.dist
+	dodoc BUGS CREDITS README.shout TODO
+}
diff --git a/net-misc/sipcalc/Manifest b/net-misc/sipcalc/Manifest
new file mode 100644
index 000000000000..e09428733319
--- /dev/null
+++ b/net-misc/sipcalc/Manifest
@@ -0,0 +1,5 @@
+DIST sipcalc-1.1.6.tar.gz 117628 SHA256 cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357 SHA512 9d2047a6fb6ef177d455f44abea19bab7d0131b16eb2444b2b074e94e776854fa74084ab625d2be9b64d136979ede71722c2e24dca12ff54e4a5bb02f947570e WHIRLPOOL 3b3e144b428031bdef15294dbc4dbc293ff27e96675f9bad530c422cdab815f0435fb48ce0d1482ebddee92172d9eb0f7031db8d2a5000c2cce0e7fa7c13a46e
+EBUILD sipcalc-1.1.6.ebuild 398 SHA256 cb5bbb295dda46e2c5177da55aebaff2716002f11d5ccb39fd7c766d8a390018 SHA512 9783c1ccf449eec4bfda253c0576184a1965f15e036dc0ac3621ec6537aea35adde6eb274cdfc1aeebdb1d529789cc7fce09dde5e63b714d80bfd63d8d8a0a00 WHIRLPOOL 7a6af12e40876eea6d882bba66126c44bbe14113cb3949fc6bfec62c581beb197a1dbe5d5d55a330e5b0c32c0790201b633c6f917deb417d5cea59e0d1ae9de4
+MISC ChangeLog 2522 SHA256 b1bba567d3058814b15025adb26a1dafadbfe6c109c8d06a6f7d14818b621dac SHA512 6b59f6137ef90a6a545ff85281d3941e6fe1c7c3639d035b46cc1887de201bbcf73ba5c142fc61dfd9d1839672d357bcf47af700a1ac027c43d6ffbc5b412b4e WHIRLPOOL 199bda89ad513ca9ce25519076f9f4a49a015633d47a7af28448e962124c302707fac31e60dfa70133ab77d466430fbedd20629a09062e1417e2c4636e6a90e3
+MISC ChangeLog-2015 3371 SHA256 bb9a4cc794c6aa2ffa32408b423d518d685fc36ffcdd82b93cd6bd948af180cb SHA512 505622285c816fee549e0526f55969ca5a3a723a56c9544b48bd4b12b0ca916cbedaafe2a07657099904fbd32d1ab456a514a12edf7877c888608e1ed0de9e32 WHIRLPOOL fbb29f18578dc97fd2beae488e2d5f13012e810445cc6cfa7b42a2b3314417f6260d5c2ce097088c186368655d99ed494dc8cf8baa3c4ec282f302aef12a8146
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/sipcalc/metadata.xml b/net-misc/sipcalc/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/sipcalc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/sipcalc/sipcalc-1.1.6.ebuild b/net-misc/sipcalc/sipcalc-1.1.6.ebuild
new file mode 100644
index 000000000000..d9861b9af859
--- /dev/null
+++ b/net-misc/sipcalc/sipcalc-1.1.6.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Sipcalc is an advanced console-based IP subnet calculator"
+HOMEPAGE="http://www.routemeister.net/projects/sipcalc/"
+SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/net-misc/siproxd/Manifest b/net-misc/siproxd/Manifest
new file mode 100644
index 000000000000..8e258ed494a9
--- /dev/null
+++ b/net-misc/siproxd/Manifest
@@ -0,0 +1,11 @@
+AUX siproxd-0.8.1-amd64_static_build.patch 1280 SHA256 37cb3e54c6bb42ad1ad68b46f53e8b66f1d0d58af70af0017edab4693762457e SHA512 d29f9d48127fa10e17a50c364ca2a50886a88e3b449ff2ef68ac08596d8f1cb84a5b088d888a76c79391c571ed506934fd2add6136ba10ee6718ce686ae99bd7 WHIRLPOOL 304f80a82b0b98f462d2bc20b0240f074c4e0bed76d43b699faae327c3172c7b3c02af5f764b7325464fbf728f6a9008af279f751f7a9e2dc096e37feb0c2df5
+AUX siproxd-libtool-2.4.patch 412 SHA256 3455d3a324758d2f719f515a5a1c7950fb605502c5af2d1cbd3cb49dace854bc SHA512 7ea24a99d65ecc8586473d49b7d485f27634c54290b23821313b1698bb495cf96db0b997d8cb48673a6291a538d5d31d1ee3089187c3d4f500727bc857de5f0c WHIRLPOOL 9bc6ea1b01c4726a6673535026ecba1fe2b21e2bcad459d689825445a1485e0f52d89034e8485b89560f89b28c7b3965db56bfa7237878640c45723b1159ceb9
+AUX siproxd.rc6 585 SHA256 df2979cb2ffd547f7c9397c1ff04d9580cf9da11294ba45a692bdf78ad1a6236 SHA512 2b15ad14121ad20dd72fed9a8a1d41b5bb4185c8ac2bb546acb589be3ee1cd9229a7cda687769a720f06c0d329874bb34543250deec14ad2ef1240ce0d9c7cee WHIRLPOOL 3bc59a482ffddc8aa938aabab5c31e75054f016c0ca1a5e58a17980ec81a912dbd1b601f40d701f2ab46edd03eed54b0444e0d3b3bba1eb4dad301165cd504b1
+AUX siproxd.rc8 464 SHA256 32d4c1978f8fb042c543d19ded8aa6d42c7a29c1dce41c4952d7d1f490d727cf SHA512 0c7deb87eb9bc0ad6b31b021c4a65fd30d9a79effa993b79954381bfde6a232ba97c82eae01ad0464916e9ee1ba00f6a731460091706aa02a9876a3335359248 WHIRLPOOL d6a21afc4ecde657261c4de47a6b12ebb86c48c3bd815eb2a3048ddae69967f6433bb385d11aa39e7352988c6cb04191e7b9117ed9b526a119e356c2cbbc35b4
+DIST siproxd-0.8.0.tar.gz 824404 SHA256 1a0306dbf5dd65f2c6d779bd449cbabba8c1a4cc79ca034e9cc83836c60f8542 SHA512 eb14a6f7a893e3347d316feedca89c1700e2977b9671da7d77c475993137b049e5caad5254e19dc00f5cb4f0f0c767188cdfb02bb16238dd7b56473886063440 WHIRLPOOL a9e618d14b5a5cd9ed954baf121f905c8024ecd069b95db730d4bff0c19590fbc8928b8d4fe51f37959d9ce506136662aaea50590038e01de96d844f41280554
+DIST siproxd-0.8.1.tar.gz 833170 SHA256 df2df04faf5bdb4980cbdfd5516a47898fc47ca1ebc2c628aa48305b20a09dad SHA512 b47c7b74b4d3adeb4fd9536f82c014a123a6fcbe508a4982c9e77e53a8c68b05bc32799f57cf749e860b3e1f19f6502dbea561a410975f9f095754748515964f WHIRLPOOL e70e79113af3fa0e0a00154c474ca89b7587202ef806c31df5fa9d79d2a813ba6fa3fa006fe8971bac5fed54b85540ae44116a8eb0c262a6bb29e5dcc3a4c612
+EBUILD siproxd-0.8.0-r3.ebuild 3331 SHA256 3a019d1a804e290f458dd55ff2cd9c31bc43604a3139b8334cf1a2200dfc0541 SHA512 8ee67a2fc081fb8caad2eacc88123e8a7f6518988e1a45baee94a48c7e1133ea32628881d9c3c332c7281fd2ac19f5a6157abd6d40546544e0dc3808ccdb55b7 WHIRLPOOL 1c013cbffc2283b48d520dcb8bd9dd375bef6178d5f5e6ed71ef9ac78c40c2562c52ddf24b5bb1ebe0dae49718e7e92deda1c2e664631e5e40390934ff2997b9
+EBUILD siproxd-0.8.1-r2.ebuild 3412 SHA256 403746e6281ef110af95d45db7bc89fb6658045fc7557d8d76f8b8b2f71feb8c SHA512 95b1325ad7d9bda11af3caed40ab59a67c5d1c9af6e3eac4f91431f8b4c37f6ce591164d1addaa616b179113d5b9608bed2ce555e59d864af2572f77b7a8437c WHIRLPOOL 8ce7316be3be077d7ac3427ac87aab894c138477ef7c88eb73d9d0f6a7e5e1e26225c618f2877712cb445f0513f957fd5443e199ff74b64ab37210f877b587c3
+MISC ChangeLog 3409 SHA256 0df1ab1fd64aecc9f4e9d27e0c4839f126631eda56e4664984380578f71891c4 SHA512 d9887e7b9e50bf2844b910a753d96fb3de82f59d49772ff8cb9b373f0554475de2d6ee031ad7717d671d61b6dc40c40eff67f7f26febc8d642723aebf31f6f08 WHIRLPOOL 1441cc7f08410c20b88343b5a053055c07bf92eaa0e58bdbb184546d498ae33d8cf1f3f8a7f4318683607cf971bc11f63906194de5e96e3c4764a2a90b147715
+MISC ChangeLog-2015 4845 SHA256 2ea9261bc04119d6d66e6fba0dcf24ec3f9aaa5398c33282cda61d927f02ac2c SHA512 5b6e95525dc20b5c4a026e727cb6a9039c2dbbba2f0e1e80be6a14407d29b2fdc198b9a5f3eeb611e7d03468e071db92c757ae4220677923cff8dd0b64f8bdb1 WHIRLPOOL 5489b0d06082eccda705b7b12767f344286618cc747c7021d8b13c975dfb7c1f371159d10255035089a346befc1951d39f1a4f748b73a226582e878473a40bdf
+MISC metadata.xml 244 SHA256 dafe3eb2076730deaf5b4cc9ab4c0af0ef435debb9b41d96ab396a93f68bf8bb SHA512 8ced66f9a1e5533891a0142222723fab44ddda99a5d00b8f880e961146cb2abbd076005db790cab522be24d5cdec5a391d6a3942c1497450efcb30774e180c97 WHIRLPOOL de3defa3cc72f0a784cceae16711f8dd9cf94b2b6611eff84ec92b67b6a73b990cd28ae10d09dec15f8c789a0c922d26a75c28f7077a02909ee7ce162f9a97ff
diff --git a/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch b/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch
new file mode 100644
index 000000000000..af491c167da1
--- /dev/null
+++ b/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch
@@ -0,0 +1,26 @@
+--- siproxd-0.8.1/configure.in
++++ siproxd-0.8.1/configure.in
+@@ -361,8 +361,9 @@
+    dnl link statically to this lib
+    dnl (this probably only will work on linux yet...)
+    AC_MSG_CHECKING("where I can find libosip2.a")
+-   libosip_static=`find $extra_libs $libosip_prefix_dir/lib /lib \
+-                        /usr/lib /usr/local/lib \
++   libosip_static=`find $extra_libs $libosip_prefix_dir/lib64 \
++			$libosip_prefix_dir/lib /lib64 /lib /usr/lib64 \
++                        /usr/lib /usr/local/lib64 /usr/local/lib \
+                         -name libosip2.a 2>/dev/null|head -1`
+    if test "x$libosip_static" != "x"; then
+       LIBS="$libosip_static $LIBS"
+@@ -371,8 +372,9 @@
+       echo "*** ERROR: a static libosip library is required!";exit 1;
+    fi
+    AC_MSG_CHECKING("where I can find libosipparser2.a")
+-   libosip_static=`find $extra_libs $libosip_prefix_dir/lib /lib \
+-                        /usr/lib /usr/local/lib \
++   libosip_static=`find $extra_libs $libosip_prefix_dir/lib64 \
++			$libosip_prefix_dir/lib /lib64 /lib /usr/lib64 \
++                        /usr/lib /ur/local/lib64 /usr/local/lib \
+                         -name libosipparser2.a 2>/dev/null|head -1`
+    if test "x$libosip_static" != "x"; then
+       LIBS="$libosip_static $LIBS"
diff --git a/net-misc/siproxd/files/siproxd-libtool-2.4.patch b/net-misc/siproxd/files/siproxd-libtool-2.4.patch
new file mode 100644
index 000000000000..189b32090f7b
--- /dev/null
+++ b/net-misc/siproxd/files/siproxd-libtool-2.4.patch
@@ -0,0 +1,13 @@
+diff -r -U 2 a/src/plugins.h b/src/plugins.h
+--- a/src/plugins.h	2010-01-07 12:44:38.000000000 +0100
++++ b/src/plugins.h	2010-06-19 13:56:30.960679284 +0200
+@@ -25,4 +25,8 @@
+ 
+ 
++#ifndef lt__PROGRAM__LTX_preloaded_symbols
++#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
++extern const void *lt_preloaded_symbols[];
++#endif
+
+ /* Plugins must return STS_SUCCESS / SUCCESS_FAILURE */
+ 
diff --git a/net-misc/siproxd/files/siproxd.rc6 b/net-misc/siproxd/files/siproxd.rc6
new file mode 100644
index 000000000000..0ec75e159f79
--- /dev/null
+++ b/net-misc/siproxd/files/siproxd.rc6
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+check_config() {
+	if [[ ! -f /etc/siproxd.conf ]]; then
+		eerror "Please create /etc/siproxd.conf first!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	check_config || return 1
+
+	ebegin "Starting siproxd"
+	start-stop-daemon --start --exec /usr/sbin/siproxd -- \
+		-p /var/run/siproxd/siproxd.pid -c /etc/siproxd.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping siproxd"
+	start-stop-daemon --stop --pidfile /var/run/siproxd/siproxd.pid
+	eend $?
+}
diff --git a/net-misc/siproxd/files/siproxd.rc8 b/net-misc/siproxd/files/siproxd.rc8
new file mode 100644
index 000000000000..017783025f1f
--- /dev/null
+++ b/net-misc/siproxd/files/siproxd.rc8
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+config_file="/etc/siproxd.conf"
+
+pidfile="/var/run/siproxd/siproxd.pid"
+command="/usr/sbin/siproxd"
+command_args="-p ${pidfile} -c ${config_file}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ ! -f "${config_file}" ] ; then
+		eerror "Please create ${config_file} first!"
+		return 1
+	fi
+	checkpath -q -d ${pidfile%/*} -o siproxd:siproxd
+}
diff --git a/net-misc/siproxd/metadata.xml b/net-misc/siproxd/metadata.xml
new file mode 100644
index 000000000000..91288ffa73c3
--- /dev/null
+++ b/net-misc/siproxd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">siproxd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/siproxd/siproxd-0.8.0-r3.ebuild b/net-misc/siproxd/siproxd-0.8.0-r3.ebuild
new file mode 100644
index 000000000000..bb230657846c
--- /dev/null
+++ b/net-misc/siproxd/siproxd-0.8.0-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils autotools user
+
+DESCRIPTION="A proxy/masquerading daemon for the SIP protocol"
+HOMEPAGE="http://siproxd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples doc static"
+# TODO: debug can be used but dmalloc is breaking the build
+# upstream has been contacted, see bug 2649238 in their bugtracker
+
+RDEPEND=">=net-libs/libosip-3.0.0
+	<net-libs/libosip-4.0.0"
+#	debug? ( dev-libs/dmalloc[threads] )"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.4
+	doc? ( app-text/docbook-sgml-utils
+		app-text/docbook-sgml-dtd:4.2 )"
+# docbook-sgml-utils is for building doc
+# docbook-sgml-dtd is for the doc dtd even if docbook-sgml-utils depends on it
+
+pkg_setup() {
+	enewgroup siproxd
+	enewuser siproxd -1 -1 /dev/null siproxd
+}
+
+src_prepare() {
+	default
+
+	# make the daemon run as user 'siproxd' by default
+	sed -i -e "s:nobody:siproxd:" doc/siproxd.conf.example \
+		|| die "patching doc/siproxd.conf.example failed"
+	# do not fail when building with external libltdl
+	sed -i 's/libltdl //' Makefile.am || die "patching Makefile failed"
+	epatch "${FILESDIR}/${PN}-libtool-2.4.patch"
+	# do not crash when building with external libltdl, bug 308495
+	sed -i 's|"../libltdl/ltdl.h"|<ltdl.h>|' src/plugins.h || die "patching plugins.h failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	# static-libosip2 make it link statically against libosip2
+	# static build static version of plugins, forced to true
+	econf \
+		$(use_enable doc) \
+		$(use_enable static static-libosip2) \
+		--enable-static
+		#$(use debug && use_enable debug dmalloc) \
+
+	# statically linked plugins to libosip2 causes a shared lib linking with
+	# static lib (gcc seems not to like it : portable issue it says).
+	# there was also DT_TEXREL issue and stripping of static plugins failed
+	# so shared lib has to be used for plugins
+	# upstream has been contacted, see bug 2649351 in their bugtracker
+	if use static; then
+		sed -i -r -e \
+			"s:LIBS =(.*)( \/[^ ]*libosip[^ ]*\.a)( \/[^ ]*libosip[^ ]*\.a)(.*):LIBS_STATIC =\1\2\3\4\nLIBS = \1\4 -losip2 -losipparser2:" \
+			src/Makefile || die "patching src/Makefile failed"
+		sed -i -e \
+			"s:\$(siproxd_LDADD) \$(LIBS):\$(siproxd_LDADD) \$(LIBS_STATIC):" \
+			src/Makefile || die "patching src/Makefile failed"
+	fi
+}
+
+src_install() {
+	einstall
+
+	newinitd "${FILESDIR}"/${PN}.rc6 ${PN}
+
+	dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \
+		doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS
+
+	if use doc; then
+		dodoc doc/RFC3261_compliance.txt
+		# auto-generated doc is not auto-installed
+		# upstream has been contacted, see bug 2649333 in their bugtracker
+		dohtml -r doc/html/
+		# pdf is not build all the time
+		if has_version app-text/docbook-sgml-utils[jadetex]; then
+			dodoc doc/pdf/*.pdf
+		fi
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/sample_*.txt
+	fi
+
+	# set up siproxd directories
+	keepdir /var/{lib,run}/${PN}
+	fowners siproxd:siproxd /var/{lib,run}/${PN}
+}
+
+pkg_postinst() {
+	if use static; then
+		elog "static USE flag does not build a _fully_ statically linked binary"
+		elog "only libosip2 and libosipparser2 are statically linked"
+		elog "In addition, plugins are dynamically linked with those libs"
+	fi
+}
diff --git a/net-misc/siproxd/siproxd-0.8.1-r2.ebuild b/net-misc/siproxd/siproxd-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..664fe43e1ff3
--- /dev/null
+++ b/net-misc/siproxd/siproxd-0.8.1-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools user
+
+DESCRIPTION="A proxy/masquerading daemon for the SIP protocol"
+HOMEPAGE="http://siproxd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc static"
+# TODO: debug can be used but dmalloc is breaking the build
+# upstream has been contacted, see bug 2649238 in their bugtracker
+
+RDEPEND=">=net-libs/libosip-3.0.0
+	<net-libs/libosip-4.0.0"
+#	debug? ( dev-libs/dmalloc[threads] )"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.4
+	doc? ( app-text/docbook-sgml-utils
+		app-text/docbook-sgml-dtd:4.2 )"
+# docbook-sgml-utils is for building doc
+# docbook-sgml-dtd is for the doc dtd even if docbook-sgml-utils depends on it
+
+pkg_setup() {
+	enewgroup siproxd
+	enewuser siproxd -1 -1 /dev/null siproxd
+}
+
+src_prepare() {
+	# make the daemon run as user 'siproxd' by default
+	sed -i -e "s:nobody:siproxd:" doc/siproxd.conf.example \
+		|| die "patching doc/siproxd.conf.example failed"
+	# do not fail when building with external libltdl
+	sed -i 's/libltdl //' Makefile.am || die "patching Makefile failed"
+	epatch "${FILESDIR}/${PN}-libtool-2.4.patch"
+	# do not crash when building with external libltdl, bug 308495
+	sed -i 's|"../libltdl/ltdl.h"|<ltdl.h>|' src/plugins.h || die "patching plugins.h failed"
+
+	epatch "${FILESDIR}/${PN}-0.8.1-amd64_static_build.patch" #380835
+
+	eautoreconf
+}
+
+src_configure() {
+	# static-libosip2 make it link statically against libosip2
+	# static build static version of plugins, forced to true
+	econf \
+		$(use_enable doc) \
+		$(use_enable static static-libosip2) \
+		$(use_enable !static shared) \
+		--enable-static
+		#$(use debug && use_enable debug dmalloc) \
+
+	# statically linked plugins to libosip2 causes a shared lib linking with
+	# static lib (gcc seems not to like it : portable issue it says).
+	# there was also DT_TEXREL issue and stripping of static plugins failed
+	# so shared lib has to be used for plugins
+	# upstream has been contacted, see bug 2649351 in their bugtracker
+	if use static; then
+		sed -i -r -e \
+			"s:LIBS =(.*)( \/[^ ]*libosip[^ ]*\.a)( \/[^ ]*libosip[^ ]*\.a)(.*):LIBS_STATIC =\1\2\3\4\nLIBS = \1\4 -losip2 -losipparser2:" \
+			src/Makefile || die "patching src/Makefile failed"
+		sed -i -e \
+			"s:\$(siproxd_LDADD) \$(LIBS):\$(siproxd_LDADD) \$(LIBS_STATIC):" \
+			src/Makefile || die "patching src/Makefile failed"
+	fi
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.rc8 ${PN}
+
+	dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \
+		doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS
+
+	if use doc; then
+		dodoc doc/RFC3261_compliance.txt
+		# auto-generated doc is not auto-installed
+		# upstream has been contacted, see bug 2649333 in their bugtracker
+		dohtml -r doc/html/
+		# pdf is not build all the time
+		if has_version 'app-text/docbook-sgml-utils[jadetex]' ; then
+			dodoc doc/pdf/*.pdf
+		fi
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/sample_*.txt
+	fi
+
+	# set up siproxd directories
+	keepdir /var/lib/${PN}
+	fowners siproxd:siproxd /var/lib/${PN}
+}
+
+pkg_postinst() {
+	if use static; then
+		elog "static USE flag does not build a _fully_ statically linked binary"
+		elog "only libosip2 and libosipparser2 are statically linked"
+		elog "In addition, plugins are dynamically linked with those libs"
+	fi
+}
diff --git a/net-misc/sipsak/Manifest b/net-misc/sipsak/Manifest
new file mode 100644
index 000000000000..227ef08d0200
--- /dev/null
+++ b/net-misc/sipsak/Manifest
@@ -0,0 +1,7 @@
+AUX 0.9.6_p1-callback.patch 490 SHA256 0ef5adc2bae0b45a3bfafab645625f1071094329ba0d1a3504d13534cec8ae8b SHA512 c10dec8410143ae5fee3b78fb65a83494e5b2539c41f2424455fdabce73a780e78ca159ce2e579db5e2344882e7472abd3f884f76863241218745451108fce4a WHIRLPOOL 12c41fb6b1fa5f7413ff607a7c4d34280737e71054169c2c900d891c4872d5bab5b610dd00f0b3e5fc2dc2090e7f5b52680bb906c6d3d5a74411602f3c022754
+DIST sipsak-0.9.6-1.tar.gz 158776 SHA256 5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9 SHA512 c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe WHIRLPOOL 40c5f38c429703c0d3063c2c1bee8f0195b3fb0e1377b29350ef1b566c55960679292f245720d77203948111df8e3914b9cb82d4c6f4a74581d29f0403c02cb6
+EBUILD sipsak-0.9.6_p1-r1.ebuild 730 SHA256 cfcbeb7687f82e4d961c5128111b744e047930e6e82f926cf77276694fb77382 SHA512 840242bb19f70596a43c618d7eb66c965f9b50a38365a8d5aa173cc4535d2b21d01f1f7cfa5e2c286a4fb8db6289852220b1c20ab3aed8aae705affa77718552 WHIRLPOOL 05f6b401ae9e93fbc6c18c05ca3c63a51cf4ebeab37bb6a8331e276029e85f1d750f973d0b4230f961e5f156828778885e671ee6a79beb1b862f28ec95a97356
+EBUILD sipsak-0.9.6_p1-r2.ebuild 775 SHA256 91d4d0939241cdf4f85c400b4b73aa1b766957aac401afbc8c3fed325dd00c01 SHA512 856e40a857f425fa8a023e65a0f4f22e10862e1fdfc6c8b14159cb8d653bcc38cd9b0818e15e35ee50934c70d25c8f81f456429898eae48400e3d63388ca6afb WHIRLPOOL 68811dad6a37a2fb320809ffba0abacfa62269d657818eb1f32d3fb263a3e3445b876b4041b1bae550dc5629c85056ccd6b1ae6913f1928f07a99edb470f37bb
+MISC ChangeLog 3005 SHA256 ee04bc8bd5f39eee4ee814c30d2673ce77a0c27e756dec4298be0b2671d1273e SHA512 1c25e8266224e827c25e3734c4cc1dff3ec5f6bfa89fc50b48161554ec60c765d1b1536e0922bca71752cfda1476df9ef3d6efffba764038be823a0e2e2bbbb1 WHIRLPOOL 90bc6fc6783d495453ef4390a2841a95f8c4b49634b59a753a930e9d0dcc170cb2cdf5cfd43360a24f9529d1a6151004405735e277c34ec65e5d549d318d81f2
+MISC ChangeLog-2015 2994 SHA256 47f3eee28a9fbcd4931ff94dfe8c662860db43913b7b9c71f86035bc02954987 SHA512 bce3fd57a086aa816c19a6a5e6c9c641747b1b07ffd78f48c7e57fd37f9d25d9f897fd9627453bc333eb92e74330e46124bcc31aba55fe4d5707b6ffa1a96b24 WHIRLPOOL bafc4fdc53b1cd2a68e0bd93fd740408abcb378740af1f21ed742c8b4a937c56d92f63c2a97ffba277c8ec1b870c823859d22faf7fceb3d548d128e24ebee1af
+MISC metadata.xml 303 SHA256 ef1a3d8fc0c93ada52d93802721ca216b3b24f5bf84dc3094db7575dbba83df7 SHA512 82474d39e280eff65aee9c5d4ccb9bb513d56bb2d55b10b8f49b161d505387ab351d3228d0253a40c01a9c4f5f2c5104bb7f2c41b227b0aa653350e6facf07d4 WHIRLPOOL 44dcfac19f4493b15b1a8a555d4b59172a005f8f3b1f11d57c7b34bad5733d79f40972dd061fcac7f196cb3203062b5ccc0ef03dfb3dd6f8505a2932a914f09a
diff --git a/net-misc/sipsak/files/0.9.6_p1-callback.patch b/net-misc/sipsak/files/0.9.6_p1-callback.patch
new file mode 100644
index 000000000000..37dc486d3174
--- /dev/null
+++ b/net-misc/sipsak/files/0.9.6_p1-callback.patch
@@ -0,0 +1,12 @@
+diff -uNr sipsak-0.9.6.ORIG/helper.c sipsak-0.9.6/helper.c
+--- sipsak-0.9.6.ORIG/helper.c	2015-01-27 14:14:12.208729426 +0000
++++ sipsak-0.9.6/helper.c	2015-01-27 14:14:55.406728851 +0000
+@@ -250,7 +250,7 @@
+ 	return aptr;
+ }
+ 
+-static void cares_callback(void *arg, int status, unsigned char *abuf, int alen) {
++static void cares_callback(void *arg, int status, int timeouts, unsigned char *abuf, int alen) {
+ 	int i;
+ 	unsigned int ancount, nscount, arcount;
+ 	const unsigned char *aptr;
diff --git a/net-misc/sipsak/metadata.xml b/net-misc/sipsak/metadata.xml
new file mode 100644
index 000000000000..9a14eb279ec0
--- /dev/null
+++ b/net-misc/sipsak/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 type="person">
+		<email>chainsaw@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sipsak.berlios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
new file mode 100644
index 000000000000..3623e28e87ae
--- /dev/null
+++ b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="small command line tool for testing SIP applications and devices"
+HOMEPAGE="https://sourceforge.net/projects/sipsak.berlios/"
+SRC_URI="mirror://sourceforge/sipsak.berlios/${P/_p/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="gnutls"
+
+RDEPEND="gnutls? ( net-libs/gnutls )
+	net-dns/c-ares"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/_p1}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-callback.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable gnutls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
new file mode 100644
index 000000000000..a4ee1948c371
--- /dev/null
+++ b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="small command line tool for testing SIP applications and devices"
+HOMEPAGE="https://sourceforge.net/projects/sipsak.berlios/"
+SRC_URI="mirror://sourceforge/sipsak.berlios/${P/_p/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="gnutls"
+
+RDEPEND="gnutls? ( net-libs/gnutls )
+	net-dns/c-ares"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/_p1}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-callback.patch"
+}
+
+src_configure() {
+	append-cflags -std=gnu89
+
+	econf \
+		$(use_enable gnutls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
new file mode 100644
index 000000000000..59335fc9025b
--- /dev/null
+++ b/net-misc/sitecopy/Manifest
@@ -0,0 +1,13 @@
+AUX sitecopy-0.16.6-01-remote-dynamic-rc.patch 4303 SHA256 c732a27b8ef935198163e764feea581c16d4d4f5522c5735b75dbbe89ee61491 SHA512 7523fefe9e242278aeb7e5c5bf58fd6392b7191742c709d55be17e91b86def997c558a84c85e350bf57f5cc03f55aef9fba63d9192c2d93a5c1b56c2f58d9c9c WHIRLPOOL ad4d1ebecb46f9b99ec22f353470bb62f1f19a8e010414252b680889f9faf429c1892f3bb004d900667c8c1a88bf6ba226c1a1144ce1fc069142ab13f65a34e1
+AUX sitecopy-0.16.6-02-french-po-fix.patch 689 SHA256 298e9cdce6f352680c2681cef3cdc176a8983ac7dfb5da94a721298cb2905767 SHA512 a4f0a42e9316479d695f4f1efb6165c75e9a96a1e65cb14499c32d6d345bb1e24985b9d02c04656b8d779d31bcc4b7a2a56de726aa58fbab5180a45b9361839a WHIRLPOOL a2df85a23a01824ba38a434b11915a4033f4656baa07487e151e00090982e651f156703abe5f332d6c2c2c276f24a8b4c332a69e6be0335b56a42981e62844cd
+AUX sitecopy-0.16.6-03-wrong-memory-397155.patch 654 SHA256 6f04086c5124d55eadc64e05dbe215bc8a4805fa0a38fc7dbd71106cb364118c SHA512 7e21f225fc6760ab07e56658b5cdadd0f145fb15efe592b18052f02713a91bf4f2c2ff6354cbc65e8188f30546115f6aaae1f1b4c7150ba691cf4a2de7849ed9 WHIRLPOOL 5f744735a1f99dc00311fa3975da02d2a3327c2e5a6f0f534672270bd7d04efc38e76c174629eadf76f4dc046fd6f3ac3ac9d3f85b73d958967410be9195fb43
+AUX sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch 477 SHA256 00c8aeabdcd7a68499c85aba9d02a6544037fd8e9837144161ee5eda5f06b73d SHA512 496580538b88619d3f7f3bd76140f573101df8176c62273676db58512b759746cb9c5a3685b3e0f9236148a0132e8b77b17ce3ae7a4adfad4afbbd38a43a7eb2 WHIRLPOOL 3bce2c80e6ce3b68d2278e23625f4f6580ad3a1a7aed60d87ba403a932c3640465de52b698c8540d99cfe402965b25e9b9ee31acfef1513831daeb63b5a1819f
+AUX sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch 1671 SHA256 adab2b37ab6f554c6edfe03041ab5201d9feec5f78596b5597d4928bb66e52f7 SHA512 16f4d27df6c0e44491529c721f93cfc8686be6826d1132c3ae90de3b49f1964de4ec9adc1e03564e6213135ea38d40641039c40d344555888f3cc7746be611c2 WHIRLPOOL 3094ba5680975a0f11ca031fc89ffef962987121e9b944584665c8a2e0bea39f4203cca30bd05be4097de9ab50500bccd16bd25532cfc830dd6b04401106508a
+AUX sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch 549 SHA256 c207cdae0849c799a4d312432ac87e0b4e3b9796b973ae50930a76aa32225572 SHA512 369fac53c1713a009578f7ee6c53b0d66439cd73c705d38897634251992abfc2743fa113fca807c3bae26ad0a155ebfa085b4f156b4a48882fb25520263f11e0 WHIRLPOOL 416747cece8e3d1c6d3da8cf3b622be873b4a25d71d89f1ce07ed1843be958c8df4546f8ea168aec0a9ed6f87bff010e66c918ffcc09000b436ea82211f52ade
+AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 SHA256 13fc4f9280328b5b1df7dffa3f2f076088f96487d26e5fdc7f73270dc2e94c32 SHA512 cdd3abe65fbaadc52caa83641212fd96430df9ea8dfaf08568d63907df3cc87b48b9de0febde545b24722ba7e77c5a8fb4226d8a6dd696b87820dfc1d4fdb6d4 WHIRLPOOL 234f983669bf0335233ac651c5813661e2ff5fd71cc62767a3685d3dd7f1cab26c3472576cfb02aca2b83c0127ba9824e727d439fd9c7ebf31b29dd92eab16a2
+DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 SHA256 09a8e30ca37ec86e7bbdc59b1b59789a6a3172d423a71382774732f19d0e9173 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965 WHIRLPOOL 0ca06284a408ba9fe6ff5b2aac0b2f8808226812b80403a9cf45b575a9b15320a03391882eb42b5e000a3c475cc5fbc531b657ca01434a7e9061b2bc49405534
+DIST sitecopy-0.16.6.tar.gz 1022265 SHA256 e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734 WHIRLPOOL 7f9e40649e20720bcb3dcfd397c1df6525bc8de5d08779770fe094cc7d2ce9c750d74bad6dbf8e307ee4a2bf8d1e1df21a4616becec3f03fbb6e0e604df5585f
+EBUILD sitecopy-0.16.6-r1.ebuild 3337 SHA256 5f9e925e03da750f2a009dfeee45b451be239232366392d0d536ce027b48e766 SHA512 90974bfa8bafed38ef4886c932f3a569f1db7e334e07819a046138d3f9495c91e75d184b58237a7b958837ec0f4fc85ad77fc8270657a578d17e5d257d180128 WHIRLPOOL f61cdef763b2ab16045b68ac97759ea39975aec8cfa96439a85003976177ef1b8fb25017b542d513d922dd7e96394533c2c5370e0114e9ba33ab88a324e9ccd8
+MISC ChangeLog 3004 SHA256 1cf4a1d64159c07e106e5f8031cb2773f875f14f803a2ff9ddd9c0868146d9ab SHA512 69f40ca93fa7e6c604bceb11cf27ee9883d311ab8cfbc2314521b49f6406869765fbb3dfcc6af8809c1123dd75d2c02d7114a958188e27f7d28ed3aee240afb9 WHIRLPOOL 99616f7bc0b4810924dc80c9c1947d0749756f0da581d616c9caf4c1ce1f526a4911408fe3d833f50234981dc676545e76c16a1d885c8b06e50713448fbd9688
+MISC ChangeLog-2015 9606 SHA256 64a6e5c3498eab79b56c65d36ea84887776f7cbc0e7b3172b3074a4e20d1dbdf SHA512 b1d30a8e7413cd863cc5152f17f0d33ce09f19dfac44e192948481c5ff03c90e50f423dfb484fe590841107ab75813b95116c113bafbcc767250ad637827ff26 WHIRLPOOL 9750ca4cb7b7c55e3c9926fc1a9afc49327985e5ba6ac1fa4447be0e1f65a00bb43ece9e60f2ad413bbd523653c8452a5b4659ae13d4e3d30b3e264c6d56a372
+MISC metadata.xml 880 SHA256 d5499426de6601d301d5c49e8fa1725a43b603125192ceb4af0d12ba3ad09e5a SHA512 543379bb5a41af9e5fa8386e07ddce7e7a0120ea7a2c849d1805774b1edd12fc8a64fd82051288a3e2e320940b25111f06de030b601c6e1c6b4cafe77f6a80d4 WHIRLPOOL 6f5f044c33c9cd7904b96bf9c5d6319151b882715b4bf13ee6da3f26c2fb3833e156c457a91a31a63362857c6857c9ac5e1845ce0044f4ea3361f8558bb479e9
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-01-remote-dynamic-rc.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-01-remote-dynamic-rc.patch
new file mode 100644
index 000000000000..803dc50b0423
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-01-remote-dynamic-rc.patch
@@ -0,0 +1,134 @@
+From: Jesus Climent <jesus dot climent at hispalinux dot es>
+Subject: A patch for generating dynamic rc files
+
+diff -u sitecopy-0.16.3-orig/src/console_fe.c sitecopy-0.16.3/src/console_fe.c
+--- sitecopy-0.16.3-orig/src/console_fe.c	2006-10-27 18:55:19.000000000 +0530
++++ sitecopy-0.16.3/src/console_fe.c	2006-10-27 18:39:06.000000000 +0530
+@@ -155,7 +155,8 @@
+     show_progress, /* Do they want the %-complete messages */
+     prompting, /* Did they say --prompting? */
+     keepgoing, /* Did they say --keep-going? */
+-    dry_run;   /* Did they say --dry-run? */
++    dry_run,   /* Did they say --dry-run? */
++    createremoteroot=false; /* Did they say --create-remote? */	
+ 
+ /* Functions prototypes */
+ static void init(int, char **);
+@@ -222,9 +223,9 @@
+ 	exit(-1);
+     }
+ 
+-    for (current=all_sites; current!=NULL; current=current->next) {
++     for (current=all_sites; current!=NULL; current=current->next) {
+ 	
+-	if (current->use_this || allsites) {
++	 if (current->use_this || allsites) {
+ 	    if (!listflat && quiet == 0) {
+ 		/* Display the banner line */
+ 		const char *str_action = _(actions[action].doing);
+@@ -507,6 +508,9 @@
+ 	    }
+ 	} break;
+ #endif
++	case 'x':
++	    createremoteroot = true;
++	    break;
+ 	case 'y':
+ 	    prompting = true;
+ 	    break;
+@@ -1210,7 +1214,8 @@
+     int ret = 0, verify_removed;
+ 
+     /* Set the options */
+-    site->keep_going = keepgoing;
++     site->keep_going = keepgoing;
++     site->create_remote_root = createremoteroot;	
+ 
+     switch (act) {
+     case action_update:
+@@ -1354,6 +1359,7 @@
+ "  -p, --storepath=PATH  Use alternate site storage directory\n"
+ "  -y, --prompting       Request confirmation before making each update\n"
+ "  -a, --allsites        Perform the operation on ALL defined sites\n"
++"  -x, --create-remote   Create root for remote site\n"
+ "  -k, --keep-going      Carry on an update regardless of errors\n"
+ "  -o, --show-progress   Display total percentage file transfer complete\n"
+ "  -q, --quiet           Be quiet while performing the operation\n"
+diff -u sitecopy-0.16.3-orig/src/sites.c sitecopy-0.16.3/src/sites.c
+--- sitecopy-0.16.3-orig/src/sites.c	2006-03-02 01:08:21.000000000 +0530
++++ sitecopy-0.16.3/src/sites.c	2006-10-27 19:12:30.000000000 +0530
+@@ -94,7 +94,6 @@
+     struct site_file *current;
+     char *full_local;
+     int ret;
+-    
+     ret = 0;
+     
+     for_each_file(current, site) {
+@@ -312,11 +311,52 @@
+     free(full_remote);
+ }
+ 
++static int create_remote_root_dirs(struct site *site, void *session)
++{
++    char *buffer;
++    int i,j=0,ret=1,flag=1;
++
++    buffer = (char *) calloc(strlen(site->remote_root)+1,sizeof(char));
++
++    buffer[j++] = '/';
++
++    for( i=1 ; site->remote_root[i] != '\0' ; i++ )
++    {
++      if (site->remote_root[i] == '/')
++        flag = 0;
++
++      if (flag)
++        buffer[j++] = site->remote_root[i];
++      else
++       if (j > 0)
++        {
++         buffer[j] = '\0';
++         ret = CALL(dir_create)(session, buffer);
++
++         if (ret != SITE_OK)
++           ret = 0;
++
++         buffer[j++] = '/';
++         flag=1;
++       }
++    }
++
++    return ret;
++}
++
+ /* Create new directories and change permissions on existing directories. */
+ static int update_create_directories(struct site *site, void *session)
+ {
+     struct site_file *current;
+-    int ret = 0;
++    int ret = 0, ret_root_dir;
++
++    if (site->create_remote_root) /* We create remote init struct before updating the whole stuff */
++    {
++      ret_root_dir = create_remote_root_dirs(site,session);
++
++      if (!ret_root_dir)
++        fe_warning (_("I couldn't create some dir. already exists?"),NULL,NULL);
++    }
+ 
+     for_each_file(current, site) {
+ 	if ((current->type == file_dir) 
+diff -u sitecopy-0.16.3-orig/src/sites.h sitecopy-0.16.3/src/sites.h
+--- sitecopy-0.16.3-orig/src/sites.h	2006-02-04 17:46:36.000000000 +0530
++++ sitecopy-0.16.3/src/sites.h	2006-10-27 18:39:06.000000000 +0530
+@@ -381,6 +381,8 @@
+     char *rsh_cmd;
+     char *rcp_cmd;
+ 
++    unsigned int create_remote_root:1; /* to create remote root in case it doesn't exist */	
++
+     unsigned int nodelete; /* whether to delete any files remotely */
+     unsigned int checkmoved; /* whether to check for moved files */
+     unsigned int checkrenames; /* whether to check for renamed files */
+
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-02-french-po-fix.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-02-french-po-fix.patch
new file mode 100644
index 000000000000..8dda2589eb01
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-02-french-po-fix.patch
@@ -0,0 +1,22 @@
+From: Ludovic Rousseau <rousseau@debian.org>
+Subject: Fixed the french translation issue
+
+--- sitecopy-0.16.3.orig/po/fr.po	2006-03-12 11:07:42.000000000 +0100
++++ sitecopy-0.16.3/po/fr.po	2007-05-05 10:14:08.000000000 +0200
+@@ -2,7 +2,6 @@
+ # Copyright (C) YEAR Free Software Foundation, Inc.
+ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+ #
+-#, fuzzy
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: sitecopy 0.9.3\n"
+@@ -12,7 +11,7 @@
+ "Last-Translator: Sylvain Glaize <mokona@puupuu.org>\n"
+ "Language-Team: fr\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=latin-1\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+ #: src/console_fe.c:119
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-03-wrong-memory-397155.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-03-wrong-memory-397155.patch
new file mode 100644
index 000000000000..5b397c01b05b
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-03-wrong-memory-397155.patch
@@ -0,0 +1,15 @@
+From: Ludovic Rousseau <rousseau at debian dot org>
+Subject: A patch for fixing wrong memory intialization
+
+diff -u sitecopy-0.16.3-orig/src/rcfile.c sitecopy-0.16.3/src/rcfile.c
+--- sitecopy-0.16.3-orig/src/rcfile.c	2006-02-04 17:46:36.000000000 +0530
++++ sitecopy-0.16.3/src/rcfile.c	2006-11-08 22:24:51.000000000 +0530
+@@ -260,7 +260,7 @@
+ 		if (this_site != &default_site)
+ 		    last_site = this_site;
+ 		/* Allocate new item */
+-		this_site = ne_malloc(sizeof(struct site));
++		this_site = ne_calloc(sizeof(struct site));
+ 		/* Copy over the defaults */
+ 		memcpy(this_site, &default_site, sizeof(struct site));
+ 		/* Deep-copy the string lists */
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch
new file mode 100644
index 000000000000..ef9f83621e19
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch
@@ -0,0 +1,13 @@
+From: Agustin Martin Domingo <agmartin@debian.org>
+Subject: Patch for sftp protocol doesn't work with >= 1:4.2p1-1
+
+diff -urNad sitecopy-0.16.3~/src/sftpdriver.c sitecopy-0.16.3/src/sftpdriver.c
+--- sitecopy-0.16.3~/src/sftpdriver.c	2005-06-29 11:44:47.000000000 +0200
++++ sitecopy-0.16.3/src/sftpdriver.c	2007-10-22 14:58:51.000000000 +0200
+@@ -140,7 +140,6 @@
+     }
+     close(c_in);
+     close(c_out);
+-    read_sftp(sess);    /* wait for prompt */
+     return SITE_OK;
+ }
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch
new file mode 100644
index 000000000000..5902282357c5
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch
@@ -0,0 +1,52 @@
+From: Andreas Henriksson <andreas@fatal.se>
+Subject: Preserve storage files it SIGINT (Ctrl+C) is sent
+
+--- sitecopy-0.16.3/src/sitestore.c	2006-02-04 11:18:08.000000000 +0100
++++ sitecopy-0.16.3-pending/src/sitestore.c	2008-06-08 21:56:23.000000000 +0200
+@@ -60,17 +60,42 @@
+ /* Opens the storage file for writing */
+ FILE *site_open_storage_file(struct site *site) 
+ {
++    char filebuf[PATH_MAX];
++
++    /* open a temporary "pending" file, to not corrupt the site file in case
++     * the program aborts while we are updating it.
++     * The site_close_storage_file() function will rename it to it's proper
++     * name.
++     * FIXME: something should clean up old *.pending files,
++     * which never got properly closed.
++     */
++    snprintf(filebuf, sizeof(filebuf), "%s.pending", site->infofile);
++
+     if (site->storage_file == NULL) {
+-	site->storage_file = fopen(site->infofile, "w" FOPEN_BINARY_FLAGS);
++	site->storage_file = fopen(filebuf, "w" FOPEN_BINARY_FLAGS);
+     }
+     return site->storage_file;
+ }
+ 
+ int site_close_storage_file(struct site *site)
+ {
+-    int ret = fclose(site->storage_file);
++    char filebuf[PATH_MAX];
++    int err;
++
++    /* close filehandle */
++    err = fclose(site->storage_file);
+     site->storage_file = NULL;
+-    return ret;
++    if (err) {
++      perror("fclose");
++      return err;
++    }
++
++    /* rename pending file to real filename (overwriting existing file). */
++    snprintf(filebuf, sizeof(filebuf), "%s.pending", site->infofile);
++    err = rename(filebuf, site->infofile);
++    if (err)
++	    perror("rename");
++    return err;
+ }
+ 
+ /* Return escaped form of 'filename'; any XML-unsafe characters are
+
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
new file mode 100644
index 000000000000..0b53e2e4e395
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
@@ -0,0 +1,17 @@
+From: Sandro Tosi <morph@debian.org>
+Subject: Add support for libneon 0.29.0 and 0.30.0
+
+diff -urNad sitecopy~/configure.in sitecopy/configure.in
+--- sitecopy~/configure.in	2008-07-20 18:21:15.000000000 +0200
++++ sitecopy/configure.in	2009-10-05 23:44:00.764858219 +0200
+@@ -112,8 +112,8 @@
+    AC_LIBOBJ(lib/fnmatch)
+ fi
+ 
+-# Support neon 0.24 through 0.28
+-NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
++# Support neon 0.24 through 0.30
++NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29 30])
+ 
+ dnl But we don't use zlib or ACL support
+ NEON_WITHOUT_ZLIB
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch
new file mode 100644
index 000000000000..cc4e4c754171
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch
@@ -0,0 +1,59 @@
+From: Christian Kujau <lists@nerdbynature.de>
+Subject: Document SFTP sitecopy functionality
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' 
+'--exclude=_darcs' '--exclude=.bzr' sitecopy~/doc/sitecopy.1 sitecopy/doc/sitecopy.1
+--- sitecopy~/doc/sitecopy.1	2011-01-03 00:03:07.596559823 +0100
++++ sitecopy/doc/sitecopy.1	2011-01-03 00:03:07.852560823 +0100
+@@ -16,7 +16,7 @@
+ files using an FTP client.  sitecopy will also optionally try to spot
+ files you move locally, and move them remotely.
+ 
+-FTP, WebDAV and other HTTP-based authoring servers (for instance,
++FTP, SFTP, WebDAV and other HTTP-based authoring servers (for instance,
+ AOLserver and Netscape Enterprise) are supported.
+ 
+ .SH GETTING STARTED
+@@ -229,6 +229,8 @@
+ .br
+   ftp       FTP driver
+ .br
++  sftp      SFTP driver
++.br
+   xml       XML parsing information
+ .br
+   xmlparse  Low-level XML parsing information
+@@ -297,7 +299,7 @@
+ .BR "url " "siteURL ]"
+ .br
+  [ 
+-.BR "protocol " "{ ftp | webdav } ]"
++.BR "protocol " "{ ftp | sftp | webdav } ]"
+ .br
+  [ 
+ .BR ftp " nopasv ]"
+@@ -353,12 +355,12 @@
+ to the default port for the protocol used, or that given by the
+ .B port
+ key.
+-sitecopy supports the WebDAV or FTP protocols - the 
++sitecopy supports the WebDAV or (S)FTP protocols - the 
+ .B protocol
+ key specifies which to use, taking the value of either
+ .B webdav
+ or 
+-.B ftp
++.B ftp/sftp
+ respectively. By default, FTP will be used.
+ 
+ The 
+@@ -769,7 +771,7 @@
+ be a useful resource for others.
+ 
+ .SH SEE ALSO
+-rsync(1), ftp(1), mirror(1)
++rsync(1), ftp(1), sftp(1), mirror(1)
+ 
+ .SH STANDARDS
+ 
+
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
new file mode 100644
index 000000000000..b03b823d1292
--- /dev/null
+++ b/net-misc/sitecopy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  	<email>rogerx.oss@gmail.com</email>
+	<name>Roger Zauner</name>
+	<description>Maintainer. Assign bugs to him</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.</flag>
+    <flag name="webdav">Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
new file mode 100644
index 000000000000..90a94c1f611d
--- /dev/null
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Maintain remote web sites with ease"
+SRC_URI="http://www.manyfish.co.uk/sitecopy/${P}.tar.gz
+	https://dev.gentoo.org/~idella4/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
+HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/"
+# Removed all Debian related stuff.  If you want more patches, they can be ported from
+# http://ftp.debian.org/debian/pool/main/s/sitecopy/
+# The sitecopy_0.16.6-5.debian.tar.gz contains their build scripts and patches.
+# This SiteCopy now builds using the original sources.
+KEYWORDS="amd64 x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="expat nls rsh ssl webdav xml zlib"
+
+# TODO: Depends copied over from old ebuild file, ensure they're still correct!
+DEPEND="rsh? ( net-misc/netkit-rsh )
+	>=net-libs/neon-0.24.6[zlib?,ssl?,expat?]
+	<=net-libs/neon-0.30.9999[zlib?,ssl?,expat?]
+	xml? ( >=net-libs/neon-0.24.6[-expat] )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# NOTE: Insert patches here.
+	# SiteCopy patches are being currently pulled & ported from
+	# http://ftp.debian.org/debian/pool/main/s/sitecopy/
+	# Consider SiteCopy to be more or less being actively maintained by
+	# Debian maintainers, but GPL patches ported into Gentoo.
+
+	# NOTE: epatch is provided by 'inherit eutils'
+	# Patch File Naming Format
+	# files/package_name - package_version - patch_order - patch_description
+
+	epatch "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \
+	"${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \
+	"${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \
+	"${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \
+	"${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \
+	"${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \
+	"${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \
+	"${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
+
+	# Source package uses incorrect '/usr/doc' for the doc folder.  So use
+	# sed to correct this error.
+	sed -i -e "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \
+		Makefile.in || die "Documentation directory patching failed"
+
+	# NOTE: eautoconf/eautomake is provided by 'inherit autotools'
+	# Need to recreate the source package provided configure script,
+	# because the package provided configure script only supports
+	# <neon-0.30.0 support.  A patch above patches the configure.in
+	# providing neon-0.30.0 support, and we then recreate the configure
+	# script based upon configure.in using autotools.
+
+	# First move configure.in to configure.ac, required by newer >autoconf-2.13
+	# per Bug #426262 automake-1.14 compatibility
+	# Should check first, autoconf-2.13 is still in the tree requiring configure.in!
+	# mv configure.in configure.ac || die
+
+	eautoconf
+	eautomake
+}
+
+src_configure() {
+	# TODO: USE functions copied over from old ebuild file, ensure they're still correct!
+	econf $(use_with ssl ssl openssl) \
+		$(use_enable webdav) \
+		$(use_enable nls) \
+		$(use_enable rsh) \
+		$(use_with expat) \
+		$(use_with xml libxml2 ) \
+		--with-neon \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/net-misc/sjphone/Manifest b/net-misc/sjphone/Manifest
new file mode 100644
index 000000000000..c403a3d2fa1a
--- /dev/null
+++ b/net-misc/sjphone/Manifest
@@ -0,0 +1,5 @@
+DIST SJphoneLnx-1.60.2235.tar.gz 4390024 SHA256 1d308fdee9b56fef0152833f7b9cf2a54a3391e5d4d353a094a300b722d5dff0 SHA512 f1c824c51cc4edfec2baf7c31c8afb71930851a96563b50ab8f7219f49b03a4233549e0a1bb4b53a55bd2b72cc3454e2f50625d2ba63491015fcbef27726b567 WHIRLPOOL 7b87323e7a5e7350da793f7e516a13677626725ab8f61d03ef5877f511513a0eac46b5242608af2db3c903c8fb06068a311eedbc78ee5b387f8a209b3aa8e573
+EBUILD sjphone-1.60.2235.ebuild 802 SHA256 66a7ee1bac6eb30cc70afcee65b485435f828655e84d47efed817f82786f933d SHA512 f455eb77f6d5173d39cf4ffcbd66143b30daf47668d68e3d1ac4ea595aba127663fecc496169db804c59b78c2b882a8969f215090d5cfbcd6c4957b1c1ffe780 WHIRLPOOL 67020ffbefd1cc552133ee8b8d705a78bb4c310eae18fe739fdcb6b70a92281e3eb94cd469b0eae1aea27520c7a41e88403373dd467470f6db8b43f51fb341c6
+MISC ChangeLog 2530 SHA256 988747aa36a886a804698e1981c2668ade5eb254a85ac9ef13393b1d562621cf SHA512 0b61d79b4d6e81caa31de144dc8cbe4407b19db62fdbf3cd246fe2346695485c5bb0d2c024028b7e0ebfc66aee03ad429edf38bd071fbd8eace79a2de5108a70 WHIRLPOOL 74c771ae077eabbfcf739fb8ba754769d14912e9467ce37b7f1f7dbe346e8a58810c5a837aa92c80f3dd1d0a2669cbbd0d9038c6d1eb27772923d5877b490046
+MISC ChangeLog-2015 1124 SHA256 5003f78c64dfffb55e47b4aa10c87f349f33f466a2250d12f1e61b586b1905a9 SHA512 1d071335daffaa629dd3f9fe9fb07a20e584da2102140428b3804e9b51e26edfc5fbb8af7c1ba7f7a3aac19e1bdf55f4dc40c14e2831af282845cc1d8780cb4d WHIRLPOOL 2af38bc6f5404d53bf1bd31dd233360be850392a7d924305c73b71b6b6743a7efe5d871514ec2effa20c2208a1ceb54fbd0d0e355e19e3fd4e916fb7513f4c00
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/sjphone/metadata.xml b/net-misc/sjphone/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/sjphone/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/sjphone/sjphone-1.60.2235.ebuild b/net-misc/sjphone/sjphone-1.60.2235.ebuild
new file mode 100644
index 000000000000..cebdf44115a6
--- /dev/null
+++ b/net-misc/sjphone/sjphone-1.60.2235.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+MY_P="SJphoneLnx-${PV}"
+DESCRIPTION=" VOIP softphone supports both SIP and H.323 standards "
+HOMEPAGE="http://www.sjlabs.com/sjp.html"
+SRC_URI="http://www.sjlabs.com/preview/linux/${MY_P}.tar.gz"
+
+LICENSE="SJ-Labs IJG libpng ZLIB RSA W3C BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp"
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="strip"
+
+src_install() {
+	insinto /opt/sjphone
+	doins -r lib/*
+	fperms a+x /opt/sjphone/sjphone
+
+	sed -i -e 's:$(dirname "$0"):/opt/sjphone:' \
+		-e 's:$WD/lib:$WD:' sjphone
+	dobin sjphone
+	dodoc README
+	doicon lib/sjphone.png
+	make_desktop_entry sjphone
+}
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
new file mode 100644
index 000000000000..df390c95f2d5
--- /dev/null
+++ b/net-misc/sks/Manifest
@@ -0,0 +1,16 @@
+AUX sks-1.1.6-unbundle-cryptokit.patch 2051 SHA256 2a9a2ad3f3e10c942a842e6905f0a957a53729cf1fbc61c5e8991b7cb285b3cb SHA512 35428b0a6052c45e4fe03fce6474c70c8c3b72e3f611fe86ed3b6055018bbc8d90174ad07748ad42bff1f748eb6a334e09d1c64be7cd23722aa76e8e21d546f4 WHIRLPOOL c7d73f8d74ed1b362e67230c045f3edf880b10188e7cc361c8e6e7b591a51453aded90a0543e495005473de0cf978524642375137d0b5ac729796863832ddd45
+AUX sks-1.1.6-use-ocamlfind.patch 1259 SHA256 dd77b6d7a18535a710deac13fe67db0bfd1b368e2c598b12d26870edfa03e16d SHA512 7fff2dbcad7f3c73e53b99d856cb1da52125e5dc51b84959be9ddc555dc34e1e39a049aa3946f350a15d9a5ed74f4bc0a58f2ea3523c4cc3675bf3901db11238 WHIRLPOOL 3378764c50d952436330707dcb7922d7a030e23e927af530ca6958fb6b582406c7cb2507850eaefc7cf6c6bc1de369e74f30d5e6283923bb1a49fa8e634d4355
+AUX sks-1.1.6-use-ocamlfind2.patch 671 SHA256 6c1493c9fcda5b7a1746e802ac333013eac3d3e5d71132416734b45cd69e704a SHA512 555a688be1e4bb1c7fb2e1bbeb4661e6dd0bc04d94a2ff3c5a12e7979549efc79531ee8cba01f6150610b633cce20072367a42eda2870f0755adf69b24cfaa7f WHIRLPOOL cfe2ffcaf9d53cd3344fbb043ec682f397304a6f95027abaac4625d9a7c56d9d5882ce4bbc533cde2c293c1503fe7c0fb84ec4a60e8acb5a79949d073771c6fa
+AUX sks-1.1.6-use-ocamlfind3.patch 665 SHA256 4a36db614b4c172d2ed4693dfeed696e8407e5e2322ee9ffd362010b165c06ed SHA512 cae267036bbe65701f06a1aec4f3cfb30d7a8f5bd8859d8eaa73b2d66438b5fe0c6ceb42cc810951dd4233b0b162091dcfd760ff9c22b3a3e39ed99e239ca13a WHIRLPOOL 0be780383a032aa376bc3efc2b2da68a240c3a65101703a8304c953f7f2cb1a35768173c2927f890c202fb75c2fe2b35ab5f05274c88ff717d83ab7017c20fc4
+AUX sks-db.initd 520 SHA256 37ee314d861184462ce3b626f1c18f593a42f04472d325acd2d38dd4931456ee SHA512 60335298f05f9917a960b5759c4e45e0ecca53455a7cd8dc9181175bf75dc1916ce2f33663f342d7b6f5f3bfa6fc4cc41bbcdc94afcfc424e31189afd40193f6 WHIRLPOOL e004ad7ccf33f0780fd3e26ccd59e7ac913d40e6f1bc6e61a29384fa7d7c29b3a89a2b0775788da7a9923caa5793426155f8fa68f3d0db1da510d029e46d3998
+AUX sks-db.service 174 SHA256 a6ae25f8f4b4ead48046ce31af89cbc0cd2fb7acc80d6ae241d301dc0059bce8 SHA512 bf90ca8a5c14ccdddb9bc0c4a7493fe10ce54ae8df7ba32773cc3f59d018f74afd3c5302794deb69186cdddbaadc82d7db8d0c3d8862f37862a3c8c104b2365e WHIRLPOOL e03a2329ed423e1d557ad9a37491285ca29f9f677ca05d4b8ae09c912b4a87958e12f70282e56d3c0350183702fafa0ba74b5019bb13d89ecf6e1ca336d22ad5
+AUX sks-recon.initd 583 SHA256 cd4c27ac6096aaafc85707e36b17ee6c0a320f31cda9c37db7bde8da019b82c7 SHA512 5d26e2196428a76bb454e2bf9e0d3813e96f894ef4f326650300874efb71a303eeb7267270327036da38960a8b68e420ce7e7e61cf21f7be85c80612c00a0f6c WHIRLPOOL 251d68c9f614262bf96d738cccf89e1acd198fe2c4117f19d52893bdf15346ab481015dea715f9b618cc14ab2690573bf9c9fe22996a7f897d4519928cabb9b2
+AUX sks-recon.service 187 SHA256 bb68920796fb0fd22ccc433306b65ff988125884988bb3d5beb0449d7e30389d SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef WHIRLPOOL b260bc4bc1091e96aed0d5e94e80574b3679449962b0dc4953e40a222cc050fc08751d33b64200de01af964b054ee65e15c4d52f7c45f8f01d80cd27e7d0df0a
+AUX sks.confd 87 SHA256 811498c2c964ee109dcbf617682addf0631172bb75e9b221af5b4084f4720214 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660 WHIRLPOOL 0ee221d86ca478af20aa9e8530eff79ecd0181dbf52da282d41fed6881a6649335281f1907e486bdc1dd4877b930265aefb3e5d189cd6b5c270d383abf329fc7
+DIST sks-1.1.6.tgz 359499 SHA256 22312dbec6dfd372932075b0b0b1d04f772059a9520faa4937feafc737d5a632 SHA512 f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099 WHIRLPOOL 85714515275c21821ff3bc429d00546f1f3b1cf6b8193edd1b26295ec07861ed1ed8b123deb811b6b915d761e977662398e7509581d8fe0e32d47ea6dd09388a
+EBUILD sks-1.1.6-r2.ebuild 3653 SHA256 2268432342d417f8427a6c0a74d05ce04b32e1d9db29ff018d57cccfae740776 SHA512 93f867791a3b09f58098b1e9047ea5e49c4abf04b2428dc8aabfc1834ae4f71d84f84f4e88ccc4e767c5e4d4171332ba4b16a1d1ab098314e58f29e664f9642f WHIRLPOOL 5ea9d509fb32f782912cdf6a39a579671a0e3e1150593dfab83dfff1837a50a0e6297cb912ddadd0d04702f1dac2436ba80396c5b91487b5063740592b2059f0
+EBUILD sks-1.1.6-r4.ebuild 3522 SHA256 6a3d58269a92408e356f3763805248759235b865f0f91dc9c3853f2a0a7ce3c8 SHA512 b93fdc43971b4d736da706189e4a300ae5d68100b52b41acbdc8930936893add99a33744b2733131ba8d0ddf861f5b81d6d53d3d25d633215a6b3298a7ed5fa7 WHIRLPOOL dc52ca8f7a5e39948c1587254eefbaca4414db9108989436f40a64210b87539f545a3a30e9522c4e380307176e37f9573d1e4e85b924d85524d0a3b0553bb4bf
+EBUILD sks-1.1.6-r5.ebuild 3665 SHA256 b224689e63c3df96d6b7f4b566d9cc63c68ff8f51b0950cfde6f3b98dd40184f SHA512 24e6a92cb17628a01e389db2fe8cadef24baa5071c68529f99f9fb4e30ceece6752069f8a58159bb5a07f28921ef6c58e325e273c3940f4d13ef0b9b0a4cd7f0 WHIRLPOOL 4839ea0e6c583dd851347bd0889d0211fab2f33acaf2e5c2e5604917ba37c9b1cf9d4e5945cfcf38b1759aebf42d7d1bb54acb3757728df96052368193ca4f6f
+MISC ChangeLog 4487 SHA256 8fe441f2077a20d5bd7fdf434f32c22c2220028f9f924a454f4366101293afe2 SHA512 15e30ad8fa51153bddb45c17c9858ce498031fa69ce1cb213b7b4c0dc14514ded3786fd655178d139de4160e29a6caeb239f3430b6520ccd8255a77c6de5f292 WHIRLPOOL c9d6da6705fe77a302e6b0d044b7355bebeec347296dd12402981feb067bf0665debcb36846bf18ef7c25ebf376bdb35b07b470b4c5f615b580fbb5d14e08166
+MISC ChangeLog-2015 2667 SHA256 0de86eb3e2bbd497955ff6c85fb314697b4d311d4e9a8af345faa8e42f0ea55e SHA512 1f32a184953872dee9085e4dea926b186fb70562af45bbdd519fa11e6e235362d70b38c38d4184c3832baa2fcdfe0a0329ab48b285b35077a8e20a80a41ff76f WHIRLPOOL 3b1fd053cbe4c23eaa8c9a241ef4eaecef356d3321bf8484fa72a51b4241b92fa0f04fa5865c028ed27ea6fb66fba9f3f1568edc8aaa00b3ec73560218814463
+MISC metadata.xml 461 SHA256 8812c3266c80ecc6cd2670b4ffe5fbbc9983e00d28a9e4ee558a94bc724d71f0 SHA512 9000d37a7cbfa59227f68c7791c3ad8d3c373da5376eab9a03c8bda742f0253143b56ad9ae492fbccabcf54f17f931c052fffc4d9991e2c5f1620afcb5da23ca WHIRLPOOL c608e724497f950b41b4e40a049bd38c45a20ef3a8f680f22c68df93158be6f31a7c2d08325152fe0f2c8da2fb3ef01bf916285239fffbdd92a617fef8b5c64a
diff --git a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
new file mode 100644
index 000000000000..bf3d19010337
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
@@ -0,0 +1,72 @@
+From: Christoph Martin <christoph.martin@uni-mainz.de>
+Date: Fri, 6 May 2016 14:55:01 -0400
+Subject: use system cryptokit
+
+Use the system cryptokit instead of the one shipped in upstream source
+---
+ Makefile | 31 ++-----------------------------
+ 1 file changed, 2 insertions(+), 29 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 15ab3ea..eb56758 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ WARNERR=-warn-error A
+ endif
+ 
+ CAMLP4=-pp $(CAMLP4O)
+-CAMLINCLUDE= -I lib -I bdb
++CAMLINCLUDE= -I lib -I bdb -I +cryptokit
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+ CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
+@@ -109,7 +109,7 @@ ALLOBJS=$(ALLOBJS.bc:.cmo=.cmx)
+ 
+ EXEOBJS.bc=$(RSERVOBJS.bc) build.cmo fastbuild.cmo dbserver.cmo pdiskTest.cmo
+ 
+-LIBS.bc= lib/cryptokit.cma bdb/bdb.cma
++LIBS.bc= bdb/bdb.cma
+ LIBS=$(LIBS.bc:.cma=.cmxa)
+ 
+ VERSION := $(shell cat VERSION)
+@@ -280,32 +280,6 @@ prepared:
+ 	touch prepared
+ 
+ 
+-CKVER=cryptokit-1.7
+-CKDIR=$(CKVER)/src
+-
+-$(CKVER)/README.txt:
+-	tar xmvfz $(CKVER).tar.gz
+-	patch -p 0 < $(CKVER)-sks.patch
+-	patch -p 0 < $(CKVER)-sks-custom_compare.patch
+-
+-$(CKDIR)/cryptokit.cma: $(CKVER)/README.txt
+-	cd $(CKDIR) && $(MAKE) all
+-
+-$(CKDIR)/cryptokit.cmxa: $(CKVER)/README.txt
+-	cd $(CKDIR) && $(MAKE) allopt
+-
+-lib/cryptokit.cma: $(CKDIR)/cryptokit.cma $(CKDIR)/cryptokit.cmxa prepared
+-	cp $(CKDIR)/cryptokit.cmi $(CKDIR)/cryptokit.cma \
+-	   $(CKDIR)/cryptokit.mli lib
+-	cp $(CKDIR)/libcryptokit.a lib
+-	if test -f $(CKDIR)/dllcryptokit.so; then \
+-	   cp $(CKDIR)/dllcryptokit.so lib; fi
+-	if test -f $(CKDIR)/cryptokit.cmxa; then \
+-	   cp $(CKDIR)/cryptokit.cmxa $(CKDIR)/cryptokit.cmx \
+-	   $(CKDIR)/cryptokit.a lib; fi
+-
+-lib/cryptokit.cmxa: lib/cryptokit.cma
+-
+ ################################
+ # old stuff
+ ################################
+@@ -404,7 +378,6 @@ clean: mlclean
+ 
+ cleanall: clean bdbclean
+ 	rm -f lib/*
+-	rm -rf $(CKVER)
+ 
+ distclean: cleanall
+ 	rm -rf Makefile.local
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch
new file mode 100644
index 000000000000..c9afc2594091
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch
@@ -0,0 +1,39 @@
+Use ocamlfind for finding dependencies, esp. for doing their transitive closure.
+
+Ideally the build system should be converted to something more modern like
+jbuilder.
+
+Index: sks-1.1.6/Makefile
+===================================================================
+--- sks-1.1.6.orig/Makefile
++++ sks-1.1.6/Makefile
+@@ -21,10 +21,10 @@ CFLAGS=-O3  $(CINCLUDES) -I .
+ CXXFLAGS=-O3 $(CINCLUDES) -I .
+ 
+ ifndef OCAMLC
+-	OCAMLC=ocamlc
++	OCAMLC=ocamlfind ocamlc
+ endif
+ ifndef OCAMLOPT
+-	OCAMLOPT=ocamlopt
++	OCAMLOPT=ocamlfind ocamlopt
+ endif
+ ifndef CAMLP4O
+ 	CAMLP4O=camlp4o
+@@ -55,12 +55,12 @@ WARNERR=-warn-error A
+ endif
+ 
+ CAMLP4=-pp $(CAMLP4O)
+-CAMLINCLUDE= -I lib -I bdb -I +cryptokit
++CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+-CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
+-OCAMLFLAGS=$(COMMONCAMLFLAGS) -g $(CAMLLIBS)
+-OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa)
++CAMLLIBS=bdb.cma nums.cma
++OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
++OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa)
+ 
+ EXE=sks sks_add_mail
+ ALL=$(EXE) sks.8.gz
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch
new file mode 100644
index 000000000000..1fba250fd4b3
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Kristian Fiskerstrand <kf@sumptuouscapital.com>
+# Date 1499610580 -7200
+# Node ID 719ffdf628a81a2f052f3b6dc746a3e1d37afe30
+# Parent  6352f0dbcadf35aac29c2fbf10fb218ae50d9c77
+Fix nums specification
+
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,7 @@
+ CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+-CAMLLIBS=bdb.cma nums.cma
++CAMLLIBS=bdb.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa)
+ 
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch
new file mode 100644
index 000000000000..ea5a82db6530
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Kristian Fiskerstrand <kf@sumptuouscapital.com>
+# Date 1499612080 -7200
+# Node ID 0106ba2f6abc8ee2f685026d3f218730114a60fa
+# Parent  719ffdf628a81a2f052f3b6dc746a3e1d37afe30
+Add num to findlib packages
+
+Although nums is detected, making this explicit
+
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,7 @@
+ endif
+ 
+ CAMLP4=-pp $(CAMLP4O)
+-CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
++CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I lib -I bdb
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+ CAMLLIBS=bdb.cma
diff --git a/net-misc/sks/files/sks-db.initd b/net-misc/sks/files/sks-db.initd
new file mode 100644
index 000000000000..9384cca7ddb2
--- /dev/null
+++ b/net-misc/sks/files/sks-db.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+source /etc/conf.d/sks
+
+command=/usr/bin/sks
+command_args="db ${SKS_ARGS}"
+command_background=1
+description="SKS database thread"
+name="SKS db"
+pidfile="/var/run/sks-db.pid"
+required_files="${SKS_DIR}/sksconf"
+start_stop_daemon_args="--chdir ${SKS_DIR} --user sks"
+
+
+depend()
+{
+	use net
+}
+
+start_pre()
+{
+    checkpath --owner sks:sks --directory \
+        ${SKS_DIR} ${SKS_DIR}/KDB ${SKS_DIR}/PTree
+    checkpath --owner sks:sks --file \
+        ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
+}
diff --git a/net-misc/sks/files/sks-db.service b/net-misc/sks/files/sks-db.service
new file mode 100644
index 000000000000..bbc3ba7e2b2d
--- /dev/null
+++ b/net-misc/sks/files/sks-db.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SKS database thread
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sks db
+User=sks
+WorkingDirectory=/var/lib/sks
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/sks/files/sks-recon.initd b/net-misc/sks/files/sks-recon.initd
new file mode 100644
index 000000000000..86de8c790b4b
--- /dev/null
+++ b/net-misc/sks/files/sks-recon.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+source /etc/conf.d/sks
+
+command=/usr/bin/sks
+command_args="recon ${SKS_ARGS}"
+command_background=1
+description="Reconnoiters SKS peers for keys"
+name="SKS recon"
+pidfile="/var/run/sks-recon.pid"
+required_files="${SKS_DIR}/sksconf ${SKS_DIR}/membership"
+start_stop_daemon_args="--chdir ${SKS_DIR} --user sks"
+
+
+depend()
+{
+    after sks-db
+    use net
+}
+
+start_pre()
+{
+    checkpath --owner sks:sks --directory \
+        ${SKS_DIR} ${SKS_DIR}/KDB ${SKS_DIR}/PTree
+    checkpath --owner sks:sks --file \
+        ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
+}
diff --git a/net-misc/sks/files/sks-recon.service b/net-misc/sks/files/sks-recon.service
new file mode 100644
index 000000000000..97ee52ffc0ed
--- /dev/null
+++ b/net-misc/sks/files/sks-recon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SKS key reconnaissance thread
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sks recon
+User=sks
+WorkingDirectory=/var/lib/sks
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/sks/files/sks.confd b/net-misc/sks/files/sks.confd
new file mode 100644
index 000000000000..64eef24ecc52
--- /dev/null
+++ b/net-misc/sks/files/sks.confd
@@ -0,0 +1,4 @@
+SKS_DIR="/var/lib/sks"
+
+# Set common options for sks db and sks recon here.
+SKS_ARGS=""
\ No newline at end of file
diff --git a/net-misc/sks/metadata.xml b/net-misc/sks/metadata.xml
new file mode 100644
index 000000000000..a4ac7ae76892
--- /dev/null
+++ b/net-misc/sks/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+		<description>Maintainer</description>
+	</maintainer>
+	<use>
+		<flag name="optimize">Enables bytecode optimization</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">skskeyserver/sks-keyserver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/sks/sks-1.1.6-r2.ebuild b/net-misc/sks/sks-1.1.6-r2.ebuild
new file mode 100644
index 000000000000..b51abaff4132
--- /dev/null
+++ b/net-misc/sks/sks-1.1.6-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib user readme.gentoo-r1 systemd
+
+DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
+HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
+SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="optimize test"
+DOC_CONTENTS="To get sks running, first build the database,
+start the database, import atleast one key, then
+run a cleandb. See the sks man page for more information
+Typical DB_CONFIG file and sksconf has been installed
+in /var/lib/sks and can be used as templates by renaming
+to remove the .typical extension. The DB_CONFIG file has
+to be in place before doing the database build, or the BDB
+environment has to be manually cleared from both KDB and PTree.
+The same applies if you are upgrading to this version with an existing KDB/Ptree,
+using another version of BDB than 4.8; you need to clear the environment
+using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
+Additionally a sample web interface has been installed as
+web.typical in /var/lib/sks that can be used by renaming it to web
+Important: It is strongly recommended to set up SKS behind a
+reverse proxy. Instructions on properly configuring SKS can be
+found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
+
+DEPEND=">=dev-lang/ocaml-4.0:=
+	dev-ml/findlib
+	dev-ml/camlp4
+	dev-ml/cryptokit:0/1.10
+	sys-libs/db:5.3"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup sks
+	enewuser sks -1 -1 /var/lib/sks sks
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch"
+	cp Makefile.local.unused Makefile.local || die
+	sed -i \
+		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
+		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
+		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
+		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+		Makefile.local || die
+	sed -i \
+		-e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
+		-e 's:-Werror-implicit-function-declaration::g' \
+		Makefile bdb/Makefile || die
+	sed -i \
+		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+		sks_build.sh || die
+	eapply_user
+}
+
+src_compile() {
+	emake dep
+	# sks build fails with paralell build in module Bdb
+	emake -j1 all
+	if use optimize; then
+		emake all.bc
+	fi
+}
+
+src_test() {
+	./sks unit_test || die
+}
+
+src_install() {
+	if use optimize; then
+		emake install.bc
+		dosym /usr/bin/sks.bc usr/bin/sks
+		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
+	else
+		emake install
+	fi
+
+	dodoc README.md
+
+	newinitd "${FILESDIR}/sks-db.initd" sks-db
+	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
+	newconfd "${FILESDIR}/sks.confd" sks
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
+
+	dodir "/var/lib/sks/web.typical"
+	insinto /var/lib/sks
+	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
+	newins sampleConfig/sksconf.typical sksconf.typical
+	insinto /var/lib/sks/web.typical
+	doins sampleWeb/HTML5/*
+
+	keepdir /var/lib/sks
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
+		einfo "The default values for pagesize settings have changed. To continue"
+		einfo "using an existing DB without rebuilding, explicit settings have to be"
+		einfo "added to the sksconf file."
+		einfo "pagesize:       4"
+		einfo "ptree_pagesize: 1"
+	fi;
+}
diff --git a/net-misc/sks/sks-1.1.6-r4.ebuild b/net-misc/sks/sks-1.1.6-r4.ebuild
new file mode 100644
index 000000000000..d08143afcd76
--- /dev/null
+++ b/net-misc/sks/sks-1.1.6-r4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib user readme.gentoo-r1 systemd
+
+DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
+HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
+SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="optimize test"
+DOC_CONTENTS="To get sks running, first build the database,
+start the database, import atleast one key, then
+run a cleandb. See the sks man page for more information
+Typical DB_CONFIG file and sksconf has been installed
+in /var/lib/sks and can be used as templates by renaming
+to remove the .typical extension. The DB_CONFIG file has
+to be in place before doing the database build, or the BDB
+environment has to be manually cleared from both KDB and PTree.
+The same applies if you are upgrading to this version with an existing KDB/Ptree,
+using another version of BDB than 4.8; you need to clear the environment
+using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
+Additionally a sample web interface has been installed as
+web.typical in /var/lib/sks that can be used by renaming it to web
+Important: It is strongly recommended to set up SKS behind a
+reverse proxy. Instructions on properly configuring SKS can be
+found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
+
+RDEPEND=">=dev-lang/ocaml-4.0:=
+	dev-ml/camlp4:=
+	dev-ml/cryptokit:=
+	sys-libs/db:5.3"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup sks
+	enewuser sks -1 -1 /var/lib/sks sks
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
+		   "${FILESDIR}/${P}-use-ocamlfind.patch"
+	cp Makefile.local.unused Makefile.local || die
+	sed -i \
+		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
+		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
+		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
+		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+		Makefile.local || die
+	sed -i \
+		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+		sks_build.sh || die
+	eapply_user
+}
+
+src_compile() {
+	emake dep
+	# sks build fails with paralell build in module Bdb
+	emake -j1 all
+	if use optimize; then
+		emake all.bc
+	fi
+}
+
+src_test() {
+	./sks unit_test || die
+}
+
+src_install() {
+	if use optimize; then
+		emake install.bc
+		dosym /usr/bin/sks.bc usr/bin/sks
+		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
+	else
+		emake install
+	fi
+
+	dodoc README.md
+
+	newinitd "${FILESDIR}/sks-db.initd" sks-db
+	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
+	newconfd "${FILESDIR}/sks.confd" sks
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
+
+	dodir "/var/lib/sks/web.typical"
+	insinto /var/lib/sks
+	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
+	newins sampleConfig/sksconf.typical sksconf.typical
+	insinto /var/lib/sks/web.typical
+	doins sampleWeb/HTML5/*
+
+	keepdir /var/lib/sks
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
+		einfo "The default values for pagesize settings have changed. To continue"
+		einfo "using an existing DB without rebuilding, explicit settings have to be"
+		einfo "added to the sksconf file."
+		einfo "pagesize:       4"
+		einfo "ptree_pagesize: 1"
+	fi;
+}
diff --git a/net-misc/sks/sks-1.1.6-r5.ebuild b/net-misc/sks/sks-1.1.6-r5.ebuild
new file mode 100644
index 000000000000..8b50b33a7cf5
--- /dev/null
+++ b/net-misc/sks/sks-1.1.6-r5.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib user readme.gentoo-r1 systemd
+
+DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
+HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
+SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="optimize test"
+DOC_CONTENTS="To get sks running, first build the database,
+start the database, import atleast one key, then
+run a cleandb. See the sks man page for more information
+Typical DB_CONFIG file and sksconf has been installed
+in /var/lib/sks and can be used as templates by renaming
+to remove the .typical extension. The DB_CONFIG file has
+to be in place before doing the database build, or the BDB
+environment has to be manually cleared from both KDB and PTree.
+The same applies if you are upgrading to this version with an existing KDB/Ptree,
+using another version of BDB than 4.8; you need to clear the environment
+using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
+Additionally a sample web interface has been installed as
+web.typical in /var/lib/sks that can be used by renaming it to web
+Important: It is strongly recommended to set up SKS behind a
+reverse proxy. Instructions on properly configuring SKS can be
+found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
+
+RDEPEND=">=dev-lang/ocaml-4.0:=
+	dev-ml/camlp4:=
+	dev-ml/cryptokit:=
+	sys-libs/db:5.3"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup sks
+	enewuser sks -1 -1 /var/lib/sks sks
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
+			"${FILESDIR}/${P}-use-ocamlfind.patch" \
+			"${FILESDIR}/${P}-use-ocamlfind2.patch" \
+			"${FILESDIR}/${P}-use-ocamlfind3.patch"
+
+	cp Makefile.local.unused Makefile.local || die
+	sed -i \
+		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
+		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
+		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
+		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+		Makefile.local || die
+	sed -i \
+		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+		sks_build.sh || die
+	dosym /usr/bin/sks_build.sh /usr/bin/sks_build.bc.sh
+	eapply_user
+}
+
+src_compile() {
+	emake dep
+	# sks build fails with paralell build in module Bdb
+	emake -j1 all
+	if use optimize; then
+		emake all.bc
+	fi
+}
+
+src_test() {
+	./sks unit_test || die
+}
+
+src_install() {
+	if use optimize; then
+		emake install.bc
+		dosym /usr/bin/sks.bc usr/bin/sks
+		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
+	else
+		emake install
+	fi
+
+	dodoc README.md
+
+	newinitd "${FILESDIR}/sks-db.initd" sks-db
+	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
+	newconfd "${FILESDIR}/sks.confd" sks
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
+
+	dodir "/var/lib/sks/web.typical"
+	insinto /var/lib/sks
+	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
+	newins sampleConfig/sksconf.typical sksconf.typical
+	insinto /var/lib/sks/web.typical
+	doins sampleWeb/HTML5/*
+
+	keepdir /var/lib/sks
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
+		einfo "The default values for pagesize settings have changed. To continue"
+		einfo "using an existing DB without rebuilding, explicit settings have to be"
+		einfo "added to the sksconf file."
+		einfo "pagesize:       4"
+		einfo "ptree_pagesize: 1"
+	fi;
+}
diff --git a/net-misc/slimrat/Manifest b/net-misc/slimrat/Manifest
new file mode 100644
index 000000000000..8bd1ba815dcd
--- /dev/null
+++ b/net-misc/slimrat/Manifest
@@ -0,0 +1,4 @@
+EBUILD slimrat-9999.ebuild 1081 SHA256 baae7d2d04eb130b94eb56aab91c10a3425277c33ce4d88b19de1e517f2fe0fe SHA512 e6e17e8f17ffbc31261556098147f20b9b2eeac032a7c7f6c5aaa69128abec116a702b1dc1a3bd3c33ccf63d457019377ed440ad123117cc801eb6d7511f91b4 WHIRLPOOL 09abe6d5a9a15a186fd6385ad3bfc4a36631bcd31b1ea83eb91dd19bd6048418a890c813c723610f1723f243c1b6e6d3642733e80895dc14baa30ad5448f7673
+MISC ChangeLog 3134 SHA256 3d336401e45f2639a212bcf511685d17cec82fbc080c90b42cb657e2324e0eb9 SHA512 9c60ecffbcaa3a94fb9f5050b8541a6524bef533eeb3330e2995f2537dbd3b123524e6290cdd5035b6306977e287e67d9922ae28aa8ff37d0321ad5ad3613cd7 WHIRLPOOL 6b3121a8a2df4e4ce8203e2050c61fc5e8091ccfd3a6ae2e70c90fa45826c51191b54208898dc4c1c41e025679f89d2430cdf1ffd3df4b9d9776e8c624147953
+MISC ChangeLog-2015 1183 SHA256 e6555cbd5f46c3523264f0fe907343df515d4a34455db2c551f5a781578b6624 SHA512 0114861e04bb07b5dbff1f443be0f16a4c2d27cf29529cf055acc15097effb3f9e28db10741fc56c196daad7610e39de05d1538b0adcfe66e6798eebaba65125 WHIRLPOOL d9ac153c3d1af9b70737158727a66d5871bced6f59ffd5c6e9af2b0ee7828deac1e10eba94cc13799d2a7cf1ccd075ae5c16cb288897eb12319af69e9aeeb864
+MISC metadata.xml 428 SHA256 221095b9bcb2bfaa590bd4fb9cde883c9545c0f4b6c74d194f13a0705b9c96bd SHA512 d33fb9e1cea64687c186691486d7b3d77ddd1b39ede452a402eb4f70a09b56b07ef050fb9cc52e1c1c036e172282eefc1735ed542b99cf7ce4682f137e8a0f12 WHIRLPOOL b18d5973daf1eb1b367a3635174ab9f271489d0fb938ed3dd4170c61b7e9eb661cdfe6b51f86fdc23d72893522514801a647e2733c40a2e571e44f69fe430e32
diff --git a/net-misc/slimrat/metadata.xml b/net-misc/slimrat/metadata.xml
new file mode 100644
index 000000000000..233beb5746c2
--- /dev/null
+++ b/net-misc/slimrat/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>premek@vohnout.cz</email>
+		<name>Premysl Vohnout</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="X">Install also GUI client</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/slimrat/slimrat-9999.ebuild b/net-misc/slimrat/slimrat-9999.ebuild
new file mode 100644
index 000000000000..2329d5f339e3
--- /dev/null
+++ b/net-misc/slimrat/slimrat-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils subversion
+
+DESCRIPTION="Linux Rapidshare downloader"
+HOMEPAGE="https://code.google.com/p/slimrat/"
+SRC_URI=""
+ESVN_REPO_URI="https://${PN}.googlecode.com/svn/trunk/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="X"
+
+DEPEND="
+	>=dev-lang/perl-5.10.1[ithreads]
+	dev-perl/JSON
+	>=dev-perl/WWW-Mechanize-1.52
+	virtual/perl-Getopt-Long
+	virtual/perl-Term-ANSIColor
+	X? (
+		dev-perl/gtk2-gladexml
+		dev-perl/Spiffy
+		x11-misc/xclip
+	)
+"
+# aview: displaying captcha
+RDEPEND="${DEPEND}
+	media-gfx/aview
+	X? ( x11-terms/xterm )
+"
+
+src_prepare() {
+	esvn_clean
+}
+
+src_install() {
+	# install binaries
+
+	exeinto "/usr/share/${PN}"
+
+	doexe "src/${PN}"
+	dosym "/usr/share/${PN}/${PN}" "${ROOT}usr/bin/${PN}"
+
+	if use X; then
+		doexe "src/${PN}-gui"
+		dosym "/usr/share/${PN}/${PN}-gui" "/usr/bin/${PN}-gui"
+	fi
+
+	# install data
+	insinto /etc
+	newins "${S}/slimrat.conf" slimrat.conf
+
+	insinto "/usr/share/${PN}"
+	doins -r "src/"*.pm "src/plugins/" "src/${PN}.glade"
+}
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
new file mode 100644
index 000000000000..ecdf393d4ae9
--- /dev/null
+++ b/net-misc/smb4k/Manifest
@@ -0,0 +1,5 @@
+DIST smb4k-2.0.2.tar.xz 3588608 SHA256 01cbd10fe7a293243a65333baa65871eec8de007d0110639498fc1e4c190a199 SHA512 de210b059757525c6e5b6db733c70f43f62ba14cdc447848c84325d3b838d2ac6d8aa591ef67881decb39801b9519ef05fc805e94bc02b93c629457194e1a974 WHIRLPOOL 3855c915319d017a5cb667c1f7b59357a2aa86586635a1ca4e80820dd695922fe54889dbd12f6b27d39cbbb767b313b680ac76069e3562791cd962e2ec3c880a
+EBUILD smb4k-2.0.2.ebuild 1201 SHA256 aa4a3f29d65f992877154125dea9a6a71efe93fd8e8a335a6d5237bb1f515e32 SHA512 70e72e0305b6815d8eec39e03fd8addc9d37ca71ea7be28158f0cf3e18f7cade714ba1fcf72952aa215fa6f29e541173d4a57d0a770b9559f4fcfb3e95aa2c1d WHIRLPOOL 437943590ed1db7a237634af24c93d0d77149e74089e197471a4374038d4851df9a3de9897ba54bf88d24ac5b9d5e1c52fbf036ba1447b17fc0eaa34545cd5ff
+MISC ChangeLog 3420 SHA256 75fba394835e645c9ca8e5997a79a1d2859e7f29c3dac8c3481ba6eb12c6fa09 SHA512 778b31ce7c1c066773a19fd28e40b9292771ea6a83d3b2b42985ffd405207e8e2e9df73d8938a11b7e003e65658783f609d6b4905632a73ce454ccb0a3a39349 WHIRLPOOL 9aef84c1bde40a40d025a144822a29260e4de82a43df4e441830824fe1b1a2f33a3ac1b0e9abc10a810e6b79c571ad06ff5a9d91b615db28534d4a828869a870
+MISC ChangeLog-2015 18786 SHA256 c820fda2ad8d33a6a3a189dafed755a86f0d18f8327631d6369496bd8ca31c79 SHA512 bf7d0a01fc125b7d311662a8939c030049ff19b001e35ce9e58d814343a40b15fc986bc583d260cd6fda74b3a2397051bc35297c11b5636bbd85c13c9084033e WHIRLPOOL c38e0f0ab4d8ef91435f1e6ec5e2cd5d3d421f4e54f910454a2cc9c5770e2adf2582be6d80d7af1e040653a62a4f68b1ee8f6779eb9605c7475526631d8d7896
+MISC metadata.xml 386 SHA256 5dd41fc7716d882e5d66f9f7d2ef3d8ae1c603c0fa4ae0aaf63f0b7aa52abb09 SHA512 7a3a3b97ae2091efca39e99a45034c9a0ef06168ca3dd74ce1a73fdada365b0b1f5fbb68a84bd7505451d1075abe593077c472ca76d23da3368872b87e06d530 WHIRLPOOL e30e1257645edb57485bc93f90f85bc894e4c3fceea36a61601bf18a568a1acdbe02ae4916b49520a53bf0a7b867571646aca366f0b149c12b74d4b79e5f9d84
diff --git a/net-misc/smb4k/metadata.xml b/net-misc/smb4k/metadata.xml
new file mode 100644
index 000000000000..fbe6764bb1df
--- /dev/null
+++ b/net-misc/smb4k/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">smb4k</remote-id>
+		<bugs-to>https://sourceforge.net/p/smb4k/tickets/</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/smb4k/smb4k-2.0.2.ebuild b/net-misc/smb4k/smb4k-2.0.2.ebuild
new file mode 100644
index 000000000000..a9bd71df9866
--- /dev/null
+++ b/net-misc/smb4k/smb4k-2.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
+[[ ${PV} != 9999 ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+[[ ${PV} != 9999 ]] && KEYWORDS="amd64 x86"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!net-misc/smb4k:4
+	>=net-fs/samba-3.4.2[cups]
+"
diff --git a/net-misc/smbc/Manifest b/net-misc/smbc/Manifest
new file mode 100644
index 000000000000..6178d99b3a1b
--- /dev/null
+++ b/net-misc/smbc/Manifest
@@ -0,0 +1,7 @@
+AUX smbc-1.2.2-cflags.patch 323 SHA256 f27a257816ea1aec34fad223f5c5d9746f64888587af04cf7c4e706180171583 SHA512 c9cde82726e201c3a9b118ef5c34816cffc82c00b6122352797f57f5366bc8fd12d4827bcf0f895056dd8417f4ecdb48d1e607046adca62fbe2c5fd8adcc75f9 WHIRLPOOL 2a7cd544149f842246727aee09c39e100ec4d6f9a2d45514c069715074be5f607b1c2729ca19ed89082386daf8bf9320a71f084dd30bb40691084c149d1be5e8
+AUX smbc-1.2.2-size_t.patch 551 SHA256 175e434e59d7ad5d9efa692bc51dbc584a1276d173dea58aa2e7c144501091b2 SHA512 f445ec293a0bda038493faca823266aff96d4e2f41cf8ed5a64beae2b4e1e941ab8de9dab966328f77be9199ba5f8655006d5aabbfcdbd28cb842966f068fbaa WHIRLPOOL 79f3d0c1c7620162f8fef2f2cfff878708c3c035cc85f021aa271ee7c1ad1d7d0ccbea5894ce25ad3ebf364d9abf7bb64bc251984c6558415d609e4685b72565
+DIST smbc-1.2.2.tgz 977908 SHA256 1059216f727bb3284eaee3daea5f868e1158b0db63f29ad4a392501c5e3f3f25 SHA512 4625ba6bb6b3ffe818826d4af4da0fcb2e516e1ed62ee15ace4cf04d5176d238c5107d349f595809048bafc38d571448e1f1f170ed061dfc8f698836b52e2b84 WHIRLPOOL a2ee73214a68ae02f5abcf842701ba88b4d80c0d8d67b12bd9d6f412b3ba6e345b83a82b7ebd0343411b6a17439bb65a3582621e4c3f5f20740897a0578cfaf6
+EBUILD smbc-1.2.2-r2.ebuild 857 SHA256 70931ea562fc80127ee2ca149b135449a9d9aa498638bcb14af70645a409680d SHA512 3fa5ea27c568a2ebc3fa4a80d1e7d18d0530449ea0a084ef0ac9a3116989f77211884c8950ec87b2633fcb106618f292dd3645c8f848e9f461b505789094a0ac WHIRLPOOL 187ac9962889972831a5c5aae35a380f31471c035f992747e80adb7480bff0188557922ad8bbe5abda2ea1b05fb8a3395c4c01a18e072d089ea5820f5db802be
+MISC ChangeLog 2602 SHA256 e91da54c6d5f16c6bfc0465a82be38229749e963ad61d9eb8a9bedd991e47dbf SHA512 cb75614e6c68014bcaf9f1fb168e9acfd60ebbcc11cb7f4c6e18d48a6a0b7f54102c9592cc71f7270939a032e39be5fa159e97562f5bcf7f62c305cd6664939a WHIRLPOOL 77adc22750cdc8e5287babd6330350be1a715c236df6407888d76f6639d12738cfeac11221cb7f3218fe177c569005d4c13c5520ce7dc014491886eccc363b2e
+MISC ChangeLog-2015 2422 SHA256 4e5781e0cb996ce7d125e27d42bf5ae27f4a99eaa72b6e15bb4d0ae389608017 SHA512 7435dad7dd575082101e97c061c8ee49043dcf25c315ec4061a7fcfd1305ec42ef442f6fa051ac1b1c927edc225b1f329671c9cd4e74634d15a3d11d1089d567 WHIRLPOOL 5308e7cda0d7473a8a401fcea5dfe1ab39340a8ad0aa2efadd2b839b342fdc718e4f870ff50d298f8775f03c9228957466e1a5b478d433cf260399b8e3069571
+MISC metadata.xml 651 SHA256 5e8a362e5e3a8d0c7e637330b565ec72096db1ebb52574674258261d2bced165 SHA512 217963f6fdf491a8d76aceb10febfc3f376fee89172f68042460258ee73c492302d7931683697b74e04d7271a256efea2c5697f7fb1da9f659750eb4b9838fb8 WHIRLPOOL b9bc6ccdcefb4f55c77e51f157962ec28203637f28f15d19dadd2ea6f59dc85e23dc0c0f9b3bfbc75fee931d83cd9f2df6db7b6348429b32af5b9a08b2924305
diff --git a/net-misc/smbc/files/smbc-1.2.2-cflags.patch b/net-misc/smbc/files/smbc-1.2.2-cflags.patch
new file mode 100644
index 000000000000..0b7baf59c75a
--- /dev/null
+++ b/net-misc/smbc/files/smbc-1.2.2-cflags.patch
@@ -0,0 +1,13 @@
+Do not define CFLAGS
+
+--- a/src/Makefile.am	2005-06-29 14:14:02.000000000 +0200
++++ b/src/Makefile.am	2009-04-28 18:18:26.000000000 +0200
+@@ -18,7 +18,7 @@
+               smb-ext.c smb-ext.h
+ 
+ smbc_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wall
+-CFLAGS = -O3
++#CFLAGS = -O3
+ 
+ if GDB
+   smbc_CFLAGS += -ggdb -g
diff --git a/net-misc/smbc/files/smbc-1.2.2-size_t.patch b/net-misc/smbc/files/smbc-1.2.2-size_t.patch
new file mode 100644
index 000000000000..cafaf4a1b713
--- /dev/null
+++ b/net-misc/smbc/files/smbc-1.2.2-size_t.patch
@@ -0,0 +1,16 @@
+Patch to enable running on amd64 (borrowed from http://bugs.debian.org/366580)
+
+--- a/src/convert.c
++++ b/src/convert.c
+@@ -98,8 +98,9 @@
+ 
+   char *inbuf  = (char*) src;
+   char *outbuf = param->dst;
+-  int  inbytesleft  = src_len - 1;
+-  int  outbytesleft = param->dst_len - 1;
++  /* iconv requires size_t and not int ! */
++  size_t  inbytesleft  = src_len - 1;
++  size_t  outbytesleft = param->dst_len - 1;
+   bzero(param->dst, param->dst_len);
+   // Need some error handling here
+   iconv(param->cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
diff --git a/net-misc/smbc/metadata.xml b/net-misc/smbc/metadata.xml
new file mode 100644
index 000000000000..23d70dca86ad
--- /dev/null
+++ b/net-misc/smbc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>samba@gentoo.org</email>
+		<name>Samba</name>
+	</maintainer>
+	<longdescription>
+Samba Commander is a text mode SMB network commander. In SMBC, you can browse the local network or you can use the search function to find the files. You can also download/upload files and directories or create them both locally and remotely. SMBC has a resume function and supports UTF-8 characters.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">smbc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/smbc/smbc-1.2.2-r2.ebuild b/net-misc/smbc/smbc-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..b81b29cc204c
--- /dev/null
+++ b/net-misc/smbc/smbc-1.2.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="A text mode (ncurses) SMB network commander. Features: resume and UTF-8"
+HOMEPAGE="https://sourceforge.net/projects/smbc/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=" ~ppc ~x86"
+IUSE="nls debug"
+
+DEPEND="net-fs/samba
+	sys-libs/ncurses
+	dev-libs/popt
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-size_t.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with debug) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	mkdir -p "${D}/usr/share/doc"
+	mv -v "${D}/usr/share/"{${PN},doc/${PF}}
+}
diff --git a/net-misc/snarf/Manifest b/net-misc/snarf/Manifest
new file mode 100644
index 000000000000..5482421cf03c
--- /dev/null
+++ b/net-misc/snarf/Manifest
@@ -0,0 +1,8 @@
+AUX snarf-basename-patch.diff 4438 SHA256 623a480b8e558f6d4146e1ef767edf77aa2907da84d1157c701e5212f1e743bd SHA512 55ee3e284f9f9da0ca61a60bd8674302f6aef5c503e9ace0060fdc00f59172daafe3fd50e5ece4114a75e0707b2ea6dd9a4d3e00b5d4ee20dd8e8a68b2cd2436 WHIRLPOOL d0242ba6072e66022fb50cc0f7403848da1873c63c9bf9da1d75e18686b3352053f5e27cbd78677978e6c90162d8e6f724a112a18947d15886c285a4a0b51aca
+AUX snarf-fix-off-by-ones.diff 1592 SHA256 fda2a91bed2f4b617cd75c3d7c4e01c8c21a7ba76090dca6723d65b3c935f137 SHA512 0e42437031fbfacbfaaeb76432b19ff65cd979cfebb0b17adef230fae75bc69cafccc386f95f656c1d40f01a849f0e4daa0d027fb78d97932ac5881c22e0cfb6 WHIRLPOOL 92ffee73c796a4c09499484fe2259d8dd8ed61049ecdce7f510342e0149e27b8d7088a4bfe38953feff118fb3fd4021ecb3ea1c1fded8a6824f2cac1fdd100ca
+AUX snarf-unlink-empty.diff 1581 SHA256 fb6de2f9dc11bbab2ab693ddc848edbbab4ae6434036de576c8467a9cbfd6e28 SHA512 bb33a2b5c4d929d8a35fce94812c8231f76b54914c9dc57d07dee7bf311e4fd034a97a343c588eba5479cbacd406cb82acc1835e15c911cd04100eff2dd3d398 WHIRLPOOL b2cdd161a306123264e4667ecdcebe8ccde8b6bc901175d5dc2598b8edaebcb5e7ece075d855ce2c62feb77f4728014f53d707a2f0cc208ce2ef49aa47b0b2de
+DIST snarf-7.0.tar.gz 64495 SHA256 85a0846d452b02eaff225bf68fb36e68dfc55be5a58fda38dcb3602dcc300a89 SHA512 311c3e4a1b32fd024da8a5c8167888f254608d538695e30b3c632c606f67d1e3d94d8c88deb7850f782f38412f1bfd9022b0ee780c8644655f0648ccf0a0354e WHIRLPOOL 2dd59e8fc550c2428c2342ed52d2ee5d6de9a3821e3ea4dc736dd2e8934b3e543f62d418eea718322983c4be97aa2fd1cf3ee48a29ca37a18ec83260f5ca12b8
+EBUILD snarf-7.0-r3.ebuild 863 SHA256 19feebc3417321ad0a4960ac54303bb1bb97d0a610a6769720dbdd51087d38ea SHA512 77a80ff1a372a6a16750b95c2ec023418b5c94fed06988636c81f23b8aff031a61e620561642ba5f6981a76f153a0a243f2de505f0b1aad31ca1a40b72f06de7 WHIRLPOOL 1e6fffe63448a2bf3bbc40ed102c5b89809189f23f40e7bb6762ce6deb91e8cc74656af1581e4c16dca70a695f684c893924868e5c81ae72269751a5450d9ede
+MISC ChangeLog 2621 SHA256 b31ed36ec2b24faa48f4e22e5ec6a7a4f32cc9781cb7599bf3ac9f76cbc7c313 SHA512 26573b89e5beb100aaae45de23a3ff67c81fe0dc7fc4aa74c5947660a14e608b838478d2cb3243db4a7f420bd43b10b0c98e2fa3a9d234debcc147cb991421e8 WHIRLPOOL 27afe57e08ba79cd9d9c7f5a0c6204e7d459886ee6f58057176c96cc723ccee7f9ac16f57c4a021f54f0c207d54083a758a431bbef2048521eba235d4822c99f
+MISC ChangeLog-2015 3707 SHA256 6b56729abff67166956d048e235d90f7ed4644b619fce55ca4fa817148bae3a6 SHA512 29dd0d1efb1ff51716adf2ce62cbc88cad627c21dae5e326a19b91d682aa88f84ee05e9e4d491de4dd373b0cd643c96c90cdab60fd777284c5b292cbe573ff76 WHIRLPOOL b3d4c84ce5698746992a9ab6f29076f4d0db65290767c3f1193291bf1527a32662bfc64160319c7436094068d8116ba23244059c8c798afd61780a72e0a2a165
+MISC metadata.xml 386 SHA256 f78ace9c040ada26669309bf8e3786a3d84aa1713111bf7611fdbdae22ea12f7 SHA512 07d79153adfb5b7d447668c0fb6d22db9c2c026d5adfca658999107018ca392e55fb673273de986263479e493133e143a2523ef6133867db5c65a8f84f6a220a WHIRLPOOL 31b99d062185120c9d3ea091feb4ae07248040507f88f9853a48d3f68869f8822e6b83f7f13877bd508f66b3e38930823cf23909421cc10f5b1ad6d2e21467d8
diff --git a/net-misc/snarf/files/snarf-basename-patch.diff b/net-misc/snarf/files/snarf-basename-patch.diff
new file mode 100644
index 000000000000..85cafb527d68
--- /dev/null
+++ b/net-misc/snarf/files/snarf-basename-patch.diff
@@ -0,0 +1,147 @@
+diff -ruN snarf-7.0.orig/http.c snarf-7.0/http.c
+--- snarf-7.0.orig/http.c	2000-08-09 01:33:30.000000000 +0100
++++ snarf-7.0/http.c	2003-07-28 12:19:08.000000000 +0100
+@@ -14,8 +14,6 @@
+ #include "util.h"
+ #include "llist.h"
+ 
+-extern int default_opts;
+-
+ int redirect_count = 0;
+ #define REDIRECT_MAX 10
+ 
+diff -ruN snarf-7.0.orig/options.c snarf-7.0/options.c
+--- snarf-7.0.orig/options.c	1999-07-27 20:42:51.000000000 +0100
++++ snarf-7.0/options.c	2003-07-28 11:59:05.000000000 +0100
+@@ -8,8 +8,8 @@
+ int default_opts;
+ extern int debug_enabled;
+ 
+-unsigned char
+-set_options(unsigned char opts, char *optstring)
++unsigned int
++set_options(unsigned int opts, char *optstring)
+ {
+         int i;
+ 
+@@ -78,6 +78,15 @@
+                 case 'd':
+                         debug_enabled = !debug_enabled;
+                         break;
++			
++		case 'b':
++			opts |= OPT_BASENAME;
++			break;
++
++		case 'B':
++			default_opts |= OPT_BASENAME;
++			break;
++
+                 default:
+                         report(WARN, "unknown option `%c', ignoring", optstring[i]);
+                 }
+diff -ruN snarf-7.0.orig/options.h snarf-7.0/options.h
+--- snarf-7.0.orig/options.h	1999-07-27 20:42:51.000000000 +0100
++++ snarf-7.0/options.h	2003-07-28 12:20:47.000000000 +0100
+@@ -12,12 +12,13 @@
+ #define OPT_PROGRESS	(1 << 5)	/* for python aka markus fleck */
+ #define OPT_BE_MOZILLA	(1 << 6)        /* To act like Mozilla */
+ #define OPT_BE_MSIE	(1 << 7)        /* To act like MSIE */
++#define OPT_BASENAME	(1 << 8)	/* Only show basename() of output */
+ 
+ /* Funcs */
+ 
+ #ifdef PROTOTYPES
+ 
+-unsigned char set_options(unsigned char, char *);
++unsigned int set_options(unsigned int, char *);
+ 
+ #endif /* PROTOTYPES */
+ 
+diff -ruN snarf-7.0.orig/snarf.1 snarf-7.0/snarf.1
+--- snarf-7.0.orig/snarf.1	2000-01-17 14:26:13.000000000 +0000
++++ snarf-7.0/snarf.1	2003-07-28 12:45:26.000000000 +0100
+@@ -90,6 +90,9 @@
+ .I "\-m"
+ Send a user-agent string similar to what Microsoft Internet Explorer
+ uses.
++.TP
++.I "\-b"
++Only print the basename of output file with the progress bars.
+ .PP
+ Each option only affects the URL that immediately follows it. To have
+ an option affect all URLs that follow it, use an uppercase letter for
+diff -ruN snarf-7.0.orig/snarf.c snarf-7.0/snarf.c
+--- snarf-7.0.orig/snarf.c	2000-08-09 01:34:45.000000000 +0100
++++ snarf-7.0/snarf.c	2003-07-28 12:43:29.000000000 +0100
+@@ -50,6 +50,7 @@
+                "    -n     Ignore '-r' and transfer file in its entirety\n"
+                "    -m     Spoof MSIE user-agent string\n"
+                "    -z     Spoof Navigator user-agent string\n"
++	       "    -b     Only print basename of output file\n"
+                "\n"
+                "Lowercase option letters only affect the URLs that "
+                "immediately follow them.\n"
+diff -ruN snarf-7.0.orig/url.h snarf-7.0/url.h
+--- snarf-7.0.orig/url.h	1999-07-27 20:42:51.000000000 +0100
++++ snarf-7.0/url.h	2003-07-28 12:00:03.000000000 +0100
+@@ -28,7 +28,7 @@
+         char *proxy;
+         char *proxy_username;
+         char *proxy_password;
+-	unsigned char options;
++	unsigned int options;
+         off_t outfile_size;
+         off_t outfile_offset;
+ };
+diff -ruN snarf-7.0.orig/util.c snarf-7.0/util.c
+--- snarf-7.0.orig/util.c	2000-08-09 01:12:39.000000000 +0100
++++ snarf-7.0/util.c	2003-07-28 13:29:46.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <time.h>
++#include <libgen.h>
+ #include "url.h"
+ #include "options.h"
+ 
+@@ -292,6 +293,10 @@
+ 
+         filename = strdup(rsrc->outfile);
+         
++	if( rsrc->options & OPT_BASENAME ){
++		filename = basename(filename);
++	}
++
+         if( strlen(filename) > 24 )
+                 filename[24] = '\0';
+ 
+@@ -312,6 +317,7 @@
+ progress_update(Progress *	p, 
+                 long int 	increment)
+ {
++	char *filename = NULL;
+         unsigned int units;
+         char *anim = "-\\|/";
+ 
+@@ -320,12 +326,16 @@
+ 
+         p->current += increment;
+ 
+-        if (strlen(p->rsrc->outfile) > 24) {
+-                p->rsrc->outfile[24] = '\0';
+-        }
++	if( p->rsrc->options & OPT_BASENAME ){
++		filename = basename(strdup(p->rsrc->outfile));
++	} else
++		filename = strdup(p->rsrc->outfile);
+ 
++	if (strlen(filename) > 24)
++		filename[24] = '\0';
++        
+         fprintf(stderr, "\r");
+-        fprintf(stderr, "%-25s [", p->rsrc->outfile);
++        fprintf(stderr, "%-25s [", filename);
+         
+ 
+         if( p->length ) {
diff --git a/net-misc/snarf/files/snarf-fix-off-by-ones.diff b/net-misc/snarf/files/snarf-fix-off-by-ones.diff
new file mode 100644
index 000000000000..c0556b3ed851
--- /dev/null
+++ b/net-misc/snarf/files/snarf-fix-off-by-ones.diff
@@ -0,0 +1,45 @@
+diff -ruNp snarf-7.0.orig/ftp.c snarf-7.0/ftp.c
+--- snarf-7.0.orig/ftp.c	2000-08-09 00:27:24.000000000 +0100
++++ snarf-7.0/ftp.c	2007-03-30 20:47:46.046783664 +0100
+@@ -89,7 +89,7 @@ get_line(UrlResource *rsrc, int control)
+         char *end;
+         char buf[BUFSIZE+1];
+ 
+-        while( (bytes_read = read(control, buf, BUFSIZE)) ) {
++        while( (bytes_read = read(control, buf, BUFSIZE)) > 0 ) {
+                 if( rsrc->options & OPT_VERBOSE )
+                         fwrite(buf, 1, bytes_read, stderr);
+ 
+diff -ruNp snarf-7.0.orig/http.c snarf-7.0/http.c
+--- snarf-7.0.orig/http.c	2007-03-30 20:46:21.176685880 +0100
++++ snarf-7.0/http.c	2007-03-30 20:47:46.205759496 +0100
+@@ -365,7 +365,7 @@ http_transfer(UrlResource *rsrc)
+ 
+         bytes_read = read(sock, buf, 8);
+ 
+-        if( bytes_read == 0 ) {
++        if( bytes_read <= 0 ) {
+                 close(sock);
+                 return 0;
+         }
+diff -ruNp snarf-7.0.orig/url.c snarf-7.0/url.c
+--- snarf-7.0.orig/url.c	1998-11-16 01:29:44.000000000 +0000
++++ snarf-7.0/url.c	2007-03-30 20:47:46.205759496 +0100
+@@ -96,7 +96,7 @@ get_username(char *string, Url *u)
+                 return string;
+         }
+  
+-        username = malloc(i);
++        username = malloc(i+1);
+         memcpy(username, string, i + 1);
+ 
+         username[i] = '\0';
+@@ -135,7 +135,7 @@ get_password(char *string, Url *u)
+ 
+         for(i = 0 ; string[i] != '@'; i++);
+         
+-        password = malloc(i);
++        password = malloc(i+1);
+ 
+         /* and finally, get the password portion */
+         memcpy(password, string, i);
diff --git a/net-misc/snarf/files/snarf-unlink-empty.diff b/net-misc/snarf/files/snarf-unlink-empty.diff
new file mode 100644
index 000000000000..66f3089b0b63
--- /dev/null
+++ b/net-misc/snarf/files/snarf-unlink-empty.diff
@@ -0,0 +1,37 @@
+diff -urN snarf-7.0.orig/http.c snarf-7.0/http.c
+--- snarf-7.0.orig/http.c	2003-08-01 14:46:26.000000000 +0100
++++ snarf-7.0/http.c	2003-08-01 14:44:02.000000000 +0100
+@@ -447,6 +447,10 @@
+  cleanup:
+         free_http_header(header);
+         close(sock); fclose(out);
++		if ((rsrc->open_created) && (rsrc->outfile_size == 0)
++			&& (retval == 0))
++			if (unlink(rsrc->outfile))
++				report(ERR, "unlink %s: %s", rsrc->outfile, strerror(errno));
+         return retval;
+ 
+ }
+diff -urN snarf-7.0.orig/url.h snarf-7.0/url.h
+--- snarf-7.0.orig/url.h	2003-08-01 14:46:26.000000000 +0100
++++ snarf-7.0/url.h	2003-08-01 13:27:22.000000000 +0100
+@@ -25,6 +25,7 @@
+ struct _UrlResource {
+ 	Url *url;
+ 	char *outfile;
++	unsigned int open_created;
+         char *proxy;
+         char *proxy_username;
+         char *proxy_password;
+diff -urN snarf-7.0.orig/util.h snarf-7.0/util.h
+--- snarf-7.0.orig/util.h	2000-08-09 01:12:25.000000000 +0100
++++ snarf-7.0/util.h	2003-08-01 14:53:54.000000000 +0100
+@@ -53,7 +53,7 @@
+ extern int debug_enabled;
+ 
+ #define open_outfile(x)  (((x)->outfile[0] == '-') ? stdout : real_open_outfile(x))
+-#define real_open_outfile(x)  (((x)->options & OPT_RESUME && !((x)->options & OPT_NORESUME)) ? (fopen((x)->outfile, "a")) : (fopen((x)->outfile, "w")))
++#define real_open_outfile(x)  (((x)->open_created = (access ((x)->outfile, F_OK)) ? 1 : 0 ),((x)->options & OPT_RESUME && !((x)->options & OPT_NORESUME)) ? (fopen((x)->outfile, "a")) : (fopen((x)->outfile, "w")))
+ 
+ #define safe_free(x)		if(x) free(x)
+ #define safe_strdup(x)		( (x) ? strdup(x) : NULL )
diff --git a/net-misc/snarf/metadata.xml b/net-misc/snarf/metadata.xml
new file mode 100644
index 000000000000..b5e6a70e9340
--- /dev/null
+++ b/net-misc/snarf/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-needed -->
+	<longdescription lang="en">
+		snarf is a command line resource grabber. It can transfer files through
+		the http, gopher, finger, and ftp protocols without user interaction.
+		It is small and fast.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/snarf/snarf-7.0-r3.ebuild b/net-misc/snarf/snarf-7.0-r3.ebuild
new file mode 100644
index 000000000000..4148b3f52458
--- /dev/null
+++ b/net-misc/snarf/snarf-7.0-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+IUSE=""
+DESCRIPTION="Small and fast CLI resource grabber for http, gopher, finger, ftp"
+SRC_URI="http://www.xach.com/snarf/${P}.tar.gz"
+HOMEPAGE="http://www.xach.com/snarf/"
+KEYWORDS="alpha amd64 ppc sparc x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/snarf-basename-patch.diff
+	epatch "${FILESDIR}"/snarf-unlink-empty.diff
+	epatch "${FILESDIR}"/snarf-fix-off-by-ones.diff
+}
+
+src_install() {
+	dobin snarf
+	doman snarf.1
+	dodoc ChangeLog README TODO
+}
+
+pkg_postinst() {
+	elog 'To use snarf with portage, try these settings in your make.conf'
+	elog
+	elog '	FETCHCOMMAND="/usr/bin/snarf -b \${URI} \${DISTDIR}/\${FILE}"'
+	elog '	RESUMECOMMAND="/usr/bin/snarf -rb \${URI} \${DISTDIR}/\${FILE}"'
+}
diff --git a/net-misc/sobby/Manifest b/net-misc/sobby/Manifest
new file mode 100644
index 000000000000..f87ca146dde4
--- /dev/null
+++ b/net-misc/sobby/Manifest
@@ -0,0 +1,8 @@
+AUX sobby-conf-0.4.7 193 SHA256 7f77745296973d00b2aea3e6c507fc43e8480d44602105590ad8d70cbc392b61 SHA512 fa18053f316a666d5eb3e5576e5a73ff6609e985a6c65e11c547a1597074f1ce60d625d859402ad44103af596e74a1aeaa87c19c4c7bcab77d21f1ce244e566c WHIRLPOOL 09663921ef857b0954d6b2cb53987e9ff53fc9db7d12702d1c9b8780da1c2657d8d4123e0a4d5f63e17b65c602be17288d61c92b82f172c454f9cad5d4e50361
+AUX sobby-init-0.4.7 560 SHA256 fd770e730bde8d108d71ec4e76f955edd768faa7d68fa623d7b92ad22c0a32ea SHA512 2c6254db40b628148591cc1a89b41962db23afcb9dd24d54d702f6bdf97c9976ef7ddc88ed93b7e6572b313f07d4410596e57c0b3b7f1ab866f930a9b0174c4c WHIRLPOOL 12e3132338e297e38b8b5ecf0e10b0086b928d789dc78fa55052be7d379dc71e4843d72ccc64fecddff49940627443fc8372baa29d0a7f8dff74adb60f205f68
+AUX sobby.xml 451 SHA256 93f57a42e69911f628b72f2291ce71361e76f99cb84c60c4c0218f1c26292f0b SHA512 5ef02607a1e60a801036ad57b59d79fa1adff128da857491e0a149dd0b3a14c7244f263e7c916a1f9b08fba49597a02a11b8ff3924b278031d570679fa9eb8e3 WHIRLPOOL f373e15bf0cfbec1ba0162ab60c7820766bdbd1c4a21318e873f5581ce1e164a1c79cd83c00f3fc2b082341943ecd522c37c95e67f3928ce3dbef6c186d88d60
+DIST sobby-0.4.8.tar.gz 134766 SHA256 a711762c0722e9e7e01934c115dbffc7a233c033d66dbc5d58025af438516f48 SHA512 b946fc5c15257f74213fd6418933f8f4970ca58213a4c5bb33e1110f85964ce137eb5a9fdd0a601d8838310315241b9c29065493f4c9b33a8dbe09e77cc25492 WHIRLPOOL b2f6fd56725e6ef97df28b36090e63019b262fdd96e3d4ac04c05d2e41adc0e637f528cafec5c6f90344d67b5a92e84a2f043cba36e7532812fcf87c26099561
+EBUILD sobby-0.4.8-r1.ebuild 1255 SHA256 9906bd5695026b69f0f84ec4952010e1193183ae77375ca75835017908af03fa SHA512 9905003ce6942c2bd3632a0a4b7449a396de3ce32f0a318b9f2000e6e79d688e56ea6e3aeb76ea9cf5b1babe7923cb189d81c9d4d792f7481b7a2474130f3bb0 WHIRLPOOL f5e3192433ba81706d0999f67f6c3f0fc737e120f23b1ea6dcc79e76c0705ee988de667966f0d0e0224f6f52b90a5bbc4c6061bf2938123a4d56295b4aad9dbf
+MISC ChangeLog 3516 SHA256 8af57a5c4708443535110e81fd55b5d3ce6cd3dc8c350c8eeba972b166c5a431 SHA512 d7a288209776a482d7f220677824b87ac6a4a304735f1cd6d3ef4987d89fe9d787e4003a20e72352cbceb09cebe2c3c8b5ff0b163ec0ed59b41ee7d8a9661214 WHIRLPOOL 5576015884d665a072aa0c878f691b0ed13020a09268d7dbe17991624179a3665e87f051f8c4d55c09947be35b54900f89d922fa0d3fdfd07defbd43ce96397f
+MISC ChangeLog-2015 4563 SHA256 15b50ee845da21477d0b351dc6e991030db3bb39e712f3d1e2e231ae45e519c2 SHA512 1518d24b5d57af323668b83877e86c4ed875bbf2331ea61bc0bf67a8ef479395a01a9272947dcf0807b31cfd2da85f1ce87a9843e81195f4e436382d29646b07 WHIRLPOOL 96db0cd9170160e421718de6bbcd6f2a80babf2ae99603684e640d8b518bd6816f3ffe5f5b229f20975503229bbca65baa8f8c610e15cdfbb8c1a8f74e07892e
+MISC metadata.xml 345 SHA256 0764571df392553ae81f17db429f689dea10c2c652e69684198d545860cfcc37 SHA512 3abe34bee888e0c4a39f293fd88991ac62d125b146536662176b99f7dd6bb8c2f440b2bc5efaac0a12daacdbd734e2818b2b0144600af79fbc8c1197e67c9f4c WHIRLPOOL 2146521c7fce13635a33211a9c7591d2decd5efdb5d93bae610e981ced17d8ecc8943ae3f74e2745f34471072171663abed3e4abd8a2d118aa8101776b8cbd41
diff --git a/net-misc/sobby/files/sobby-conf-0.4.7 b/net-misc/sobby/files/sobby-conf-0.4.7
new file mode 100644
index 000000000000..0dced5a6df41
--- /dev/null
+++ b/net-misc/sobby/files/sobby-conf-0.4.7
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2         
+
+SOBBY_OPTS="-c /etc/sobby/sobby.xml"
+SOBBY_USER="sobby"
+SOBBY_GROUP="sobby"
diff --git a/net-misc/sobby/files/sobby-init-0.4.7 b/net-misc/sobby/files/sobby-init-0.4.7
new file mode 100644
index 000000000000..2fc00631147f
--- /dev/null
+++ b/net-misc/sobby/files/sobby-init-0.4.7
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2         
+
+depend() {
+	use avahi
+}
+
+start() {
+	ebegin "Starting obby dedicated server"
+	start-stop-daemon -b --quiet --start  --make-pidfile \
+		--pidfile /var/run/sobby.pid -u ${SOBBY_USER} -g ${SOBBY_GROUP} \
+		--exec /usr/bin/sobby -- ${SOBBY_OPTS}
+	eend $? "Failed to start sobby"
+}
+
+stop() {
+	ebegin "Stopping obby dedicated server"
+	start-stop-daemon --stop --quiet --pidfile /var/run/sobby.pid
+	eend $? "Failed to stop sobby"
+}
diff --git a/net-misc/sobby/files/sobby.xml b/net-misc/sobby/files/sobby.xml
new file mode 100644
index 000000000000..b61a89f211e5
--- /dev/null
+++ b/net-misc/sobby/files/sobby.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sobby_config>
+  <settings>
+    <autosave_directory>/var/lib/sobby</autosave_directory>
+    <autosave_file>autosave.obby</autosave_file>
+    <autosave_interval>0</autosave_interval>
+    <command_directory></command_directory>
+    <name>Standalone obby server</name>
+    <password>secret</password>
+    <port>6522</port>
+    <post_save_hook></post_save_hook>
+    <session></session>
+  </settings>
+</sobby_config>
diff --git a/net-misc/sobby/metadata.xml b/net-misc/sobby/metadata.xml
new file mode 100644
index 000000000000..2c70b7b5af87
--- /dev/null
+++ b/net-misc/sobby/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+  <longdescription>Stand alone server for the obby colaborative editor</longdescription>
+</pkgmetadata>
diff --git a/net-misc/sobby/sobby-0.4.8-r1.ebuild b/net-misc/sobby/sobby-0.4.8-r1.ebuild
new file mode 100644
index 000000000000..551d727f0525
--- /dev/null
+++ b/net-misc/sobby/sobby-0.4.8-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic user
+
+DESCRIPTION="Standalone Obby server"
+HOMEPAGE="http://gobby.0x539.de/"
+SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="zeroconf"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.6
+	>=dev-libs/libsigc++-2.0
+	>=dev-libs/gmp-4.1.4:0
+	>=dev-cpp/libxmlpp-2.6:2.6
+	>=net-libs/net6-1.3.12
+	>=net-libs/obby-0.4.6[zeroconf=]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup sobby
+	enewuser sobby -1 -1 /var/lib/sobby sobby
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf $(use_enable zeroconf)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}/${PN}-conf-0.4.7" sobby
+	newinitd "${FILESDIR}/${PN}-init-0.4.7" sobby
+
+	insinto /etc/sobby
+	doins "${FILESDIR}/sobby.xml"
+
+	keepdir /var/lib/sobby
+
+	fperms -R 0700 /var/lib/sobby
+	fperms -R 0700 /etc/sobby
+
+	fowners sobby:sobby /var/lib/sobby
+	fowners -R sobby:sobby /etc/sobby
+}
+
+pkg_postinst() {
+	elog "To start sobby, you can use the init script:"
+	elog "    /etc/init.d/sobby start"
+	elog ""
+	elog "Please check the configuration in /etc/sobby/sobby.xml"
+	elog "before you start sobby"
+}
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
new file mode 100644
index 000000000000..96e20e0cecc4
--- /dev/null
+++ b/net-misc/socat/Manifest
@@ -0,0 +1,13 @@
+AUX socat-1.7.3.0-filan-build.patch 1164 SHA256 1916386401f633c4d4e74aa61ca3039580cb69b6d89e69e73e0eaf9d463c1c15 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf WHIRLPOOL 187535c491bb3ba7b83df865077038a054c7aa7ba3a39ad3ba868db62db113bc876f4bf3da6cdffc5cfc03ac6f4ac5ceb5058cf8185622a3dce290772306fa41
+AUX socat-1.7.3.1-stddef_h.patch 1272 SHA256 3401aaadd8b837fea293105431d8f939bf8ee15cc76039726fd7c91add16063f SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf WHIRLPOOL 89bad00d356003fbbb17e00d73f6d2cf7f07a3aa08a4447e421ac31b965ce7fbc4db16d220d0835813b2574bf33a24c5383216cce4212087f699654ed5206430
+AUX socat-2.0.0_beta9-libressl.patch 9738 SHA256 46630195ffceab6aa72995a3f44449cae0893e89183d3dc8c4bcc94c9ec72197 SHA512 183972f5354872557a6ad131f1c8276b0250729aaa6659cd202dcf534d8b4bc41dd19cc6525bc888c325c670922ba382c684103ecdd8a385e5d27f52f321c7ed WHIRLPOOL 7c1b368d56d18b6eb076f78a311017e272ccf2ac07145d8422cff0f65f61c71a5e25e0b5c775f1e7978b8235716698e934b21142c2bba23bf163d1dd87af343c
+DIST socat-1.7.3.1.tar.bz2 488467 SHA256 d2da659540c38139f388e9437bfaae16bb458d174d056cb3228432a8f489fbaa SHA512 463340f578d4d1d54458b8ef9573ad3eff51dbcc736205e1b62e9a4782770d4bb76e6a07506350fd35405b130660559aaa79dfa2664c53ea268d7d64231f9b32 WHIRLPOOL 09f0fc537eaad194cac97cce73971c9f69047c648f03788fa69ac3444673ff73f143b2657d0ed28d082e2cfc36829304ed7bf0ff79c7ed75e96c991292f94dd4
+DIST socat-1.7.3.2.tar.bz2 493324 SHA256 e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251 SHA512 9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293 WHIRLPOOL d5b25ee77fd9ac77fd2a0dd33c39ae636cfe380608b8cee0d14f4d2e042bd53f9269edb466ae6c5403ccd5f5e2bff48b5f1ab15504957419f5ec759fc84a84f4
+DIST socat-2.0.0-b9.tar.bz2 516673 SHA256 49efb0a5c66b94b279014addc2851faf8ebbd1ec4b7e31c1de7e912d7b4983d2 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 WHIRLPOOL e293f9da0fed9573a02658b79ae87c24e2d88c57f6d8b1ddaeecd52e035b5012eaebbfa82da80f8442da666114d14e1c2767cf929e57b634f762e198ed4e3b50
+EBUILD socat-1.7.3.1.ebuild 1183 SHA256 7e52656464953dc40cc5dffd01544efe6be7fc907ca701d66e582f31866ec856 SHA512 e74c8df05fbda264927cfa59c1e35c596c64088dae51a193823967c23a121929cbc7d2d719d7ecc998279f8ce81dcd8e61be5abe5701280b0ad26f2eaf77c4c2 WHIRLPOOL 6bd015928731712d96b837b409a68f8b9120dab73ddb1a50ff7ce2d2515810a70f57fbdfc38cf1642fb635a4e37f57557da06cf928d98694a638a23e2acb7b0d
+EBUILD socat-1.7.3.2.ebuild 1528 SHA256 72158b812e2ea985bf4579ad3ee8ce104385ed82ac2dd24882a9a3089fe85f04 SHA512 96b94e4973e9336e081fcd41139e30c20c31cbdc75b787d9f10d24280a7a2be678aba43a6b5611e009ad985d2e59cd500b7e59aa5b30e0c85ca6e3076002473e WHIRLPOOL 048720b5c5cba9c586e44c7c5f624297c652d816ad1978e8afa76337346fd5dc6e06fdb934adf38863452bd94c5f0115a9b9795a4537b72b47277fb0cf6f5a54
+EBUILD socat-2.0.0_beta9.ebuild 1512 SHA256 c76a144514a134654b34ee41fc87dbf4cb9462f4e83cbc3dd0bbfd31c5619b38 SHA512 859b4a4732bf418f5e517e6345b484c6fcb2ff2e4b42f59824dbfe51943c5432ba7fdce610501bc673c7b51399115b3b60af78441c5932739c5597219fed8705 WHIRLPOOL ade1f0e71041c4293c28b0ed3b8da72d032370db4a0e442f5f564bf26c700c989d9f0927588fbc9112a4e4171d6f0a7ca5f2b6301eb142ce83d607495e6d2cfa
+EBUILD socat-9999.ebuild 1430 SHA256 e944c6ca929cb4cf7d1e1c626e946cff13d1aee7da627160be7900fb9f641e8f SHA512 b4d6de5f62b6131efcfede03b81357abcc8201c609fad8b28b3527e0a5a956cb4e495493918005816bb83ab6cf1c07ac45fcddd770f0b4579624cd41d2fe5802 WHIRLPOOL f41c1a0e19d971820ea68fbeaf350951a0f95d53993ad099f7733c9ffb320e729ff6a58ba370e9a886055fb95e2ee2f46667aed348cb7a71b22ac583f7bb93b8
+MISC ChangeLog 6221 SHA256 e67dc843031754b15d485d5ead008c2394ec16ad6385204ef2b1bd93579f45be SHA512 1b20bd90a3c71c85b62f6d13d587de0700fcb8bd98c7bee597aa61156a80fd43eafd9bb768c825b95e4cd1eb156a9f801942d23b9760a7ed219053e809d37b3b WHIRLPOOL a2ecc961b8f3d7ac766a4c853a2cc6730549d602eb614a529e338107c9e2e291defea2a82def15ff1872662c3173fc8e5c71d06af8b563b2232e1a4131915a78
+MISC ChangeLog-2015 19923 SHA256 d0348859fac57da6b07b7fe97fef4b91f0b7de949074d1f449b64a65bb1acbf4 SHA512 8495e5fb70a62a43fe847edd30e29c0446f376bf9553662ca9937349e16726e9fdac550ed7d63902af76302ac6ed7d26d3f9716944f61b7201dc8b60b8dd2ae3 WHIRLPOOL 40d1f4ecfa998af5feacf50711e3ee0c385b0eee84e57778fb6cff50fbcce6f9e0ffcc3a89ee216fbfac035d52b3a8dec3bdc49984f6d93a182b09b5d6c27d91
+MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328
diff --git a/net-misc/socat/files/socat-1.7.3.0-filan-build.patch b/net-misc/socat/files/socat-1.7.3.0-filan-build.patch
new file mode 100644
index 000000000000..861c673ad91d
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.3.0-filan-build.patch
@@ -0,0 +1,30 @@
+From aae2ea107b543fa908956f2fdcdf6db684e4a2e6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 24 Apr 2015 23:06:37 -0400
+Subject: [PATCH] filan: fix depend list
+
+The link line contains more objects than the depend line; sync them like
+procan does.  Otherwise, parallel builds randomly fail.
+---
+ Makefile.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f2a6edb..0c00459 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -118,8 +118,9 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut
+ procan: $(PROCAN_OBJS)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS)
+ 
+-filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS)
++FILAN_OBJS=filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
++filan: $(FILAN_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FILAN_OBJS) $(CLIBS)
+ 
+ libxio.a: $(XIOOBJS) $(UTLOBJS)
+ 	$(AR) r $@ $(XIOOBJS) $(UTLOBJS)
+-- 
+2.3.5
+
diff --git a/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
new file mode 100644
index 000000000000..c914a817ceca
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
@@ -0,0 +1,38 @@
+When disabling OpenSSL support, nestlex.c still needs stddef.h which is
+magically included through the OpenSSL headers otherwise.
+
+--- a/configure.in
++++ b/configure.in
+@@ -61,7 +61,7 @@
+ AC_CHECK_HEADERS(inttypes.h)
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h)
+-AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
++AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
+ AC_CHECK_HEADERS(pty.h)
+ AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
+ AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
+--- a/config.h.in
++++ b/config.h.in
+@@ -189,6 +189,9 @@
+ /* Define if you have the <grp.h> header file.  */
+ #undef HAVE_GRP_H
+ 
++/* Define if you have the <stddef.h> header file.  */
++#undef HAVE_STDDEF_H
++
+ /* Define if you have the <stdint.h> header file.  */
+ #undef HAVE_STDINT_H
+ 
+--- a/sysincludes.h
++++ b/sysincludes.h
+@@ -51,6 +51,9 @@
+ #if HAVE_SYS_TIME_H
+ #include <sys/time.h>	/* select(); OpenBSD: struct timespec */
+ #endif
++#if HAVE_STDDEF_H
++#include <stddef.h>
++#endif
+ #if HAVE_STDINT_H
+ #include <stdint.h>	/* uint8_t */
+ #endif
diff --git a/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch b/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch
new file mode 100644
index 000000000000..535297c04b06
--- /dev/null
+++ b/net-misc/socat/files/socat-2.0.0_beta9-libressl.patch
@@ -0,0 +1,267 @@
+From fbb0cc3b65a2ead522019fb461ae520371cc3ede Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@blackhole.sk>
+Date: Mon, 6 Jun 2016 18:41:30 +0200
+Subject: [PATCH] Support compiling with LibreSSL 2.4.0
+
+This patch checks for macros OPENSSL_NO_COMP, OPENSSL_NO_EGD, and
+if disables those features if they are.
+
+Also add ifdef for HAVE_SSLv3_{client/server}_method in sslcls.c,
+since these were removed from LibreSSL 2.4.0.
+---
+ sslcls.c      |  8 +++++++-
+ sslcls.h      |  4 +++-
+ xio-openssl.c | 24 ++++++++++++++++++------
+ xio-openssl.h |  4 +++-
+ xioopts.c     |  8 ++++++--
+ xioopts.h     |  4 +++-
+ 6 files changed, 40 insertions(+), 12 deletions(-)
+
+diff --git a/sslcls.c b/sslcls.c
+index ea4c303..5011ef2 100644
+--- a/sslcls.c
++++ b/sslcls.c
+@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) {
+ }
+ #endif
+ 
++#if HAVE_SSLv3_client_method
+ const SSL_METHOD *sycSSLv3_client_method(void) {
+    const SSL_METHOD *result;
+    Debug("SSLv3_client_method()");
+@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) {
+    Debug1("SSLv3_client_method() -> %p", result);
+    return result;
+ }
++#endif
+ 
++#if HAVE_SSLv3_server_method
+ const SSL_METHOD *sycSSLv3_server_method(void) {
+    const SSL_METHOD *result;
+    Debug("SSLv3_server_method()");
+@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) {
+    Debug1("SSLv3_server_method() -> %p", result);
+    return result;
+ }
++#endif
+ 
+ const SSL_METHOD *sycSSLv23_client_method(void) {
+    const SSL_METHOD *result;
+@@ -347,6 +351,7 @@ void sycSSL_free(SSL *ssl) {
+    return;
+ }
+ 
++#ifndef OPENSSL_NO_EGD
+ int sycRAND_egd(const char *path) {
+    int result;
+    Debug1("RAND_egd(\"%s\")", path);
+@@ -354,6 +359,7 @@ int sycRAND_egd(const char *path) {
+    Debug1("RAND_egd() -> %d", result);
+    return result;
+ }
++#endif
+ 
+ DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
+    DH *result;
+@@ -391,7 +397,7 @@ int sycFIPS_mode_set(int onoff) {
+ }
+ #endif /* WITH_FIPS */
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+ const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) {
+    const COMP_METHOD *result;
+    Debug1("SSL_get_current_compression(%p)", ssl);
+diff --git a/sslcls.h b/sslcls.h
+index 152fe5b..9fd8ef2 100644
+--- a/sslcls.h
++++ b/sslcls.h
+@@ -49,7 +49,9 @@ X509 *sycSSL_get_peer_certificate(SSL *ssl);
+ int sycSSL_shutdown(SSL *ssl);
+ void sycSSL_CTX_free(SSL_CTX *ctx);
+ void sycSSL_free(SSL *ssl);
++#ifndef OPENSSL_NO_EGD
+ int sycRAND_egd(const char *path);
++#endif
+ 
+ DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u);
+ 
+@@ -57,7 +59,7 @@ BIO *sycBIO_new_file(const char *filename, const char *mode);
+ 
+ int sycFIPS_mode_set(int onoff);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+ const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl);
+ const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl);
+ const char *sycSSL_COMP_get_name(const COMP_METHOD *comp);
+diff --git a/xio-openssl.c b/xio-openssl.c
+index c7f283c..38dc20d 100644
+--- a/xio-openssl.c
++++ b/xio-openssl.c
+@@ -181,9 +181,11 @@ const struct optdesc opt_openssl_key         = { "openssl-key",         "key",
+ const struct optdesc opt_openssl_dhparam     = { "openssl-dhparam",     "dh",    OPT_OPENSSL_DHPARAM,     GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
+ const struct optdesc opt_openssl_cafile      = { "openssl-cafile",     "cafile", OPT_OPENSSL_CAFILE,      GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
+ const struct optdesc opt_openssl_capath      = { "openssl-capath",     "capath", OPT_OPENSSL_CAPATH,      GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
++#ifndef OPENSSL_NO_EGD
+ const struct optdesc opt_openssl_egd         = { "openssl-egd",        "egd",    OPT_OPENSSL_EGD,         GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
++#endif
+ const struct optdesc opt_openssl_pseudo      = { "openssl-pseudo",     "pseudo", OPT_OPENSSL_PSEUDO,      GROUP_OPENSSL, PH_SPEC, TYPE_BOOL,     OFUNC_SPEC };
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+ const struct optdesc opt_openssl_compress    = { "openssl-compress",   "compress", OPT_OPENSSL_COMPRESS,  GROUP_OPENSSL, PH_SPEC, TYPE_STRING,   OFUNC_SPEC };
+ #endif
+ #if WITH_FIPS
+@@ -220,7 +222,7 @@ int xio_reset_fips_mode(void) {
+ static void openssl_conn_loginfo(SSL *ssl) {
+    Notice1("SSL connection using %s", SSL_get_cipher(ssl));
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+    {
+       const COMP_METHOD *comp, *expansion;
+ 
+@@ -786,7 +788,7 @@ int _xioopen_openssl_listen(struct single *xfd,
+ #endif /* WITH_LISTEN */
+ 
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+ /* In OpenSSL 0.9.7 compression methods could be added using
+  * SSL_COMP_add_compression_method(3), but the implemntation is not compatible
+  * with the standard (RFC3749).
+@@ -857,8 +859,10 @@ int
+    char *opt_dhparam = NULL;	/* file name of DH params */
+    char *opt_cafile = NULL;	/* certificate authority file */
+    char *opt_capath = NULL;	/* certificate authority directory */
++#ifndef OPENSSL_NO_EGD
+    char *opt_egd = NULL;	/* entropy gathering daemon socket path */
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#endif
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+    char *opt_compress = NULL;  /* compression method */
+ #endif
+    bool opt_pseudo = false;	/* use pseudo entropy if nothing else */
+@@ -875,9 +879,11 @@ int
+    retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath);
+    retropt_string(opts, OPT_OPENSSL_KEY, &opt_key);
+    retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam);
++#ifndef OPENSSL_NO_EGD
+    retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd);
++#endif
+    retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo);
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+    retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);
+ #endif
+ #if WITH_FIPS
+@@ -1010,9 +1016,11 @@ int
+       }
+    }
+ 
++#ifndef OPENSSL_NO_EGD
+    if (opt_egd) {
+       sycRAND_egd(opt_egd);
+    }
++#endif
+ 
+    if (opt_pseudo) {
+       long int randdata;
+@@ -1124,7 +1132,7 @@ int
+    }
+ #endif /* !defined(EC_KEY) */
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+    if (opt_compress) {
+       int result;
+       result = openssl_setup_compression(*ctx, opt_compress);
+@@ -1238,7 +1246,11 @@ static int openssl_SSL_ERROR_SSL(int level, const char *funcname) {
+       if (e == ((ERR_LIB_RAND<<24)|
+ 		(RAND_F_SSLEAY_RAND_BYTES<<12)|
+ 		(RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) {
++#ifdef OPENSSL_NO_EGD
++	 Error("too few entropy; use option \"pseudo\"");
++#else
+ 	 Error("too few entropy; use options \"egd\" or \"pseudo\"");
++#endif
+ 	 stat = STAT_NORETRY;
+       } else {
+ 	 Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf));
+diff --git a/xio-openssl.h b/xio-openssl.h
+index 62586fc..f10ee0c 100644
+--- a/xio-openssl.h
++++ b/xio-openssl.h
+@@ -21,9 +21,11 @@ extern const struct optdesc opt_openssl_key;
+ extern const struct optdesc opt_openssl_dhparam;
+ extern const struct optdesc opt_openssl_cafile;
+ extern const struct optdesc opt_openssl_capath;
++#ifndef OPENSSL_NO_EGD
+ extern const struct optdesc opt_openssl_egd;
++#endif
+ extern const struct optdesc opt_openssl_pseudo;
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+ extern const struct optdesc opt_openssl_compress;
+ #endif
+ #if WITH_FIPS
+diff --git a/xioopts.c b/xioopts.c
+index 6c231f4..9a56298 100644
+--- a/xioopts.c
++++ b/xioopts.c
+@@ -303,7 +303,7 @@ const struct optname optionnames[] = {
+ #if WITH_EXT2 && defined(EXT2_COMPR_FL)
+ 	IF_ANY    ("compr",	&opt_ext2_compr)
+ #endif
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+ 	IF_OPENSSL("compress",  &opt_openssl_compress)
+ #endif
+ #ifdef TCP_CONN_ABORT_THRESHOLD  /* HP_UX */
+@@ -419,7 +419,9 @@ const struct optname optionnames[] = {
+ #ifdef ECHOPRT
+ 	IF_TERMIOS("echoprt",	&opt_echoprt)
+ #endif
++#ifndef OPENSSL_NO_EGD
+ 	IF_OPENSSL("egd",	&opt_openssl_egd)
++#endif
+ 	IF_ANY    ("end-close",	&opt_end_close)
+ 	IF_TERMIOS("eof",	&opt_veof)
+ 	IF_TERMIOS("eol",	&opt_veol)
+@@ -1062,11 +1064,13 @@ const struct optname optionnames[] = {
+ 	IF_OPENSSL("openssl-certificate",	&opt_openssl_certificate)
+ 	IF_OPENSSL("openssl-cipherlist",	&opt_openssl_cipherlist)
+ 	IF_OPENSSL("openssl-commonname",	&opt_openssl_commonname)
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+ 	IF_OPENSSL("openssl-compress",  &opt_openssl_compress)
+ #endif
+ 	IF_OPENSSL("openssl-dhparam",	&opt_openssl_dhparam)
++#ifndef OPENSSL_NO_EGD
+ 	IF_OPENSSL("openssl-egd",	&opt_openssl_egd)
++#endif
+ #if WITH_FIPS
+ 	IF_OPENSSL("openssl-fips",	&opt_openssl_fips)
+ #endif
+diff --git a/xioopts.h b/xioopts.h
+index 2a165f5..37d6883 100644
+--- a/xioopts.h
++++ b/xioopts.h
+@@ -478,11 +478,13 @@ enum e_optcode {
+    OPT_OPENSSL_CERTIFICATE,
+    OPT_OPENSSL_CIPHERLIST,
+    OPT_OPENSSL_COMMONNAME,
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
+    OPT_OPENSSL_COMPRESS,
+ #endif
+    OPT_OPENSSL_DHPARAM,
++#ifndef OPENSSL_NO_EGD
+    OPT_OPENSSL_EGD,
++#endif
+    OPT_OPENSSL_FIPS,
+    OPT_OPENSSL_KEY,
+    OPT_OPENSSL_METHOD,
+-- 
+2.7.3
+
diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/net-misc/socat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/socat/socat-1.7.3.1.ebuild b/net-misc/socat/socat-1.7.3.1.ebuild
new file mode 100644
index 000000000000..63c88ab0a5be
--- /dev/null
+++ b/net-misc/socat/socat-1.7.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+MY_P=${P/_beta/-b}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="ssl readline ipv6 tcpd"
+
+DEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+DOCS=(
+	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
+)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
+	epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags '-Wno-error*' #293324
+	tc-export AR
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	dohtml doc/*.html doc/*.css
+}
diff --git a/net-misc/socat/socat-1.7.3.2.ebuild b/net-misc/socat/socat-1.7.3.2.ebuild
new file mode 100644
index 000000000000..ba6cc50d964b
--- /dev/null
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+MY_P=${P/_beta/-b}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="bindist libressl ssl readline ipv6 tcpd"
+
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test
+	ssl? ( readline? ( bindist ) )"
+
+DOCS=(
+	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
+)
+
+pkg_setup() {
+	# bug #587740
+	if use readline && use ssl; then
+		elog "You are enabling both readline and openssl USE flags, the licenses"
+		elog "for these packages conflict. You may not be able to legally"
+		elog "redistribute the resulting binary."
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags '-Wno-error*' #293324
+	tc-export AR
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}
diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild b/net-misc/socat/socat-2.0.0_beta9.ebuild
new file mode 100644
index 000000000000..f8881af9ed21
--- /dev/null
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+MY_P=${P/_beta/-b}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="libressl ssl readline ipv6 tcpd"
+
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test
+	ssl? ( readline? ( bindist ) )"
+
+DOCS=(
+	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
+	"${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+	"${FILESDIR}"/${PN}-2.0.0_beta9-libressl.patch
+)
+
+pkg_setup() {
+	# bug #587740
+	if use readline && use ssl; then
+		elog "You are enabling both readline and openssl USE flags, the licenses"
+		elog "for these packages conflict. You may not be able to legally"
+		elog "redistribute the resulting binary."
+	fi
+}
+
+src_prepare() {
+	default
+
+	touch doc/${PN}.1 || die
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -Wall '-Wno-error*' #293324
+	tc-export AR
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
new file mode 100644
index 000000000000..52fde25ab3f0
--- /dev/null
+++ b/net-misc/socat/socat-9999.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic git-r3 toolchain-funcs
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+MY_P=${P/_beta/-b}
+S="${WORKDIR}/${MY_P}"
+EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="libressl ssl readline ipv6 tcpd"
+
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+DEPEND="
+	${RDEPEND}
+	app-text/yodl
+"
+
+RESTRICT="test
+	ssl? ( readline? ( bindist ) )"
+
+DOCS=(
+	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
+	"${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+)
+
+pkg_setup() {
+	# bug #587740
+	if use readline && use ssl; then
+		elog "You are enabling both readline and openssl USE flags, the licenses"
+		elog "for these packages conflict. You may not be able to legally"
+		elog "redistribute the resulting binary."
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags '-Wno-error*' #293324
+	tc-export AR
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}
diff --git a/net-misc/sock/Manifest b/net-misc/sock/Manifest
new file mode 100644
index 000000000000..203d8a3d7d4b
--- /dev/null
+++ b/net-misc/sock/Manifest
@@ -0,0 +1,6 @@
+DIST sock-1.1.tar.gz 21951 SHA256 92292d80317f1cf2a6697e468352f34fa4d8fad7be2e5db51d5035140e227d85 SHA512 9ee5155a51df6d4aadef0786904ae710413b0523a7b5a84c44c7ff4fc48035a7a6fc3b1ad6f4491bb8a4d350b88040ee188af528df8c10b8dd1bca17190fd252 WHIRLPOOL f19808c38b44da8739604f1b1e03f16163ff69c47795189422341aac74c517dae59104554bbe8f7c1e404fc5f0f5310404a15013a7fc5b59aa936c5266602772
+EBUILD sock-1.1-r1.ebuild 417 SHA256 aa9854713b713b6f8df844ad1f7cd0262db2cf5577df16799926a5ba9da60291 SHA512 0daf70ec560302b463d302c46289989726a74f802404eafb54c5839f047372f951afea9829a6305d7969179239b96821b5b16b382126f9e085ce0064316eae26 WHIRLPOOL e61febd59bcc043a02295f78fe1f715a9136f007dfb63a99279a44085ab94d54292b95676ade62fd399b048283a1be5a173aa5b453fca62f8739e3586defc221
+EBUILD sock-1.1.ebuild 440 SHA256 71f9432ab010e0e136d2f3f951bd9e8cc793e00d68305b442fc8b931cba96ad5 SHA512 e4927f0149433750c21b83a481992439160dd512696654b47a760eb0d1a29ec8da2885797284f71f55d3ab1d97e92717832827935ebe21d7e29cfd58d029d3bf WHIRLPOOL e5a85302a7504881faaa9dd6355f8d1b63353e0a84d7c1bfb32ac60884cbb7d4843fd13d909d613fb89f11a417821dfeddb9eb877b5a87e0656b1be4b4b047e0
+MISC ChangeLog 2509 SHA256 98b53c1abdbb6adce4b5aa40b464d9dabf46ec074adf5433c0daf3328a2dc8bf SHA512 1ffffffe8bd9a95a7f7afece0f8ca4d8f392fcca87b792bbb9a29e0f20bc1434483d3c488910502fe48f1719317b34b4669bc1407e639c4dfc3284abe76a03f3 WHIRLPOOL 626496b6086b1b206d90b244210d98bd4f2a193a060fa56c4e010632c61eb665dad8b55c4b38abda5e440b69a0a74dfe1a23c9c477417940f8fe454d7361ab02
+MISC ChangeLog-2015 962 SHA256 3abd8d17a21eea35a3faf2c359af4c1d93955342461fed7051b6229fb3fc8c5b SHA512 272c366ffd034ee97089fa1214dab1d08f76dc4410cc689f89b1241273dc47ef7d6162e45dfd4b36130ba0c3426e6b3f2ee91ef0623d59c03a011f8455dfd490 WHIRLPOOL df554c091a41fdcc9e1283d993252fc240f67aa0ccf70c85e016bb5695c4a5cd554592fdc320fea7c5d84e3441b89f7cc5ddcdce0c5fcf0ff71fb0dc1597a10c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/sock/metadata.xml b/net-misc/sock/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/sock/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/sock/sock-1.1-r1.ebuild b/net-misc/sock/sock-1.1-r1.ebuild
new file mode 100644
index 000000000000..6ab67020c393
--- /dev/null
+++ b/net-misc/sock/sock-1.1-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A shell interface to network sockets"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/${P}.tar.gz"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/linux.shtml"
+KEYWORDS="~amd64 ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+src_install () {
+	dobin "${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/net-misc/sock/sock-1.1.ebuild b/net-misc/sock/sock-1.1.ebuild
new file mode 100644
index 000000000000..22501bbca627
--- /dev/null
+++ b/net-misc/sock/sock-1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A shell interface to network sockets"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/${P}.tar.gz"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/linux.shtml"
+KEYWORDS="amd64 sparc x86"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+
+src_install () {
+	dobin sock
+	doman sock.1
+	dodoc README ChangeLog
+}
diff --git a/net-misc/socket-burst-dampener/Manifest b/net-misc/socket-burst-dampener/Manifest
new file mode 100644
index 000000000000..3296e576584b
--- /dev/null
+++ b/net-misc/socket-burst-dampener/Manifest
@@ -0,0 +1,6 @@
+DIST socket-burst-dampener-1.1.0.tar.gz 3188 SHA256 16df469e60a94bd75d955a7be2b62739d301e7ad89d5506e16c008752f326f53 SHA512 f77e3e0cb26655c1c4477309f358f3d167e6ac89cfbd1e21c12aff7f33a22a956a8d2c77c28c888360f03b9aff4c9b1fa7174e4830e874bfc515285189c36cb9 WHIRLPOOL 0ca39bf1fd1aaa9bcbf912b9a0e0c9c29862a195232d1b1370a39dca1a0ae829e148ffb2b2c5a9cee3aa8e2b39bcdce50f729a856b494cf0f37a4d8e652d83b1
+DIST socket-burst-dampener-1.2.0.tar.gz 3823 SHA256 c18ae52a403e79ac876bd86cbe3eddd55b0ade2a2673542cee356c28cd282813 SHA512 e2130abf33c95255dc4249fb82a628b2569a0db8582f4b42b07b0c2c88d7f3968634062a4befc9ab4a257c750e31dbc5ffc5512a9b1ab2e34c8f660f598da080 WHIRLPOOL 26376ad1170b3f4afec773c1bfdabfe07c86242fdde9705950e3a0b173459306d818aea3e71502587de19bbaa98c85dfb0c36ccaadaea3ba770ffbb844f5cb4d
+EBUILD socket-burst-dampener-1.1.0.ebuild 637 SHA256 815b080eabfc7bda9672212617705a807b5280a7573d817e5128919016866069 SHA512 61e6653587c014c870cf35bed564c7687523c501be33a8559e8958514a43b87140e590727ae79bb7e17c137657913ad01e79f6a0b5b33a167eed2edb31a135ea WHIRLPOOL a610b9f2e7704c403f405f76cdcf5348cccb518948e622b7c7539d85f118624e89ba471d2e87f0735cf7c4f18a60ba885261106088698765a3f6652eb58707dc
+EBUILD socket-burst-dampener-1.2.0.ebuild 639 SHA256 dacf4949723026ae224d46feb23f2c6bab897d03e2dae1a43bdae5af5b4f3594 SHA512 696c82341529eaefc676aa00472a8930002b34d0296eb21cf011d20e5819d795e2a543b33e11dac560a93be8fe3e02619e49048d1c5f9f5b47a5784118e06adb WHIRLPOOL 51713370b49f60612b79a36d2f8f08e6bf2ea784c3c02695f23e316c31a3757d245c3821cdd21920594866dd70b3244f88c5d2cc6f41d1a713e55feeb8db264b
+MISC ChangeLog 937 SHA256 3c1fd0ee1879670cd61ab7cfa1671cfe72c628b2981beb808df5f3eebd2ee76a SHA512 a644b3b13075098b7f3b8172dbe394bba56be9012e4de75015698d9f2de84a63bf82ec8f81563992a19386a93a8e963b9c896a8dca314df7cee542220169fab4 WHIRLPOOL d38df86a1493bdd64535f4a043e28ff72f9869c2ab311f83073e48d4b70dece322e4d480d5ccb4b53b327ccb8c3308c6b326276eec45ffbb477a23f7368bc9d5
+MISC metadata.xml 312 SHA256 119f6eb7d0b23236d44ab682713367628b11babfae053d9e8e85ed23fd9884de SHA512 ba8571dd5e13df29810fdc4fc852da5bc40fc5e4c6b58fe94b85801b678c768ed2c0a7908303a46307351ee282705fd547e4b0e92b3ab8fd18338d819a0cf4b1 WHIRLPOOL fc54080fce1cd2a90036f3b2d82edb9b9e05cd967d6f69da92347e25a037bfe14291105604962d739386231567ebc43163ca71bf85322ee1a53bb24f22f5ca70
diff --git a/net-misc/socket-burst-dampener/metadata.xml b/net-misc/socket-burst-dampener/metadata.xml
new file mode 100644
index 000000000000..682ea708fac3
--- /dev/null
+++ b/net-misc/socket-burst-dampener/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">zmedico/socket-burst-dampener</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild
new file mode 100644
index 000000000000..572942950dbf
--- /dev/null
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A daemon that spawns one command per connection, and dampens connection bursts"
+HOMEPAGE="https://github.com/zmedico/${PN}"
+SRC_URI="https://github.com/zmedico/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i "s:^\(__version__ =\).*:\\1 \"${PV}\":" src/${PN//-/_}.py || die
+	distutils-r1_src_prepare
+}
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
new file mode 100644
index 000000000000..f3abae3360a3
--- /dev/null
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A daemon that spawns one command per connection, and dampens connection bursts"
+HOMEPAGE="https://github.com/zmedico/${PN}"
+SRC_URI="https://github.com/zmedico/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i "s:^\(__version__ =\).*:\\1 \"${PV}\":" src/${PN//-/_}.py || die
+	distutils-r1_src_prepare
+}
diff --git a/net-misc/socket/Manifest b/net-misc/socket/Manifest
new file mode 100644
index 000000000000..3f67a153d303
--- /dev/null
+++ b/net-misc/socket/Manifest
@@ -0,0 +1,6 @@
+AUX socket-1.5-makefile.patch 416 SHA256 7767c7e5b47a3fda135d8e79e27f21a045f4049a9ce6faf6cfc888183b6f3be2 SHA512 615c059534f45da30ec7a584a4fa945c9ce90070a1d0f09af785667742e2c692a51e03c00c19bd60429031597dcc5054f40fe51372fa39d213812062252628d0 WHIRLPOOL fb4a24de6c8af68b01b1f61802080903300335cd198a8e33a279e1b97a5d399bd3a3aea02453fb32b48efae57befc343430b906940df2014b1c2d8151fb39a95
+DIST socket-1.5.tar.gz 22002 SHA256 fa36abdc29e1b8a48156061f8a16779ee3446770197071802efbdb01051024a7 SHA512 9503139087a65a63462571788b6710c486c7a00532bc027b87d9f4bd0c92a7e90befe8a3ec86c622bc02ff51beaec05cacfcaffb06d7c983a73c38a18bca315d WHIRLPOOL a220486af2c6cb9c95c6518c630ebc2fc11f6d250e5e02d532d50744eb29271318d3d0c2bf8bc09fc828071aca989cdad78cf18854735eaec874346a5c07ba44
+EBUILD socket-1.5.ebuild 606 SHA256 8e0f363f3c78ed9e3f8ebe291654ce7874666adbdb6b819fac5fd892a3072e3a SHA512 19a7057620dc30aaca065bc1f8ff32ab00da89535b7bedc63a16ccce5b60a38bdd2efec63c4a53ba8a38180a0000667f68bf33dc307253c2cf836d896a46ed80 WHIRLPOOL cd72f02731cf61a8247c20558494f1c261b7e4aeff1841337ca90b4bfecd3dac390c80f34edaef56103543c0085c8f098eb79cc6c0d2edb5df8e93b86664b1a1
+MISC ChangeLog 2203 SHA256 39b1acdebf65e78d75a15130cd14ee7390b15d911a322b42c76c0b4f320d6c23 SHA512 9aeefc939e582a141d5ac725340e01468201caa012e51dd3c7c0a5da198436a99d3535fe133cb01a2321e506d901ef0fc1c2411d9dc5310d2fb71b62f802dd2f WHIRLPOOL 7f945919b3bec1191d49e6d77259b607df460e0a2dc71f7482ded797d0edc77f4126e221036bc272604b3bae83ec1b998840f5f1fa7bac261e643b804dc12af9
+MISC ChangeLog-2015 458 SHA256 eee8933d8c187fa47cdcd23497627814fe1f1788d9f63c2f83797ac6fe55cc88 SHA512 d46f7f60d9a3709cdb19933fe11d40f691c62afa748276dcf6b2884628cbed611ddee110e90708067e3853edbd37a6d80b25c2d2add299785ca4ed74fa2a1a93 WHIRLPOOL 735fc1f72564a61f1ea01a5beeaff09030f4ba333c5662b9ae0da1c5da6a47908bde616ac859da491e07a2e0dafdddfc948f40b9d10bfc64b96aa4117d7d8b77
+MISC metadata.xml 247 SHA256 fb925313d1ae70feaa6db91150f34a2157b48e884e8f47d773640af149e3744b SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a WHIRLPOOL 142b4295733faec48b0ca9eb6d3561799ff743481aabf2b74ecf6d717d972b4961979c7b6bf32b9840cb34e47d22fe2befb9b0ef8ec0d3f28f6416069128d3c7
diff --git a/net-misc/socket/files/socket-1.5-makefile.patch b/net-misc/socket/files/socket-1.5-makefile.patch
new file mode 100644
index 000000000000..7dc3e7c1f5c3
--- /dev/null
+++ b/net-misc/socket/files/socket-1.5-makefile.patch
@@ -0,0 +1,14 @@
+--- Makefile.orig	2008-06-27 13:57:47.000000000 +0400
++++ Makefile	2013-02-05 00:42:25.241748516 +0400
+@@ -38,9 +38,8 @@
+ INSTALLMANPATH = $(INSTALLBASE)/man
+ INSTALLMANMODE = 444
+ GCCOPTS = -Wall -Wstrict-prototypes
+-CC = cc
+-CFLAGS = $(SWITCHES) -g
+-LDFLAGS = $(SWITCHES) # -s
++CC ?= cc
++CFLAGS += $(SWITCHES) 
+ # To use an architecture-specific compile directory (inside of the
+ # source directory):
+ ARCHDIR = .
diff --git a/net-misc/socket/metadata.xml b/net-misc/socket/metadata.xml
new file mode 100644
index 000000000000..5b159fbcadd1
--- /dev/null
+++ b/net-misc/socket/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/socket/socket-1.5.ebuild b/net-misc/socket/socket-1.5.ebuild
new file mode 100644
index 000000000000..a08430d13f1f
--- /dev/null
+++ b/net-misc/socket/socket-1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base toolchain-funcs
+
+DESCRIPTION="A shell-level interface to TCP sockets"
+HOMEPAGE="http://www.jnickelsen.de/socket/"
+SRC_URI="http://www.jnickelsen.de/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+IUSE="examples"
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin socket
+	doman socket.1
+	dodoc BLURB CHANGES README
+	if use examples; then
+		docinto examples
+		dodoc scripts/*
+	fi
+}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
new file mode 100644
index 000000000000..ebba4e7e165d
--- /dev/null
+++ b/net-misc/spice-gtk/Manifest
@@ -0,0 +1,10 @@
+AUX README.gentoo 527 SHA256 c3d3baf43a172dcf6e7a1a95a6d1cb46585389f76c265037c1736eb16afbb7b5 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b WHIRLPOOL ba414014f78fc212544087dcdaeca5e74c2d0d12e274b0a65b1a3e8861758ad490a63b2b5876f8793c3449ac05ebd983e2e4e4c103340268aac922d5190873cc
+AUX spice-gtk-0.33-sys-sysmacros.h.patch 1459 SHA256 b0e2aaf2048f0a2bb30221ff957d12488faa1b239c63cba581503c3422da8a3a SHA512 9d3331f3a4d9c3b680ca78a0a8e430067d1cbc551865a3bba33bc4d2df64b716f8ac4d49fd2cb279f6e6ce870aab02aea29e93a8269664063245dcaee5942bc1 WHIRLPOOL deddb04a47e51f4fa3c66d0e3036f562369c8adac0921c1dca22019881b69aeeeabf26c3bd2ea62743cfddd7a82d14f9be706f8bc63b3c7ea27c5f92a7121f17
+DIST spice-gtk-0.33.tar.bz2 1383927 SHA256 7daf33b786ab8ebc9fe6e7b11745100ee1ab66e61a5811d1d5aabe4d66eaaf39 SHA512 ee5750194057a7f568641f6382d6969b67dc7271b4d13037570b79cdecd70a7eeb457ad349d3ed8e576f1fbd9701fac7d24607d5cbde8af0e030433b347abc80 WHIRLPOOL efe5f1684ac1ff569b744309ab18dfd0369411f1963e001060646ca7db5724bf2e306178963e104dba08c02c89782a08e2f8ce0db346efe28eeb495f9d5db4d8
+DIST spice-gtk-0.34.tar.bz2 1480566 SHA256 e9720e01165f8451c9f3f58ad50e3afb990993b81cc2db86b3661b7ac5b976ee SHA512 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689 WHIRLPOOL 96ced199ec8867b85b0dbdd2119b1a41149373215125b7b2e2bbc7ed34d3fbb67b084c473cf68de4207969eaa49cf3826f0eafaa3d70cbc071cbd469f8b73d53
+EBUILD spice-gtk-0.33-r2.ebuild 3746 SHA256 31ae4964497836619a0bcd949fee86d770ad21597c7c6e2c686543db4e6de83b SHA512 8c9badea4c1a3d070684e3998e981d9232f79602f14e50876e182a83e57c59d9ea1eb793925abf7539c570b4dbfd11777fafcf1b38faee957470aed6e024e245 WHIRLPOOL d04717709a747390905dd0b9a69ed94d502115c62ba0d78cc9e03ed38f170eb7fc58b686fca337be7c824d02bc3164c270dd407dbceb92a8c2ed9a46cde02619
+EBUILD spice-gtk-0.34.ebuild 3687 SHA256 0fa3c1fb73158ea84d08474f061cb9695c87b6c48bd02dfe0a0778d33ca35f4c SHA512 de9cd651a7d0c7232185c6232100fe4c96b40ad71c3cb9be57c21dc289aecf34379db654509497e87266fb1741e7208ad365917ad6ff8f235c4cffdd2cc621d3 WHIRLPOOL d2e89050eba27dbe80a9d9e1cc3622df9901e7d9d8e9043049c4ac05a71000e75ffc7b78d846cac7899580a2b622bf047bd3312fe6b5c4f5d3a765adac71b284
+EBUILD spice-gtk-9999.ebuild 3626 SHA256 d759232d2ecb488dcd5a5315f3e5684eb161fa3027f08caf143b408f16ec91a0 SHA512 9c76cb32ce824078f94c5b77f700834c15bd1df5868d53c779c462d5082a5c52844b01f5a9adad394c7f3151522f9be295139112f50664511d97ead29112ae07 WHIRLPOOL 28cc2eafab427da815210acf9e8d7698f5baa7c67f57f3ecf6134d8da503a081f68617dee9048fe886fb360020433d45a0e081dbb90fdfa0f0d5a51a7f989c98
+MISC ChangeLog 12970 SHA256 064e85a1a3e9cc492723459a65927bbb803a0bb026d8d4768b4112be4e8c1099 SHA512 dee213af3d612b6f23ef2585095f0ae873e8b81e3b4e7e58ad2c4627b6cb38c4689b5ea599bab181b45e9bae78ecd6d92402743933eff6f54522f145a8333f19 WHIRLPOOL c5bac78a24c612ede81ea6e016813bf37b44f6c112b82fa19212600574b3ca91d8e569dacd5f5d9c8cbea98631970fc6c3ac76417441898dc11c6307d07ad6de
+MISC ChangeLog-2015 15485 SHA256 f87695d419e36a98448e28b4a9ad9a2095f58e60528bc6088318f6ea769628ac SHA512 5570b7cc255b2e366c5a3ac68b0c47f2e27ba5d527920d76a157960c58c95f041e6e4d70677914f50ecb1559cc9a86d371b71a4fb47ffb1922d0e91b081d5212 WHIRLPOOL a2716c8b8d18c829d8781b1e47df345c0c4b5d7fd23663cbe67e26767669e939aaf7c3dbdf27e21b15b883936fabc3d62b1bf2aa5b28d596e714aea1e7629750
+MISC metadata.xml 1179 SHA256 c4ae3486e6ecf7350aa9abaf8100f7cd59935329a614814611c1d81ccc26118c SHA512 6cd0e7da9d10bdefe4180785f4c19a9b6579ac098622bf5423f00f291bdd49be60769eb230830b8aa348da2b0d91ba303576380cd1d8a56de6b27f0f49442515 WHIRLPOOL 7eea72b1a5ba4aa9503b089f578b15cc626768d8b3f59d3a8eb9c138e294b5cf70c4a0cc923ae551859b29601ea9e22ad2081d9e4bd0b11dae1cda2a3536e6d1
diff --git a/net-misc/spice-gtk/files/README.gentoo b/net-misc/spice-gtk/files/README.gentoo
new file mode 100644
index 000000000000..e18b6d8e539e
--- /dev/null
+++ b/net-misc/spice-gtk/files/README.gentoo
@@ -0,0 +1,14 @@
+
+If you choose to enable the video streaming support of gstreamer,
+please try to install addtional gst-plugins which matching the video codecs
+
+One the client side:
+	mjpeg,x264	media-plugins/gst-plugins-libav:1.0
+	vpx		media-plugins/gst-plugins-vpx:1.0
+
+One the server side (which app-emulation/qemu running), you should also install
+additional gstreamer plugins for the app-emulation/spice package:
+	mjpeg		media-plugins/gst-plugins-libav:1.0
+	vpx		media-plugins/gst-plugins-vpx:1.0
+	x264		media-plugins/gst-plugins-x264:1.0
+
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch b/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch
new file mode 100644
index 000000000000..902ee9dd0292
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch
@@ -0,0 +1,44 @@
+From a27a83da30d58511b2a5f2cdb13ebd4fca7a3d0a Mon Sep 17 00:00:00 2001
+From: Pavel Grunt <pgrunt@redhat.com>
+Date: Tue, 1 Nov 2016 17:08:01 +0100
+Subject: [PATCH] Adjust include header to new location of macros
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+minor & major macros were moved to sysmacros.h
+
+usbutil.c: In function ‘spice_usbutil_get_sysfs_attribute’:
+usbutil.c:110:14: warning: ‘__major_from_sys_types’ is deprecated:
+  In the GNU C Library, `major' is defined by <sys/sysmacros.h>.
+  For historical compatibility, it is currently defined by
+  <sys/types.h> as well, but we plan to remove this soon.
+  To use `major', include <sys/sysmacros.h> directly.
+  If you did not intend to use a system-defined macro `major',
+  you should #undef it after including <sys/types.h>.
+  [-Wdeprecated-declarations]
+              major(stat_buf.st_rdev), minor(stat_buf.st_rdev), attribute);
+
+Acked-by: Victor Toso <victortoso@redhat.com>
+---
+ src/usbutil.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/usbutil.c b/src/usbutil.c
+index 7bfbe44..b68a2e1 100644
+--- a/src/usbutil.c
++++ b/src/usbutil.c
+@@ -30,7 +30,10 @@
+ #ifdef __linux__
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
++#ifndef major /* major and minor macros were moved to sys/sysmacros.h from sys/types.h */
+ #include <sys/types.h>
++#endif
+ #include <sys/stat.h>
+ #endif
+ #include "usbutil.h"
+-- 
+2.10.2
+
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
new file mode 100644
index 000000000000..a84b4fbfe9ac
--- /dev/null
+++ b/net-misc/spice-gtk/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
+	<use>
+		<flag name="dbus">Support for desktop integration such as
+			automounting and other APIs exposed by your DE via D-Bus</flag>
+		<flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of
+			<pkg>x11-libs/gtk+</pkg>:2</flag>
+		<flag name="lz4">Enable support for LZ4 compression using
+			<pkg>app-arch/lz4</pkg></flag>
+		<flag name="policykit">Enable <pkg>sys-auth/polkit</pkg> support for the
+			usbredir acl helper</flag>
+		<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
+			devices to another machine over TCP</flag>
+		<flag name="mjpeg">Enable builtin mjpeg video decoder</flag>
+		<flag name="webdav">Support for folder-sharing between guest and client
+			using <pkg>net-libs/phodav</pkg></flag>
+		<flag name="gstaudio">Using gstreamer backend as audio decodec support</flag>
+		<flag name="gstvideo">Using gstreamer backend as video decodec support</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild
new file mode 100644
index 000000000000..04a67a9a2432
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils xdg-utils vala readme.gentoo-r1
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
+
+REQUIRED_USE="?? ( pulseaudio gstaudio )"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	gstvideo? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	gstaudio? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	>=x11-libs/pixman-0.17.7
+	>=media-libs/celt-0.5.1.1:0.5.1
+	media-libs/opus
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	>=dev-libs/glib-2.36:2
+	>=x11-libs/cairo-1.2
+	virtual/jpeg:0=
+	sys-libs/zlib
+	introspection? ( dev-libs/gobject-introspection )
+	lz4? ( app-arch/lz4 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		virtual/libgudev:=
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+			!~sys-auth/polkit-0.111 )
+		)
+	webdav? (
+		net-libs/phodav:2.0
+		>=dev-libs/glib-2.43.90:2
+		>=net-libs/libsoup-2.49.91 )
+"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-0.12.12
+	dev-perl/Text-CSV
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.33-sys-sysmacros.h.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	# Clean up environment, bug #586642
+	xdg_environment_reset
+
+	local myconf
+
+	if use vala ; then
+		# force vala regen for MinGW, etc
+		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+	fi
+
+	myconf="
+		--disable-maintainer-mode \
+		$(use_enable static-libs static) \
+		$(use_enable introspection) \
+		$(use_with sasl) \
+		$(use_enable smartcard) \
+		$(use_enable usbredir) \
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
+		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
+		$(use_with gtk3 gtk 3.0) \
+		$(use_enable policykit polkit) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable gstaudio) \
+		$(use_enable gstvideo) \
+		$(use_enable mjpeg builtin-mjpeg) \
+		$(use_enable vala) \
+		$(use_enable webdav) \
+		$(use_enable dbus) \
+		--disable-gtk-doc \
+		--disable-werror \
+		--enable-pie"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	# Remove .la files if they're not needed
+	use static-libs || prune_libtool_files
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/spice-gtk/spice-gtk-0.34.ebuild b/net-misc/spice-gtk/spice-gtk-0.34.ebuild
new file mode 100644
index 000000000000..72765271063a
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.34.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils xdg-utils vala readme.gentoo-r1
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
+
+REQUIRED_USE="?? ( pulseaudio gstaudio )"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	gstvideo? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	gstaudio? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	>=x11-libs/pixman-0.17.7
+	>=media-libs/celt-0.5.1.1:0.5.1
+	media-libs/opus
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	>=dev-libs/glib-2.36:2
+	>=x11-libs/cairo-1.2
+	virtual/jpeg:0=
+	sys-libs/zlib
+	introspection? ( dev-libs/gobject-introspection )
+	lz4? ( app-arch/lz4 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		virtual/libgudev:=
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+			!~sys-auth/polkit-0.111 )
+		)
+	webdav? (
+		net-libs/phodav:2.0
+		>=dev-libs/glib-2.43.90:2
+		>=net-libs/libsoup-2.49.91 )
+"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-0.12.12
+	dev-perl/Text-CSV
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	# Clean up environment, bug #586642
+	xdg_environment_reset
+
+	local myconf
+
+	if use vala ; then
+		# force vala regen for MinGW, etc
+		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+	fi
+
+	myconf="
+		--disable-maintainer-mode \
+		$(use_enable static-libs static) \
+		$(use_enable introspection) \
+		$(use_with sasl) \
+		$(use_enable smartcard) \
+		$(use_enable usbredir) \
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
+		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
+		$(use_with gtk3 gtk 3.0) \
+		$(use_enable policykit polkit) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable gstaudio) \
+		$(use_enable gstvideo) \
+		$(use_enable mjpeg builtin-mjpeg) \
+		$(use_enable vala) \
+		$(use_enable webdav) \
+		$(use_enable dbus) \
+		--disable-gtk-doc \
+		--disable-werror \
+		--enable-pie"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	# Remove .la files if they're not needed
+	use static-libs || prune_libtool_files
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
new file mode 100644
index 000000000000..aa41fd8ab9ac
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils xdg-utils vala readme.gentoo-r1
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
+KEYWORDS=""
+IUSE="dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
+
+REQUIRED_USE="?? ( pulseaudio gstaudio )"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	gstvideo? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	gstaudio? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	>=x11-libs/pixman-0.17.7
+	>=media-libs/celt-0.5.1.1:0.5.1
+	media-libs/opus
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	>=dev-libs/glib-2.36:2
+	>=x11-libs/cairo-1.2
+	virtual/jpeg:0=
+	sys-libs/zlib
+	introspection? ( dev-libs/gobject-introspection )
+	lz4? ( app-arch/lz4 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		virtual/libgudev:=
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+			!~sys-auth/polkit-0.111 )
+		)
+	webdav? (
+		net-libs/phodav:2.0
+		>=dev-libs/glib-2.43.90:2
+		>=net-libs/libsoup-2.49.91 )
+"
+DEPEND="${RDEPEND}
+	=app-emulation/spice-protocol-9999
+	dev-perl/Text-CSV
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	# Clean up environment, bug #586642
+	xdg_environment_reset
+
+	local myconf
+
+	if use vala ; then
+		# force vala regen for MinGW, etc
+		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+	fi
+
+	myconf="
+		--disable-maintainer-mode \
+		$(use_enable static-libs static) \
+		$(use_enable introspection) \
+		$(use_with sasl) \
+		$(use_enable smartcard) \
+		$(use_enable usbredir) \
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
+		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
+		$(use_with gtk3 gtk 3.0) \
+		$(use_enable policykit polkit) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable gstaudio) \
+		$(use_enable gstvideo) \
+		$(use_enable mjpeg builtin-mjpeg) \
+		$(use_enable vala) \
+		$(use_enable webdav) \
+		$(use_enable dbus) \
+		--disable-gtk-doc \
+		--disable-werror \
+		--enable-pie"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS NEWS README TODO
+
+	# Remove .la files if they're not needed
+	use static-libs || prune_libtool_files
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/spiped/Manifest b/net-misc/spiped/Manifest
new file mode 100644
index 000000000000..e346711d9d3e
--- /dev/null
+++ b/net-misc/spiped/Manifest
@@ -0,0 +1,7 @@
+AUX spiped.confd 639 SHA256 0cc43294119709525605c0dbc8bcb1676a6b1d4c95a054eb575565c008fa8edd SHA512 ce2b2f4025ce69ec639e452ed4f4760600e2acd41c29b7ab9c75a7e72bc66cf29c60d417a19f08bd7f7f1cfc7d8582ad6de62738251be3964bcf16ca872887ac WHIRLPOOL 83c01d407ce5fe1a47ec468a5b7c8978a0164d6d621affcb57fbafab7c819e449a35bada64627b7e19b0f19b3cc486a4192201acedd84f8304c1a741eb486922
+AUX spiped.initd 649 SHA256 353a176a4f142ec881941ef88131b529dcb9ac52bb2a7012a0bef9ba684d3759 SHA512 6acdf82ca2ed469e3b69813e59628d3148b7c3600b5af74a82d6c715d812b74ed1effd43d7e644d872f1faea4a553e365f36cf054c4727fdc902446f0b89f52a WHIRLPOOL 7581f0de55beb0bb47a310d11f55800f6e08e33111acfd52c1fefd01ad22154f4266678525a876386b11546ac57994f1046c8db8f80e097ec3b1dcd4df1c122f
+DIST spiped-1.6.0.tgz 94431 SHA256 e6f7f8f912172c3ad55638af8346ae7c4ecaa92aed6d3fb60f2bda4359cba1e4 SHA512 9bca8e7da31b86f956a653279f9346d8270a7e28a07d30b4a7104b21fbfbd1a81410e6a7dc0827127331a8f10226d5b8d2ddaacb94c9f76ecc6d15d728ead27a WHIRLPOOL 7fa1b30ba031b8214ae8fa64ac0d7b4586a9551869f76b16cc5b0d9b043abb79a12905802c34d87ef519183e940735cfdf8e8b7d2ed1bab144d013b2aa28aae9
+EBUILD spiped-1.6.0-r1.ebuild 912 SHA256 e4b88db90660945e172bdab500e693dd6b5cf9db051bdc3d79b0b1fecf2d66ac SHA512 f78d65f7360c4291c8c3cb7c8f3d19858c56de144ef5af9e5c75d27773ad1f514604e8b7dfa5c2ec3abc463a1dd0f28c2e16d98b211c8a3335db667b9c8b12bb WHIRLPOOL 190cf964abe656f64434b91efa47be56b1a482acb9c7c2f685a657283cbd77576eb5e0548a1dbd1a14939249b2ad7b611530256365722949727a6a478f9cbca6
+MISC ChangeLog 3187 SHA256 66e2362781a485ab49c65c14e3720646ec5208c7b81b79c139e9d8a530e68996 SHA512 cb1a64a89cc37a02c959ade38e40534d8511bb12ffd1f60298c2789a5e146eb78555b3513fbab8556106751f59173fad920fbab4a1642119ba528d970dade69e WHIRLPOOL 683fde36e37b27bb7f20b27727120317d4d87273f638d96dfc811e221c9ae8a9cb852113e1025f3b1c200f58b8f48c33294da8308348a9c71c42589682736a35
+MISC ChangeLog-2015 566 SHA256 96783b93a0ee4b464770cfc1cfaa8bb9e85d3b1c4db685d1eb7bff0e3d99d687 SHA512 fd26908d0fd7961b1fee06b725bf13bba1afbe266ef0c67d990e56ac55d11a172885145c50644b75bc369b942d43d8b9e4b28cfc8093e82705bdf294b66247dd WHIRLPOOL 4c59f9893146030de4e9fc0b848fda80fee62706d6281be3d6c8b3bc6e7cfee2821e11d3e046a54dd585369ded2fa67b7ecb3301e8c5d7104d2ead2981ad0dad
+MISC metadata.xml 698 SHA256 6c779060f3e96cdb0c030f960703b916e1c0d777d993c885540e52bf1c4679aa SHA512 26f7bb3fc9a8fd2f2ecc9a6b249b777bc9761f2058f3aa01a700d745e17a8e1f6aba16a8b013576b6bbb4cad951e7a4e01975c22c1cec9217307723ecaebbb63 WHIRLPOOL 0d6a6174ecb9b3b1aeb60565840e5fd7955601c606fa48f3f39e015d1788734c68a9b31d14716f33428f1046955e3aba6155522d0b41a249bcf6a3fc0aa0f212
diff --git a/net-misc/spiped/files/spiped.confd b/net-misc/spiped/files/spiped.confd
new file mode 100644
index 000000000000..117be90309c3
--- /dev/null
+++ b/net-misc/spiped/files/spiped.confd
@@ -0,0 +1,21 @@
+# /etc/conf.d/spiped
+
+# Once you're happy with your settings,
+# set IS_CONFIGURED to "yes".
+IS_CONFIGURED="no"
+
+# spiped is shipped with plenty of options. 
+# Please see the man page for the complete list.
+# -e : encrypt communication
+# -d : decrypt communication
+OPTS="-e"
+
+# Address and port on which spiped should listen for incoming connections.
+# If you want it to listen on the loopback interface, do not specify "localhost" 
+# but the localhost IP address instead. spiped won't start if you do so.
+SRCHOST="127.0.0.1"
+SRCPORT="12345"
+
+# Address and port to which spiped should connect
+TARGETHOST="some.domain.tld"
+TARGETPORT="1337"
diff --git a/net-misc/spiped/files/spiped.initd b/net-misc/spiped/files/spiped.initd
new file mode 100644
index 000000000000..80a164c64999
--- /dev/null
+++ b/net-misc/spiped/files/spiped.initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${KEYFILE:="/etc/spiped/keyfile"}
+: ${SPIPED_USER:="nobody"}
+
+command="/usr/sbin/spiped"
+command_args="${OPTS}
+	-s [${SRCHOST}]:${SRCPORT}
+	-t ${TARGETHOST}:${TARGETPORT}
+	-k ${KEYFILE}
+	-F"
+command_background="true"
+command_user="${SPIPED_USER}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+    use net
+    before logger
+}
+
+checkconfig() {
+    if [[ ! "$IS_CONFIGURED" == "yes" ]]; then
+        eerror "You need to setup /etc/conf.d/spiped first!"
+        return 1
+    fi
+}
+
+start_pre() {
+    checkconfig || return 1
+}
diff --git a/net-misc/spiped/metadata.xml b/net-misc/spiped/metadata.xml
new file mode 100644
index 000000000000..31619e764b4f
--- /dev/null
+++ b/net-misc/spiped/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+	<longdescription> 
+		Spiped (pronounced "ess-pipe-dee") is a utility for creating symmetrically
+		encrypted and authenticated pipes between socket addresses, so that one may
+		connect to one address (e.g., a UNIX socket on localhost) and transparently
+		have a connection established to another address (e.g., a UNIX socket on a
+		different system). This is similar to 'ssh -L' functionality, but does not
+		use SSH and requires a pre-shared symmetric key.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/spiped/spiped-1.6.0-r1.ebuild b/net-misc/spiped/spiped-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..b3ab508eb627
--- /dev/null
+++ b/net-misc/spiped/spiped-1.6.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="secure pipe daemon"
+HOMEPAGE="http://www.tarsnap.com/spiped.html"
+SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libressl"
+
+MY_PN="${PN/d/}"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+
+# Blocker added due to #548126
+RDEPEND="
+	${DEPEND}
+	!net-mail/qlogtools"
+
+src_install() {
+	dobin "${MY_PN}/${MY_PN}"
+	dosbin "${PN}/${PN}"
+
+	doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	dodir "etc/${PN}"
+}
+
+pkg_postinst() {
+	elog
+	elog "You will need to configure spiped via its"
+	elog "configuration file located in /etc/conf.d/."
+	elog
+	elog "Please have a look at this file prior to starting up spiped!"
+	elog
+}
diff --git a/net-misc/spread/Manifest b/net-misc/spread/Manifest
new file mode 100644
index 000000000000..c37b3d3648b4
--- /dev/null
+++ b/net-misc/spread/Manifest
@@ -0,0 +1,8 @@
+AUX spread.init.d 519 SHA256 0c6ec9652d3fb3db57ba35a0ae04f45786f82f04b3cf15908469bbd01203d5d7 SHA512 20852b8fe9b14a1b3cde97683042060382f7a66c28e2072ede63bca9752cd0c4307e5aad689b3274018cf83b0918d0418a99b162af67a332ecc0d90d0deb475a WHIRLPOOL 1d991f4616e22816d479801c86dc7d1d439b07ae8ae3319f7995edf65503aad4869478973fa64df925c474237eaf607abd7f88508345f8568fec834408f09f36
+DIST spread-src-4.1.0.tar.gz 641060 SHA256 764d84ecf06877802c805efc1e84bbb362f14c791829e88d62fcba9951a68cdd SHA512 6db3cf9760d483685bd23d32760f52b9af667fcf98341fad198b0831cc41cc839998dee59dee04426bf4db15700656fe90f4f457e2a3c6e449eb51b07fc18a6d WHIRLPOOL 39304f2341e410fca42314195d022b333fb9b1a3874ed1a32f8e8bc4f45e4cd436c50eb08180c3d5c562c7c79c6700e3d918b58696465396faa2710ce3fa8fec
+DIST spread-src-4.3.0.tar.gz 745113 SHA256 1f8f7709842c90fd486eb286f6a92631767ccd9704e530043c488f73902fa305 SHA512 7eb87e896a623accfe3f36c44ba55f8258d078ff9cdc141509456af4a069802f087edaeafcd356791337dbfb4d4f67b808a482ea54ac58aef8fb980cdbc6fea6 WHIRLPOOL 467025306728aefae22c94930d304efb89a0a946da505faa532b998815a5b2085429b4f111ff68a9fa237446d8442b04b620488ea3fc2f7ae1b9e3d59dd95ddb
+EBUILD spread-4.1.0-r1.ebuild 733 SHA256 b4796fb781b20245f824ad83b75f4943871059c10a797b8c0f2bcded61d45ded SHA512 feffbcb7c76c5faf979e00a224c4487cc64dc754a27a4b6ea62335eac68e1a6ddcf8ff0acb7bc3e7996fff1f0dcfe8ddc7bc24f359c0f9109f4f31be0f1f556c WHIRLPOOL ca9c569927215987bc680b8d4105d378d3505e1add151a322f8fd51c0d54db041f2cb6b2fe1cdc63cab8bcef9c4824581997bd934c2d76d2204be88729f09ea4
+EBUILD spread-4.3.0-r1.ebuild 712 SHA256 17325414af6c3a5981e49b4def84f1e8fda8cc4c5cdb26ae0da77d172b3e1b40 SHA512 4469a47c5ab38f67812df29aa559461b8cf79d98fa27519ddc179434c626507b38f580477d7b851829dd7e1850cf00dd645b966320cde66902ced1e3efa87c5b WHIRLPOOL d9c25ba33b2c9053f75d4223a3f51f009402ace9cf84303527e9b9aacabecb59b49cf5408725c959bb7f80890f1b9c29ad11359feff8818e51762b6300b931fc
+MISC ChangeLog 3075 SHA256 1524606ac1d3dec5a2838bdda4b47de7aba543345840055c676225c6d185ed00 SHA512 3ff6783c9cdbe789840ed7fa80291d98c7ec9893aade719b108911c56375939c1390360c580fe880e1d5a8368d3747e7966668b1e2d98ecf65ecb50bb8942797 WHIRLPOOL b8f497311fe5fe11b051180cf2f2b51b0e60ebe44922e190fcf26d91bd269f3e06fac096bb5e532a77e9c09233590fbf44c496460ba8f0b0b04ca2965dddd8e8
+MISC ChangeLog-2015 2265 SHA256 91c7dac7ef0a0a1d2a689242b0736461d949e6e40fb0fba5a3eca75bc102e4c3 SHA512 26c75613e40fa6652c36fc64201a8e5c7dd96e3f0e62221cfec8395bcdb19b793aafaba885391d49d669da7f36be447e58ed8d4976df1ba75ce85fac4b03e858 WHIRLPOOL 34d45b6731d2b1ddbd75a471bd2cbc41a075cacdc8d4dba3f58dcd9a09a370c8b580e0d5abaccf601ecbdf34ff517fde1365401649ee9731ed4fdb85f4b6a072
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/spread/files/spread.init.d b/net-misc/spread/files/spread.init.d
new file mode 100644
index 000000000000..c041444e65a9
--- /dev/null
+++ b/net-misc/spread/files/spread.init.d
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+mkdir_spreadirs() {
+	[ -d /var/run/spread ] || mkdir -p /var/run/spread
+}
+
+start() {
+	ebegin "Starting Spread Daemon"
+	mkdir_spreadirs
+	start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/spread.pid --exec /usr/sbin/spread &
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Spread"
+	start-stop-daemon --stop --pidfile /var/run/spread.pid
+	eend $?
+}
diff --git a/net-misc/spread/metadata.xml b/net-misc/spread/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/spread/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/spread/spread-4.1.0-r1.ebuild b/net-misc/spread/spread-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..06e268e108bf
--- /dev/null
+++ b/net-misc/spread/spread-4.1.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit user
+
+MY_PN="spread-src"
+
+DESCRIPTION="Distributed network messaging system"
+HOMEPAGE="http://www.spread.org"
+SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Spread-1.0 GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	enewuser spread
+	enewgroup spread
+}
+
+src_prepare() {
+	default
+
+	# don't strip binaries
+	sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+	newinitd "${FILESDIR}"/spread.init.d spread
+	dodir /var/run/spread
+}
diff --git a/net-misc/spread/spread-4.3.0-r1.ebuild b/net-misc/spread/spread-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..06bbce63e1c6
--- /dev/null
+++ b/net-misc/spread/spread-4.3.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit user
+
+MY_PN="spread-src"
+
+DESCRIPTION="Distributed network messaging system"
+HOMEPAGE="http://www.spread.org"
+SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Spread-1.0 GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	enewuser spread
+	enewgroup spread
+}
+
+src_prepare() {
+	default
+
+	# don't strip binaries
+	sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+	newinitd "${FILESDIR}"/spread.init.d spread
+}
diff --git a/net-misc/srf-ip-conn-srv/Manifest b/net-misc/srf-ip-conn-srv/Manifest
new file mode 100644
index 000000000000..381022191ca7
--- /dev/null
+++ b/net-misc/srf-ip-conn-srv/Manifest
@@ -0,0 +1,6 @@
+AUX srf-ip-conn-srv 162 SHA256 15a8006f3fd8a81b519b59ce1531ab63d76c1f107356024e8f3cc3650d636d5c SHA512 7a5d2fe94f89c06ae54e01a532bc57735d39a0a620d11a536a5f27ae0912a017661b4e5928ceb3f4a63e49d155592cb763043a6a53f270810b15bc0f22074e41 WHIRLPOOL fb4e66d1b06256f147ce3348367b07492d963dd36a949a8f5b745ea355d2da920e4aa2eb3977f0152a728ce62a290d17e1e3ee852b5714593c7b30db80c4622b
+DIST jsmn-35086597a72d.tar.gz 11056 SHA256 9cf211b926e5fa288cb40037823d70f9c3e61cb696cf35fc15e29e8f48307376 SHA512 0cec27867f3ffd39ae1040e5236b7710a0e1b31fd184da6b56aed3995379da64907dc00aa01692f244ed5ea59ec995d62bacfd3a130bd1dd59724405f24560bd WHIRLPOOL 7dc2d6ec236f8377cc48539b3a7df774d51322827d1ee50e8548dd7cf540933912e7747f88ab1e12ff02131205ea4efe80c8709b04284d0397a0a6f3e667193a
+DIST srf-ip-conn-140c9b8a8619.tar.gz 112882 SHA256 e46f16afa0454fa4ed094666e4bed606f9b910bbc18c9c93087efb9ed95b2c5f SHA512 6f6e6fbc1b3d17fb36ef48c530756d2c4b2bee0a0e9016355ca57ac7124ca2b18c845110d40818673b200a3700b92f6b40664d157a158979705146aad579186b WHIRLPOOL 0b03c01fac2f12a8217386e534fab7de5e473a26b50cd329eaa64a8a2b5225b4b46ffc5b275f2ad2dc89b27e2026b1bfd3eebc85d242433519aa7a41dd0c9cef
+EBUILD srf-ip-conn-srv-9999.ebuild 1703 SHA256 b081de7e06a40fe0b91f05c28392c49289564a8111b3bece6bd86b85c4720212 SHA512 557704ae6a2831103de64197fc63d1e45cb532501b84e95261129855f09cf3fe6bad57b85fa7a4b33ce3f1456c6737a9123c2697929632a1600dc4850519ca87 WHIRLPOOL d370bd3fed2d03ce58781b695523e3bfb9ac319496af1be1f0f646a44065d80d5e1ce95faaaa0363a7cdd73b7b729d0f3e6af50f1ee35274e8a821aeef8b6909
+MISC metadata.xml 238 SHA256 fb3f3758a51e2214d17a7ee3860535abef87230f8ebee7ddd0c1c8b64a9bec1b SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f WHIRLPOOL 1645c553345ed030e8d8fdb0c826c7e1e24178e472b1c1f3001a601719e09d4768ad6fd9e35f0b0c56a53f257cdc5593726114acd8e5c89d3c13436c6b2185a2
+MISC srf-ip-conn-srv.pid 6 SHA256 25a476f277b84fd0a6a0f1bb32edd87717d37a4dd500584bc444ec2f13df04e2 SHA512 b34f721fe50aec75d17d74f002a9a09ef643dfdbc06d9a889cfc93ddf0ca95b7e23ecc90f2947a7ec7ba31bd0709473c3f706f8aac4dfc04ca76ce6ab27fcf31 WHIRLPOOL 4a6fff4734acee627bf6012437e7d5379f986d700e878ffffee346467f40f5ccb0a363e8fe9ea9a29029a8efe24ab99497ce5dbd8d00b63f5f1f5ec4e7e9bf04
diff --git a/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv b/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv
new file mode 100644
index 000000000000..4bc3f9d30f33
--- /dev/null
+++ b/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [[ "$*" == *-c* ]]; then
+  /usr/bin/srf-ip-conn-srv-target "$@"
+else
+  /usr/bin/srf-ip-conn-srv-target -c /etc/srf-ip-conn-srv/config.json "$@"
+fi
diff --git a/net-misc/srf-ip-conn-srv/metadata.xml b/net-misc/srf-ip-conn-srv/metadata.xml
new file mode 100644
index 000000000000..1570f891c6a3
--- /dev/null
+++ b/net-misc/srf-ip-conn-srv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild b/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild
new file mode 100644
index 000000000000..f92e83711ca8
--- /dev/null
+++ b/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot git-r3 cmake-utils
+
+DESCRIPTION="SharkRF IP Connector Protocol server"
+HOMEPAGE="https://github.com/sharkrf/srf-ip-conn-srv"
+srfipcon="srf-ip-conn-140c9b8a8619"
+jsmn="jsmn-35086597a72d"
+SRC_URI="https://github.com/sharkrf/srf-ip-conn/archive/140c9b8a86193b8f345c9e113691113310859ff8.tar.gz -> ${srfipcon}.tar.gz
+		https://github.com/zserge/jsmn/archive/35086597a72d94d8393e6a90b96e553d714085bd.tar.gz -> ${jsmn}.tar.gz"
+EGIT_REPO_URI="https://github.com/sharkrf/srf-ip-conn-srv.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/build"
+
+CMAKE_IN_SOURCE_BUILD=true
+
+src_unpack() {
+	vcs-snapshot_src_unpack ${A}
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	#set needed paths
+	sed -i "s#\$ENV{JSMN_PATH}#${WORKDIR}/${jsmn}#" CMakeLists.txt
+	sed -i "s#\$ENV{SRF_IP_CONN_PATH}#${WORKDIR}/${srfipcon}#" CMakeLists.txt
+
+	#set cflags/ldflags
+	sed -i "s#-O4#${CFLAGS}#" CMakeLists.txt
+	sed -i "s#CMAKE_EXE_LINKER_FLAGS_RELEASE \"\"#CMAKE_EXE_LINKER_FLAGS_RELEASE \"${LDFLAGS}\"#" CMakeLists.txt
+
+	#be in a sane directory for eapply_user
+	cd "${WORKDIR}/${P}"
+	eapply_user
+}
+
+src_install() {
+	#add a default banned list to edit
+	sed -i 's#"banlist-file": ""#"banlist-file":"/etc/srf-ip-conn-srv/banlist.json"#' "${WORKDIR}/${P}/config-example.json"
+	echo "{}" > "${ED}/etc/srf-ip-conn-srv/banlist.json"
+
+	insinto /etc/srf-ip-conn-srv
+	doins "${WORKDIR}/${P}/banlist-example.json"
+	newins "${WORKDIR}/${P}/config-example.json" config.json
+	newbin Release/srf-ip-conn-srv srf-ip-conn-srv-target
+
+	dobin "${FILESDIR}/srf-ip-conn-srv"
+}
diff --git a/net-misc/srf-ip-conn-srv/srf-ip-conn-srv.pid b/net-misc/srf-ip-conn-srv/srf-ip-conn-srv.pid
new file mode 100644
index 000000000000..e9fe9b5ac5a0
--- /dev/null
+++ b/net-misc/srf-ip-conn-srv/srf-ip-conn-srv.pid
@@ -0,0 +1 @@
+22258
diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
new file mode 100644
index 000000000000..a5bb3b497dd3
--- /dev/null
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -0,0 +1,7 @@
+AUX ssh-askpass-fullscreen-1.0-libX11.patch 845 SHA256 2c567b1269cc1ab17fe70fa1802163ca93f60fc9c65017f03aa1ad733ba4f6b7 SHA512 cbf89dba7398f735807f841f4df8534e8918c09e95bca43d4fcfe451e5697194712f723a081830eeccc01e5e389cb8ea319401e80d68365c3763c8294dbd69d7 WHIRLPOOL 9ac5180929bf73cc36ae21d1b2ea2a6c36ed7cdad5727be13a01afc2c09eb49ba5e761267bccd68c61cf7eccf433bceb25fa96efac0631bd660a4e4057ad6ea5
+AUX ssh-askpass-fullscreen.1 2542 SHA256 bde17cd9bcb8b1c6d9cf781118c2ce51f0d5742d57c0ea4944095ff5a34332e4 SHA512 84f28b5603a15a4d283b0980b4bc0dafd0c0eb3b889a579d51dab69577fe57eb0854c30adf358423731d2a2543647e28c1739bca04a77c8217299d6372f8d45e WHIRLPOOL 96f8b7f66cbad880b25f15050708b450972d3886d2df36c69f6f116e347961498e86ad0765f254adb0f4420588dc3cec51db440104e217a5355891fb8ec753e4
+DIST ssh-askpass-fullscreen-1.0.tar.bz2 69301 SHA256 5843f3c580964be64aa40bf20a03d4d7de326fe8957aae213b38c405c5d10b9a SHA512 272b7d8bcbfb997530afcb6c619180b625e6753e1dc86cba30f30fa594cd71ec8bfc522b0fb8aee5842cb7a4532a00fc1e0954def9ac81a1b521360d7140f52b WHIRLPOOL 029b152835dea0f67636f3781cdaf550aa1a3cfb905af233be80a7333606a90a6c635220dc7baf598acd4f4a6b4a66aa07ec4627633c9a0a7ec194a72ef8d2ba
+EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 999 SHA256 95d882553f5a1d090c579d8fa380abc0628df283edaa02cc45931d15a9e7c5c6 SHA512 276ab28a351dce6d24d9aa4cb80fc421b7801295350097a2732f9b3366a969e003a461d009c877fd75f4b413a4d22bd9d8953c8152493e604742bc954e03f998 WHIRLPOOL 2a2d12f0e2c2aa31ca9d745f4fcd6047fb1f6454f9abb62bd96d503c4c81b4a6542ffd8023af44da17dcf84abb376a862d4e9a82d84e6b6229a59784c7373e4c
+MISC ChangeLog 2633 SHA256 1f27b28a318ae2dd6730dce8e3685b6e2477bf93430590b01dbe033d41dd0504 SHA512 1449eeacd1b0792c516243c5de661916dcdd60ff9a2166a62306155883ff73ce488c3bc04cac12555152c7172421175eb4ca277412f0928bafb3bd726ecac690 WHIRLPOOL 839c1598953388d59771d0f23f4b17c15c801c23e8617ce93a916d8ef4a2244465d912eced68407d52d4b11120d3ba391f150058f459baa270e6cf18a8e2941c
+MISC ChangeLog-2015 5719 SHA256 0e82183b1428bdcc7f6770beece4b91aaa7552c4866699d111912164667708bd SHA512 1790667116119b05688edadba69908ba8716bfe64d1afbe9855bf2f408b54a8c23be8113324d54e727e1d7d137325456df870be5cb567ed104af28115e942b2b WHIRLPOOL a7bff2830dcf46aa3d710db940e1868274cdfd580691fc6d7fac3b0e749a17354e1c3145388d8a1f6b3cb548821022d73c3e65ff92999fa953365f08fe73d21a
+MISC metadata.xml 344 SHA256 6f7bb4fce65a2bea198d4386277df69b6f64414153832278d7e837092bb8739c SHA512 26eb499745d0f954b33834ebecef34ba44ad457837ea4c0b0a44e917513aabe6486887124ac5ce47d69c1756f2a00693ced7ed4dabcb35539d047f19deeb33f0 WHIRLPOOL 771e5374aaa1c3f822e33cbdcad858b5445d73ab436c3ed9e8efb15580e7fdd4a9f476c3d338d3b16e1f9979c75c3ad5c234042564828c6a6a66ed0b72c6b0b8
diff --git a/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch b/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch
new file mode 100644
index 000000000000..eadf2639b7a2
--- /dev/null
+++ b/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch
@@ -0,0 +1,27 @@
+From 313871922aefef489115967d634f991edfaad39c Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 12 Oct 2012 17:10:02 -0400
+Subject: [PATCH] Explicitly link to libX11 for XUngrabServer()
+
+Prevents underlinking failure when using recent ld.gold and recent
+versions of gtk+; see https://bugs.gentoo.org/show_bug.cgi?id=370019
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8f46279..01e36dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,7 +8,7 @@ AC_PROG_CC
+ AC_CHECK_HEADERS([stdio.h stdlib.h string.h unistd.h])
+ AC_CHECK_FUNCS([memset])
+ 
+-PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.10.0],,
++PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.10.0 x11],,
+ 		  AC_MSG_ERROR([>=GTK+-2.10 is required to compile ${PACKAGE_NAME}]
+ ))
+ 
+-- 
+1.7.12.3
+
diff --git a/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen.1 b/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen.1
new file mode 100644
index 000000000000..86f97cde03cd
--- /dev/null
+++ b/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen.1
@@ -0,0 +1,79 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH SSH-ASKPASS-FULLSCREEN 1 "May 8 , 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+ssh-askpass-fullscreen \- A simple replacement for ssh-askpass written with gtk2
+.SH SYNOPSIS
+.B ssh-askpass-fullscreen
+
+.SH DESCRIPTION
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+
+.B gnome-ssh-askpass
+is a GNOME-based passphrase dialog for use with OpenSSH. It is
+intended to be called by the
+.B ssh-add(1)
+program and not invoked directly.  It allows 
+.B ssh-add(1)
+to obtain a passphrase from a user, even if not connected to a terminal
+(assuming that an X display is available).  This happens auto-matically
+in the case where
+.B ssh-add 
+is invoked from one's 
+.B ~/.xsession or as one of the GNOME startup programs, for example.
+
+In order to be called automatically by 
+.B ssh-add, 
+.B ssh-askpass-fullscreen
+should be installed as /usr/bin/ssh-askpass
+
+
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBssh-askpass-fullscreen\fP is a program that...
+.SH ENVIRONMENT VARIABLES
+The following environment variables are recognized:
+
+.TP 
+.IR "GNOME_SSH_ASKPASS_GRAB_SERVER"
+              Causes gnome-ssh-askpass to grab the X server before
+asking for a passphrase.
+
+.TP 
+.IR "GNOME_SSH_ASKPASS_GRAB_POINTER"
+              Causes gnome-ssh-askpass to grab the mouse pointer will be
+grabbed too.
+
+.PP
+These  may have some benefit to security if you don't trust your X
+server. Keyboard is always grabbed.
+
+.TP
+
+.SH SEE ALSO
+.BR ssh-add (1),
+.BR ssh-askpass (1).
+.br
+
+.SH AUTHOR
+This manual page was written by Marco Presi (Zufus) <zufus@debian.org>,
+for the Debian GNU/Linux system (but may be used by others) and it is
+based on that for x11-ssh-askpass by Philip Hands and the one for
+gnome-ssh-askpass by Colin Watson <cjwatson@debian.org>
diff --git a/net-misc/ssh-askpass-fullscreen/metadata.xml b/net-misc/ssh-askpass-fullscreen/metadata.xml
new file mode 100644
index 000000000000..796542559d7d
--- /dev/null
+++ b/net-misc/ssh-askpass-fullscreen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">atj/ssh-askpass-fullscreen</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
new file mode 100644
index 000000000000..580ea00be4dc
--- /dev/null
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="A small SSH Askpass replacement written with GTK2"
+HOMEPAGE="https://github.com/atj/ssh-askpass-fullscreen"
+SRC_URI="mirror://github/atj/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.10.0:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# https://github.com/atj/ssh-askpass-fullscreen/pull/1
+	epatch "${FILESDIR}/${P}-libX11.patch"
+
+	# automake-1.13 fix, bug #468764
+	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	# Automatically display the passphrase dialog - see bug #437764
+	echo "SSH_ASKPASS='${EPREFIX}/usr/bin/ssh-askpass-fullscreen'" >> "${T}/99ssh_askpass" \
+		|| die "envd file creation failed"
+	doenvd "${T}"/99ssh_askpass || die "doenvd failed"
+}
diff --git a/net-misc/ssh-chain/Manifest b/net-misc/ssh-chain/Manifest
new file mode 100644
index 000000000000..9ee0c3bec332
--- /dev/null
+++ b/net-misc/ssh-chain/Manifest
@@ -0,0 +1,5 @@
+DIST ssh-chain-20131217.tar.gz 3956 SHA256 da84435531a6e22d167fe94c64b193fe8424ac35f40923f81fdb6650dec93f3a SHA512 7d9faa9bbce44a50ca56d65fd778d35f79c7ece982e2bb0e424471c866f9cc584390484dbed73447473016fe5de4564e22883d3dda4aa54e167853a3e0ce2975 WHIRLPOOL 5cc066e31372fe61b3b72c72786f1e6351247e13c643598c78e875715e64cfee4254b28c21d1facd33556241a26614c92670cd5832714e798b69d4db4a6c0819
+EBUILD ssh-chain-20131217.ebuild 797 SHA256 71c4dd759834ec378c0486230231d30d3cab21f7036d73fe5a7581efcb7d41c0 SHA512 ba404d05580c0b37167fb2632357591061e1910e26e4c7bf4ebcc2ea8b6488f8d05851382a2c5fec9bade4531debc23210d9fa87888775eb1f8777a3a2f78f01 WHIRLPOOL d378196c3ed6146f23701a7d72cb36a95cb15c6958c3ec05bfbe6e2bdf68de9751cbd999007512020056f90879b41576684a2b038c42e3828a0e54ba4a4f6b64
+MISC ChangeLog 2311 SHA256 f76daabc024245b41749ae252a8fab16723d738382197d7967bddefe89408756 SHA512 043635cf10c78526fc20c477e3de61cd5b3994bb31648e730285aa7d8330e43ca464766e1ce1d2524340162ca31c15fdcc061ca9d8cd06fec8507ca232078366 WHIRLPOOL ee960e09128de8cf34388942a02b28cc1847a13b88e6390819983decb5a27c268913f2c0a368b2951df8f8262ed0ffaa8c9fba305207408d215f6f843f20b153
+MISC ChangeLog-2015 360 SHA256 ad50eb4f0c199b753f42aaeeb7fc1fe2c83ed08aa8fd7ef5dab28321a8c35fb5 SHA512 5a3d9a28fe754a22c71049c22ebcab0633248dc446617563d38b9398479fe9438d43c9377d218839b75b6b3be84ef7a23523349df251c6ac12be03c0d8cb2d7d WHIRLPOOL 3f03395d954d43e997c92cf51a4b164ce4c363b1e1b3747f0e808dff12e82b51e66485b2924bdf90c399c378516bad409107f889c8eed50318f5b5f3c39a4ea0
+MISC metadata.xml 339 SHA256 50da21b8c5652edb94f44d0338a19369c86107fdd74bbd893f12974b1d13f5f9 SHA512 573a755a2936fdf1abb1fbca32a61d3b6bb097ae70cdb75348fca0c5d031e9a55e85e97ba4d56d658581430c68500c10a7a46c48d89d21a31ba24481be179681 WHIRLPOOL 569de4b86c723e90519ae90d4de37f1bae8855ca447831b299ee9845c38c2297027089c06019c1fb52716875bbbb84ac653628a8f5e3429efad47028e3b631db
diff --git a/net-misc/ssh-chain/metadata.xml b/net-misc/ssh-chain/metadata.xml
new file mode 100644
index 000000000000..20206d367bf0
--- /dev/null
+++ b/net-misc/ssh-chain/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>junghans@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ryancdotorg/ssh-chain</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/ssh-chain/ssh-chain-20131217.ebuild b/net-misc/ssh-chain/ssh-chain-20131217.ebuild
new file mode 100644
index 000000000000..896d1ece4208
--- /dev/null
+++ b/net-misc/ssh-chain/ssh-chain-20131217.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vcs-snapshot
+
+COMMIT="c1bd9d82d750bf001d12a9cd41b9b24a3fd84f81"
+DESCRIPTION="ssh via a chain of intermediary hosts"
+HOMEPAGE="https://github.com/ryancdotorg/ssh-chain"
+SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	virtual/ssh"
+
+src_install() {
+	dobin "${PN}"
+	dodoc README
+	if [[ -f "${EROOT}"/etc/ssh/ssh_config ]] && ! grep -q "^Host \*^\*" "${EROOT}"/etc/ssh/ssh_config; then
+		cp "${EROOT}"/etc/ssh/ssh_config "${T}/ssh_config"
+		cat >> "${T}/ssh_config" <<EOF
+
+#for ${PN}
+Host *^*
+	ProxyCommand ssh-chain %h %p
+
+EOF
+		insinto /etc/ssh
+		doins "${T}/ssh_config"
+	fi
+}
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
new file mode 100644
index 000000000000..bb942118f094
--- /dev/null
+++ b/net-misc/sshpass/Manifest
@@ -0,0 +1,7 @@
+DIST sshpass-1.05.tar.gz 98362 SHA256 c3f78752a68a0c3f62efb3332cceea0c8a1f04f7cf6b46e00ec0c3000bc8483e SHA512 92ff3428a3cbc2b517e8ee0a6676b409bac3ec0900bfb370cf3882ccc62017edb695ce00e025f73680e9718e1b0213b2ac1bbd2a2558fe43f0f5a7b0d690c810 WHIRLPOOL 15c951f1c7e66a3967d5ed2c541862b95056faab108976206d6e81e76d6234ff116e7f490925305482238b5c86098a6783a691c8f436d8911ffea159df275ff0
+DIST sshpass-1.06.tar.gz 112205 SHA256 c6324fcee608b99a58f9870157dfa754837f8c48be3df0f5e2f3accf145dee60 SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8 WHIRLPOOL 1a3c17f61bad4ad61eab8e13f3582fab833cbbebb4768c55383f3ec74935e68e61d7ef4c45be399a4d07c9dd0a2a9fd0abfec7d2351236f070d7cf6b8cdd182c
+EBUILD sshpass-1.05.ebuild 408 SHA256 61da734a1225c11e1f442db49c8f963a1cd8fe3355a2df077c912b49541123e9 SHA512 cc073ce58bca4f7191c878912e6198acfcd75f49bc49d59089014e2f5fc47cfbc1e5041f142cb9a6e923cdbe989826d051d8c2483565a6c0881eaeace9157871 WHIRLPOOL 33118e272a8f1be88f50d283fadf3ca4295916c814930532b5752523b20fb4a3361e16683e82350f5b13f6b9de9800cb16a8031ef8676c26ea3fde6f8fda1540
+EBUILD sshpass-1.06.ebuild 398 SHA256 8b4851427ebd6f8fa4443cb554b3a642d792e2c573ec72110a0e284e01d62253 SHA512 9405313f06d315f04e5d353de12e010dd9b90fda1dd2b7ac8a8c3921039f9088048ddb82415150f08333fe346c4c8b4d2eef743b4e776e630bfa0bb8d1b330b5 WHIRLPOOL 50c09666d991d2011167d984efe932a61fad1b697b4c2fbbe77d40a6a520f857d46d654cc16057ee6334bd0664503bf33fc664d6a70f03169f192afa28de1e56
+MISC ChangeLog 2577 SHA256 b81d887c5275e7047700221c249a689f7132a1af9de461fc1246bb30a5e39ebf SHA512 b23d5086d3c9288fc38cbd082763c21f8cce9b81f4c28adb608cd79a46c1c5d13a2ce290857a7fecd23b4bb19df7f1eb6066756d5e12b7b0db2e906a1a1adbfe WHIRLPOOL 0ed53af170f84b0cde55d3e9cbf90a2006c166ccdb09764f618b43753e0a855427505724ece9462b81260ce41f114d3dc4a35038efcce0a0c6419b83549ac7c0
+MISC ChangeLog-2015 2086 SHA256 7edf478f6d22ecd04243b113a337dc8bd9a0323d82239aeb380a9b2a0ead5e54 SHA512 a5765075cd3157db6646130f461f6c10e47d73ecac6700b6ddc084ceae17aaaf7e8e002c02a33f84922fb822a835a5f2237f1dfa25a25997066807560efa2b8f WHIRLPOOL c00476021390ed91768294ce027b62dda49bcf187f5d828d27f552bb8d5af93ab1b5f5e8af103dae553fd7ad0bb94b11071c4fe9026a8ab1a1312e2e28d5bc00
+MISC metadata.xml 692 SHA256 606234934ad5450f877c853fc7f7ec9416ccc9d5779b24f28332cfc9560529e9 SHA512 7d04016dd742353ea3aec5ed0c8dbffcffa6d3a3980c96132e88080115e23f7fe91c1b4ba86da39d5d8a953a51a19ba7978834de74a7299295ac07252e2721b1 WHIRLPOOL 4bc7865eb3408c56b34afb1c617178d90d9d56dc4e19be6aa162844b0bd7b790e0d1ead88a402aec4f60f9c184866c1b505d4c5133581114ba699a1bfff25f80
diff --git a/net-misc/sshpass/metadata.xml b/net-misc/sshpass/metadata.xml
new file mode 100644
index 000000000000..8a6b9b82415b
--- /dev/null
+++ b/net-misc/sshpass/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jingcheng01@gmail.com</email>
+		<name>Jing, Cheng</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+		<description>Proxy maintainer; CC him on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sshpass</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/sshpass/sshpass-1.05.ebuild b/net-misc/sshpass/sshpass-1.05.ebuild
new file mode 100644
index 000000000000..b7bcea5622ea
--- /dev/null
+++ b/net-misc/sshpass/sshpass-1.05.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="Tool for noninteractively performing password authentication with ssh"
+HOMEPAGE="http://sshpass.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
+IUSE=""
+
+RDEPEND="net-misc/openssh"
+DEPEND=""
diff --git a/net-misc/sshpass/sshpass-1.06.ebuild b/net-misc/sshpass/sshpass-1.06.ebuild
new file mode 100644
index 000000000000..6e138ac018fc
--- /dev/null
+++ b/net-misc/sshpass/sshpass-1.06.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool for noninteractively performing password authentication with ssh"
+HOMEPAGE="http://sshpass.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE=""
+
+RDEPEND="net-misc/openssh"
diff --git a/net-misc/sshrc/Manifest b/net-misc/sshrc/Manifest
new file mode 100644
index 000000000000..1b82e7bd97f5
--- /dev/null
+++ b/net-misc/sshrc/Manifest
@@ -0,0 +1,4 @@
+DIST sshrc-0.6.1.tar.gz 3701 SHA256 e849ff19319381548011a9bdf1e33abc6eba3dc6a910c4226e6981d75d5564dd SHA512 69e0919bdef0ec6fb187814f1a0dd360b331dc4c0fc047f7767399944eccb949c172682331e6ebe940c275f0a2b6293a66a6018e12351f566638eed1ac362d64 WHIRLPOOL 590e0bad2239466f1f37dd44f04ff9c3dec39d654fe48dbfbb40a607eb82700a50cc01877e231c086ee1895c9c072a8caae7b7f42c5b7184855615abb4bee5ed
+EBUILD sshrc-0.6.1.ebuild 508 SHA256 70854e68b3da498c1ff4db7d6e29168d0eb1377a5f89fe91c3d4aa781b444ffe SHA512 76035a2894f49e02366e587ba66e4c0ede86fbffc41a908106eca9b4b2777d1f7786df4e210573d7956d6c7c97b79e14bfb58f4d9b4a3bff571c4d4440c16ce5 WHIRLPOOL 9b631edd6bbb7ac9297c87716a4526ec750c4b3aac78d2a398fd519423a145a6523069b531b334fdfd8ebc8a3d7b10ddedac26208e53e67fff2462957041b6fc
+MISC ChangeLog 727 SHA256 785f6279532fa767b760ebc1f1266f9de6945d2be78fb9048c557d1259443097 SHA512 172f57051a61f027733a8e47eb7e9e91e3535f8af6dbbcf7e469cf0418509af78cf13e4eb2ccfff0dc63aafaf3df5b926890539f1bfcaec4f3ae0d5f243dfaa3 WHIRLPOOL 343c95f43e1b68ebb345412658510d3137911b2799a943039b170755e994710788f83a6b22ddc1f89e6e74720f2c25a2db849c6da96f3b086423894ffdadc9d3
+MISC metadata.xml 784 SHA256 7bb02fda44d53ed995e99a8890c55305a633caa68d5a28a729096aed7fa8fe81 SHA512 8727895d7f371d07490800a192e590036cd0c076f889214b6fdadb1132530ba7604ed647f0d4c2ee4d19a5c0dd0e99f8ae5ebb7e6e329c9ded714424b1f44ddf WHIRLPOOL 5a85838d9959653add620046a520d2faab789e049f66b04ab3d18029a6423ae1304c1b7b08e6d3b139200bee65cb55c79294628a61fc549a3093cab1376d57e2
diff --git a/net-misc/sshrc/metadata.xml b/net-misc/sshrc/metadata.xml
new file mode 100644
index 000000000000..70aa61c45f48
--- /dev/null
+++ b/net-misc/sshrc/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- bogus commit to force manifest regeneration #596462 -->
+	<maintainer type="person">
+		<email>otakuto.gentoo@gmail.com</email>
+		<name>Tact Yoshida</name>
+		<description>Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>alicef@gentoo.org</email>
+		<name>Alice Ferrazzi</name>
+		<description>CC on bugs, proxying</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="mosh">Install Support for mosh</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Russell91/sshrc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/sshrc/sshrc-0.6.1.ebuild b/net-misc/sshrc/sshrc-0.6.1.ebuild
new file mode 100644
index 000000000000..9d32fba7974f
--- /dev/null
+++ b/net-misc/sshrc/sshrc-0.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Bring your .bashrc, .vimrc, etc. from your local machine when you ssh"
+HOMEPAGE="https://github.com/Russell91/sshrc"
+SRC_URI="https://github.com/Russell91/sshrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mosh"
+
+RDEPEND="
+	virtual/ssh:0=
+	mosh? ( net-misc/mosh:0[client] )
+"
+
+src_install()
+{
+	dobin sshrc
+	use mosh && dobin moshrc
+}
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
new file mode 100644
index 000000000000..8521ed2721b4
--- /dev/null
+++ b/net-misc/sslh/Manifest
@@ -0,0 +1,9 @@
+AUX sslh-1.18-systemd-generator.patch 603 SHA256 ae201388a020857df2ff4940847823ed1195fec8b282bdbc81e74e73da36c91d SHA512 71bfc4fe78d7b2b1c6a131533029c1ad9a676989ca9821e1c798109c9f9ce43809ad504aac262a20ed7babd3349485887947f9ccb26cba1803fe3fbd0afe79b9 WHIRLPOOL 9e7928c21caf655c5c2314bf8eb3d6e6b8f5711cfa40580731fb193681d782ef66dec6139aa3a60531feb4305727f6f3a5563341833f8224e27095f805c2fbc4
+AUX sslh-1.18-version-deps.patch 256 SHA256 28929f54167321a79633a941a5dd0fdbb3e8a1afb4c6c471684ec0193ef15b16 SHA512 2f438df2777cf4811f7d33769a403f90d3cb7fc0b4e9eeeafe0cf2b29f203b3a0a0503729894103c0efde3ac1ff0d9253c7fd4b09627fedd3fefd18b595df87a WHIRLPOOL 72247c30fde1eb2b4a1e950caf5018714d7be06dbfc242c813a5cf6aaf12e6703ed0c0e58693c51cbc83dafcf7fe512b3a626d5395f3abd1f1c909751df9fc40
+AUX sslh.conf.d-2 297 SHA256 c7308d651779d45496f06945c6f82a0dfda7afae87e891d23b7b5ff8788d1b5d SHA512 580114cef9356d66ec1e6c306837d44dc3098e8f3f805eda20c5d8f81f087bf295b25801ee64ee2bc667ce7324f510ff6f4fc7e222d1431ec3d4e82bbcfb160f WHIRLPOOL e2e918f19143285cd6d99e009586cc0ef55406e2f732a415db30ce20715e469a660916717832f4ee73446a47556e30026dee28c1adcbd2c8100e1eeb871d8129
+AUX sslh.init.d-2 465 SHA256 bad892b6670bf5845efce0c6fc66c8086ae723b3ef05eb4eaf1025db0fa200fe SHA512 73b38af0142f6d591d71531e03aca3ddf625faa7825a9951dc31112fa1bca5b28f8074a3f9ca565b2cd3995b635cc7818d899ce099d64d2eb97ff9cab2e617ba WHIRLPOOL 0a1ae96c4b3189b32dccf1f6db547890f6ef236c99e7a851bd40fae39a4d75293eb227871ed9c2daf3569ea6fe2556f68fe896db0bbad5ba731ea0a41092545c
+DIST sslh-v1.18.tar.gz 53170 SHA256 1601a5b377dcafc6b47d2fbb8d4d25cceb83053a4adcc5874d501a2d5a7745ad SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea WHIRLPOOL 31ab991527072c6304770b40ad07ce62ad8642e4697ac1cbeadd9f6226522f40b858d0dc6657578df3adba0f92d8f85fd38ece199f347eec352f3a831c131b35
+EBUILD sslh-1.18-r2.ebuild 1753 SHA256 975af1b94e956dc44502a20f472bd9c57dc5c7d2bfccba877964ddbf61bba27e SHA512 a4a96c61476381f0870b0cef1278219d555e7b6c8760c078a4772ab26550163ec991b57797362bf885d07331d4ceac5294180e868dbf65af9e9122da7e467ef7 WHIRLPOOL 5c5d6c0440f76a18256356c210fa869383931babc89234c71ab404360423a562bad073bb98f488a59ed95661dba7efdb395461c64b8494d115e0ee7a87d8b688
+MISC ChangeLog 4975 SHA256 599cf7248907b2777ce6aada40eca92996224f3fb9c152dd0ceffec7c869e9d8 SHA512 85ea146e9f6b54e0481fbcd8fbd1697d5f39a8f570350ff0d3d66de47261d9ed6d5e6e54914f4d6ad4432c6a044abfe63e63109ab3e22c8278d2f2acb0c62936 WHIRLPOOL 1240ae36c1448daec29c3cc545db347e18fe3d14cd14ff61f871244e98e28dab37d14c707653506aa76cc96c5a5fa6744e002dc40804c3a497f29fe77c8b678d
+MISC ChangeLog-2015 3320 SHA256 067a519e67e6bd2e27b65d2f5a73d02e0b3123826f305bdc95bd2f440ee336ad SHA512 48e5cd5472f692709b4c96ae1ef8bb130b540f0f48f85f64328d93fa5cd774e15ac1fff0c913bb83cad604ba2a599f0706133748fd909a2146c2e041f59a6207 WHIRLPOOL 78b3969b488b1a89853b3458bee2954b18915b569159a8e8b3a66cf16ed11a7317172b387fb06ec10ddc72d7fbcde7d718e1f99e643573c71c899c9cf246993c
+MISC metadata.xml 221 SHA256 c73636a70f6ee6e176f71ac32048a002355627ef4f1181fb245c6c0eb39be8b8 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353 WHIRLPOOL 8e35f4dca402d63d64baae4aba21722f8daccb3a61861a0b453cb355305fb29dc8e9d1e1760eb2f13d264502aaaafc37d15258338e97dbb4aea15239944f25d6
diff --git a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch b/net-misc/sslh/files/sslh-1.18-systemd-generator.patch
new file mode 100644
index 000000000000..476de2a4c1e1
--- /dev/null
+++ b/net-misc/sslh/files/sslh-1.18-systemd-generator.patch
@@ -0,0 +1,26 @@
+https://patch-diff.githubusercontent.com/raw/yrutschle/sslh/pull/98
+--- a/Makefile
++++ b/Makefile
+@@ -27,6 +27,8 @@ CFLAGS ?=-Wall -g $(CFLAGS_COV)
+ LIBS=
+ OBJS=common.o sslh-main.o probe.o tls.o
+ 
++CONDITIONAL_TARGETS=
++
+ ifneq ($(strip $(USELIBWRAP)),)
+ 	LIBS:=$(LIBS) -lwrap
+ 	CPPFLAGS+=-DLIBWRAP
+@@ -54,10 +56,11 @@ endif
+ ifneq ($(strip $(USESYSTEMD)),)
+         LIBS:=$(LIBS) -lsystemd
+         CPPFLAGS+=-DSYSTEMD
++	CONDITIONAL_TARGETS+=systemd-sslh-generator
+ endif
+ 
+ 
+-all: sslh $(MAN) echosrv
++all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS)
+ 
+ .c.o: *.h
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
diff --git a/net-misc/sslh/files/sslh-1.18-version-deps.patch b/net-misc/sslh/files/sslh-1.18-version-deps.patch
new file mode 100644
index 000000000000..c6108ffb1e9c
--- /dev/null
+++ b/net-misc/sslh/files/sslh-1.18-version-deps.patch
@@ -0,0 +1,15 @@
+Make sure the files using version.h depend on it being generated first.
+
+Gentoo-bug: 594586
+
+--- a/Makefile
++++ b/Makefile
+@@ -59,7 +59,7 @@
+ 
+ all: sslh $(MAN) echosrv
+ 
+-.c.o: *.h
++%.o: %.c *.h version.h
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ version.h:
diff --git a/net-misc/sslh/files/sslh.conf.d-2 b/net-misc/sslh/files/sslh.conf.d-2
new file mode 100644
index 000000000000..73d08d5f4484
--- /dev/null
+++ b/net-misc/sslh/files/sslh.conf.d-2
@@ -0,0 +1,8 @@
+# /etc/conf.d/sslh
+
+# Options to sslh itself.  See the sslh(1) man page.
+#DAEMON_OPTS=""
+
+# Multiplexing example
+# Port 44 can be used for ssh, http, and https. Drop privileges after starting.
+#DAEMON_OPTS="-p localhost:44 --ssh 127.0.0.1:22 --http 127.0.0.1:80 --ssl 127.0.0.1:443 --user nobody"
diff --git a/net-misc/sslh/files/sslh.init.d-2 b/net-misc/sslh/files/sslh.init.d-2
new file mode 100644
index 000000000000..7e4b2cb578a4
--- /dev/null
+++ b/net-misc/sslh/files/sslh.init.d-2
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start \
+		--pidfile /var/run/${SVCNAME}.pid \
+		--exec /usr/sbin/sslh -- \
+			${DAEMON_OPTS} \
+			--pidfile /var/run/${SVCNAME}.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --retry 20 \
+		--pidfile /var/run/${SVCNAME}.pid
+	eend $?
+}
diff --git a/net-misc/sslh/metadata.xml b/net-misc/sslh/metadata.xml
new file mode 100644
index 000000000000..69570e849328
--- /dev/null
+++ b/net-misc/sslh/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 type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/sslh/sslh-1.18-r2.ebuild b/net-misc/sslh/sslh-1.18-r2.ebuild
new file mode 100644
index 000000000000..4779d7c31e0b
--- /dev/null
+++ b/net-misc/sslh/sslh-1.18-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-v${PV}"
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
+SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86"
+IUSE="caps systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/libconfig-1.5"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.18-version-deps.patch"
+	"${FILESDIR}/${PN}-1.18-systemd-generator.patch"
+)
+
+src_compile() {
+	# On older versions of GCC, the default gnu89 variant
+	# will reject within-for-loop initializers, bug #595426
+	# Furthermore, we need to use the gnu variant (gnu99) instead
+	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+	# to be defined.
+	append-cflags -std=gnu99
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBCAP=$(usev caps) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+
+	gunzip ${PN}.8.gz
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-2 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+		systemd_newunit scripts/systemd.sslh.service sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/sslwrap/Manifest b/net-misc/sslwrap/Manifest
new file mode 100644
index 000000000000..b3094b50a6dd
--- /dev/null
+++ b/net-misc/sslwrap/Manifest
@@ -0,0 +1,6 @@
+AUX sslwrap-2.0.6-build.patch 3008 SHA256 4b0fac341cb8be7756706d56afe3df47ad593e43227cb315c60ba7becdb87c55 SHA512 fa6fe2bd63c37d772eb7a943558f1d1ef1db4376532467d6c6f6483f94098df8143868d01c16271c4672e6736b627c969eed001da6d492df780c7e6ba41fe937 WHIRLPOOL 9460c0752256f04b338bf4208c00bb3950bfcd2d600fecdcb558075c1f2bb0390936df74b70ef764829b0ef06fb433832ea88dc7ffcec6c6fe38917a486da234
+DIST sslwrap-2.0.6.tar.gz 21170 SHA256 596a1bf61a457662e754b9fcfec6b3df7fb2f6c88498bd76ef8027f08c3af336 SHA512 627c25bdf45245f9b3e8d03272fc46a0ef8d1c356e2b7990898b07267c2bbb28efd13d5ca97d330ce7369eedd2d20b5fa781f2e1a00ac732407e06d0b3a8890d WHIRLPOOL 8d3c6843413d8a77830a3533aa972cc676bf2aa934cb259b3b04a485aedc052551914668efbcff071fcd50fd0f21ea9cd57c702f95d803f06315d92e79fafc89
+EBUILD sslwrap-2.0.6-r2.ebuild 602 SHA256 e4b4e631237c2b075f0f8709bba832c8866dcd46926902b4f15954d49dec42c3 SHA512 42ec94d0a1a8dfaa181ace4c9319f0bdd5bbe35ee205734d06a5bcda9dfbe2eb6d39948897bdc14731f5677badaa8a93e530f80b388e18522337ff7470fad123 WHIRLPOOL 8302ee50af313290d679dde24dd43e407a7ccf37b8f727cfea592ada78118550ed80f1bbe88617b754541049c8212e956c76465744e8341b035c7226df3b1450
+MISC ChangeLog 2562 SHA256 374147d2de54d8138972082a2eae8a89b0b1ecbc17590480133b7c1907b3d83e SHA512 07ec62fa9ad3bd39e4773ea1bb72283adbe56335e691f5ab480bbb5567683101f6392813577a04dc22ff62f6da3d07286a177678a9f361765a66b56c443209c3 WHIRLPOOL 1463619ec1b85bc10378090d22105b9819e67e27d49fbfacc19c88ba2277a967297bce94449b4499ab8814b5e7bae8991794513b31bcf1b971d6c4a82efa0f91
+MISC ChangeLog-2015 3648 SHA256 55989d5e23ad0adca1efee17c80e18c1fcf62a7464a057dfd046a1c1698603e3 SHA512 afaa8ad7960381fa346529a8f60d6a2c080570f98109a8d008698860f31879279d2553aaf33872b2035f73b6fdf9f5ac1712f1b471a64345b42b0956b8b65395 WHIRLPOOL 1accf47fbcaf15c5b3d5f51a3110b4be00d3e8a4751d2fd435bd3b3e36409ac8f54ea7adb86062c6a13df9ca45b9e4b67a5fc364922bd536abac181d038d21d1
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch b/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch
new file mode 100644
index 000000000000..a797c00b152c
--- /dev/null
+++ b/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch
@@ -0,0 +1,147 @@
+http://bugs.gentoo.org/34151
+http://bugs.gentoo.org/146828
+http://bugs.gentoo.org/335001
+
+--- apps.h
++++ apps.h
+@@ -65,9 +65,9 @@
+ #include "../e_os.h"
+ #endif
+ 
+-#include OPENSSL"buffer.h"
+-#include OPENSSL"bio.h"
+-#include OPENSSL"crypto.h"
++#include "openssl/buffer.h"
++#include "openssl/bio.h"
++#include "openssl/crypto.h"
+ /*#include "progs.h"*/
+ 
+ #ifdef WIN16
+--- Makefile
++++ Makefile
+@@ -1,28 +1,9 @@
+-
+ SRC = s_server.c s_socket.c s_cb.c
+-
+-# For Solaris2.6
+-#EXTLIBS = -lxnet
+-
+-# Debug/Optimizations
+-#OPT = -g
+-OPT = -O2
+-
+-# Define 
++LIBS = `pkg-config --libs openssl`
+ OPENSSL="\"openssl/\""
+-#OPENSSL=""
+ 
+-all :
+-	gcc -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \
+-		-L/usr/local/ssl/lib -lssl -lcrypto \
+-		-I/usr/local/ssl/include \
+-		${EXTLIBS}
++all:
++	$(CC) $(LDFLAGS) $(CFLAGS) -o sslwrap ${SRC} -DFLAT_INC -DOPENSSL=${OPENSSL} ${LIBS}
+ 
+ clean:
+ 	rm -f sslwrap *.o *~
+-
+-
+-
+-
+-
+-
+--- s_cb.c
++++ s_cb.c
+@@ -63,9 +63,9 @@
+ #include "apps.h"
+ #undef NON_MAIN
+ #undef USE_SOCKETS
+-#include OPENSSL"err.h"
+-#include OPENSSL"x509.h"
+-#include OPENSSL"ssl.h"
++#include "openssl/err.h"
++#include "openssl/x509.h"
++#include "openssl/ssl.h"
+ #include "s_apps.h"
+ 
+ int verify_depth=0;
+--- s_server.c
++++ s_server.c
+@@ -121,14 +117,14 @@
+ #ifdef WIN16
+ #define APPS_WIN16
+ #endif
+-#include OPENSSL"lhash.h"
+-#include OPENSSL"bn.h"
++#include "openssl/lhash.h"
++#include "openssl/bn.h"
+ #define USE_SOCKETS
+ #include "apps.h"
+-#include OPENSSL"err.h"
+-#include OPENSSL"pem.h"
+-#include OPENSSL"x509.h"
+-#include OPENSSL"ssl.h"
++#include "err.h"
++#include "openssl/pem.h"
++#include "openssl/x509.h"
++#include "openssl/ssl.h"
+ #include "s_apps.h"
+ 
+ #ifndef NOPROTO
+@@ -468,7 +464,7 @@
+ 
+ 	if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL);
+ 	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
+-	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NON_EXPORT_FIRST);
++	if (hack) SSL_CTX_set_options(ctx,SSL_OP_CIPHER_SERVER_PREFERENCE);
+ 
+ 	if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
+ 
+@@ -622,7 +618,7 @@
+ #endif /*NO_EXEC*/
+ 	}
+ 
+-	if ((buf=malloc(BUFSIZZ)) == NULL)
++	if ((buf=CRYPTO_malloc(BUFSIZZ,__FILE__,__LINE__)) == NULL)
+ 		{
+ 		BIO_printf(bio_err,"out of memory\n");
+ 		goto err;
+@@ -729,7 +725,7 @@
+ 	if (buf != NULL)
+ 		{
+ 		memset(buf,0,BUFSIZZ);
+-		free(buf);
++		CRYPTO_free(buf);
+ 		}
+ 
+ 	return(ret);
+--- s_socket.c
++++ s_socket.c
+@@ -67,7 +67,7 @@
+ #undef USE_SOCKETS
+ #undef NON_MAIN
+ #include "s_apps.h"
+-#include OPENSSL"ssl.h"
++#include "openssl/ssl.h"
+ 
+ #ifndef NOPROTO
+ static struct hostent *GetHostByName(char *name);
+@@ -305,7 +305,7 @@
+ 			return(0);
+ 			}
+ 		i=(*cb)(name,sock, sock);
+-		if (name != NULL) free(name);
++		if (name != NULL) CRYPTO_free(name);
+ 		SHUTDOWN(sock);
+ 		if (i < 0)
+ 			{
+@@ -410,7 +410,7 @@
+ 		}
+ 	else
+ 		{
+-		if ((*host=(char *)malloc(strlen(h1->h_name)+1)) == NULL)
++		if ((*host=(char *)CRYPTO_malloc(strlen(h1->h_name)+1,__FILE__,__LINE__)) == NULL)
+ 			{
+ 			perror("Malloc");
+ 			return(0);
diff --git a/net-misc/sslwrap/metadata.xml b/net-misc/sslwrap/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/sslwrap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild b/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild
new file mode 100644
index 000000000000..609997604369
--- /dev/null
+++ b/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="TSL/SSL - Port Wrapper"
+HOMEPAGE="http://www.rickk.com/sslwrap/index.htm"
+SRC_URI="http://www.rickk.com/${PN}/${PN}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="SSLeay"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}${PV//.}
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_install() {
+	dosbin ${PN}
+	dodoc README
+	dohtml -r .
+}
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
new file mode 100644
index 000000000000..a84f9e0f4985
--- /dev/null
+++ b/net-misc/sstp-client/Manifest
@@ -0,0 +1,5 @@
+DIST sstp-client-1.0.10.tar.gz 3012713 SHA256 5f9084d8544c42c806724a4e70d039d8cb7b0ea06be8ea9cc5120684d4e0d424 SHA512 8f3e4b1b4d795015230b3a1b8aabf7d5fddd89be511bd6a59c22e5414520a392ba430f66f30aa2b982f084955e0085b0ea66d5acf5fd00414dc37c2c52a78cb7 WHIRLPOOL ab1484edc04f2473d0704fdaaafca2de0262e74fe1ca20415ec512c1922818c0818b3900ae68129c2afab7b30ad192a90f9734613189f502069daae8bb1b0036
+EBUILD sstp-client-1.0.10-r1.ebuild 1420 SHA256 97323609b45d3ec59d2a570150d361394150ffc0509dc78404dcbe7fcdd3fd4c SHA512 009fe28e314d9450e2b6b4f44671396cd9edbd219c04281d960a4387f3669f530106a32f31311512f68fd8f6713be0695b542c84f1f46e28c9df86fe24901844 WHIRLPOOL fcf26527b2f2ca15e30d9e00ca8dffacdf06a360e02e25f0c45d5ad62b08cb5733b973d3b4fcc740a6ce814599920a6fea1b47e37bf7acab8035356f4ba546c7
+MISC ChangeLog 3996 SHA256 fb8536ef8226b766246d56331235471391549c2f97b2664db2103bbc550240ca SHA512 67864d059ada474b14ad09c37a83c3c07b947f324150d0455d516d1817cc886429cbbaafc8c1af245928cc88ba861e6e5fa1d8b65e6adf97083f0a45b02825eb WHIRLPOOL 16879ef720f6c4654a46b66a7dbd1a272ea69f209a146153469fbecb1ef4e0ad210e81b8994511de13a9f7f03fa22a0333ee4d272f8f52ed3a2103290fdd0ab5
+MISC ChangeLog-2015 758 SHA256 1045b21859fd650b5eef8ecc59a463ca1f3b9d9ff0dcdb7877d55e770f2b9a33 SHA512 eea61f59db366d7e170c8ab0f6790b8f269223a73ab24ec14f82c651d9935029683c4e44c81c21a128f92110270dd975cd6d53b8260641d04e25e1504915f148 WHIRLPOOL 6cec749749abb4d81e82c21f3ed23890ff5ef37423f7d6d0e3f1add7386d2b2baf8212470f3876ed02bf15353e0241e02d4c658bfd46404a512913c6800f5969
+MISC metadata.xml 558 SHA256 bf5d92bc434d26000a958a1297258ddf62bbbba309a452a55fddecc3a6a0cefa SHA512 e223985a2f14609b55afee8fba99fe539ad003f02aab653c11dda2754e791676fb7638a5b14df5f62815f2dac9321cc91ca597eb686fc62e53c6ae791a7c402f WHIRLPOOL d43105a28a5f69a0b767cc422f1ad463df85a02985b81ef462203a9ccb5474da369bd7203d0d75697a82c508ab17aa104a6dcad61b2534d88cdf72ba656b30f7
diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml
new file mode 100644
index 000000000000..0829a0755cd7
--- /dev/null
+++ b/net-misc/sstp-client/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>m.j.everitt@iee.org</email>
+		<name>Michael Everitt</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sstp-client</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild b/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild
new file mode 100644
index 000000000000..9bf1d84c1aca
--- /dev/null
+++ b/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info multilib user
+
+DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)"
+HOMEPAGE="http://sstp-client.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="static"
+
+RDEPEND=">=dev-libs/libevent-2.0.10
+	dev-libs/openssl:0
+	net-dialup/ppp:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK"
+DOCS=( AUTHORS ChangeLog DEVELOPERS INSTALL NEWS README TODO USING )
+
+pkg_setup() {
+	enewgroup sstpc
+	enewuser sstpc -1 -1 -1 sstpc
+}
+
+src_prepare() {
+	# set proper examples dir, --docdir overriding in src_configure does not work
+	sed -i -e "/^docdir/s:@PACKAGE@:${PF}/examples:" Makefile.am || die 'sed on Makefile.am failed'
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	PPPD_VER=${PPPD_VER#*/*-} 		# reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*}		# main version without beta/pre/patch/revision
+	econf \
+		--enable-ppp-plugin \
+		--enable-group=sstpc \
+		--enable-user=sstpc \
+		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" \
+		--with-runtime-dir="/run/sstpc" \
+		$(use_enable static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
new file mode 100644
index 000000000000..67e45bad89d0
--- /dev/null
+++ b/net-misc/ssvnc/Manifest
@@ -0,0 +1,11 @@
+AUX Makefile.libvncauth 140 SHA256 323eb71d93404499b1234e152db9b4af4e02ee04590f49c8a09a2c910ea521d4 SHA512 7d3a8833afc2169ab6440763680b24550fc16a0c60371e8b9ceb8eca48217638cc5e0beb9bff5d6c65fb81fe0bad77b6eb7b71c81195fa70b8879e45967852be WHIRLPOOL ba3f0dd338e76bdc6a1bd82a0825aa01074ee025ea807c3a34f755771674a18d78bf165573adf3b5d3e6cbb148ad68c0719d7c8e57f30b0b899a0ad1c304595c
+AUX Makefile.vncviewer 295 SHA256 7793e2e7855373a2ce255d603e1e13c47668db0cf24bc0cfed3d3f851abb24e6 SHA512 1161a2612ab2d3a5e87efdf144baf84d0b90307f20c216cb7c49a6b13e0b8da4eb3aebc1db14192672d796cd92db6e7a6336611e07405b1fbbe2d2dcc5374625 WHIRLPOOL 58e1a7a156cdfe00b7c24d25f96eb09a017a5ef965d47d6f73b742c730cf8153c383ed2b1984e0dd3fdef9e029dbb0d4c5627f8f367255f6a08b7c51f1393a70
+AUX ssvnc-1.0.27-build.patch 1393 SHA256 87217a491943208b30bcb7262af1a80971c3dd6fc05c5378435c52e53e296afe SHA512 2cc49d8c1e2c8db02f0bf680ac80f55595b606796e1501388649ca463b25d1a2a98bcc8646992f3f21c22ac775f7a8667951002ca03d40f3042ffb3c7c432f0e WHIRLPOOL 0107bf9e81c720790f966abc17e44a1fd095a8370a9e96b6ac0229cfbc0b37c9ecf5463e955d059113606034317d120ea8766e892fade755870271e42ff5ef72
+AUX ssvnc-1.0.29-build.patch 1087 SHA256 2c00c5c66fd0260433aa1ca33f788f008bb6f18f8a7c7a1eb2493fe52a3428b5 SHA512 f0dbbf55f3c37aba66b8b26160e7447c413986bcf9676fcf744c1d53a63c3776a3c25f90a1ad5819f21ff3967151d5c7c44abb15b78898840bc45cb9c2ef5157 WHIRLPOOL 32b2c90389d1d3652cfe141a8785fdd477347a934dff2afaab8a3018d3921506fc144c6a0f1a61eca340b1a4130ead08fed03481fc20d580cb8c8784c0e38c6b
+DIST ssvnc-1.0.28.src.tar.gz 542796 SHA256 a4244e81f3e3f2778af1e04d8953576133bb66607d6f3c1457a07594b94c1de1 SHA512 8b86fc3ba971cae72878ba45a775b97b22c537c389d8ae3260e5d5657fe96c6ead51e3871bc8ff47bb5368d7e95c43250814be93508f0d403210b49c8393a712 WHIRLPOOL a0f5c0b098634d71c8324120e33136edbe863ee31fce425125bb07ddd6c7ef0083136c5a02b3b77c8183267f94620b0b83d6e1192605552a294cb6ee927d9161
+DIST ssvnc-1.0.29.src.tar.gz 552796 SHA256 74df32eb8eaa68b07c9693a232ebe42154617c7f3cbe1d4e68d3fe7c557d618d SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092 WHIRLPOOL 087a570c73dccc93e8c9c149c3be003b2859961518669bfb1cf9017f9c0e71d946d1a78257ea2ad2929197d7f19c3d0d8dbe81983bb667fcd1e4bfb3e6225e0e
+EBUILD ssvnc-1.0.28.ebuild 1376 SHA256 539b08f9107deed0b51c13e6fc4a320230b1970fd11f082f22cf314da7ed776e SHA512 e3eea930fbb50ad4131fe1a8f3458631553193580b4c91fddea5efce282197100b76ee49e73867d109b1c53eb68ee7da7d8b439d538f9ac5538751f64456e201 WHIRLPOOL 7f99181a2402864b606873b5580a4d2118724094070ae138ecce713be25d9ca9a5cf1c9692b454399787df097055a584fe068757d12d1f930d953ee7a88a3315
+EBUILD ssvnc-1.0.29.ebuild 1377 SHA256 425a29065150e9c1a66768adadd6aa139a8e7407c9028dbbed7807e76fd1a885 SHA512 860548659d0a1e04ea2b4706a138745225606a28fc4fbf0fc61ea741ab5dc61dd02c7feaceb553e6b962e5c870283cd845c4b4f88b903a6a578f49e2c1b04b0e WHIRLPOOL a6f25f54dd510247a2bac87f96418b1ab12a75b4cbc565d5e5862795342adf13188b5141508a41a1a952ab47b399973cb43a9c7495a9188bc2ac264774f1d00e
+MISC ChangeLog 2347 SHA256 47863b7022beddecc50d54884379a9d30de1da6c0dd19bd222f799e629884942 SHA512 60f38075df1004ee5332cc2be710e5594437f644800258564f9fce35c3952df06863301655a2e11bad06c5db193a30ab779b3e73ae799f69aab294e2777b7a72 WHIRLPOOL 3952bb3b913055260c7375bb13d80d2e1d45bd1a381f04728a61e6e75316357a0aed80cfa544be55c92d83efbbe3fd2a9b35506680eecefc048dce2435302786
+MISC ChangeLog-2015 3837 SHA256 54d1a0a77d57de8703af648414050e5554447a2fa21419651dec7550eb01a144 SHA512 4f9084d9548d6e372122f0d97b8f5008ae83ffcdb7aa4696c1ad559923dfad2e7fe38c3960687d499fdf2656352ef0cafbf2be0286b09ec7bd65ff39fb1755d0 WHIRLPOOL 5e20aa149b8cc88b9da01d70e62864fe9e65612cbdd50b0acabdde90c0e34bfc73f35ccc764234ec0d1b58d2018ee9d5b9f167e83a8fea69704ce65996ab301e
+MISC metadata.xml 292 SHA256 1142e172f641852d9d181aacabfa2b4d86e604d9c4cfbf867b6329447f7aaf0e SHA512 335b9739fbde2c3fd73e8923cade391dca0a1169710fdc432039bc4c6b49513bdc0e492b7337db1a9d7fdbdb25e2ffc19cccc9c5bb6e874f263a32e1d20840b8 WHIRLPOOL ede04b94a0fee52c5b729ef8729d7b6b27d8e747ab0aeedb1f1e086892d1c3a5ad27d5dfd22bda1dc1f021a62f1b12fd21a2ee9bc9966ca20316ffd528c17856
diff --git a/net-misc/ssvnc/files/Makefile.libvncauth b/net-misc/ssvnc/files/Makefile.libvncauth
new file mode 100644
index 000000000000..c24ce4663d5d
--- /dev/null
+++ b/net-misc/ssvnc/files/Makefile.libvncauth
@@ -0,0 +1,7 @@
+AR ?= ar
+CPPFLAGS += -I. -I../include -D_GNU_SOURCE
+srcs = $(wildcard *.c)
+libvncauth.a: $(srcs:.c=.o)
+	$(AR) rc $@ $^
+clean:
+	rm -f *.[oa]
diff --git a/net-misc/ssvnc/files/Makefile.vncviewer b/net-misc/ssvnc/files/Makefile.vncviewer
new file mode 100644
index 000000000000..60879b9461a5
--- /dev/null
+++ b/net-misc/ssvnc/files/Makefile.vncviewer
@@ -0,0 +1,8 @@
+CFLAGS += -fno-strength-reduce -fno-strict-aliasing
+CPPFLAGS += -I. -I../include -D_GNU_SOURCE -DMITSHM
+LDLIBS += ../libvncauth/libvncauth.a -lz -ljpeg -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXp -lXext -lX11
+include Makefile.in
+all: vncviewer
+vncviewer: $(SRCS:.c=.o)
+clean:
+	rm -f *.[oa] vncviewer
diff --git a/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch
new file mode 100644
index 000000000000..dc433ac2d145
--- /dev/null
+++ b/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch
@@ -0,0 +1,56 @@
+https://sourceforge.net/tracker/?func=detail&aid=3031380&group_id=243486&atid=1122548
+
+--- a/vnc_unixsrc/vncviewer/sockets.c
++++ b/vnc_unixsrc/vncviewer/sockets.c
+@@ -32,6 +32,7 @@
+ #include <netdb.h>
+ #include <fcntl.h>
+ #include <assert.h>
++#include <ctype.h>
+ #include <vncviewer.h>
+ 
+ #ifndef SOL_IPV6
+--- a/Makefile
++++ b/Makefile
+@@ -21,11 +21,11 @@
+ 
+ # N.B. ?= is gnu make specific.  Some of the subdir Makefiles are too. 
+ #
+-PREFIX  ?= /usr/local
+-ROOT    ?=
++PREFIX   = /usr
++ROOT     = $(DESTDIR)
+ BIN      = bin
+ LIB      = lib/ssvnc
+ MAN      = man
+-MANDIR  ?= $(MAN)
++MANDIR   = share/$(MAN)
+ APPS    ?= share/applications
+ BINNAME ?= ssvncviewer
+@@ -66,7 +66,6 @@
+ 
+ install: all
+ 	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1
+-	strip $(VIEWER)
+ 	cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
+--- a/vncstorepw/Makefile
++++ b/vncstorepw/Makefile
+@@ -14,7 +14,6 @@
+ 
+ $(CMD): vncauth.o vncstorepw.o d3des.o
+ 	PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o
+-	PATH=$$PATH:$(EPATH) strip $(CMD)
+ 	@ls -l $(CMD)
+ 
+ $(UNWRAP): unwrap.c
+@@ -41,7 +40,6 @@
+ 	else \
+ 		PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lcrypto; \
+ 	fi
+-	PATH=$$PATH:$(EPATH) strip $(ULTDSM)
+ 	@ls -l $(ULTDSM)
+ 
+ test: $(CMD)
+
diff --git a/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch
new file mode 100644
index 000000000000..8d2db6f5cc7f
--- /dev/null
+++ b/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch
@@ -0,0 +1,44 @@
+--- a/Makefile
++++ b/Makefile
+@@ -21,11 +21,11 @@
+ 
+ # N.B. ?= is gnu make specific.  Some of the subdir Makefiles are too. 
+ #
+-PREFIX  ?= /usr/local
+-ROOT    ?=
++PREFIX   = /usr
++ROOT     = $(DESTDIR)
+ BIN      = bin
+ LIB      = lib/ssvnc
+ MAN      = man
+-MANDIR  ?= $(MAN)
++MANDIR   = share/$(MAN)
+ APPS    ?= share/applications
+ BINNAME ?= ssvncviewer
+@@ -66,7 +66,6 @@
+ 
+ install: all
+ 	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1
+-	strip $(VIEWER)
+ 	cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
+--- a/vncstorepw/Makefile
++++ b/vncstorepw/Makefile
+@@ -14,7 +14,6 @@
+ 
+ $(CMD): vncauth.o vncstorepw.o d3des.o
+ 	PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o
+-	PATH=$$PATH:$(EPATH) strip $(CMD)
+ 	@ls -l $(CMD)
+ 
+ $(UNWRAP): unwrap.c
+@@ -41,7 +40,6 @@
+ 	else \
+ 		PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lcrypto; \
+ 	fi
+-	PATH=$$PATH:$(EPATH) strip $(ULTDSM)
+ 	@ls -l $(ULTDSM)
+ 
+ test: $(CMD)
+
diff --git a/net-misc/ssvnc/metadata.xml b/net-misc/ssvnc/metadata.xml
new file mode 100644
index 000000000000..eb4341a7b3cc
--- /dev/null
+++ b/net-misc/ssvnc/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 type="person">
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ssvnc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/ssvnc/ssvnc-1.0.28.ebuild b/net-misc/ssvnc/ssvnc-1.0.28.ebuild
new file mode 100644
index 000000000000..3e9f88e5d8be
--- /dev/null
+++ b/net-misc/ssvnc/ssvnc-1.0.28.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="VNC viewer that adds encryption security to VNC connections"
+HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html"
+SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-linux"
+IUSE="java"
+
+RDEPEND="sys-libs/zlib
+	virtual/jpeg
+	dev-libs/openssl
+	dev-lang/tk
+	net-misc/stunnel
+	java? ( virtual/jre )
+	x11-terms/xterm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXaw
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	java? ( virtual/jdk )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.27-build.patch
+
+	sed -i \
+		-e "/^LIB/s:lib/:$(get_libdir)/:" \
+		-e "$(use java || echo '/^JSRC/s:=.*:=:')" \
+		Makefile
+	sed -i \
+		-e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \
+		vncstorepw/Makefile
+
+	cp "${FILESDIR}"/Makefile.libvncauth vnc_unixsrc/libvncauth/Makefile
+	cd "${S}"/vnc_unixsrc/vncviewer
+	sed -n '/^SRCS/,/^$/p' Imakefile > Makefile.in
+	cp "${FILESDIR}"/Makefile.vncviewer Makefile
+}
+
+src_compile() {
+	tc-export AR CC CXX RANLIB
+	emake all || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || \
+		die "make install failed"
+	dodoc README
+}
diff --git a/net-misc/ssvnc/ssvnc-1.0.29.ebuild b/net-misc/ssvnc/ssvnc-1.0.29.ebuild
new file mode 100644
index 000000000000..f240e4e65996
--- /dev/null
+++ b/net-misc/ssvnc/ssvnc-1.0.29.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="VNC viewer that adds encryption security to VNC connections"
+HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html"
+SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="java"
+
+RDEPEND="sys-libs/zlib
+	virtual/jpeg
+	dev-libs/openssl
+	dev-lang/tk
+	net-misc/stunnel
+	java? ( virtual/jre )
+	x11-terms/xterm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXaw
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	java? ( virtual/jdk )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.29-build.patch
+
+	sed -i \
+		-e "/^LIB/s:lib/:$(get_libdir)/:" \
+		-e "$(use java || echo '/^JSRC/s:=.*:=:')" \
+		Makefile
+	sed -i \
+		-e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \
+		vncstorepw/Makefile
+
+	cp "${FILESDIR}"/Makefile.libvncauth vnc_unixsrc/libvncauth/Makefile
+	cd "${S}"/vnc_unixsrc/vncviewer
+	sed -n '/^SRCS/,/^$/p' Imakefile > Makefile.in
+	cp "${FILESDIR}"/Makefile.vncviewer Makefile
+}
+
+src_compile() {
+	tc-export AR CC CXX RANLIB
+	emake all || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die
+	dodoc README
+}
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest
new file mode 100644
index 000000000000..38d6ff9e0aff
--- /dev/null
+++ b/net-misc/stargazer/Manifest
@@ -0,0 +1,28 @@
+AUX logrotate 130 SHA256 aa61e339247685708af8661f82e02b9312f733a1b4f3662e79868c95b92f53e9 SHA512 bc6b186ac83fdfdbd26c75fbef6a350e7e3af0b106082cebc4001512b07be501326df23bc260846453b1bb322e8a08abc2a1b111982c71edf1df5c05cb394790 WHIRLPOOL 158eaf9ed5595a101d96922c7f8fe734548019f41eaffe9077e23f404bc0927675556b3390b4765fb44a1f4661ee23dbf33f827e6f7ece56a0031b9b89d6384f
+AUX mans/rscriptd.8 1057 SHA256 2858cd9ecebe64b352809a92c2b1228aa761f5b1ddce035161d6a832e74984bc SHA512 2afbd834aceb273a7574012bae43881d9918247524c96a1f60fa31cdc4331757a0e345432155d83a21a21a7c37f494984c175a282f4b16e4f1fb2882754676bc WHIRLPOOL 3fc0a8e7b68f673188b2737ce2fd4c6f67012bb53a83f004e946cd9ea91482656c300dd88c0ff0ed9878a1cd5e3682f03803a0eb4b1f24f1f70c4df0ce6d9c6e
+AUX mans/sgauth.8 1146 SHA256 261ed5b23e4cda616e200fbf08aa232a3f9aeff115992ff0539e67c717f146b8 SHA512 724ce9ed66abe53b9c22db273e04e372663d958bb8a70938baa88f844410f7eccaaf3b95515f2d24189b6b93711f26d2588758ffd2cdf8116631c092d18d72c2 WHIRLPOOL 92148933eef8d0076043907f4e1cd7155dcc28ef2c9a1edbbc72ce39c79e84e55d67b55c1edd7d4b25212f6ae2d39830b81854ec16df3539e79c1a548f31662c
+AUX mans/sgconf.1 2870 SHA256 be35cebafe115fea1b43ba51394f5c73d7c5f706776290630b3ea4ebdc25ac65 SHA512 5ae47adf857d52ee339937cf2ef892602ae513037358470fb87ae682397fe4321ef15d03211d384020c06af3488dc868f5be8ccdaec5b3ad2bea446a8c939776 WHIRLPOOL 258b7a7efb68d2f1fda1e0c719423b15ba104d6ce60f6dbacee5220edc0891f0c24c47e7c9df6cbb5aef193501ee0f33f7a3f2640d66f538d9169e228a4fc15b
+AUX mans/sgconf_xml.1 1527 SHA256 d3b4c006137182c693679e3277e5f0991355868a68a6a3036d636b49f7922638 SHA512 db79a12955865955022a1cdeef1c6496f9c4232b1cac972f3c8bfdf7aff503f206d3b177961357bcaa14a60426b06bd49ffe8601fc57bbf2c00dd2bea890da75 WHIRLPOOL 3b2575457a445a0b9107957a8f46ea5722c1c4e11c9e00b56bbe59555ef328dc8e1c8ddabbec583ad0aa816b0dbbcb52b37f4de50eafb62e86e76cb5f6c8ac44
+AUX mans/sgconv.1 892 SHA256 9b6e7b52b0d051fb5a0a44c0fb8c7f2e70a1f240a61bc71d25e6d98aa64fd5fe SHA512 de6ff8c3569a5aba6690539a2c523833200e732777c1b7e9325b4e518ca1cb72906325fb4ea58c2abd0ce80bb0bf5c55f564cc31cbd122c93d8528d2e3a033e8 WHIRLPOOL a2ec524e388ea2a0b5e3aea60fb7add256e15db57572f376fd12e56b0fb7c1d38ade2772a6011598894126a68c08377eeb9665c0bccab850fe5b6d73221830d0
+AUX mans/stargazer.8 1394 SHA256 4e0c1e7f16d3de50de0299b1013f9cba7472b1f334a542c50539d754d7309d6e SHA512 6c69970f0dfee31f1a9d68ee784a54f169b2ba272a10bb3f3be139407d374fd8d8d5e9e37c4d1e3091c85c22cd84ed7235894cd5f678614017111b6175e08e89 WHIRLPOOL 7251a461b07eb3bbd4d030992b6c293a49504919379f47273f32ef17f140efc0cbc8a520d3852fb2e6b6caf0decc98c5d4b42b2ed397c94e510bf5f802ba2104
+AUX patches/stg-2.408-build-upstream.patch 4759 SHA256 f9bfcb79a678bdc647ad840673f1da9be85e61608ff419fe53e17f283b33e31e SHA512 76cd10b98db0c70f989b5f498a13c7baacac3e2a0b6bc0b1449d34789a94317b2576bfb96d48ee567480ce98783c758920a7f3004990f487592fc8a7e8bcd7df WHIRLPOOL 1b7de2fe1fffc79a17da199285cbb949fa924abf78ebb791f2c2499f6b4e159becfb4943232c8403d38e23085db44238a7658bac124e2daef580cbf357d4a064
+AUX patches/stg-2.408-build.patch 4220 SHA256 d5bab39ee070d245a5e8860d3131848a06d44ee2496f2da900d6a61c34922439 SHA512 98b3824b379aa8c9febf4e0907135ad072844cfea63541e3384e99cd47f6d0a9457e376d1658fb146196ea6ee397dcf7e715abb9bb1a279d209866735974448f WHIRLPOOL ec000b4f6a0583f1707ffa7818925b223f6ddf5c2936d901808263bb439f95e74643300b51a175d3a9222e12659b07f2796e5be026230c9b80547cd916794605
+AUX patches/stg-2.408-correct-paths.patch 6489 SHA256 ad173a7cb322de0ac1f31ccfec95ec4abcbf3361207f95fbfe9c4185a06dc173 SHA512 e400b4d5ba4bb7305557aaba29fae7415d8bde0343a695ac7e979839549b843cf90a0d19e598f050d08282d717ed3b46e4e5572d4be6b295ce88e962ac6966d3 WHIRLPOOL e665ab3af671b9b5abe54e3874af11b93cd1b9f4c90605d457d8b64d4e0d2d72baf61c55d4ad1556510bd8bb51c220b0c3c99388bc06b151b0e430d68d8ac5f7
+AUX patches/stg-2.408-fix-crash-on-stop.patch 6125 SHA256 d015c4d19f33b2fb84c0d325d45662f2a4c5f2a9c84fc9f9382f08071b28ab9f SHA512 efa0345eafaffc8fd3efa78dfe511987b4fc8990446339b797f3ffaf0dad2f44b061baba390ee4f22232bbb8a8cd785a7ea5062377afb92c4287dbde9df7523b WHIRLPOOL cddf720e4555ad56d4240842f42401fbfb6989b7d3fc099234835c10464bee8fd4cd37d9caaacffa211ac47a4e77317ee3068b1c243392e54c80db53cc77eb9e
+AUX patches/stg-2.408-makefile-build-upstream.patch 11266 SHA256 433bb4118fab97a59e58b7299f21e5f41df5762b7b9cf8698629748f8ca4f95c SHA512 722be9686fdcd1b979d3a303c088c6b1567fe6288609696a47cf2677280244fee2345c6f31b0caecd73d7bc4a423e0dfd2cd73f53a795137adc18bfc6ec97d3e WHIRLPOOL 2d4ab114051aefa47ee1c56cb6947c0dfbb7731361936707533b8a561342c2ee255a06fa5ec7f30bfc2b46203a4e6508a10a6f02f774306b5b8bf3b3de749559
+AUX patches/stg-2.408-makefile-firebird-upstream.patch 396 SHA256 9262bb643034aa9dacb3cfcac44761a100709cd8d5cd0d771b5c95a91a53b83a SHA512 c7a3cf5a4f9ace4aa7293c56530207827b390aed6aee7cafd38ca50502c47ade22020dbdc096dea3971551f0507910f8d5051dee7ba4d7fc14366cb2f765de76 WHIRLPOOL ac01b4a191276970ee9e5126e3a4a649bba248431f24f43b2519ad25ea37950ab92d63d343b718b5ed8db8e65f9b8440a850e5372b8f4ac67bd2aaac04621891
+AUX patches/stg-2.408-makefile.patch 8499 SHA256 0106c2655fa64f8e9a1c02dc7a21e4a2d473f676ba9c33e2ec5cf002e9ec3c6d SHA512 5d4ad2104710d3c6a7bd8bc48d8c71c20b68f14aff7017606a028d55003344832d47d9e28853b595581863b4128c312e971cdea260515269d9c8cf1e693dacab WHIRLPOOL a4201cc145161a61477b0fa0d04f548ee7c2103e1a5e3fce95eec07b1bc7aedf4e1f5798b5fb4ca3c255036b711aa93ea82c4cbc5e7b664dc92ccf8519297bab
+AUX patches/stg-2.408-on-upstream.patch 5160 SHA256 b7ece6e7187b8bbfc4ad2f55c30bbf15ecd531b537fdb40b6856b9e133a46bcf SHA512 9b83b8e744b246c391abbaad49226b5ccade1395ce2d6eb8573bd13e3e3d1dcdb4b4611a0625ad5a426d9859b09913c6af050161c739a7a63c24bb7ce71f406b WHIRLPOOL ba6de01f2c72dbc72917351a317c21b852261c44fa55003d503afd57fe0cdae8e0cfc736162206a6e575d76f62d9f9858bb42982cc39bf560e3d882cb1ce2780
+AUX patches/stg-2.408-radius-upstream.patch 861 SHA256 ef147f056236b0fde0a21a567ac4f3c7a83290651a10a57c83e33892036dcafb SHA512 2c59de06ede39e6987d1235fd423e9d42a2d2a0cdcbe291b28c567d1bcd34243753243faedab8e9cf987e7bbb1dabbc2afc2d7757fd50f0f4170c724f16dd4ef WHIRLPOOL 93ce3418a29d746163855a99d371dde7cb6289518540870238bb695119012975ee7c2c2962487e55dee08676b3070c223c71a0a87b2c6e266e7edbf72dffb9fd
+AUX patches/stg-2.408-rscriptd-upstream.patch 1103 SHA256 2204be3eb6cdba6b2452dc178c711d0a456d258c36be911a28d99fb9d92a861d SHA512 397240006551501ec3b8829e967a9191e813f1299abd7108d8effc9c11e9ac048a091f77961c348a7878ffe475af3a612cf82aa9d804d3206411b610191bbde9 WHIRLPOOL 4d308bc68fdca640ef9b57f4361b8829360d1de2764f5a609969134012893e5f509608eb49f8d45ab3d1574b5824ac195cdecc8b467798227b8bf903126530cb
+AUX patches/stg-2.408-rscriptd.conf-upstream.patch 2515 SHA256 be1f4a43e36c7af3760f792028dbc7bdc51c90925ffe106c4263f3d9826b0183 SHA512 4b2da01d05d07e62bc9c5d002c4a7bc190958e59236c03dde49238ac4e23dfc8e4e67a323ac12c2f89872285506614d3bb127cf3f4873df095c1579f441aa73c WHIRLPOOL d006ca65f93aad5fc55a86b01203a5c392547a41f7601dd9bc8aeee678150e54b4c11bbf9d4fa23b1074d4b8029548aaae24907d935f11d50f98dc889d26461e
+AUX patches/stg-2.408-sgauth.conf-upstream.patch 2382 SHA256 778495180f9207a93c528c64afbe7ee576fbdc82a3ae38c36de1e0889d9f0270 SHA512 2875f9b719a2058d435220016bb83b2b30fba9c927b9d1f06b5bfd5149fad213e312106e8de3c1cdedc9c3dd8178d6a1944327f0f9635a57cee329a623946d39 WHIRLPOOL 8ed9902f77e922900744600480f1dc1c00814eaf3815382a717ffacde4448194eb97fa0543cd310cf04127ef232a544e1c44ed66ba41079d6ad3d90a8a93a4a8
+AUX patches/stg-2.408-sgconv-upstream.patch 1542 SHA256 cf607c416cc990b09e4f696915b4170139929b55899aa6942c368c0738385ca3 SHA512 bc25e9b682ae33ceec30edef35c62e90fc24cdd8c891397193c2aa041557f7e7071abe998ec77291401953899da4a817a269e825be5b5cb552e83c34ac026d70 WHIRLPOOL f613346d461d3f1227645cb13e92014778fe5658def366f4603ff20cca33cdae050d257aad302cb010ffaa19c9ce76da92ab783b840186d019a615521500da5d
+AUX patches/stg-2.408-static-libs.patch 194 SHA256 6e1cd7b76a266335bd49b00decd72f799e77eb5c6baefbfab291a4eb621c68d9 SHA512 f6961a429bf4c23ec17935a8568acfccdcecb7e646aa6a607177cbf95fd20b6169d17713e8a0649ff164eb5b34c11bebe94cd252ccdac8577025859aa2c0fca9 WHIRLPOOL 96d320406c8e11462a1e43e62aceb7ca56a3b147697951e7c53dbf675149814ade10e142b97f0bf23842730646ed9bcb6845b27b36c720b8425b8a23f7f8ea7e
+AUX rscriptd 453 SHA256 c47c6fb356207f97cd73cfa5be132a2d35ee26eefa57ae3809223bc927ad1636 SHA512 21cb21a5a14901f3b370f2cedb6ede9414c1080d3d4e073ed048f005f40622179cd91e8cf80f609f0a7b5cacecff5f15913a5cf954dfff56ad036649f4a0a48f WHIRLPOOL fb142b12339ece7e1a3a7ff10f2050bf89b33b281283a428e56203828307204a40fe8f0b03ed80272ddfe0efe588a515c4ff2f7270ba005000ad1cc1a1256c2e
+AUX sgauth 462 SHA256 5a03f047433a8b4a81494f831975a7d851f7dff93d31d57e9f03c11e33ac70dc SHA512 a2d6ba8c2200095072a73342fab4cb5706470d52d9dc6a57f023b16dc895957d4377bc089a4a3cd57126bc9628020c2c1bb60347758e53576eccbc0c854c2364 WHIRLPOOL 4410375712f6c30a17d22fb11a9d29184ee28a45c772b86dba5ea4397a93835e110ec0a83360f79343a5aab2aa269fcaa47275f1ac01564ab2608fc3e6233c94
+DIST stg-2.408.tar.gz 5100291 SHA256 f2de88cba1a07b10dba266df262ba719cdeb8efc169ce52711519d81b3c36fc1 SHA512 200e08cfd629dbacda31ffd3134c2908a1ad58604421cc288ad0ec1bdcd60fe021d51fed50fdc2517bb7c2b61ef23b0b9c71a606babd09bc7804cb899e0b7f75 WHIRLPOOL 3701d0bf16e06dc61474a772566a570a21d04fcf5ac5c28fb61b454f21c1471adc6f45645c3929b3ed15bb33eee10425a942b25f83ea7b3ea94eb15b80df7dad
+EBUILD stargazer-2.408.ebuild 19983 SHA256 bdadacbf2c678682e5bd8cc2531b43076188e16a172e14cb4ea6bc0d127152ad SHA512 a385d94e92c6407230dbe57f23830f19561561625d97d5c1c0d3c8db533693aa1241b84c509e4bab25d83bc3965a2dbbaa7e862a6a5eccb45eeb6a9fd705fc70 WHIRLPOOL 39a573a08712aa0349c79c60ed57ef3e61ddd1ffc83fa5cdfa80c46e7e2a747a0f9d5b4be4a6315f6101fec1f5ea291ec06e736539bad8bbf2ca77521c18d54d
+MISC ChangeLog 3869 SHA256 10b625447869fa336a94c2d60d255c2d4c3d08bcfb192e351bcc43a3993aa44a SHA512 5166111b4c3c73bd7c9181e10c198f590e06e0392d3b95eec4e52d049a2ebfb26cb96dd416aa3793a68f19c02c4873be2b186a7ccb98f9d1851b06945667d550 WHIRLPOOL 9818853d42418735ee85ef293d4459f3ad7e9aa04b59b69ea3290cb857085ae1ac48bd3dde51c5cce1cd5728f8f5a2383a36d53c0aefdee0dbe01abb2135ead2
+MISC ChangeLog-2015 2538 SHA256 3bec8395849706b23a0cee4564c9d940f9ed8e1a1a6c88c5ed429a683cde24e9 SHA512 2ac7c82473237d2ae9f7d6cc7a2c4c52c344c193ab254cc9e84b76529cf439ab7cb1d293573c98cae90513b6e0c7dad1581a9104e01d4c57e81b85d1daefde0d WHIRLPOOL 41a80aeafae8ec3e61c79316fbf5a736f7a1f82d840d002abd47949da9f9e1341d89e33ee543d00848f55574fb78bbca59c31448ca2e8590121404cdae23d84e
+MISC metadata.xml 4496 SHA256 557972b89248589b4ddfb7f0b0a2322e6c2797c905617572e977103dc0262dda SHA512 c5a2a3acd3b605a8108734fa620df6f26d7f693e99986961eff1dde3c0fff84638568d48f9f666b254c6d29e9f78e642387375d94b0cd69ec1eeae2cd3d0ab32 WHIRLPOOL 437e60a634e732576bb8928fb60e643ac206643dcf2f0855be8eb74d36b7584a98dbb24a36701316f35da8ef5119a512b2b9e01959f73c45fa99c0b6705c0aa5
diff --git a/net-misc/stargazer/files/logrotate b/net-misc/stargazer/files/logrotate
new file mode 100644
index 000000000000..ffa9c23f3012
--- /dev/null
+++ b/net-misc/stargazer/files/logrotate
@@ -0,0 +1,9 @@
+/var/log/stargazer/*.log {
+    daily
+    rotate 31
+    compress
+    missingok
+    notifempty
+    copytruncate
+    sharedscripts
+}
diff --git a/net-misc/stargazer/files/mans/rscriptd.8 b/net-misc/stargazer/files/mans/rscriptd.8
new file mode 100644
index 000000000000..440f7b0267b1
--- /dev/null
+++ b/net-misc/stargazer/files/mans/rscriptd.8
@@ -0,0 +1,51 @@
+.TH rscriptd 8 "December 31, 2012" "" "rscriptd"
+
+.SH NAME
+rscriptd \- a remote script execute daemon for Stargazer
+
+.SH SYNOPSIS
+.B rscriptd
+.RI [ config-file ]
+.br
+
+.SH DESCRIPTION
+The
+.B rscriptd
+daemon typically runs on a last-wire router before users and
+manages firewall rules to allow/disallow users get their services.
+.B rscriptd
+communicates with
+.B Stargazer
+main daemon by UDP protocol.
+
+.SH OPTIONS
+.TP
+.I config-file
+Path to rscriptd configuration file. Default is 
+.B
+/etc/rscriptd/rscriptd.conf
+
+.SH FILES
+.B
+/usr/sbin/rsriptd
+.br
+.B
+/etc/stargazer/rscriptd.conf
+.br
+.B
+/var/log/stargazer/rscriptd.log
+
+.SH SEE ALSO
+.BR sgconf (1),
+.BR sgconf_xml (1),
+.BR sgconv (1),
+.BR sgauth (8),
+.BR stargazer (8).
+
+.SH AUTHOR
+rscriptd was originally written by Boris Mikhailenko <stg34@stargazer.dp.ua> and 
+Maxim Mamontov <faust@stargazer.dp.ua>.
+.PP
+This manual page was written by Alexey Osipov <simba@lerlan.ru>,
+for the Debian project (and may be used by others), and was modified by
+Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file
diff --git a/net-misc/stargazer/files/mans/sgauth.8 b/net-misc/stargazer/files/mans/sgauth.8
new file mode 100644
index 000000000000..24c872761f7e
--- /dev/null
+++ b/net-misc/stargazer/files/mans/sgauth.8
@@ -0,0 +1,54 @@
+.TH sgauth 1 "December 31, 2012" "" "sgauth"
+
+.SH NAME
+sgauth \- a command-line utility for authorization in Stargazer
+
+.SH SYNOPSIS
+.B sgauth
+.RI [ config-file ]
+.br
+
+.SH DESCRIPTION
+.B sgauth
+allow user to become authorized in 
+.B Stargazer
+billing system.
+.PP
+.B sgauth
+reads the
+.IR config-file ,
+connects to
+.B Stargazer
+server and authentificates on it using data supplied in
+.IR config-file .
+In addition, it runs a simple http-server on port 5580, capable of
+monitoring and controlling the connection (if specified in 
+.IR config-file ")."
+
+.SH OPTIONS
+.TP
+.I config-file
+Path to file containing user login, password and other configuration data. Default is 
+.B
+/etc/sgauth.conf
+
+.SH FILES
+.B
+/usr/sbin/sgauth
+.br
+.B
+/etc/stargazer/sgauth.conf
+
+.SH SEE ALSO
+.BR sgconf (1),
+.BR sgconf_xml (1),
+.BR sgconv (1),
+.BR stargazer (8),
+.BR rscriptd (8).
+
+.SH AUTHOR
+sgauth was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>.
+.PP
+This manual page was written by Alexey Osipov <simba@lerlan.ru>,
+for the Debian project (and may be used by others), and was modified by
+Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file
diff --git a/net-misc/stargazer/files/mans/sgconf.1 b/net-misc/stargazer/files/mans/sgconf.1
new file mode 100644
index 000000000000..4017d9e59648
--- /dev/null
+++ b/net-misc/stargazer/files/mans/sgconf.1
@@ -0,0 +1,160 @@
+.TH sgconf 1 "December 31, 2012" "" "sgconf"
+
+.SH NAME
+sgconf \- a command-line utility for configuring Stargazer
+
+.SH SYNOPSIS
+.B sgconf
+(
+.I get
+|
+.I set
+)
+.BI \-s " server"
+.BI \-p " port"
+.BI \-a " admin"
+.BI \-w " admin-pass"
+.BI \-u " user"
+.I special-options
+.br
+
+.SH DESCRIPTION
+.B sgconf
+allows 
+.B Stargazer
+system administrators to configure users.
+.PP
+.B sgconf
+support two subset of commands - 
+.I get
+and
+.IR set .
+.I get
+commands are for reading actual values from 
+.B Stargazer
+and
+.I set
+commands are for writing new values to
+.BR Stargazer .
+
+.SH OPTIONS
+.TP
+.BI \-s " server"
+IP or hostname where 
+.B Stargazer 
+server run.
+.TP
+.BI \-p " port"
+Port, which 
+.B Stargazer 
+listen for configuration connections (typically 5555).
+.TP
+.BI \-a " admin"
+Administrator login.
+.TP
+.BI \-w " admin-pass"
+Administrator password.
+.TP
+.TP
+.IR special-options " are following:"
+(Use without argument for
+.IR get ")"
+.TP
+.BI \-c " add_cash[:log message]"
+Get user's balance or add money to user's balance with optional log message.
+.TP
+.BI \-v " set_cash[:log message]"
+Set user's balance with optional log message.
+.TP
+.BI \-t " tariff:now|delayed"
+Get/set user's tariff. If 
+.I now 
+specified, the change is immediate. If
+.I delayed
+specified, the change will happen at end of the month.
+.TP
+.BI \-r " credit"
+Get/set user's maximum credit.
+.TP
+.BI \-o " password"
+Get/set user's password.
+.TP
+.BI \-e " prepaid"
+Get/set amount of user's prepaid traffic.
+.TP
+.BI \-I " *|ip_addr[,ip_addr...]"
+Get/set user's allowed IP addresses. Asterisk mark means "any address".
+.TP
+.BI \-A " name"
+Get/set user's name.
+.TP
+.BI \-N " note"
+Get/set user's note.
+.TP
+.BI \-D " address"
+Get/set user's street address.
+.TP
+.BI \-L " email"
+Get/set user's email.
+.TP
+.BI \-P " phone"
+Get/set user's phone.
+.TP
+.BI \-G " group"
+Get/set group, user belongs to.
+.TP
+.BI \-d " 0|1"
+Get/set user's "down" ("disabled") flag.
+.TP
+.BI \-i " 0|1"
+Get/set user's "passive" ("frozen") flag.
+.TP
+.BI \-\-disable\-stat " 0|1"
+Get/set user's "disableDetailStat" flag.
+.TP
+.BI \-\-always\-online " 0|1"
+Get/set user's "alwaysOnline" flag.
+.TP
+.BI \-\-u "X traffic"
+Get/set user's upload traffic for
+.I X
+service (direction).
+.TP
+.BI \-\-d "X traffic"
+Get/set user's download traffic for
+.I X
+service (direction).
+.TP
+.BI \-\-ud "X userdata"
+Get/set user's
+.I X
+custom data.
+.TP
+.BI \-m " message"
+Send
+.I message
+to user.
+.TP
+.B \-n
+Create new user.
+.TP
+.B \-l
+Delete user.
+
+.SH FILES
+.B
+/usr/bin/sgconf
+
+.SH SEE ALSO
+.BR sgauth (8),
+.BR sgconf_xml (1),
+.BR sgconv (1),
+.BR stargazer (8),
+.BR rscriptd (8).
+
+.SH AUTHOR
+sgconf was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>.
+.PP
+This manual page was written by Alexey Osipov <simba@lerlan.ru>,
+for the Debian project (and may be used by others), and was modified by
+Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file
diff --git a/net-misc/stargazer/files/mans/sgconf_xml.1 b/net-misc/stargazer/files/mans/sgconf_xml.1
new file mode 100644
index 000000000000..428fadfd5b18
--- /dev/null
+++ b/net-misc/stargazer/files/mans/sgconf_xml.1
@@ -0,0 +1,79 @@
+.TH sgconf_xml 1 "December 31, 2012" "" "sgconf_xml"
+
+.SH NAME
+sgconf_xml \- a command-line xml-based utility for configuring Stargazer
+
+.SH SYNOPSIS
+.B sgconf_xml
+.BI \-s " server"
+.BI \-p " port"
+.BI \-a " admin"
+.BI \-w " admin-pass"
+(
+.BI \-r " request-string"
+|
+.BI \-f " request-file"
+)
+
+.SH DESCRIPTION
+.B sgconf_xml
+allows system administrators to configure 
+.BR Stargazer .
+.PP
+.B sgconf_xml
+uses XML for requests and responses. You can specify a 
+file containing XML request by using
+.B \-f
+option, or you can specify XML request directly as a
+string by using
+.B \-r
+option.
+
+.SH OPTIONS
+.TP
+.BI \-s " server"
+IP or hostname where 
+.B Stargazer 
+server run.
+.TP
+.BI \-p " port"
+Port, which 
+.B Stargazer 
+listen for configuration connections (typically 5555).
+.TP
+.BI \-a " admin"
+Administrator login.
+.TP
+.BI \-w " admin-pass"
+Administrator password.
+.TP
+.BI \-r " request-string"
+The request in form of XML.
+.TP
+.BI \-f " request-file"
+File containing request in form of XML.
+
+.SH REQUEST SYNTAX
+TODO.
+.br
+As for now you can check an example by running 
+.B sgconf_xml
+without arguments.
+
+.SH FILES
+.B
+/usr/bin/sgconf_xml
+
+.SH SEE ALSO
+.BR sgauth (8),
+.BR sgconf (1),
+.BR sgconv (1),
+.BR stargazer (8),
+.BR rscriptd (8).
+
+.SH AUTHOR
+sgconf_xml was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>.
+.PP
+This manual page was written by Alexey Osipov <simba@lerlan.ru>,
+for the Debian project (and may be used by others), and was modified by
+Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file
diff --git a/net-misc/stargazer/files/mans/sgconv.1 b/net-misc/stargazer/files/mans/sgconv.1
new file mode 100644
index 000000000000..b5fb225ab064
--- /dev/null
+++ b/net-misc/stargazer/files/mans/sgconv.1
@@ -0,0 +1,42 @@
+.TH sgconv 1 "December 31, 2012" "" "sgconv"
+
+.SH NAME
+sgconv \- an utility to convert Stargazer data between storage backends
+
+.SH SYNOPSIS
+.B sgconv
+.RI [ config-file ]
+
+.SH DESCRIPTION
+.B sgconv
+allows system administrators to copy and merge
+.B Stargazer
+data from one storage backend to another.
+
+.SH OPTIONS
+.TP
+.I config-file
+A path to config file containing convertion parameters. Default is
+.B sgconv.conf 
+in current directory.
+
+.SH FILES
+.B
+/usr/bin/sgconv
+.br
+.B
+/etc/stargazer/sgconv.conf
+
+.SH SEE ALSO
+.BR sgauth (8),
+.BR sgconf (1),
+.BR sgconf_xml (1),
+.BR stargazer (8),
+.BR rscriptd (8).
+
+.SH AUTHOR
+sgconv was initially written by Maxim Mamontov <faust@stargazer.dp.ua>.
+.PP
+This manual page was written by Alexey Osipov <simba@lerlan.ru>,
+for the Debian project (and may be used by others), and was modified by
+Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file
diff --git a/net-misc/stargazer/files/mans/stargazer.8 b/net-misc/stargazer/files/mans/stargazer.8
new file mode 100644
index 000000000000..a1860c5d97b9
--- /dev/null
+++ b/net-misc/stargazer/files/mans/stargazer.8
@@ -0,0 +1,64 @@
+.TH stargazer 8 "December 31, 2012" "" "stargazer"
+
+.SH NAME
+stargazer \- a powerfull billing system daemon
+
+.SH SYNOPSIS
+.B stargazer
+.RI [ config-directory ]
+.br
+
+.SH DESCRIPTION
+This manual page explains the
+.B stargazer
+daemon. This daemon address ISP user accounting and billing problems.
+.PP
+.B Stargazer
+is capable of:
+.PP
+- manage user accounts using several kinds of stores (plain files, MySQL, Firebird, 
+PostgreSQL)
+.br
+- gather traffic flow information using several methods (Netflow protocol, rawsocket
+ethernet packets capture, netfilter IPQ capture)
+.br
+- bill user accounts according to rate rules and traffic classification
+.br
+- authentificate and authorize users to get access to the internet
+
+.SH OPTIONS
+.TP
+.I config-directory
+Path to directory containing stargazer configuration files. Default is 
+.B
+/etc/stargazer
+
+.SH FILES
+.B
+/usr/sbin/stargazer
+.br
+.B
+/etc/stargazer/
+.br
+.B
+/var/lib/stargazer/
+.br
+.B
+/var/log/stargazer/stargazer.log
+.br
+.B
+/var/log/stargazer/xmlrpc.log
+
+.SH SEE ALSO
+.BR sgconf (1),
+.BR sgconf_xml (1),
+.BR sgconv (1),
+.BR sgauth (8),
+.BR rscriptd (8).
+
+.SH AUTHOR
+stargazer was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>.
+.PP
+This manual page was written by Alexey Osipov <simba@lerlan.ru>,
+for the Debian project (and may be used by others), and was modified by
+Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file
diff --git a/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch
new file mode 100644
index 000000000000..c8b73d85a63a
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch
@@ -0,0 +1,214 @@
+--- projects/rlm_stg/build.org	2013-01-15 15:25:59.000000000 +0200
++++ projects/rlm_stg/build	2013-01-15 19:48:13.000000000 +0200
+@@ -16,21 +16,15 @@
+ DIR_MODE=0755
+ OWNER=root
+ 
+-if [ -z $1 ]
+-then
+-    MAKEOPTS="-j1"
+-    DEBUG="no"
++if [ "$1" = "debug" ]
++then
++   DEFS="$DEFS -DDEBUG"
++   MAKEOPTS="$MAKEOPTS -j1"
++   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
++   DEBUG="yes"
+ else
+-    if [ "$1" = "debug" ]
+-    then
+-        DEFS="-DDEBUG"
+-        MAKEOPTS="-j1"
+-        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
+-        DEBUG="yes"
+-    else
+-        MAKEOPTS="-j1"
+-        DEBUG="no"
+-    fi
++   DEFS="$DEFS -DNDEBUG"
++   DEBUG="no"
+ fi
+ 
+ CXXFLAGS="$CXXFLAGS -I/usr/local/include"
+--- projects/rscriptd/build.org	2013-01-15 18:28:32.000000000 +0200
++++ projects/rscriptd/build	2013-01-15 18:38:13.000000000 +0200
+@@ -16,21 +16,15 @@
+ DIR_MODE=0755
+ OWNER=root
+ 
+-if [ -z $1 ]
++if [ "$1" = "debug" ]
+ then
+-    MAKEOPTS="-j1"
+-    DEBUG="no"
++   DEFS="$DEFS -DDEBUG"
++   MAKEOPTS="$MAKEOPTS -j1"
++   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
++   DEBUG="yes"
+ else
+-    if [ "$1" = "debug" ]
+-    then
+-        DEFS="-DDEBUG"
+-        MAKEOPTS="-j1"
+-        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
+-        DEBUG="yes"
+-    else
+-        MAKEOPTS="-j1"
+-        DEBUG="no"
+-    fi
++   DEFS="$DEFS -DNDEBUG"
++   DEBUG="no"
+ fi
+ 
+ CXXFLAGS="$CXXFLAGS -I/usr/local/include"
+--- projects/sgauth/build.org	2013-01-15 18:29:20.000000000 +0200
++++ projects/sgauth/build	2013-01-15 18:36:33.000000000 +0200
+@@ -16,21 +16,15 @@
+ DIR_MODE=0755
+ OWNER=root
+ 
+-if [ -z $1 ]
++if [ "$1" = "debug" ]
+ then
+-    MAKEOPTS="-j1"
+-    DEBUG="no"
++   DEFS="$DEFS -DDEBUG"
++   MAKEOPTS="$MAKEOPTS -j1"
++   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
++   DEBUG="yes"
+ else
+-    if [ "$1" = "debug" ]
+-    then
+-        DEFS="-DDEBUG"
+-        MAKEOPTS="-j1"
+-        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
+-        DEBUG="yes"
+-    else
+-        MAKEOPTS="-j1"
+-        DEBUG="no"
+-    fi
++   DEFS="$DEFS -DNDEBUG"
++   DEBUG="no"
+ fi
+ 
+ CXXFLAGS="$CXXFLAGS -I/usr/local/include"
+--- projects/sgconf/build.org	2013-01-15 18:29:59.000000000 +0200
++++ projects/sgconf/build	2013-01-15 18:35:41.000000000 +0200
+@@ -16,21 +16,15 @@
+ DIR_MODE=0755
+ OWNER=root
+ 
+-if [ -z $1 ]
++if [ "$1" = "debug" ]
+ then
+-    MAKEOPTS="-j1"
+-    DEBUG="no"
++   DEFS="$DEFS -DDEBUG"
++   MAKEOPTS="$MAKEOPTS -j1"
++   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
++   DEBUG="yes"
+ else
+-    if [ "$1" = "debug" ]
+-    then
+-        DEFS="-DDEBUG"
+-        MAKEOPTS="-j1"
+-        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
+-        DEBUG="yes"
+-    else
+-        MAKEOPTS="-j1"
+-        DEBUG="no"
+-    fi
++   DEFS="$DEFS -DNDEBUG"
++   DEBUG="no"
+ fi
+ 
+ CXXFLAGS="$CXXFLAGS -I/usr/local/include"
+--- projects/sgconf_xml/build.org	2013-01-15 18:30:26.000000000 +0200
++++ projects/sgconf_xml/build	2013-01-15 18:34:53.000000000 +0200
+@@ -16,21 +16,15 @@
+ DIR_MODE=0755
+ OWNER=root
+ 
+-if [ -z $1 ]
++if [ "$1" = "debug" ]
+ then
+-    MAKEOPTS="-j1"
+-    DEBUG="no"
++   DEFS="$DEFS -DDEBUG"
++   MAKEOPTS="$MAKEOPTS -j1"
++   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
++   DEBUG="yes"
+ else
+-    if [ "$1" = "debug" ]
+-    then
+-        DEFS="-DDEBUG"
+-        MAKEOPTS="-j1"
+-        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
+-        DEBUG="yes"
+-    else
+-        MAKEOPTS="-j1"
+-        DEBUG="no"
+-    fi
++   DEFS="$DEFS -DNDEBUG"
++   DEBUG="no"
+ fi
+ 
+ CXXFLAGS="$CXXFLAGS -I/usr/local/include"
+--- projects/sgconv/build.org	2013-01-15 18:31:01.000000000 +0200
++++ projects/sgconv/build	2013-01-15 18:32:46.000000000 +0200
+@@ -16,11 +16,20 @@
+ DIR_MODE=0755
+ OWNER=root
+ VAR_DIR="./inst/var/stargazer"
+-DEFS="-DDEBUG"
+-MAKEOPTS="-j1"
++
++if [ "$1" = "debug" ]
++then
++   DEFS="$DEFS -DDEBUG"
++   MAKEOPTS="$MAKEOPTS -j1"
++   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
++   DEBUG="yes"
++else
++   DEFS="$DEFS -DNDEBUG"
++   DEBUG="no"
++fi
++
+ CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-DEBUG="yes"
+ 
+ if [ "$sys" = "Linux" ]
+ then
+--- projects/stargazer/build.org	2013-01-15 19:48:54.000000000 +0200
++++ projects/stargazer/build	2013-01-15 19:51:13.000000000 +0200
+@@ -35,23 +35,15 @@
+ XMLRPC_FEATURES="c++2 abyss-server"
+ 
+ 
+-if [ -z "$1" ]
++if [ "$1" = "debug" ]
+ then
++    DEFS="$DEFS -DDEBUG"
++    MAKEOPTS="$MAKEOPTS -j1"
++    CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
++    DEBUG="yes"
++else
+     DEFS="$DEFS -DNDEBUG"
+-    MAKEOPTS="-j1"
+     DEBUG="no"
+-else
+-    if [ "$1" = "debug" ]
+-    then
+-        DEFS="$DEFS -DDEBUG"
+-        MAKEOPTS="-j1"
+-        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
+-        DEBUG="yes"
+-    else
+-        DEFS="$DEFS -DNDEBUG"
+-        MAKEOPTS="-j1"
+-        DEBUG="no"
+-    fi
+ fi
+ 
+ CXXFLAGS="$CXXFLAGS -I/usr/local/include"
diff --git a/net-misc/stargazer/files/patches/stg-2.408-build.patch b/net-misc/stargazer/files/patches/stg-2.408-build.patch
new file mode 100644
index 000000000000..380b4cbe91f2
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-build.patch
@@ -0,0 +1,179 @@
+--- projects/rlm_stg/configure.org	2013-01-18 18:06:17.000000000 +0200
++++ projects/rlm_stg/configure	2013-01-18 18:07:18.000000000 +0200
+@@ -34,6 +34,7 @@
+ then
+     OS=linux
+     release=""
++    ETC_DIR="./inst/linux/etc/stargazer"
+     MAKE="make"
+ fi
+ 
+@@ -48,6 +49,7 @@
+         9) OS=bsd7;;
+         *) OS=unknown;;
+     esac
++    ETC_DIR="./inst/freebsd/etc/stargazer"
+     MAKE="gmake"
+ fi
+ 
+@@ -163,5 +165,4 @@
+ echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
+ echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
+ echo "OWNER=$OWNER" >> $CONFFILE
+-$MAKE $MAKEOPTS
+-
++echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
+\ No newline at end of file
+--- projects/rscriptd/configure.org	2013-01-18 18:07:28.000000000 +0200
++++ projects/rscriptd/configure	2013-01-18 18:08:02.000000000 +0200
+@@ -34,6 +34,7 @@
+ then
+     OS=linux
+     release=""
++    ETC_DIR="./inst/linux/etc/stargazer"
+     MAKE="make"
+ fi
+ 
+@@ -48,6 +49,7 @@
+         9) OS=bsd7;;
+         *) OS=unknown;;
+     esac
++    ETC_DIR="./inst/freebsd/etc/stargazer"
+     MAKE="gmake"
+ fi
+ 
+@@ -169,6 +171,4 @@
+ echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
+ echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
+ echo "OWNER=$OWNER" >> $CONFFILE
+-
+-$MAKE $MAKEOPTS
+-
++echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
+\ No newline at end of file
+--- projects/sgauth/configure.org	2013-01-18 18:08:10.000000000 +0200
++++ projects/sgauth/configure	2013-01-18 18:08:38.000000000 +0200
+@@ -34,6 +34,7 @@
+ then
+     OS=linux
+     release=""
++    ETC_DIR="./inst/linux/etc/stargazer"
+     MAKE="make"
+ fi
+ 
+@@ -48,6 +49,7 @@
+         9) OS=bsd7;;
+         *) OS=unknown;;
+     esac
++    ETC_DIR="./inst/freebsd/etc/stargazer"
+     MAKE="gmake"
+ fi
+ 
+@@ -167,5 +169,4 @@
+ echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
+ echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
+ echo "OWNER=$OWNER" >> $CONFFILE
+-$MAKE $MAKEOPTS
+-
++echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
+\ No newline at end of file
+--- projects/sgconf/configure.org	2013-01-18 18:08:46.000000000 +0200
++++ projects/sgconf/configure	2013-01-18 18:09:44.000000000 +0200
+@@ -34,6 +34,7 @@
+ then
+     OS=linux
+     release=""
++    ETC_DIR="./inst/linux/etc/stargazer"
+     MAKE="make"
+ fi
+ 
+@@ -48,6 +49,7 @@
+         9) OS=bsd7;;
+         *) OS=unknown;;
+     esac
++    ETC_DIR="./inst/freebsd/etc/stargazer"
+     MAKE="gmake"
+ fi
+ 
+@@ -186,6 +188,4 @@
+ echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
+ echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
+ echo "OWNER=$OWNER" >> $CONFFILE
+-
+-$MAKE $MAKEOPTS
+-
++echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
+\ No newline at end of file
+--- projects/sgconf_xml/configure.org	2013-01-18 18:09:54.000000000 +0200
++++ projects/sgconf_xml/configure	2013-01-18 18:10:23.000000000 +0200
+@@ -34,6 +34,7 @@
+ then
+     OS=linux
+     release=""
++    ETC_DIR="./inst/linux/etc/stargazer"
+     MAKE="make"
+ fi
+ 
+@@ -48,6 +49,7 @@
+         9) OS=bsd7;;
+         *) OS=unknown;;
+     esac
++    ETC_DIR="./inst/freebsd/etc/stargazer"
+     MAKE="gmake"
+ fi
+ 
+@@ -186,6 +188,4 @@
+ echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
+ echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
+ echo "OWNER=$OWNER" >> $CONFFILE
+-
+-$MAKE $MAKEOPTS
+-
++echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
+\ No newline at end of file
+--- projects/sgconv/configure.org	2013-01-18 18:10:30.000000000 +0200
++++ projects/sgconv/configure	2013-01-18 18:11:09.000000000 +0200
+@@ -35,6 +35,7 @@
+ then
+     OS=linux
+     release=""
++    ETC_DIR="./inst/linux/etc/stargazer"
+     MAKE="make"
+ fi
+ 
+@@ -49,6 +50,7 @@
+         9) OS=bsd7;;
+         *) OS=unknown;;
+     esac
++    ETC_DIR="./inst/freebsd/etc/stargazer"
+     MAKE="gmake"
+ fi
+ 
+@@ -293,8 +295,6 @@
+ echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
+ echo "OWNER=$OWNER" >> $CONFFILE
+ echo "VAR_DIR=$VAR_DIR" >> $CONFFILE
++echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
+ 
+-mkdir -p ../stargazer/modules
+-
+-$MAKE $MAKEOPTS
+-
++mkdir -p ../stargazer/modules
+\ No newline at end of file
+--- projects/stargazer/configure.org	2013-01-18 18:11:15.000000000 +0200
++++ projects/stargazer/configure	2013-01-18 18:11:40.000000000 +0200
+@@ -404,11 +404,4 @@
+ echo "VAR_DIR=$VAR_DIR" >> $CONFFILE
+ echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
+ 
+-mkdir -p modules
+-
+-if [ "$1" != "debug" ]
+-then
+-    $MAKE $MAKEOPTS
+-else
+-    echo -e "\n\n\nDebug build. Type $MAKE explicitly"
+-fi
++mkdir -p modules
+\ No newline at end of file
diff --git a/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch b/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch
new file mode 100644
index 000000000000..82698af5b6f7
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch
@@ -0,0 +1,186 @@
+--- projects/rscriptd/rscriptd.conf.org	2013-01-08 18:19:34.000000000 +0200
++++ projects/rscriptd/rscriptd.conf	2013-01-08 18:20:52.000000000 +0200
+@@ -6,7 +6,7 @@
+ # Parameter: optional
+ # Value: file path
+ # Default: /var/log/rscriptd.log
+-LogFileName = /var/log/rscriptd.log
++LogFileName = /var/log/stargazer/rscriptd.log
+ 
+ # Amount of rscriptd-exec processes.
+ # These processes are responsible for the execution of scripts 
+@@ -22,7 +22,7 @@
+ # Parameter: optional
+ # Value: directory path
+ # Default: /etc/rscriptd
+-ConfigDir = /etc/rscriptd
++ConfigDir = /etc/stargazer
+ 
+ # Defines password for the encryption exchange between
+ # Stargazer server and rscriptd.
+@@ -49,12 +49,12 @@
+ # Parameter: optional
+ # Value: file path
+ # Default: /etc/rscriptd/OnConnect
+-ScriptOnConnect = /etc/rscriptd/OnConnect
++ScriptOnConnect = /etc/stargazer/OnConnect
+ 
+ # Defines file which runs when user loses access
+ # Parameter: optional
+ # Value: file path
+ # Default: /etc/rscriptd/OnDisconnect
+-ScriptOnDisconnect = /etc/rscriptd/OnDisconnect
++ScriptOnDisconnect = /etc/stargazer/OnDisconnect
+ 
+ ################################################################################
+\ No newline at end of file
+--- projects/sgconv/sgconv.conf.org	2012-12-18 21:56:33.578221904 +0200
++++ projects/sgconv/sgconv.conf	2012-12-18 21:58:22.355217059 +0200
+@@ -18,27 +18,27 @@
+     # Working server directory, provides data on tariffs, users, administrators.
+     # Parameter: required
+     # Value: directory path
+-    WorkDir = /var/stargazer
++    WorkDir = /var/lib/stargazer
+ 
+     # Owner, group and permissions of the files of user statistics (stat)
+     # Parameter: required
+     # Values: any, supported by OS
+-    ConfOwner = root
+-    ConfGroup = root
++    ConfOwner = stg
++    ConfGroup = stg
+     ConfMode = 600
+ 
+     # Owner, group and permissions on user configuration files (conf)
+     # Parameter: required
+     # Values: any, supported by OS
+-    StatOwner = root
+-    StatGroup = root
++    StatOwner = stg
++    StatGroup = stg
+     StatMode = 640
+ 
+     # Owner, group and permissions for user log files (log)
+     # Parameter: required
+     # Values: any, supported by OS
+-    UserLogOwner = root
+-    UserLogGroup = root
++    UserLogOwner = stg
++    UserLogGroup = stg
+     UserLogMode = 640
+ 
+ </SourceStoreModule>
+@@ -54,7 +54,7 @@
+     # Parameter: required
+     # Value: file path
+     # Default: /var/stg/stargazer.fdb
+-    # database = /var/stg/stargazer.fdb
++    # database = /var/lib/stargazer/stargazer.fdb
+ 
+     # Database username
+     # Parameter: required
+--- projects/stargazer/inst/linux/etc/stargazer/stargazer.conf.org	2012-12-30 14:35:22.000000000 +0200
++++ projects/stargazer/inst/linux/etc/stargazer/stargazer.conf	2012-12-30 14:36:37.000000000 +0200
+@@ -6,7 +6,7 @@
+ # Parameter: required
+ # Value: file path
+ # Default: /var/log/stargazer.log
+-LogFile = /var/log/stargazer.log
++LogFile = /var/log/stargazer/stargazer.log
+ 
+ # PID file name
+ # Parameter: optional
+@@ -147,7 +147,7 @@
+ # Parameter: optional
+ # Value: file path
+ # Default: /var/stargazer/monitor
+-#MonitorDir=/var/stargazer/monitor
++#MonitorDir=/var/lib/stargazer/monitor
+ 
+ # Defines message maximum lifetime
+ # Note: 0 - unlimited
+--- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf.org	2012-12-25 14:03:49.000000000 +0200
++++ projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf	2012-12-25 14:04:00.000000000 +0200
+@@ -16,7 +16,7 @@
+     # Parametr: required
+     # Values: filename
+     # Default: subnets
+-    SubnetFile = subnets
++    SubnetFile = /etc/stargazer/subnets
+ 
+     # The password to encrypt packets between the stg-server and remote server
+     # Parameter: required
+--- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf.org	2012-12-25 13:31:01.000000000 +0200
++++ projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf	2012-12-25 13:31:43.000000000 +0200
+@@ -5,27 +5,27 @@
+     # Working server directory, provides data on tariffs, users, administrators.
+     # Parameter: required
+     # Value: directory path
+-    WorkDir = /var/stargazer
++    WorkDir = /var/lib/stargazer
+ 
+     # Owner, group and permissions of the files of user statistics (stat)
+     # Parameter: required
+     # Values: any, supported by OS
+-    ConfOwner = root
+-    ConfGroup = root
++    ConfOwner = stg
++    ConfGroup = stg
+     ConfMode = 640
+ 
+     # Owner, group and permissions on user configuration files (conf)
+     # Parameter: required
+     # Values: any, supported by OS
+-    StatOwner = root
+-    StatGroup = root
++    StatOwner = stg
++    StatGroup = stg
+     StatMode = 640
+ 
+     # Owner, group and permissions for user log files (log)
+     # Parameter: required
+     # Values: any, supported by OS
+-    UserLogOwner = root
+-    UserLogGroup = root
++    UserLogOwner = stg
++    UserLogGroup = stg
+     UserLogMode = 640
+ 
+ </StoreModule>
+--- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf.org	2012-12-25 13:39:00.000000000 +0200
++++ projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf	2012-12-25 13:39:28.000000000 +0200
+@@ -9,7 +9,7 @@
+     # Parameter: required
+     # Value: file path
+     # Default: /var/stg/stargazer.fdb
+-    Database = /var/stg/stargazer.fdb
++    Database = /var/lib/stargazer/stargazer.fdb
+ 
+     # Database username
+     # Parameter: required
+--- projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp.org	2012-12-31 11:08:26.000000000 +0200
++++ projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp	2012-12-31 11:08:41.000000000 +0200
+@@ -169,7 +169,7 @@
+ rpcServer = new xmlrpc_c::serverAbyss(
+         xmlrpc_c::serverAbyss::constrOpt()
+         .registryP(&rpcRegistry)
+-        .logFileName("/var/log/stargazer_rpc.log")
++        .logFileName("/var/log/stargazer/xmlrpc.log")
+         .socketFd(fd)
+         );
+ 
+--- projects/stargazer/inst/var/00-base-00.sql.org	2013-01-02 16:22:28.000000000 +0200
++++ projects/stargazer/inst/var/00-base-00.sql	2013-01-02 16:22:52.000000000 +0200
+@@ -50,9 +50,9 @@
+ /*
+  * CONNECT 'localhost:/var/stg/stargazer.fdb' USER 'stg' PASSWORD '123456';
+  * DROP DATABASE;
+- *
+- * CREATE DATABASE 'localhost:/var/stg/stargazer.fdb' USER 'stg' PASSWORD '123456' DEFAULT CHARACTER SET UTF8;
+  */
++  CREATE DATABASE 'localhost:/var/lib/stargazer/stargazer.fdb' USER 'stg' PASSWORD '123456' DEFAULT CHARACTER SET UTF8;
++ 
+ 
+  
+ 
diff --git a/net-misc/stargazer/files/patches/stg-2.408-fix-crash-on-stop.patch b/net-misc/stargazer/files/patches/stg-2.408-fix-crash-on-stop.patch
new file mode 100644
index 000000000000..367c91209be7
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-fix-crash-on-stop.patch
@@ -0,0 +1,190 @@
+diff -Naur stg-2.408/projects/rscriptd/listener.cpp stg-2.408-patched/projects/rscriptd/listener.cpp
+--- stg-2.408/projects/rscriptd/listener.cpp	2012-02-09 12:26:59.000000000 +0200
++++ stg-2.408-patched/projects/rscriptd/listener.cpp	2013-02-11 09:04:32.000000000 +0200
+@@ -49,6 +49,8 @@
+       receiverStopped(true),
+       processorStopped(true),
+       userTimeout(0),
++      receiverThread(0),
++      processorThread(0),
+       listenSocket(0)
+ {
+ version = "rscriptd listener v.1.2";
+@@ -149,8 +151,10 @@
+         }
+     }
+ 
+-pthread_join(receiverThread, NULL);
+-pthread_join(processorThread, NULL);
++if (receiverThread != 0)
++    pthread_join(receiverThread, NULL);
++if (processorThread != 0)
++    pthread_join(processorThread, NULL);
+ 
+ pthread_mutex_destroy(&mutex);
+ 
+diff -Naur stg-2.408/projects/stargazer/eventloop.cpp stg-2.408-patched/projects/stargazer/eventloop.cpp
+--- stg-2.408/projects/stargazer/eventloop.cpp	2012-02-09 12:27:06.000000000 +0200
++++ stg-2.408-patched/projects/stargazer/eventloop.cpp	2013-02-11 09:03:11.000000000 +0200
+@@ -10,7 +10,7 @@
+     : ACTIONS_LIST(),
+       _running(false),
+       _stopped(true),
+-      _tid(),
++      _tid(0),
+       _mutex(),
+       _condition()
+ {
+@@ -41,7 +41,8 @@
+ // Wake up thread
+ pthread_cond_signal(&_condition);
+ // Wait until thread exit
+-pthread_join(_tid, NULL);
++if (_tid != 0)
++    pthread_join(_tid, NULL);
+ return false;
+ }
+ 
+diff -Naur stg-2.408/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp stg-2.408-patched/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
+--- stg-2.408/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp	2012-02-09 12:27:14.000000000 +0200
++++ stg-2.408-patched/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp	2013-02-11 09:01:34.000000000 +0200
+@@ -55,8 +55,8 @@
+ NF_CAP::NF_CAP()
+     : traffCnt(NULL),
+       settings(),
+-      tidTCP(),
+-      tidUDP(),
++      tidTCP(0),
++      tidUDP(0),
+       runningTCP(false),
+       runningUDP(false),
+       stoppedTCP(true),
+@@ -153,7 +153,8 @@
+         }
+     if (stoppedUDP)
+         {
+-        pthread_join(tidUDP, NULL);
++        if (tidUDP != 0)
++            pthread_join(tidUDP, NULL);
+         }
+     else
+         {
+@@ -176,7 +177,8 @@
+         }
+     if (stoppedTCP)
+         {
+-        pthread_join(tidTCP, NULL);
++        if (tidTCP != 0)
++            pthread_join(tidTCP, NULL);
+         }
+     else
+         {
+diff -Naur stg-2.408/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp stg-2.408-patched/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
+--- stg-2.408/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp	2012-02-09 12:27:15.000000000 +0200
++++ stg-2.408-patched/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp	2013-02-11 09:02:05.000000000 +0200
+@@ -74,7 +74,7 @@
+ //-----------------------------------------------------------------------------
+ ETHER_CAP::ETHER_CAP()
+     : errorStr(),
+-      thread(),
++      thread(0),
+       nonstop(false),
+       isRunning(false),
+       capSock(-1),
+@@ -140,7 +140,8 @@
+         }
+     else
+         {
+-        pthread_join(thread, NULL);
++        if (thread != 0)
++            pthread_join(thread, NULL);
+         }
+     }
+ 
+diff -Naur stg-2.408/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp stg-2.408-patched/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp
+--- stg-2.408/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp	2012-02-09 12:27:15.000000000 +0200
++++ stg-2.408-patched/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp	2013-02-11 09:02:37.000000000 +0200
+@@ -58,7 +58,7 @@
+ IPQ_CAP::IPQ_CAP()
+     : ipq_h(NULL),
+       errorStr(),
+-      thread(),
++      thread(0),
+       nonstop(false),
+       isRunning(false),
+       capSock(-1),
+@@ -120,7 +120,8 @@
+         }
+     else
+         {
+-        pthread_join(thread, NULL);
++        if (thread != 0)
++            pthread_join(thread, NULL);
+         }
+     }
+ IPQCapClose();
+diff -Naur stg-2.408/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp stg-2.408-patched/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
+--- stg-2.408/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp	2012-02-09 12:27:16.000000000 +0200
++++ stg-2.408-patched/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp	2013-02-11 09:00:33.000000000 +0200
+@@ -93,7 +93,7 @@
+       rpcServer(NULL),
+       running(false),
+       stopped(true),
+-      tid(),
++      tid(0),
+       cookies(),
+       dayFee(0),
+       dirNames()
+@@ -201,7 +201,8 @@
+     }
+ else
+     {
+-    pthread_join(tid, NULL);
++    if (tid != 0)
++        pthread_join(tid, NULL);
+     }
+ 
+ close(fd);
+diff -Naur stg-2.408/projects/stargazer/plugins/other/smux/smux.cpp stg-2.408-patched/projects/stargazer/plugins/other/smux/smux.cpp
+--- stg-2.408/projects/stargazer/plugins/other/smux/smux.cpp	2012-02-09 12:27:24.000000000 +0200
++++ stg-2.408-patched/projects/stargazer/plugins/other/smux/smux.cpp	2013-02-11 09:07:54.000000000 +0200
+@@ -99,7 +99,7 @@
+       errorStr(),
+       smuxSettings(),
+       settings(),
+-      thread(),
++      thread(0),
+       mutex(),
+       running(false),
+       stopped(true),
+@@ -227,7 +227,7 @@
+         }
+     }
+ 
+-if (stopped)
++if (stopped && thread != 0)
+     pthread_join(thread, NULL);
+ 
+ ResetNotifiers();
+diff -Naur stg-2.408/projects/stargazer/stg_timer.cpp stg-2.408-patched/projects/stargazer/stg_timer.cpp
+--- stg-2.408/projects/stargazer/stg_timer.cpp	2012-02-09 12:27:30.000000000 +0200
++++ stg-2.408-patched/projects/stargazer/stg_timer.cpp	2013-02-11 08:58:55.000000000 +0200
+@@ -7,7 +7,7 @@
+ #include "stg/common.h"
+ 
+ static int nonstop;
+-static pthread_t thrStgTimer;
++static pthread_t thrStgTimer(0);
+ static bool isTimerRunning = false;
+ volatile time_t stgTime;
+ 
+@@ -101,7 +101,8 @@
+ void StopStgTimer()
+ {
+ nonstop = 0;
+-pthread_join(thrStgTimer, NULL); // Cleanup thread resources
++if (thrStgTimer != 0)
++    pthread_join(thrStgTimer, NULL); // Cleanup thread resources
+ printfd(__FILE__, "STG_TIMER stopped\n");
+ }
+ //-----------------------------------------------------------------------------
diff --git a/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch
new file mode 100644
index 000000000000..51d0f1f04ea6
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch
@@ -0,0 +1,386 @@
+diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile
+index efacbb6..04c00cc 100644
+--- a/projects/sgconv/Makefile
++++ b/projects/sgconv/Makefile
+@@ -58,6 +58,21 @@ clean:
+ distclean: clean
+ 	rm -f ../../Makefile.conf
+ 
++install: install-bin
++
++install-bin:
++ifeq ($(DEBUG), yes)
++	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
++endif
++	$(MAKE) -C $(DIR_PLUGINS) install
++
++uninstall: uninstall-bin
++
++uninstall-bin:
++	rm -f $(PREFIX)/usr/bin/$(PROG)
++
+ ifneq ($(MAKECMDGOALS),distclean)
+ ifneq ($(MAKECMDGOALS),clean)
+ ifneq ($(MAKECMDGOALS),uninstall)
+diff --git a/projects/convertor/build b/projects/convertor/build
+index 0144b0f..471ee62 100755
+--- a/projects/sgconv/build
++++ b/projects/sgconv/build
+@@ -20,6 +20,7 @@ DEFS="-DDEBUG"
+ MAKEOPTS="-j1"
+ CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
++DEBUG="yes"
+ 
+ if [ "$sys" = "Linux" ]
+ then
+@@ -251,6 +252,7 @@ fi
+ 
+ echo "OS=$OS" > $CONFFILE
+ echo "STG_TIME=yes" >> $CONFFILE
++echo "DEBUG=$DEBUG" >> $CONFFILE
+ echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
+ echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
+ echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
+diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
+index 98f5f2d..6190491 100644
+--- a/projects/rlm_stg/Makefile
++++ b/projects/rlm_stg/Makefile
+@@ -57,13 +57,17 @@ distclean: clean
+ install: install-bin
+ 
+ install-bin:
+-	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
++ifeq ($(DEBUG), yes)
++	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
++endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ uninstall: uninstall-bin
+ 
+ uninstall-bin:
+-	rm -f $(PREFIX)/usr/lib/$(PROG)
++	rm -f $(PREFIX)/usr/lib/freeradius/$(PROG)
+ 
+ ifneq ($(MAKECMDGOALS),distclean)
+ ifneq ($(MAKECMDGOALS),clean)
+diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build
+index 0145d03..3781d1b 100755
+--- a/projects/rlm_stg/build
++++ b/projects/rlm_stg/build
+@@ -19,14 +19,17 @@ OWNER=root
+ if [ -z $1 ]
+ then
+     MAKEOPTS="-j1"
++    DEBUG="no"
+ else
+     if [ "$1" = "debug" ]
+     then
+         DEFS="-DDEBUG"
+         MAKEOPTS="-j1"
+         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
++        DEBUG="yes"
+     else
+         MAKEOPTS="-j1"
++        DEBUG="no"
+     fi
+ fi
+ 
+@@ -144,6 +147,7 @@ rm -f fake
+ 
+ echo "OS=$OS" > $CONFFILE
+ echo "STG_TIME=yes" >> $CONFFILE
++echo "DEBUG=$DEBUG" >> $CONFFILE
+ echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
+ echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
+ echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
+diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
+index 0912be0..da06b50 100644
+--- a/projects/rscriptd/Makefile
++++ b/projects/rscriptd/Makefile
+@@ -57,7 +57,11 @@ distclean: clean
+ install: install-bin install-data
+ 
+ install-bin:
+-	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++ifeq ($(DEBUG), yes)
++	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ install-data:
+diff --git a/projects/rscriptd/build b/projects/rscriptd/build
+index 885eef7..6a7c77f 100755
+--- a/projects/rscriptd/build
++++ b/projects/rscriptd/build
+@@ -19,14 +19,17 @@ OWNER=root
+ if [ -z $1 ]
+ then
+     MAKEOPTS="-j1"
++    DEBUG="no"
+ else
+     if [ "$1" = "debug" ]
+     then
+         DEFS="-DDEBUG"
+         MAKEOPTS="-j1"
+         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
++        DEBUG="yes"
+     else
+         MAKEOPTS="-j1"
++        DEBUG="no"
+     fi
+ fi
+ 
+@@ -150,6 +153,7 @@ rm -f build_check.c
+ 
+ echo "OS=$OS" > $CONFFILE
+ echo "STG_TIME=yes" >> $CONFFILE
++echo "DEBUG=$DEBUG" >> $CONFFILE
+ echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
+ echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
+ echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
+diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
+index 99cd0e4..a59371c 100644
+--- a/projects/sgauth/Makefile
++++ b/projects/sgauth/Makefile
+@@ -58,7 +58,11 @@ distclean: clean
+ install: install-bin install-data
+ 
+ install-bin:
+-	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++ifeq ($(DEBUG), yes)
++	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ install-data:
+diff --git a/projects/sgauth/build b/projects/sgauth/build
+index ec747e2..e3ad87f 100755
+--- a/projects/sgauth/build
++++ b/projects/sgauth/build
+@@ -19,14 +19,17 @@ OWNER=root
+ if [ -z $1 ]
+ then
+     MAKEOPTS="-j1"
++    DEBUG="no"
+ else
+     if [ "$1" = "debug" ]
+     then
+         DEFS="-DDEBUG"
+         MAKEOPTS="-j1"
+         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
++        DEBUG="yes"
+     else
+         MAKEOPTS="-j1"
++        DEBUG="no"
+     fi
+ fi
+ 
+@@ -148,6 +151,7 @@ rm -f build_check.c
+ 
+ echo "OS=$OS" > $CONFFILE
+ echo "STG_TIME=yes" >> $CONFFILE
++echo "DEBUG=$DEBUG" >> $CONFFILE
+ echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
+ echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
+ echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
+diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
+index 4d62bb5..297d3e2 100644
+--- a/projects/sgconf/Makefile
++++ b/projects/sgconf/Makefile
+@@ -66,7 +66,11 @@ distclean: clean
+ install: install-bin
+ 
+ install-bin:
+-	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++ifeq ($(DEBUG), yes)
++	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
++endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ uninstall: uninstall-bin
+diff --git a/projects/sgconf/build b/projects/sgconf/build
+index 1f6c0a0..da81773 100755
+--- a/projects/sgconf/build
++++ b/projects/sgconf/build
+@@ -19,14 +19,17 @@ OWNER=root
+ if [ -z $1 ]
+ then
+     MAKEOPTS="-j1"
++    DEBUG="no"
+ else
+     if [ "$1" = "debug" ]
+     then
+         DEFS="-DDEBUG"
+         MAKEOPTS="-j1"
+         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
++        DEBUG="yes"
+     else
+         MAKEOPTS="-j1"
++        DEBUG="no"
+     fi
+ fi
+ 
+@@ -166,6 +169,7 @@ fi
+ 
+ echo "OS=$OS" > $CONFFILE
+ echo "STG_TIME=yes" >> $CONFFILE
++echo "DEBUG=$DEBUG" >> $CONFFILE
+ echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
+ echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
+ echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
+diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
+index b7ebca0..32384e6 100644
+--- a/projects/sgconf_xml/Makefile
++++ b/projects/sgconf_xml/Makefile
+@@ -66,7 +66,11 @@ distclean: clean
+ install: install-bin install-data
+ 
+ install-bin:
+-	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++ifeq ($(DEBUG), yes)
++	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
++endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ uninstall: uninstall-bin uninstall-data
+diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
+index f78e6f7..9797075 100755
+--- a/projects/sgconf_xml/build
++++ b/projects/sgconf_xml/build
+@@ -19,14 +19,17 @@ OWNER=root
+ if [ -z $1 ]
+ then
+     MAKEOPTS="-j1"
++    DEBUG="no"
+ else
+     if [ "$1" = "debug" ]
+     then
+         DEFS="-DDEBUG"
+         MAKEOPTS="-j1"
+         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
++        DEBUG="yes"
+     else
+         MAKEOPTS="-j1"
++        DEBUG="no"
+     fi
+ fi
+ 
+@@ -166,6 +169,7 @@ fi
+ 
+ echo "OS=$OS" > $CONFFILE
+ echo "STG_TIME=yes" >> $CONFFILE
++echo "DEBUG=$DEBUG" >> $CONFFILE
+ echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
+ echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
+ echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
+diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
+index 44ae35e..9dfc0b5 100644
+--- a/projects/stargazer/Makefile
++++ b/projects/stargazer/Makefile
+@@ -77,7 +77,11 @@ distclean: clean
+ install: install-bin install-data
+ 
+ install-bin: $(PROG)
+-	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++ifeq ($(DEBUG), yes)
++	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
++endif
+ 	$(MAKE) -C $(DIR_INCLUDE) install
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 	$(MAKE) -C $(DIR_PLUGINS) install
+diff --git a/projects/stargazer/build b/projects/stargazer/build
+index c58b969..8a34c4f 100755
+--- a/projects/stargazer/build
++++ b/projects/stargazer/build
+@@ -39,15 +39,18 @@ if [ -z "$1" ]
+ then
+     DEFS="$DEFS -DNDEBUG"
+     MAKEOPTS="-j1"
++    DEBUG="no"
+ else
+     if [ "$1" = "debug" ]
+     then
+         DEFS="$DEFS -DDEBUG"
+         MAKEOPTS="-j1"
+         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
++        DEBUG="yes"
+     else
+         DEFS="$DEFS -DNDEBUG"
+         MAKEOPTS="-j1"
++        DEBUG="no"
+     fi
+ fi
+ 
+@@ -391,6 +394,7 @@ fi
+ 
+ echo "OS=$OS" > $CONFFILE
+ echo "STG_TIME=yes" >> $CONFFILE
++echo "DEBUG=$DEBUG" >> $CONFFILE
+ echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
+ echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
+ echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
+diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in
+index 17e10ac..70954a2 100644
+--- a/projects/stargazer/plugins/Makefile.in
++++ b/projects/stargazer/plugins/Makefile.in
+@@ -15,12 +15,12 @@ LIBS += $(addprefix -lstg,$(STGLIBS))
+ 
+ CXXFLAGS += -fPIC $(STGLIBS_INCS)
+ CFLAGS += -fPIC $(STGLIBS_INCS)
+-LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg $(STGLIBS_LIBS)
++LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg
+ 
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
++	$(CXX) $^ $(STGLIBS_LIBS) $(LIBS) $(LDFLAGS) -o $(PROG)
+ 	$(LN) -fs "`pwd`/$(PROG)" $(DIR_MOD)/$(PROG)
+ 
+ clean:
+@@ -28,7 +28,11 @@ clean:
+ 
+ install: $(PROG)
+ 	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
+-	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
++ifeq ($(DEBUG), yes)
++	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
++endif
+ 
+ uninstall:
+ 	rm -f $(PREFIX)/usr/lib/stg/$(PROG)
+diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
+index a318497..b5d1195 100644
+--- a/stglibs/Makefile.in
++++ b/stglibs/Makefile.in
+@@ -35,8 +35,11 @@ clean:
+ 	rm -f deps $(PROG) *.o *.a *.so tags *.*~ 
+ 
+ install: $(PROG)
+-	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
+-	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
++ifeq ($(DEBUG), yes)
++	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
++endif
+ 	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg
+ 	install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/
+ 
diff --git a/net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch
new file mode 100644
index 000000000000..81f46f4a3bfe
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch
@@ -0,0 +1,13 @@
+--- projects/stargazer/plugins/store/firebird/Makefile.org	2013-01-04 22:50:13.000000000 +0200
++++ projects/stargazer/plugins/store/firebird/Makefile	2013-01-04 22:50:56.000000000 +0200
+@@ -22,5 +22,11 @@
+ 	  locker \
+ 	  crypto
+ 
++FB_CFLAGS = $(shell fb_config --cflags)
++FB_LDFLAGS = $(shell fb_config --libs)
++
++CXXFLAGS +=  $(FB_CFLAGS)
++LDFLAGS += $(FB_LDFLAGS)
++
+ include ../../Makefile.in
diff --git a/net-misc/stargazer/files/patches/stg-2.408-makefile.patch b/net-misc/stargazer/files/patches/stg-2.408-makefile.patch
new file mode 100644
index 000000000000..81772d6641fe
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-makefile.patch
@@ -0,0 +1,203 @@
+--- projects/sgauth/Makefile.org	2013-01-05 23:47:38.000000000 +0200
++++ projects/sgauth/Makefile	2013-01-05 23:48:34.000000000 +0200
+@@ -67,8 +67,8 @@
+ 
+ install-data:
+ 	# Install etc
+-	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc
+-	install -m $(DATA_MODE) -o $(OWNER) ./sgauth.conf $(PREFIX)/etc/sgauth.conf
++	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer
++	install -m $(DATA_MODE) -o $(OWNER) ./sgauth.conf $(PREFIX)/etc/stargazer/sgauth.conf
+ 
+ uninstall: uninstall-bin uninstall-data
+ 
+--- projects/stargazer/Makefile.org	2013-01-05 22:53:26.000000000 +0200
++++ projects/stargazer/Makefile	2013-01-05 22:54:52.000000000 +0200
+@@ -92,30 +92,8 @@
+ 	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-available.d
+ 	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-enabled.d
+ 	install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/stargazer.conf $(PREFIX)/etc/stargazer/stargazer.conf
+-	install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/conf-available.d/*.conf $(PREFIX)/etc/stargazer/conf-available.d
+-	ln -sf ../conf-available.d/mod_ao.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ao.conf
+-	ln -sf ../conf-available.d/mod_ia.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ia.conf
+-	ln -sf ../conf-available.d/mod_ping.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ping.conf
+-	ln -sf ../conf-available.d/mod_sg.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_sg.conf
+-	ln -sf ../conf-available.d/store_files.conf $(PREFIX)/etc/stargazer/conf-enabled.d/store_files.conf
+-
+-ifeq ($(OS),linux)
+-	ln -sf ../conf-available.d/mod_cap_ether.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_ether.conf
+-else
+-	ln -sf ../conf-available.d/mod_cap_bpf.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_bpf.conf
+-endif
+-
+ 	install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/rules $(PREFIX)/etc/stargazer/rules
+ 	install -m $(BIN_MODE) -o $(OWNER) $(ETC_DIR)/On* $(PREFIX)/etc/stargazer/
+-	
+-	# Install file db
+-	mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/admins
+-	mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/tariffs
+-	mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/users/test
+-	install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/admins/admin.adm $(PREFIX)/var/stargazer/admins/admin.adm
+-	install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/tariffs/tariff.tf $(PREFIX)/var/stargazer/tariffs/tariff.tf
+-	install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/conf $(PREFIX)/var/stargazer/users/test/conf
+-	install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/stat $(PREFIX)/var/stargazer/users/test/stat
+ 
+ uninstall: uninstall-bin uninstall-data
+ 
+--- projects/rscriptd/Makefile.org	2013-01-19 17:03:42.000000000 +0200
++++ projects/rscriptd/Makefile	2013-01-19 17:04:25.000000000 +0200
+@@ -65,15 +65,13 @@
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ install-data:
+-	# Install etc
+-	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd
+-	install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/rscriptd/rscriptd.conf
++	install -D -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/stargazer/rscriptd.conf
+ ifeq ($(OS), linux)
+-	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
+-	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
++	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/stargazer/
++	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/stargazer/
+ else
+-	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
+-	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
++	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/stargazer/
++	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/stargazer/
+ endif
+ 
+ uninstall: uninstall-bin uninstall-data
+--- projects/rlm_stg/Makefile.org	2013-02-03 14:02:58.000000000 +0200
++++ projects/rlm_stg/Makefile	2013-02-03 14:05:43.000000000 +0200
+@@ -56,19 +56,11 @@
+ install: install-bin
+ 
+ install-bin:
+-ifeq ($(DEBUG), yes)
+ ifeq ($(OS), linux)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+ else
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG)
+ endif
+-else
+-ifeq ($(OS), linux)
+-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+-else
+-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
+-endif
+-endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ uninstall: uninstall-bin
+--- projects/rscriptd/Makefile.org	2013-02-03 14:17:01.000000000 +0200
++++ projects/rscriptd/Makefile	2013-02-03 14:17:32.000000000 +0200
+@@ -57,11 +57,7 @@
+ install: install-bin install-data
+ 
+ install-bin:
+-ifeq ($(DEBUG), yes)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+-else
+-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+-endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ install-data:
+--- projects/sgauth/Makefile.org	2013-02-03 14:18:37.000000000 +0200
++++ projects/sgauth/Makefile	2013-02-03 14:18:48.000000000 +0200
+@@ -58,11 +58,7 @@
+ install: install-bin install-data
+ 
+ install-bin:
+-ifeq ($(DEBUG), yes)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+-else
+-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+-endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ install-data:
+--- projects/sgconf/Makefile.org	2013-02-03 14:19:18.000000000 +0200
++++ projects/sgconf/Makefile	2013-02-03 14:19:28.000000000 +0200
+@@ -66,11 +66,7 @@
+ install: install-bin
+ 
+ install-bin:
+-ifeq ($(DEBUG), yes)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
+-else
+-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
+-endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ uninstall: uninstall-bin
+--- projects/sgconf_xml/Makefile.org	2013-02-03 14:19:53.000000000 +0200
++++ projects/sgconf_xml/Makefile	2013-02-03 14:19:59.000000000 +0200
+@@ -66,11 +66,7 @@
+ install: install-bin install-data
+ 
+ install-bin:
+-ifeq ($(DEBUG), yes)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
+-else
+-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
+-endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ uninstall: uninstall-bin uninstall-data
+--- projects/sgconv/Makefile.org	2013-02-03 14:20:24.000000000 +0200
++++ projects/sgconv/Makefile	2013-02-03 14:20:33.000000000 +0200
+@@ -61,11 +61,7 @@
+ install: install-bin
+ 
+ install-bin:
+-ifeq ($(DEBUG), yes)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
+-else
+-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
+-endif
+ 	$(MAKE) -C $(DIR_PLUGINS) install
+ 
+ uninstall: uninstall-bin
+--- projects/stargazer/Makefile.org	2013-02-03 14:20:56.000000000 +0200
++++ projects/stargazer/Makefile	2013-02-03 14:21:30.000000000 +0200
+@@ -77,11 +77,7 @@
+ install: install-bin install-data
+ 
+ install-bin: $(PROG)
+-ifeq ($(DEBUG), yes)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+-else
+-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+-endif
+ 	$(MAKE) -C $(DIR_INCLUDE) install
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 	$(MAKE) -C $(DIR_PLUGINS) install
+--- stglibs/Makefile.in.org	2013-02-03 14:53:02.000000000 +0200
++++ stglibs/Makefile.in	2013-02-03 14:53:11.000000000 +0200
+@@ -35,11 +35,7 @@
+ 	rm -f deps $(PROG) *.o *.a *.so tags *.*~ 
+ 
+ install: $(PROG)
+-ifeq ($(DEBUG), yes)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
+-else
+-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
+-endif
+ 	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg
+ 	install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/
+ 
+--- projects/stargazer/plugins/Makefile.in.org	2013-02-03 15:38:41.000000000 +0200
++++ projects/stargazer/plugins/Makefile.in	2013-02-03 15:38:51.000000000 +0200
+@@ -28,11 +28,7 @@
+ 
+ install: $(PROG)
+ 	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
+-ifeq ($(DEBUG), yes)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
+-else
+-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
+-endif
+ 
+ uninstall:
+ 	rm -f $(PREFIX)/usr/lib/stg/$(PROG)
diff --git a/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch
new file mode 100644
index 000000000000..4afbb0340253
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch
@@ -0,0 +1,151 @@
+--- projects/stargazer/inst/linux/etc/stargazer/OnChange.org	2013-01-09 14:30:32.000000000 +0200
++++ projects/stargazer/inst/linux/etc/stargazer/OnChange	2013-01-09 15:50:01.000000000 +0200
+@@ -1,8 +1,20 @@
+ #! /bin/sh
+ 
+-login=$1
+-param=$2
+-oldValue=$3
+-newValue=$4
++# About: This script is called when user account is changed.
++# Common Task: Notify about various events.
++# Priority: optional
+ 
+-#echo "User: '$login'. Parameter $param changed from '$oldValue' to '$newValue'" >> /var/stargazer/users.chg.log
+\ No newline at end of file
++# User login
++LOGIN=$1
++
++# User parameter
++PARAMETER=$2
++
++# User parameter old value
++OLDVALUE=$3
++
++# User parameter new value
++NEWVALUE=$4
++
++# Usage examples:
++#echo "User: '$LOGIN'. Parameter $PARAMETER changed from '$OLDVALUE' to '$NEWVALUE'" >> /var/stargazer/user.change.log
+\ No newline at end of file
+--- projects/stargazer/inst/linux/etc/stargazer/OnConnect.org	2013-01-09 14:39:51.000000000 +0200
++++ projects/stargazer/inst/linux/etc/stargazer/OnConnect	2013-01-09 15:11:49.000000000 +0200
+@@ -1,24 +1,23 @@
+ #! /bin/sh
+ 
+-#Этот скрипт вызывается в момент, когда пользователь
+-#успешно прошел авторизацию на сервере. Задача скрипта - перестроить 
+-#файрвол так, что бы пользователь получил доступ в интернет
++# About: This script is called when the user successfully authenticated on the server.
++# Common Task: Rebuild firewall to allow user to access the Internet.
++# Priority: required
+ 
+-# Login
++# User login
+ LOGIN=$1
+ 
+-#user IP
++# User IP
+ IP=$2
+ 
+-#cash
++# User cash
+ CASH=$3
+ 
+-#user ID
++# User ID
+ ID=$4
+ 
+-#Selected dirs to connect
++# Selected DIRs (from rules file) to connect
+ DIRS=$5
+ 
+-
+-#echo "C `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log
+-
++# Usage examples:
++#echo "Connected `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log
+\ No newline at end of file
+--- projects/stargazer/inst/linux/etc/stargazer/OnDisconnect.org	2013-01-09 14:54:36.000000000 +0200
++++ projects/stargazer/inst/linux/etc/stargazer/OnDisconnect	2013-01-09 15:11:33.000000000 +0200
+@@ -1,24 +1,23 @@
+ #! /bin/sh
+ 
+-# Этот скрипт вызывается в момент, когда пользователь
+-# желает отключится от интернета или вышел таймаут у пользователя
+-# и сервер сам отключает пользователя
+-# Задача скрипта подобна задаче скрипта OnConnect - перестроить 
+-# файрвол так, что бы пользователю закрыть доступ в интернет
++# About: This script is called when the user wants to disconnect or authorization timeout has passed.
++# Common task: Rebuild firewall to disallow user to access to the Internet.
++# Priority: required
+ 
+-# Login
++# User login
+ LOGIN=$1
+ 
+-#user IP
++# User IP
+ IP=$2
+ 
+-#cash
++# User cash
+ CASH=$3
+ 
+-#user ID
++# User ID
+ ID=$4
+ 
+-#Selected dirs to disconnect
++# Selected DIRs (from rules file) to disconnect
+ DIRS=$5
+ 
+-#echo "D `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log
++# Usage examples:
++#echo "Disconnected `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log
+\ No newline at end of file
+--- projects/stargazer/inst/linux/etc/stargazer/OnUserAdd.org	2013-01-09 15:01:57.000000000 +0200
++++ projects/stargazer/inst/linux/etc/stargazer/OnUserAdd	2013-01-09 15:10:55.000000000 +0200
+@@ -1,14 +1,12 @@
+ #! /bin/sh
+ 
+-# Использование (неиспользование) этого скрипта дело вкуса.
+-# Он не выполняет критических функций. Его задача автматизировать
+-# действия характерные при добавлении пользователя сети, например добавлекние 
+-# пользователю почты
+-
+-# Login
+-login=$1
+-
+-#echo "added user $login" >> /var/stargazer/add_del.log
+-
++# About: This script is called when the user is added to the Stargazer.
++# Common task: Automate typical actions on adding user to the network,
++#              such as creating email or IM account.
++# Priority: optional
+ 
++# User login
++LOGIN=$1
+ 
++# Usage examples:
++#echo "Added user $login" >> /var/stargazer/add_del.log
+\ No newline at end of file
+--- projects/stargazer/inst/linux/etc/stargazer/OnUserDel.org	2013-01-09 15:12:32.000000000 +0200
++++ projects/stargazer/inst/linux/etc/stargazer/OnUserDel	2013-01-09 15:14:10.000000000 +0200
+@@ -1,7 +1,13 @@
+ #! /bin/sh
+ 
+-# Login
+-login=$1
++# About: This script is called when the user is removed from the Stargazer.
++# Common task: Automate typical actions on removing user from the network,
++#              such as removing email or IM account.
++# Priority: optional
+ 
+-#echo "deleted user $login" >> /var/stargazer/add_del.log
++# User login
++LOGIN=$1
++
++# Usage examples:
++#echo "Deleted user $LOGIN" >> /var/stargazer/add_del.log
+ 
diff --git a/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch
new file mode 100644
index 000000000000..790cc3a91e1e
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch
@@ -0,0 +1,31 @@
+--- projects/rlm_stg/Makefile.org	2013-01-18 16:17:18.000000000 +0200
++++ projects/rlm_stg/Makefile	2013-01-18 16:19:13.000000000 +0200
+@@ -57,16 +57,28 @@
+ 
+ install-bin:
+ ifeq ($(DEBUG), yes)
++ifeq ($(OS), linux)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+ else
++	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG)
++endif
++else
++ifeq ($(OS), linux)
+ 	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
++endif
+ endif
+ 	$(MAKE) -C $(DIR_LIBSRC) install
+ 
+ uninstall: uninstall-bin
+ 
+ uninstall-bin:
++ifeq ($(OS), linux)
+ 	rm -f $(PREFIX)/usr/lib/freeradius/$(PROG)
++else
++	rm -f $(PREFIX)/usr/lib/$(PROG)
++endif
+ 
+ ifneq ($(MAKECMDGOALS),distclean)
+ ifneq ($(MAKECMDGOALS),clean)
diff --git a/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch
new file mode 100644
index 000000000000..4e97da2f80e3
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch
@@ -0,0 +1,26 @@
+--- projects/rscriptd/Makefile.org	2013-01-18 16:22:46.000000000 +0200
++++ projects/rscriptd/Makefile	2013-01-18 16:25:08.000000000 +0200
+@@ -68,6 +68,13 @@
+ 	# Install etc
+ 	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd
+ 	install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/rscriptd/rscriptd.conf
++ifeq ($(OS), linux)
++	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
++	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
++else
++	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
++	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
++endif
+ 
+ uninstall: uninstall-bin uninstall-data
+ 
+@@ -77,7 +84,8 @@
+ uninstall-data:
+ 	# Uninstall etc
+ 	rm -f $(PREFIX)/etc/rscriptd/rscriptd.conf
+-
++	rm -f $(PREFIX)/etc/rscriptd/OnConnect
++	rm -f $(PREFIX)/etc/rscriptd/OnDisconnect
+ 
+ ifneq ($(MAKECMDGOALS),distclean)
+ ifneq ($(MAKECMDGOALS),clean)
diff --git a/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch
new file mode 100644
index 000000000000..21746e59e8d1
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch
@@ -0,0 +1,80 @@
+--- projects/rscriptd/rscriptd.conf.org	2013-01-12 15:44:46.000000000 +0200
++++ projects/rscriptd/rscriptd.conf	2013-01-12 15:45:44.000000000 +0200
+@@ -1,8 +1,68 @@
+-LogFileName=/var/log/rscriptd.log
+-ExecutersNum=1
+-ConfigDir=/etc/rscriptd
+-Password=123456
+-Port=9999
+-UserTimeout=60
+-ScriptOnConnect=/etc/stargazer/OnConnect
+-ScriptOnDisconnect=/etc/stargazer/OnDisconnect
++################################################################################
++#                         Rscriptd Configuration file                          #
++################################################################################
++
++# LOG file name
++# Parameter: optional
++# Value: file path
++# Default: /var/log/rscriptd.log
++LogFileName = /var/log/rscriptd.log
++
++# Amount of rscriptd-exec processes.
++# These processes are responsible for the execution of scripts 
++# OnConnect and OnDisconnect.
++# Amount of processes means how many scripts can be executed simultaneously.
++# Recommend to leave 1 to avoid errors when executing scripts
++# Parameter: optional
++# Value: 1 ... 1024
++# Default: 1
++ExecutersNum = 1
++
++# Message queue identifier for the script executer.
++# It may be changed if there're a needs to run multiple copies of rscriptd.
++# Warning: If you do not understand it, do not touch this setting!
++# Parameter: optional
++# Value: 0 ... 2 ^ 32
++# Default: 5555
++# ExecMsgKey = 5555
++
++# The path to directory where config files are
++# Parameter: optional
++# Value: directory path
++# Default: /etc/rscriptd
++ConfigDir = /etc/rscriptd
++
++# Defines password for the encryption exchange between
++# Stargazer server and rscriptd.
++# Parameter: optional
++# Value: any
++# Default: 123456
++Password = 123456
++
++# Defines port number for communication between
++# Stargazer server and rscriptd.
++# Parameter: optional
++# Value: 1 ... 65535
++# Default: 9999
++Port = 9999
++
++# User timeout. If Stargazer does not respond during this time,
++# the user will be disconnected.
++# Parameter: optional
++# Values: 5 ... 600
++# Default: 60
++UserTimeout = 60
++
++# Defines file which runs when user gets access
++# Parameter: optional
++# Value: file path
++# Default: /etc/rscriptd/OnConnect
++ScriptOnConnect = /etc/rscriptd/OnConnect
++
++# Defines file which runs when user loses access
++# Parameter: optional
++# Value: file path
++# Default: /etc/rscriptd/OnDisconnect
++ScriptOnDisconnect = /etc/rscriptd/OnDisconnect
++
++################################################################################
+\ No newline at end of file
diff --git a/net-misc/stargazer/files/patches/stg-2.408-sgauth.conf-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-sgauth.conf-upstream.patch
new file mode 100644
index 000000000000..213d35fd2db7
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-sgauth.conf-upstream.patch
@@ -0,0 +1,112 @@
+--- projects/sgauth/sgauth.conf.org	2013-01-08 15:43:09.000000000 +0200
++++ projects/sgauth/sgauth.conf	2013-01-09 13:41:53.000000000 +0200
+@@ -1,37 +1,72 @@
+-#Stargazer server ip
+-ServerName=192.168.1.2
++################################################################################
++#                           Sgauth Configuration file                          #
++################################################################################
++
++# Stargazer server
++# Parameter: required
++# Values: IP address or DNS name
++# Default:
++ServerName = 192.168.1.2
++
++# Port on which Stargazer interacts with sgauth
++# Parameter: optional
++# Value: 1 ... 65535
++# Default: 5555
++ServerPort = 5555
++
++# User's login in Stargazer
++# Parameter: required
++# Value: any
++# Default:
++Login = test
++
++# Port on which sgauth interacts with Stargazer
++# Parameter: optional
++# Value: 1 ... 65535
++# Default: 0
++LocalPort = 12345
++
++# User's password in Stargazer
++# Parameter: required
++# Value: any
++# Default:
++Password = 123456
++
++# Defines should sgauth try to reestablish connection to Stargazer
++# if it was lost
++# Parameter: optional
++# Value: yes, no
++# Default: yes
++Reconnect = yes
++
++# Defines should sgauth run as daemon
++# Parameter: optional
++# Value: yes, no
++# Default: yes
++Daemon = yes
++
++# Web-page refresh period in built-in webserver
++# Parameter: optional
++# Value: any numeric (minutes)
++# Default: 10
++RefreshPeriod = 10
++
++# Defines should sgauth use built-in webserver
++# Parameter: optional
++# Value: yes, no
++# Default: no
++DisableWeb = no
++
++# Defines address on which sgauth's built-in webserver will listen
++# Parameter: optional
++# Value: IP address or DNS name
++# Default: 127.0.0.1
++ListenWebIP = 127.0.0.1
++
++# Defines should sgauth show it process ID in process list
++# Parameter: optional
++# Value: yes, no
++# Default: no
++ShowPid = no
+ 
+-#Stargazer server port
+-#Default value 5555
+-ServerPort=5555
+-
+-#User's login
+-Login=test
+-
+-#
+-#
+-LocalPort=12345
+-
+-#User's password
+-Password=1234567
+-
+-#
+-#Default value yes
+-#Reconnect=no
+-
+-#
+-#Default value yes
+-#Daemon=yes
+-
+-#Refresh web page period
+-#Default value 10
+-#RefreshPeriod=10
+-
+-#
+-#Default value 127.0.0.1
+-ListenWebIP=127.0.0.1
+-
+-#Default value no
+-DisableWeb=no
+-
+-#ShowPid=no
++################################################################################
+\ No newline at end of file
diff --git a/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch
new file mode 100644
index 000000000000..cfce675b1287
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch
@@ -0,0 +1,40 @@
+--- projects/sgconv/Makefile.org	2013-01-08 12:07:06.000000000 +0200
++++ projects/sgconv/Makefile	2013-01-08 12:07:11.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ include ../../Makefile.conf
+ 
+-PROG = convertor
++PROG = sgconv
+ 
+ SRCS = ./main.cpp \
+        ./settings_impl.cpp
+--- projects/sgconv/build.org	2012-02-09 12:26:57.000000000 +0200
++++ projects/sgconv/build	2013-01-08 12:10:02.000000000 +0200
+@@ -45,13 +45,13 @@
+ if [ "$OS" = "unknown" ]
+ then 
+     echo "#############################################################################"
+-    echo "# Sorry, but convertor currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #"
++    echo "# Sorry, but sgconv currently supported by Linux, FreeBSD 4.x, 5.x, 6.x     #"
+     echo "#############################################################################"
+     exit 1
+ fi
+ 
+ echo "#############################################################################"
+-echo "       Building convertor for $sys $release"
++echo "       Building sgconv for $sys $release"
+ echo "#############################################################################"
+ 
+ STG_LIBS="logger.lib 
+--- projects/sgconv/settings_impl.h.org	2013-01-08 12:11:53.000000000 +0200
++++ projects/sgconv/settings_impl.h	2013-01-08 12:11:58.000000000 +0200
+@@ -38,7 +38,7 @@
+ 
+ class SETTINGS_IMPL {
+ public:
+-    SETTINGS_IMPL() : confFile("./convertor.conf") {}
++    SETTINGS_IMPL() : confFile("./sgconv.conf") {}
+     SETTINGS_IMPL(const std::string & cf) : confFile(cf) {}
+     ~SETTINGS_IMPL() {}
+     int ReadSettings();
diff --git a/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch b/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch
new file mode 100644
index 000000000000..723d177ac79a
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch
@@ -0,0 +1,10 @@
+--- stglibs/Makefile.org	2013-01-19 18:21:57.000000000 +0200
++++ stglibs/Makefile	2013-01-19 18:24:25.000000000 +0200
+@@ -15,6 +15,6 @@
+ 
+ clean: all
+ 
+-install: all
++install:
+ 
+ uninstall: all
diff --git a/net-misc/stargazer/files/rscriptd b/net-misc/stargazer/files/rscriptd
new file mode 100644
index 000000000000..d8ddf44f696e
--- /dev/null
+++ b/net-misc/stargazer/files/rscriptd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+
+DAEMON=/usr/sbin/rscriptd
+RSCRIPTD_OPTS="/etc/stargazer/rscriptd.conf"
+PIDFILE="/run/rscriptd.pid"
+
+depend() {
+	need net
+	provide rscriptd
+}
+
+start() {
+	ebegin "Starting rscriptd"
+	start-stop-daemon --start --quiet --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- ${RSCRIPTD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping rscriptd"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	rm -f ${PIDFILE}
+	eend $?
+}
\ No newline at end of file
diff --git a/net-misc/stargazer/files/sgauth b/net-misc/stargazer/files/sgauth
new file mode 100644
index 000000000000..0dec60bfa1af
--- /dev/null
+++ b/net-misc/stargazer/files/sgauth
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+
+DAEMON=/usr/sbin/sgauth
+SGAUTH_OPTS="/etc/stargazer/sgauth.conf"
+PIDFILE="/run/sgauth.pid"
+
+depend() {
+	need net
+	provide sgauth
+}
+
+start() {
+	ebegin "Starting sgauth"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} -- ${SGAUTH_OPTS}
+	eend $?
+}
+
+start_post() {
+	pgrep -n $RC_SVCNAME > ${PIDFILE}
+}
+
+stop() {
+	ebegin "Stopping sgauth"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	rm -f ${PIDFILE}
+	eend $?
+}
\ No newline at end of file
diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml
new file mode 100644
index 000000000000..92c0c7692cce
--- /dev/null
+++ b/net-misc/stargazer/metadata.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>spiderx@spiderx.dp.ua</email>
+    <name>Vladimir Pavljuchenkov</name>
+    <description>Primary maintainer.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    Stargazer is a powerful (inter)net billing system, capable of gathering
+    traffic statistics from many sources (such as NetFlow protocol,
+    ethernet packets capture, or IPQ subsystem), managing and billing user
+    accounts according to specified fees and rules (including time-based rules,
+    traffic source/destination rules and a payoff system).
+    This ebuild allows you to compile it yourself depending of your needs.
+  </longdescription>
+  <use>
+    <flag name="sgconv">Enable build of utility to convert Stargazer data between storage backends.</flag>
+    <flag name="radius">Enable build of FreeRADIUS module for data access via Stargazer.</flag>
+    <flag name="rscriptd">Enable build of remote script execute daemon for Stargazer, which run scripts when receive special signal from Stargazer.</flag>
+    <flag name="sgauth">Enable build of command-line utility for authorization in Stargazer.</flag>
+    <flag name="sgconf">Enable build of command-line utility for configuring Stargazer.</flag>
+    <flag name="sgconf_xml">Enable build of command-line xml-based utility for configuring Stargazer.</flag>
+    <flag name="stargazer">Enable build of Stargazer billing system.</flag>
+    <flag name="debug">Enable extra debug codepaths, like asserts and extra output.</flag>
+    <flag name="doc">Adds extra documentation (API, doc, etc).</flag>
+    <flag name="examples">Install examples, usually source code.</flag>
+    <flag name="static-libs">Install static libraries.</flag>
+    <flag name="module_auth_always_online">Enable build of "Always Online" authentication module for Stargazer.</flag>
+    <flag name="module_auth_internet_access">Enable build of "InetAccess" authentication module for Stargazer. InetAccess is a Stargazer specific authentication protocol.</flag>
+    <flag name="module_auth_freeradius">Enable build of "Radius" authentication module for Stargazer. This module capable of using RADIUS procotol for user authentication.</flag>
+    <flag name="module_capture_ether">Enable build of "Ethernet" traffic capture module for Stargazer. This module uses RAW sockets to capture traffic.</flag>
+    <flag name="module_capture_ipq">Enable build of "IPQ" traffic capture module for Stargazer. This module uses IPQ subsystem to capture traffic.</flag>
+    <flag name="module_capture_netflow">Enable build of "NetFlow" traffic capture module for Stargazer. This module capable of receiving traffic data by NetFlow protocol.</flag>
+    <flag name="module_config_rpcconfig">Enable build of "XMLRPC" configuration module for Stargazer. This module uses XML-RPC protocol for configuring Stargazer.</flag>
+    <flag name="module_config_sgconfig">Enable build of "SGConf" configuration module for Stargazer. This module uses Stargazer specific protocol for configuring Stargazer.</flag>
+    <flag name="module_other_ping">Enable build of "Ping" module for Stargazer. This module pings connected users from time to time to ensure they are alive.</flag>
+    <flag name="module_other_remote_script">Enable build of "Remote Script" module for Stargazer. This module control rscriptd daemon over the net and makes it execute scripts in reaction to different Stargazer events.</flag>
+    <flag name="module_other_smux">Enable build of SMUX module for Stargazer. This module uses SMUX protocol to provide various information about Stargazer.</flag>
+    <flag name="module_store_files">Enable build of storage plugin for Stargazer based on plain files.</flag>
+    <flag name="module_store_firebird">Enable build of storage plugin for Stargazer, which uses Firebird database for storage.</flag>
+    <flag name="module_store_mysql">Enable build of storage plugin for Stargazer, which uses MySQL for storage.</flag>
+    <flag name="module_store_postgres">Enable build of storage plugin for Stargazer, which uses PostgreSQL for storage.</flag>
+  </use>
+  <upstream>
+    <changelog>http://stg.dp.ua/server_dl.php</changelog>
+    <doc>http://stg.dp.ua/doc.php</doc>
+    <bugs-to>mailto:faust@stg.dp.ua</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/stargazer/stargazer-2.408.ebuild b/net-misc/stargazer/stargazer-2.408.ebuild
new file mode 100644
index 000000000000..112fde0575b7
--- /dev/null
+++ b/net-misc/stargazer/stargazer-2.408.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils linux-info multilib user
+
+DESCRIPTION="Billing system for small home and office networks"
+HOMEPAGE="http://stg.dp.ua/"
+LICENSE="GPL-2"
+
+MY_P="stg-${PV}"
+SRC_URI="http://stg.dp.ua/download/server/${PV}/${MY_P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="stargazer? ( ^^ ( module_store_files module_store_firebird module_store_mysql module_store_postgres ) )"
+
+RDEPEND="module_config_rpcconfig? ( dev-libs/xmlrpc-c[abyss] sys-libs/zlib )
+	module_config_sgconfig? ( dev-libs/expat )
+	module_store_firebird? ( >=dev-db/firebird-2.0.3.12981.0-r6 )
+	module_store_mysql? ( virtual/mysql )
+	module_store_postgres? ( dev-db/postgresql dev-libs/openssl sys-libs/zlib )
+	sgconf? ( dev-libs/expat )
+	sgconf_xml? ( dev-libs/expat )"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt )"
+
+PROJECTS="sgconv rlm_stg rscriptd sgauth sgconf sgconf_xml stargazer"
+
+STG_MODULES_AUTH="always_online internet_access freeradius"
+STG_MODULES_CAPTURE="ipq ether netflow"
+STG_MODULES_CONFIG="sgconfig rpcconfig"
+STG_MODULES_OTHER="ping smux remote_script"
+STG_MODULES_STORE="files firebird mysql postgres"
+
+declare -A MODULES
+MODULES=( [module_auth_always_online]="authorization\/ao:mod_ao"
+	[module_auth_internet_access]="authorization\/inetaccess:mod_ia"
+	[module_auth_freeradius]="other\/radius:mod_radius"
+	[module_capture_ipq]="capture\/ipq_linux:mod_cap_ipq"
+	[module_capture_ether]="capture\/ether_linux:mod_cap_ether"
+	[module_capture_netflow]="capture\/cap_nf:mod_cap_nf"
+	[module_config_sgconfig]="configuration\/sgconfig:mod_sg"
+	[module_config_rpcconfig]="configuration\/rpcconfig:mod_rpc"
+	[module_other_ping]="other\/ping:mod_ping"
+	[module_other_smux]="other\/smux:mod_smux"
+	[module_other_remote_script]="other\/rscript:mod_remote_script"
+	[module_store_files]="store\/files:store_files"
+	[module_store_firebird]="store\/firebird:store_firebird"
+	[module_store_mysql]="store\/mysql:store_mysql"
+	[module_store_postgres]="store\/postgresql:store_postgresql"
+)
+
+IUSE="sgconv radius rscriptd sgauth sgconf sgconf_xml stargazer debug doc examples static-libs"
+
+for module in ${STG_MODULES_AUTH} ; do IUSE="${IUSE} module_auth_${module}" ; done
+for module in ${STG_MODULES_CAPTURE} ; do IUSE="${IUSE} module_capture_${module}" ; done
+for module in ${STG_MODULES_CONFIG} ; do IUSE="${IUSE} module_config_${module}" ; done
+for module in ${STG_MODULES_OTHER} ; do IUSE="${IUSE} module_other_${module}" ; done
+for module in ${STG_MODULES_STORE} ; do IUSE="${IUSE} module_store_${module}" ; done
+
+IUSE=${IUSE/stargazer/+stargazer}
+IUSE=${IUSE/module_store_files/+module_store_files}
+
+src_prepare() {
+	# Patches already in upstream's trunk
+	# Rename convertor to sgconv to avoid possible file name collisions
+	mv "${S}"/projects/convertor/ "${S}"/projects/sgconv/ || die "Couldn't move convertor folder"
+	mv "${S}"/projects/sgconv/convertor.conf "${S}"/projects/sgconv/sgconv.conf || die "Couldn't move convertor config"
+	epatch "${FILESDIR}"/patches/stg-2.408-sgconv-upstream.patch
+
+	# Fix dependency on fbclient for module_store_firebird
+	epatch "${FILESDIR}"/patches/stg-2.408-makefile-firebird-upstream.patch
+
+	# Debug support. Install radius lib to /usr/lib/freeradius
+	epatch "${FILESDIR}"/patches/stg-2.408-makefile-build-upstream.patch
+
+	# Don't compile sgconv always with debug. Remove MAKEOPTS=-j1
+	epatch "${FILESDIR}"/patches/stg-2.408-build-upstream.patch
+
+	# Rewrite config for rscriptd
+	epatch "${FILESDIR}"/patches/stg-2.408-rscriptd.conf-upstream.patch
+
+	# Rewrite config for sgauth
+	epatch "${FILESDIR}"/patches/stg-2.408-sgauth.conf-upstream.patch
+
+	# Standardization of 'On-scripts'
+	epatch "${FILESDIR}"/patches/stg-2.408-on-upstream.patch
+
+	# FreeBSD install directory
+	epatch "${FILESDIR}"/patches/stg-2.408-radius-upstream.patch
+
+	# Install demo scripts for rscriptd
+	epatch "${FILESDIR}"/patches/stg-2.408-rscriptd-upstream.patch
+
+	# Fix crush on stop
+	epatch "${FILESDIR}"/patches/stg-2.408-fix-crash-on-stop.patch
+
+	for project in ${PROJECTS} ; do
+		# Rename build script to configure for further econf launch in every projects
+		mv "${S}"/projects/${project}/build "${S}"/projects/${project}/configure || die "Couldn't move build folder for ${project}"
+
+		# Change check for debug build
+		sed -i 's/if \[ "$1" = "debug" \]/if \[ "${10}" = "--enable-debug" \]/' "${S}"/projects/${project}/configure || die "sed for debug check failed"
+	done
+
+	# Correct working directory, user and group for sgconv.conf, store_files.conf
+	# Correct paths for rscriptd.conf, store_firebird.conf, mod_remote_scriptd.conf, stargazer.conf, rpcconfig.cpp, 00-base-00.sql
+	epatch "${FILESDIR}"/patches/stg-2.408-correct-paths.patch
+
+	# Correct target install-data for stargazer, rscriptd, sgauth, remove debug symbols stripping
+	epatch "${FILESDIR}"/patches/stg-2.408-makefile.patch
+
+	# Remove make from script (for keeping symbols), always add variable to Makefile.conf for all projects
+	epatch "${FILESDIR}"/patches/stg-2.408-build.patch
+
+	# Remove static-libs if not needed
+	use static-libs || epatch "${FILESDIR}"/patches/stg-2.408-static-libs.patch
+
+	# Define which module to compile
+	for module in ${!MODULES[@]} ; do
+		if ! use $module ; then
+			sed -i "s/${MODULES[$module]%:*}//" "${S}"/projects/stargazer/configure || die "sed for module configure failed"
+		fi
+	done
+
+	# Correct Gentoo init script provided by upstream (TODO: Remove in further releases, already fixed in upstream's trunk)
+	if use stargazer ; then
+		sed -i 's/opts/extra_commands/' "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo || die "sed for stargazer failed"
+	fi
+
+	# Correct Gentoo init script dependencies
+	if use module_store_files ; then
+		sed -i '11d' "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo || die "sed for module_store_files failed"
+	fi
+
+	if use module_store_firebird ; then
+		sed -i '11d;s/need net/need net firebird/' "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo || die "sed for module_store_firebird failed"
+	fi
+
+	if use module_store_mysql ; then
+		sed -i '11d;s/need net/need net mysql/' "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo || die "sed for module_store_mysql failed"
+	fi
+
+	if use module_store_postgres ; then
+		sed -i '11d;s/need net/need net postgresql/' "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo || die "sed for module_store_postgres failed"
+	fi
+
+	# Check for IPQ subsystem availability
+	( use module_capture_ipq && kernel_is ge 3 5 ) && die "IPQ subsystem is gone since Linux kernel 3.5. You can't compile module_capture_ipq with your current kernel."
+
+	epatch_user
+}
+
+src_configure() {
+	# Define local variables, strip '+' symbol for used by default USE flags
+	local USEFLAGS=(${IUSE//+})
+	local PROJECTS=($PROJECTS)
+
+	for (( i = 0 ; i < ${#PROJECTS[@]} ; i++ )) ; do
+		if use ${USEFLAGS[$i]} ; then
+			cd "${S}"/projects/${PROJECTS[$i]} || die "cd to ${PROJECTS[$i]} failed"
+			econf $(use_enable debug)
+		fi
+	done
+}
+
+src_compile() {
+	# Define local variables, strip '+' symbol for used by default USE flags
+	local USEFLAGS=(${IUSE//+})
+	local PROJECTS=($PROJECTS)
+
+	# Set jobs to 1 for debug build
+	use debug && MAKEOPTS="-j1"
+
+	# Build necessary libraries first
+	touch "${S}"/Makefile.conf
+	cd "${S}"/stglibs || die "cd to stglibs failed"
+	emake STG_LIBS="ia.lib srvconf.lib"
+
+	for (( i = 0 ; i < ${#PROJECTS[@]} ; i++ )) ; do
+		if use ${USEFLAGS[$i]} ; then
+			cd "${S}"/projects/${PROJECTS[$i]} || die "cd to ${PROJECTS[$i]} failed"
+			emake
+		fi
+	done
+
+	if use doc ; then
+		cd "${S}"/doc/xmlrpc || die "cd to doc/xmlrpc failed"
+		emake
+	fi
+}
+
+src_install() {
+	dodoc ChangeLog
+
+	if use rscriptd || use stargazer ; then
+		# Install config file for logrotate
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/logrotate stargazer
+
+		# Keeping logs directory
+		diropts -m 755 -o stg -g stg
+		keepdir /var/log/stargazer
+		if use stargazer ; then
+			diropts -m 775 -o stg -g stg
+			keepdir /var/lib/stargazer
+		fi
+	fi
+
+	if use doc ; then
+		# Install files into docs directory
+		dodoc "${S}"/projects/stargazer/inst/var/base.dia
+		dodoc "${S}"/doc/proto_client.gif
+		dodoc "${S}"/doc/proto_server.gif
+
+		# Install html documentation
+		docinto html/xmlrpc
+		dohtml -r "${S}"/doc/xmlrpc/book/
+	fi
+
+	if use examples ; then
+		# Install files into specified directory
+		insinto /usr/share/stargazer
+		doins -r "${S}"/projects/stargazer/scripts
+		doins "${S}"/doc/xmlrpc.php
+	fi
+
+	if use sgconv ; then
+		cd "${S}"/projects/sgconv || die "cd to sgconv project failed"
+
+		emake DESTDIR="${D}" PREFIX="${D}" install
+
+		# Install files into specified directory
+		insinto /etc/stargazer
+		doins "${S}"/projects/sgconv/sgconv.conf
+
+		# Install manual page
+		doman "${FILESDIR}"/mans/sgconv.1
+	fi
+
+	if use radius ; then
+		cd "${S}"/projects/rlm_stg || die "cd to rlm_stg project failed"
+
+		emake DESTDIR="${D}" PREFIX="${D}" install
+	fi
+
+	if use rscriptd ; then
+		cd "${S}"/projects/rscriptd || die "cd to rscriptd project failed"
+
+		emake DESTDIR="${D}" PREFIX="${D}" install
+
+		# Install Gentoo init script
+		doinitd "${FILESDIR}"/rscriptd
+
+		# Correct permissions for file
+		fperms 0640 /etc/stargazer/rscriptd.conf
+
+		# Install manual page
+		doman "${FILESDIR}"/mans/rscriptd.8
+	fi
+
+	if use sgauth ; then
+		cd "${S}"/projects/sgauth || die "cd to sgauth project failed"
+
+		emake DESTDIR="${D}" PREFIX="${D}" install
+
+		# Correct permissions for file
+		fperms 0640 /etc/stargazer/sgauth.conf
+
+		# Install manual page
+		doman "${FILESDIR}"/mans/sgauth.8
+	fi
+
+	if use sgconf ; then
+		cd "${S}"/projects/sgconf || die "cd to sgconf project failed"
+
+		emake DESTDIR="${D}" PREFIX="${D}" install
+
+		# Install manual page
+		doman "${FILESDIR}"/mans/sgconf.1
+	fi
+
+	if use sgconf_xml ; then
+		cd "${S}"/projects/sgconf_xml || die "cd to sgconf_xml project failed"
+
+		emake DESTDIR="${D}" PREFIX="${D}" install
+
+		# Install manual page
+		doman "${FILESDIR}"/mans/sgconf_xml.1
+	fi
+
+	if use stargazer ; then
+		cd "${S}"/projects/stargazer || die "cd to stargazer project failed"
+
+		emake DESTDIR="${D}" PREFIX="${D}" install
+
+		# Install docs
+		dodoc BUGS CHANGES README TODO
+
+		# Install and rename Gentoo init script
+		newinitd "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo stargazer
+
+		# Install manual page
+		doman "${FILESDIR}"/mans/stargazer.8
+
+		# Install files needed for module_store_files
+		if use module_store_files ; then
+			# Install files into specified directory
+			insinto /var/lib
+			doins -r "${S}"/projects/stargazer/inst/var/stargazer
+
+			# Correct user and group for files and directories
+			fowners -R stg:stg /var/lib/stargazer
+		fi
+
+		if use module_store_firebird ; then
+			# Install files into specified directory
+			insinto /usr/share/stargazer/db/firebird
+			doins \
+				"${S}"/projects/stargazer/inst/var/00-base-00.sql \
+				"${S}"/projects/stargazer/inst/var/00-alter-01.sql
+		fi
+
+		if use module_store_mysql ; then
+			# Install file into specified directory
+			insinto /usr/share/stargazer/db/mysql
+			doins "${S}"/projects/stargazer/inst/var/00-mysql-01.sql
+		fi
+
+		if use module_store_postgres ; then
+			# Install files into specified directory
+			insinto /usr/share/stargazer/db/postgresql
+			doins \
+				"${S}"/projects/stargazer/inst/var/00-base-00.postgresql.sql \
+				"${S}"/projects/stargazer/inst/var/00-alter-01.postgresql.sql
+		fi
+
+		if use module_other_smux ; then
+			# Install files into specified directory
+			insinto /usr/share/snmp/mibs
+			doins "${S}"/projects/stargazer/plugins/other/smux/STG-MIB.mib
+		fi
+
+		if use module_other_remote_script ; then
+			# Create subnets file based on example from mod_remote_script.conf
+			grep 192 "${S}"/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf | sed 's/# //' > "${D}"/etc/stargazer/subnets
+
+			# Correct permissions for file
+			fperms 0640 /etc/stargazer/subnets
+		fi
+
+		# Correct permissions for files
+		fperms 0640 \
+			/etc/stargazer/rules \
+			/etc/stargazer/stargazer.conf
+
+		# Install files into specified directory for selected modules
+		insinto /etc/stargazer/conf-available.d
+		insopts -m 0640
+
+		for module in ${!MODULES[@]} ; do
+			use $module && doins "${S}"/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/${MODULES[$module]#*:}.conf
+		done
+
+		# Create symlinks of configs for selected modules
+		for module in ${!MODULES[@]} ; do
+			use $module && dosym /etc/stargazer/conf-available.d/${MODULES[$module]#*:}.conf /etc/stargazer/conf-enabled.d/${MODULES[$module]#*:}.conf
+		done
+	fi
+
+	# Correct user and group for files and directories
+	( use sgconv || use rscriptd || use sgauth || use stargazer ) && fowners -R stg:stg /etc/stargazer
+
+	# Put the files in the right folder to support multilib
+	if [ ! -e "${ED}"/usr/$(get_libdir) ] ; then
+		mv "${ED}"/usr/lib/ "${ED}"/usr/$(get_libdir) || die "Failed to move library directory for multilib support"
+	fi
+}
+
+pkg_setup() {
+	# Add user and group to system only when necessary
+	if use sgconv || use rscriptd || use sgauth || use stargazer ; then
+		enewgroup stg
+
+		# Add stg user to system (no home directory specified, because otherwise it will be result in stg:root ownership on it)
+		enewuser stg -1 -1 -1 stg
+	fi
+}
+
+pkg_postinst() {
+	if use sgconv ; then
+		einfo "\nSgconv:"
+		einfo "----------"
+		einfo "    For further use of sgconv please edit /etc/stargazer/sgconv.conf depending on your needs."
+	fi
+
+	if use radius ; then
+		einfo "\nRadius:"
+		einfo "-------"
+		einfo "    For further use of radius, emerge net-dialup/freeradius.\n"
+
+		einfo "    Example config:\n"
+
+		einfo "        stg {"
+		einfo "               local_port = 6667"
+		einfo "               server = localhost"
+		einfo "               port = 6666"
+		einfo "               password = 123456"
+		einfo "        }\n"
+
+		einfo "    You should place 'stg' into section Instantiate, Authorize."
+		einfo "    In section Authentificate 'stg' should go in sub-section Auth-Type before other authentifications modules:\n"
+
+		einfo "        Auth-Type PAP {"
+		einfo "                         stg"
+		einfo "                         pap"
+		einfo "        }\n"
+
+		einfo "    It also may be used in section Accounting and Post-Auth."
+
+		use module_auth_freeradius || einfo "\n    For use RADIUS data processing you should also enable USE-flag module_auth_freeradius."
+	fi
+
+	if use rscriptd ; then
+		einfo "\nRemote Script Executer:"
+		einfo "-----------------------"
+		einfo "    For further use of rscriptd please edit /etc/stargazer/rscriptd.conf depending on your needs."
+		einfo "    You have to change 'Password' field at least."
+	fi
+
+	if use sgauth ; then
+		einfo "\nSgauth:"
+		einfo "-------"
+		einfo "    For further use of sgauth please edit /etc/stargazer/sgauth.conf depending on your needs."
+		einfo "    You have to change 'ServerName', 'Login', 'Password' fields at least."
+	fi
+
+	if use sgconf ; then
+		einfo "\nSgconf:"
+		einfo "-------"
+		use module_config_sgconfig || einfo "    For further use of sgconf utility you should also enable USE-flag module_config_sgconfig."
+	fi
+
+	if use sgconf_xml ; then
+		einfo "\nSgconf_xml:"
+		einfo "-----------"
+		use module_config_rpcconfig || einfo "    For further use of sgconf_xml utility you should also enable USE-flag module_config_rpcconfig."
+	fi
+
+	if use stargazer ; then
+		einfo "\nStargazer:"
+		einfo "----------"
+		einfo "    Modules availability:\n"
+
+		if use module_auth_always_online ; then
+			einfo "      * module_auth_always_online available."
+		fi
+
+		if use module_auth_internet_access ; then
+			einfo "      * module_auth_internet_access available."
+		fi
+
+		if use module_auth_freeradius ; then
+			einfo "      * module_auth_freeradius available.\n"
+			einfo "           For further use of module, emerge net-dialup/freeradius.\n"
+			use radius || einfo "\n           For use RADIUS data processing you should also enable use USE-flag radius."
+		fi
+
+		if use module_capture_ipq ; then
+			einfo "      * module_capture_ipq available."
+		fi
+
+		if use module_capture_ether ; then
+			einfo "      * module_capture_ether available."
+		fi
+
+		if use module_capture_netflow ; then
+			einfo "      * module_capture_netflow available.\n"
+			einfo "           For further use of module, emerge net-firewall/ipt_netflow or net-analyzer/softflowd.\n"
+		fi
+
+		if use module_config_sgconfig ; then
+			einfo "      * module_config_sgconfig available."
+		fi
+
+		if use module_config_rpcconfig ; then
+			einfo "      * module_config_rpcconfig available.\n"
+			einfo "           KNOWN BUG: Sometimes you can't configure Stargazer through xml-based configurator,"
+			einfo "                      because module is not responding."
+			einfo "                      This bug is introduced by xmlrpc-c library. This bug proceeds very rare, but it still exists.\n"
+		fi
+
+		if use module_other_ping ; then
+			einfo "      * module_other_ping available."
+		fi
+
+		if use module_other_smux ; then
+			einfo "      * module_other_smux available.\n"
+			einfo "           For further use of module emerge net-analyzer/net-snmp.\n"
+		fi
+
+		if use module_other_remote_script ; then
+			einfo "      * module_other_remote_script available.\n"
+			einfo "           Don't forget to edit /etc/stargazer/subnets file depending on your needs."
+		fi
+
+		if use module_store_files ; then
+			einfo "      * module_store_files available.\n"
+			einfo "           Necessary and sufficient rights to the directory /var/lib/stargazer for this backend is 0755."
+			einfo "           You may fix it if needed.\n"
+		fi
+
+		if use module_store_firebird ; then
+			einfo "      * module_store_firebird available.\n"
+			einfo "           Necessary and sufficient rights to the directory /var/lib/stargazer for this backend is 0775."
+			einfo "           Check that it was so, and fix it if needed."
+			einfo "           You should add 'firebird' user to stg group:\n"
+			einfo "             # usermod -a -G stg firebird\n"
+			einfo "           and restart firebird:\n"
+			einfo "             # /etc/init.d/firebird restart\n"
+			einfo "           Stargazer DB schema for Firebird is here: /usr/share/stargazer/db/firebird"
+			einfo "           For new setup you should execute 00-base-00.sql:\n"
+			einfo "             # fbsql -q -i /usr/share/stargazer/db/firebird/00-base-00.sql\n"
+			einfo "           For upgrade from version 2.406 you should execute 00-alter-01.sql:\n"
+			einfo "             # fbsql -q -u <username> -p <password> -d <database> -i /usr/share/stargazer/db/firebird/00-alter-01.sql\n"
+		fi
+
+		if use module_store_mysql ; then
+			einfo "      * module_store_mysql available.\n"
+			einfo "           For upgrade from version 2.406 you should execute 00-mysql-01.sql:\n"
+			einfo "             # mysql -h <hostname> -P <port> -u <username> -p <password> <database> < /usr/share/stargazer/db/mysql/00-mysql-01.sql\n"
+		fi
+
+		if use module_store_postgres ; then
+			einfo "      * module_store_postgres available.\n"
+			einfo "           Stargazer DB schema for PostgresSQL is here: /usr/share/stargazer/db/postgresql"
+			einfo "           For new setup you should execute 00-base-00.postgresql.sql:\n"
+			einfo "             # psql -h <hostname> -p <port> -U <username> -d <database> -W -f /usr/share/stargazer/db/postgresql/00-base-00.postgresql.sql\n"
+			einfo "           For upgrade from version 2.406 you should execute 00-alter-01.sql:\n"
+			einfo "             # psql -h <hostname> -p <port> -U <username> -d <database> -W -f /usr/share/stargazer/db/postgresql/00-alter-01.sql\n"
+		fi
+
+		einfo "\n    For all storage backends:\n"
+		einfo "      * Default admin login - admin, default admin password - 123456."
+		einfo "      * Default subscriber login - test, default subscriber password - 123456.\n"
+		einfo "Don't run newer versions without reading their ChangeLog first,"
+		einfo "it can be found in /usr/share/doc/${PF}"
+	fi
+
+	if use debug ; then
+		ewarn "\nThis is a debug build. You should avoid to use it in production.\n"
+	fi
+}
diff --git a/net-misc/stone/Manifest b/net-misc/stone/Manifest
new file mode 100644
index 000000000000..cf1edfc5f8f2
--- /dev/null
+++ b/net-misc/stone/Manifest
@@ -0,0 +1,7 @@
+AUX stone-2.3e-makefile.patch 551 SHA256 ca9cb87e0e6411b48b84c099adc57b729ae9d778ba7506c6dee2f57aabd6a98c SHA512 ab9051fc87046484c755830f1803b1ac9ceca5c0fdc00e09f690eae538d7cd7611049fcad4100c43cf996dacea2eb57360778eb91aa40b76b697a217e105c18c WHIRLPOOL 7bea2b8781ad93689b5d0c4ad2f2497f95723f3f17d31449e04616bf45bb1dad7b710e6a0df0131c41ce4321e5fdfaed561ec1826f8845624e45eee76164c438
+AUX stone.man 15094 SHA256 d45b4e0bfc06e86a12aba7dfaecdb5a0485ddc473a6dadc32c4e2956c5d8a9b4 SHA512 9ee8f9c95d6dffcd15b872bc40f1b58f3bd476ba93a61e404d2204b14d72f986683b98375aa195b4d3da8f31000d4c3c5b1c6e35a55ffbf3bda3a0f2b346d806 WHIRLPOOL cd108cf7e640d4d4ae9b169a2c44fee28c632f0088e18a65812c5091b27ecd82bedbacc6b743a2b1a5ad899ffc51c97b7ba5dfb7338159c4d4cb1a3f896e97d7
+DIST stone-2.3e.tar.gz 92587 SHA256 b2b664ee6771847672e078e7870e56b886be70d9ff3d7b20d0b3d26ee950c670 SHA512 a0cccc123222c4fb4c1b2f031fc4d039f39e77691adc9f1df367d99bef8524738265350d1056c926c5f216236d2db25f31d14e9bec297b1bb4ea17e217c4983b WHIRLPOOL f73f5dd7d91f0d0e68065b0dd20adf50865c5081f1628154d9bf4b5c8c11fe9aa2355e7cc4dc6409f241325f509af4e5f1dd7eaf690eecca794c191dfa72028a
+EBUILD stone-2.3e-r1.ebuild 845 SHA256 78a0e40563ac920065b834aedd2226251e79682241ca939fdea67a7fef9c87b3 SHA512 fdd8c255e1f846fa3bfe4fe940e06fa4c54f6e02da8749b39781032aa0f0029576ca2827fd3929871d4b749e66190db774026213b08040db4a05173b9f01f6cf WHIRLPOOL 30158a2cc93726c708dbf24cb6dbcd6f9edd043b44d6defda04b1dd2093c6273d1cc13072b7b7fc2e105d17a69d61d0446cf0015e25e3637a57544a71b5ff0e4
+MISC ChangeLog 2574 SHA256 7322466089e07b7f2a2d884ab43794d30ddea15f573aa5407dde2357ce282860 SHA512 33f2843945b0daccfd70a8967ebe4f904e80220153e147fbb32d98f2b409659c2db036905b96b6c7aa282eec0e05b3f86151c73ee6f19c3854c761efb1db25fd WHIRLPOOL 29fbc9736b4711e8124753cb5df683d59812a6a943b7d9e853474afad9cb493e8ebecabc20ce4b1884d32806ac0762ae3dfbe6fe65a3575ce932811b7b1aab76
+MISC ChangeLog-2015 3329 SHA256 0bda3001956c13dce789f10a56c207fb68c9ac1cbf9edc9064f42c32320b988d SHA512 bcf669a866639c32366a6df27410c0116306e67294da96eb2a4573a25c5a33a8ced2fe29082adc0dd206172740bc8a126671fdce7ef95e179feda031561b9d38 WHIRLPOOL 17464e5b1f08f53044a5ea695d579a9c46333275ebddff3690f608f7b9255be09f6b71f99896cc8d05635161748550709e74ef0ebf6ed151725b95c5d8f4ad18
+MISC metadata.xml 358 SHA256 0840f50c7583246c8cf79ebb72a4b1336db309f62365cefbce0adf5e67c3b3d1 SHA512 25b8605a017689b08da8641f389cbb5c5c43908a71614382576c3adce13325edd4d550bc0216c48de625d117a011a5d2c7276c8edb59057affd42ab0af8ce148 WHIRLPOOL 0c33beff147cbf14cd9c2b48eedc168664aa058106b9e87aa2a5d72334c24390653dd4d27c5404c049ffbdce74d2697611c1052421b09e98e65d402e38b8c0d4
diff --git a/net-misc/stone/files/stone-2.3e-makefile.patch b/net-misc/stone/files/stone-2.3e-makefile.patch
new file mode 100644
index 000000000000..5df2b6868a24
--- /dev/null
+++ b/net-misc/stone/files/stone-2.3e-makefile.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig	2013-02-20 17:45:36.000000000 +0400
++++ Makefile	2013-02-20 17:47:19.323650328 +0400
+@@ -19,8 +19,6 @@
+ # -DWINDOWS	Windows95/98/NT
+ # -DNT_SERVICE	WindowsNT/2000 native service
+ 
+-CFLAGS=		# -g
+-
+ SSL=		/usr/local/ssl
+ SSL_FLAGS=	-DUSE_SSL
+ SSL_LIBS=	-lssl -lcrypto
+@@ -60,7 +58,7 @@
+ 	@echo "*** md5c.c is contained in RFC1321"
+ 
+ stone: stone.c
+-	$(CC) $(CFLAGS) $(FLAGS) -o $@ $? $(LIBS)
++	$(CC) $(CFLAGS) $(FLAGS) ${LDFLAGS} -o $@ $? $(LIBS)
+ 
+ pop_stone: $(POP_LIBS)
+ 	$(MAKE) FLAGS="$(POP_FLAGS)" LIBS="$(POP_LIBS)" $(TARGET)
diff --git a/net-misc/stone/files/stone.man b/net-misc/stone/files/stone.man
new file mode 100644
index 000000000000..fa10c6eef18f
--- /dev/null
+++ b/net-misc/stone/files/stone.man
@@ -0,0 +1,464 @@
+.\" Roff format skeleton provided by Taketo Kabe <kabe@sra-tohoku.co.jp>
+.TH stone 1 "version 2.3"
+.
+.SH NAME
+stone \- Simple Repeater
+.
+.SH SYNOPSIS
+.B "stone [-C \fIfile\fP] [-P \fIcommand\fP] [-Q \fIoptions\fP] [-N] [-d] [-p] [-n]"
+.br
+.B "      [-u \fImax\fP] [-f \fIn\fP] [-l] [-L \fIfile\fP] [-a \fIfile\fP] [-i \fIfile\fP]"
+.br
+.B "      [-X \fIn\fP] [-T \fIn\fP] [-r]"
+.br
+.B "      [-x \fIport\fP[,\fIport\fP][-\fIport\fP]... \fIxhost\fP... --]"
+.br
+.B "      [-s \fIsend\fP \fIexpect\fP... --]"
+.br
+.B "      [-b [\fIvar\fP=\fIval\fP]... \fIn\fP \fImaster\fP:\fIport\fP \fIbackup\fP:\fIport\fP]"
+.br
+.B "      [-B \fIhost\fP:\fIport\fP \fIhost1\fP:\fIport1\fP... --]"
+.br
+.B "      [-I \fIhost\fP]"
+.br
+.B "      [-o \fIn\fP] [-g \fIn\fP] [-t \fIdir\fP] [-D] [-c \fIdir\fP]"
+.br
+.B "      [-q \fISSL\fP] [-z \fISSL\fP]"
+.br
+.B "      [-M install \fIname\fP] [-M remove \fIname\fP]"
+.br
+.B "      \fIst\fP [-- \fIst\fP]..."
+.
+.SH DESCRIPTION
+\fBStone\fP is a TCP & UDP repeater in the application layer.  It repeats TCP
+and UDP from inside to outside of a firewall, or from outside to inside.
+.P
+\fBStone\fP has following features:
+.
+.TP
+.B 1. Stone supports Win32.
+Formerly, UNIX machines are used as firewalls, but recently
+WindowsNT machines are used, too.  You can easily run \fBstone\fP on
+WindowsNT and Windows95.  Of course, available on Linux,
+FreeBSD, BSD/OS, SunOS, Solaris, HP-UX and so on.
+.
+.TP
+.B 2. Simple.
+\fBStone\fP's source code is only 8000 lines long (written in C
+language), so you can minimize the risk of security
+holes.
+.
+.TP
+.B 3. Stone supports SSL.
+Using OpenSSL (\fIhttp://www.openssl.org/\fP), \fBstone\fP can
+encrypt/decrypt.  Client verifications, and server verifications
+are also supported.  \fBStone\fP can send a substring of the subject
+of the certificate to the destination.
+.
+.TP
+.B 4. Stone is a http proxy.
+\fBStone\fP can also be a tiny http proxy.
+.
+.TP
+.B 5. POP -> APOP conversion.
+With \fBstone\fP and a mailer that does not support APOP, you can
+access to an APOP server.
+.
+.TP
+.B 6. Stone supports IPv6.
+\fBStone\fP can convert IP and IPv6 each other.  With \fBstone\fP, you can
+use IP-only software on IPv6 network.
+.
+.SH OPTIONS
+If the \fB-C\fP \fIfile\fP flag is used, the program read these
+options and \fIst\fPs from the configuration file \fIfile\fP.
+If the \fB-P\fP \fIcommand\fP flag is used, the program executes
+specified pre-processor to read the configuration file.  \fB-Q\fP \fIoptions\fP
+can be used to pass options to the pre-processor.  If the \fB-N\fP
+flag is used, \fBstone\fP will terminate after parsing options
+and configuration file without opening the ports.
+.P
+If the \fB-d\fP flag is used, then increase the debug level.  If
+the \fB-p\fP flag is used, data repeated by \fBstone\fP are dumped.  If
+the \fB-n\fP is used, IP addresses and service port numbers are
+shown instead of host names and service names.
+.P
+If the \fB-u\fP \fImax\fP flag (\fImax\fP is integer) is used, the
+program memorize \fImax\fP UDP sources simultaneously.  The default value
+is 100. If the
+\fB-f\fP \fIn\fP flag (\fIn\fP is integer) is used, the program spawn
+\fIn\fP child processes. The default behavior is not to spawn any child processes.
+.P
+If the \fB-l\fP flag is used, the program sends error messages to
+the syslog instead of stderr.  If the \fB-L\fP \fIfile\fP (\fIfile\fP
+is a file name) flag is used, the program writes error messages
+to the file.  If the \fB-a\fP \fIfile\fP flag is used, the program
+writes accounting to the file.  If the \fB-i\fP \fIfile\fP flag is
+used, the program writes its process ID to the file.
+.P
+The \fB-X\fP \fIn\fP flag alters the buffer size of the repeater.
+The default value is 1000 bytes. If
+the \fB-T\fP \fIn\fP is used, the timeout of TCP sessions can be
+specified to \fIn\fP sec.  Default: 600 (10 min).  The \fB-r\fP flag is
+used, SO_REUSEADDR is set on the socket of \fIst\fP .
+.P
+Using the \fB-x\fP \fIport\fP[,\fIport\fP][-\fIport\fP]... \fIxhost\fP... \fB--\FP flag,
+the http proxy (described later) can only connect to
+\fIxhost\fP:\fIport\fP.  If more than one \fB-x\fP ... \fB--\fI flags are
+designated, the posterior one whose \fIport\fP list matches the
+connecting port.  If the \fB-x\fP \fB--\fP is used, prior \fB-x\fP flags
+are ignored.
+.P
+The \fB-b\fP \fIn\fP \fImaster\fP:\fIport\fP \fIbackup\fP:\fIport\fP flag designates
+the backup destination for \fImaster\fP:\fIport\fP.  The program checks
+every \fIn\fP seconds whether \fImaster\fP:\fIport\fP is connectable, using
+the health check script defined by \fB-s\fP flag described below.
+If not, the backup is used instead.  Alternative \fIhost\fP can be
+checked, using host=\fIhost\fP and alternative \fIport\fP, using
+port=\fIport\fP.
+.P
+The \fB-s\fP \fIsend\fP \fIexpect\fP... \fB--\fP flag defines the health check
+script.  Sending \fIsend\fP, then checks whether the response match
+the regular expression \fIexpect\fP.
+.P
+The \fB-B\fP \fIhost\fP:\fIport\fP \fIhost1\fP:\fIport1\fP... \fB--\fP is for the
+destination group.  If the destination of \fIst\fP is \fIhost\fP:\fIport\fP,
+the program chooses a destination randomly from the group.  The
+destination \fIhost\fP:\fIport\fP that is designated by \fB-b\fP flag and
+turned out unhealthy, is excluded from the group.
+.P
+The \fB-I\fP \fIhost\fP designates the interface used as the source
+address of the connection to the desctination.
+.P
+If the \fB-o\fP \fIn\fP or \fB-g\fP \fIn\fP flag is used, the program set
+its uid or gid to \fIn\fP respectively.  If the \fB-t\fP \fIdir\fP
+flag (\fIdir\fP is a directory) is used, the program change its
+root to the directory.  If the \fB-D\fP flas is used, \fBstone\fP runs
+as a daemon. The \fB-c\fP \fIdir\fP flag designates the
+directory for core dump.
+.P
+The \fB-M\fP install \fIname\fP and the \fB-M\fP remove \fIname\fP flags are
+for NT service.  \fIname\fP is the service name.  Start the
+service using the command: net start \fIname\fP.  To install \fBstone\fP
+service as the name \fIrepeater\fP, for example:
+.P
+.RS
+C:\\>\fBstone -M install \fIrepeater\fB -C \fIC:\\stone.cfg\fR
+.br
+C:\\>\fBnet start \fIrepeater\fR
+.RE
+.P
+The \fB-q\fP \FISSL\FP and the \fB-z\fP \FISSL\FP flags are for SSL
+encryption.  The \fB-q\fP \FISSL\FP is for the client mode, that is,
+when \fBstone\fP connects to the other SSL server as a SSL client.
+The \fB-z\fP \FISSL\FP if for the server mode, that is, when other SSL
+clients connect to the \fBstone\fP.
+.P
+\FISSL\FP is one of the following.
+.P
+.PD 0
+.IP default 15
+reset SSL options to the default.
+Using multiple \fIst\fP, different SSL options can
+be designated for each \fIst\fP.
+.IP verbose
+verbose mode.
+.IP verify
+require SSL certificate to the peer.
+.IP verify,once
+request a client certificate on the initial TLS/SSL
+handshake. (\fB-z\fP only)
+.IP verify,ifany
+The certificate returned (if any) is checked. (\fB-z\fP only)
+.IP verify,none
+never request SSL certificate to the peer.
+.IP crl_check
+lookup CRLs.
+.IP crl_check_all
+lookup CRLs for whole chain.
+.IP uniq
+if the serial number of peer's SSL certificate
+is different from the previous session, deny it.
+.IP re\fIn\fP=\fIregex\fP
+The certificate of the peer must satisfy the
+\fIregex\fP.  \fIn\fP is the depth.  re0 means the subject
+of the certificate, and re1 means the issure.
+The maximum of \fIn\fP is 9.
+.IP depth=\fIn\fP
+The maximum of the certificate chain.
+If the peer's certificate exceeds \fIn\fP, the
+verification fails.  The maximum of \fIn\fP is 9.
+.IP tls1
+Just use TLSv1 protocol.
+.IP ssl3
+Just use SSLv3 protocol.
+.IP ssl2
+Just use SSLv2 protocol.
+.IP no_tls1
+Turn off TLSv1 protocol.
+.IP no_ssl3
+Turn off SSLv3 protocol.
+.IP no_ssl2
+Turn off SSLv2 protocol.
+.IP bugs
+Switch on all SSL implementation bug workarounds.
+.IP serverpref
+Use server's cipher preferences (only SSLv2).
+.IP sid_ctx=\fIstr\fP
+Set session ID context.
+.IP passfile=\fIfile\fP
+The filename of the file containing password of the key
+.IP key=\fIfile\fP
+The filename of the secret key of the certificate.
+.IP cert=\fIfile\fP
+The filename of the certificate.
+.IP CAfile=\fIfile\fP
+The filename of the certificate of the CA.
+.IP CApath=\fIdir\fP
+The directory of the certificate files.
+.IP pfx=\fIfile\fP
+The filename of the PKCS#12 bag.
+.IP cipher=\fIlist\fP
+The list of ciphers.
+.IP lb\fIn\fP=\fIm\fP
+change the destination according to the
+certificate of the peer.  The number calculated
+from the matched string to the \fIn\fPth ( ... ) in
+the ``regex'' of SSL options (mod \fIm\fP) is used
+to select the destination from the destination
+group defined by \fB-B\fP flag.
+.PD
+.P
+\fIst\fP is one of the following.  Multiple \fIst\fP can be
+designated, separated by \fB--\fP.
+.P
+.PD 0
+.IP (1)
+\fIhost\fP:\fIport\fP \fIsport\fP [\fIxhost\fP...]
+.IP (2)
+\fIhost\fP:\fIport\fP \fIshost\fP:\fIsport\fP [\fIxhost\fP...]
+.IP (3)
+proxy \fIsport\fP [\fIxhost\fP...]
+.IP (4)
+\fIhost\fP:\fIport\fP/http \fIrequest\fP [\fIxhost\fP...]
+.IP (5)
+\fIhost\fP:\fIport\fP/proxy \fIheader\fP [\fIxhost\fP...]
+.IP (6)
+health \fIsport\fP [\fIxhost\fP...]
+.PD
+.P
+The program repeats the connection on port \fIsport\fP to the
+other machine \fIhost\fP port \fIport\fP.  If the machine, on
+which the program runs, has two or more interfaces, type (2) can
+be used to repeat the connection on the specified interface
+\fIshost\fP.  You can also specify path name that begins with
+``/'' or ``./'', instead of \fIhost\fP:\fIport\fP so that the
+program handles a unix domain socket.
+.P
+Type (3) is a http proxy.  Specify the machine, on which the
+program runs, and port \fIsport\fP in the http proxy settings of
+your WWW browser.
+Extentions can be added to the ``proxy'' like \fIxhost\fP/\fIext\fP.
+\fIext\fP is:
+.P
+.IP v4only
+limit the destination within IP addresses.
+.IP v6only
+limit the destination within IPv6 addresses.
+.P
+Type (4) relays stream over http request.  \fIrequest\fP is the
+request specified in HTTP 1.0.  In the \fIrequest\fP, \ is
+the escape character, and the following substitution occurs.
+.PP
+.RS 8
+.PD 0
+.IP \\\\n 8
+newline  (0x0A)
+.IP \\\\r
+return   (0x0D)
+.IP \\\\t
+tab      (0x09)
+.IP \\\\\\\\
+\ itself (0x5C)
+.IP \\\\a
+the IP address of the client connecting to the \fBstone\fP.
+.IP \\\\A
+\fIIP address of the client\fP:\fIport number\fP
+.IP \\\\0
+the serial number of peer's SSL certificate.
+.IP "\\\\1 - \\\\9"
+the matched string in the ``regex'' of SSL options.
+.IP \\\\?1\fIthen\fP\\\\:\fIelse\fP\\\\/
+if \1 (\2 - \9 in a similar way) is not null,
+\fIthen\fP, otherwise \fIelse\fP.
+.PD
+.RE
+.P
+Type (5) repeats http request with \fIheader\fP in the top of
+request headers.  The above escapes can be also used.
+.P
+Type (6) designates the port that other programs can check
+whether the \fBstone\fP runs `healthy' or not.  Following commands are
+available to check the \fBstone\fP.
+.P
+.RS 8
+.PD 0
+.IP "HELO \fIany string\fP" 24
+returns the status of the \fBstone\fP
+.IP "LIMIT \fIvar\fP \fIn\fP"
+check the value of \fIvar\fP is
+less than \fIn\fP
+.PD
+.RE
+.P
+\fIvar\fP is one of the following:
+.P
+.RS 8
+.PD 0
+.IP PAIR 16
+the number of ``pair''
+.IP CONN
+the number of ``conn''
+.IP ESTABLISHED
+seconds passed since the last conn established
+.IP READWRITE
+seconds passed since the last read/write
+.IP ASYNC
+the number of threads
+.PD
+.RE
+.P
+The response of the \fBstone\fP is 2xx when normal, or 5xx when
+abnormal on the top of line.
+.P
+If the \fIxhost\fP are used, only machines or its IP addresses
+listed in \fIxhost\fP separated by space character can
+connect to the program and to be repeated.
+.P
+Extentions can be added to the \fIxhost\fP like
+\fIxhost\fP/\fIex\fP,\fIex\fP....  \fIex\fP is:
+.IP \fIm\fP
+You can designate the length of prefix bits of the
+netmask, so that only machines on specified.  In the
+case of class C network 192.168.1.0, for example, use
+``192.168.1.0/24''.
+.IP v4
+\fIxhost\fP is resolved as the IP address.
+.IP v6
+\fIxhost\fP is resolved as the IPv6 address.
+.IP p\fIm\fP
+the data repeated by the program are dumped, only if it
+was connected by the machines specified by \fIxhost\fP.  \fIm\fP
+is the dump mode, equivalent to the number of \fB-p\fP
+options.
+.P
+Use ``!'' instead of ``\fIxhost\fP'', to deny machines by following
+\fIxhost\fP.
+.P
+Extentions can be added to the \fIport\fP like
+\fIport\fP/\fIext\fP,\fIext\fP....  \fIext\fP is:
+.IP udp
+repeats UDP instead of TCP.
+.IP ssl
+forwards with encryption.
+.IP v6
+connects to the destination using IPv6.
+.IP base
+forwards with MIME base64 encoding.
+.P
+Extentions can be added to the \fIsport\fP like
+\fIsport\fP/\fIext\fP,\fIext\fP....  \fIext\fP is:
+.IP udp
+repeats UDP instead of TCP.
+.IP apop
+converts POP to APOP.  The conversion is derived from
+the RSA Data Security, Inc. MD5 Message-Digest Algorithm.
+.IP ssl
+forwards with decryption.
+.IP v6
+accepts connection using IPv6.  If \fIshost\fP is omitted
+like (1), IP is also acceptable.
+.IP v6only
+accepts connection using IPv6 only.  Even if \fIshost\fP is
+omitted like (1), IP is not acceptable.
+.IP base
+forwards with MIME base64 decoding.
+.IP http
+relays stream over http.
+.IP ident
+identifies the owner of the incoming connection
+on the peer using ident protocol (RFC1413).
+.SH EXAMPLES
+.PD 0
+.IP \fIouter\fP\^:
+a machine in the outside of the firewall
+.IP \fIinner\fP\^:
+a machine in the inside of the firewall
+.IP \fIfwall\fP\^:
+the firewall on which the \fBstone\fP is executed
+.PD
+.TP
+\fBstone \fIouter\fB:telnet 10023\fR
+Repeats the telnet protocol to \fIouter\fP.
+Run telnet fwall 10023 on \fIinner\fR.
+.TP
+\fBstone \fIouter\fB:domain/udp domain/udp\fR
+Repeats the DNS query to \fIouter\fP.
+Run \fBnslookup -\fP \fIfwall\fP on \fIinner\fP.
+.TP
+\fBstone \fIouter\fB:ntp/udp ntp/udp\fR
+Repeats the NTP to \fIouter\fP.
+Run \fBntpdate \fIfwall\fR on \fIinner\fP.
+.TP
+\fBstone localhost:http 443/ssl\fR
+Make WWW server that supports https.
+Access \fBhttps://\fIfwall\fB/\fR using a WWW browser.
+.TP
+\fBstone localhost:telnet 10023/ssl\fR
+Make telnet server that supports SSL.
+Run \fBSSLtelnet -z ssl \fIfwall\fB 10023\fR on \fIinner\fP.
+.TP
+\fBstone proxy 8080\fR
+http proxy
+.TP
+\fBstone\fP \fIouter\fB:110/apop 110\fR
+connect to \fIinner\fP:pop using a mailer that does not
+support APOP.
+.PP
+Where \fIfwall\fP is a http proxy (port 8080):
+.TP
+\fBstone \fIfwall\fB:8080/http 10023 'POST http://\fIouter\fB:8023 HTTP/1.0'\fR
+.br
+.ns
+.TP
+\fBstone localhost:telnet 8023/http
+.nf
+Run \fBstone\fPs on \fIinner\fP and \fIouter\fP respectively.
+Relays stream over http.
+.TP
+\fBstone \fIfwall\fB:8080/proxy 9080 \'Proxy-Authorization: Basic \fIc2VuZ29rdTpoaXJvYWtp\fB\'\fR
+for browser that does not support proxy authorization.
+.fi
+.
+.SH HOMEPAGE
+The official homepage of \fBstone\fP is:
+.br
+\fIhttp://www.gcd.org/sengoku/stone/\fP
+.
+.SH COPYRIGHT
+All rights about this program \fBstone\fP are reserved by the
+original author, Hiroaki Sengoku.  The program is free software;
+you can redistribute it and/or modify it under the terms of the
+\fIGNU IGeneral Public License (GPL)\fP.  Furthermore you can link it
+with openssl.
+.
+.SH NO WARRANTY
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY.
+.
+.SH AUTHOR
+.nf
+Hiroaki Sengoku
+sengoku@gcd.org
+http://www.gcd.org/sengoku/
+.fi
diff --git a/net-misc/stone/metadata.xml b/net-misc/stone/metadata.xml
new file mode 100644
index 000000000000..fde75b04e631
--- /dev/null
+++ b/net-misc/stone/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>Stone is a TCP/IP packet repeater in the application layer.  It repeats TCP and UDP packets from inside to outside of a firewall, or from outside to inside.</longdescription>
+</pkgmetadata>
diff --git a/net-misc/stone/stone-2.3e-r1.ebuild b/net-misc/stone/stone-2.3e-r1.ebuild
new file mode 100644
index 000000000000..6e1111841a3d
--- /dev/null
+++ b/net-misc/stone/stone-2.3e-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A simple TCP/IP packet repeater"
+HOMEPAGE="http://www.gcd.org/sengoku/stone/"
+SRC_URI="http://www.gcd.org/sengoku/stone/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-2.3d-2.3.2.7"
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) # bug #337879
+
+src_prepare() {
+	tc-export CC
+	append-cflags "-D_GNU_SOURCE"
+
+	epatch "${PATCHES[@]}"
+	epatch_user
+}
+
+src_compile() {
+	local myargs
+	if use ssl ; then
+		myargs="SSL=/usr linux-ssl"
+	else
+		myargs="linux"
+	fi
+	emake ${myargs}
+}
+
+src_install() {
+	dobin stone
+	newman "${FILESDIR}/${PN}.man" "${PN}.1"
+	dodoc README*
+}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
new file mode 100644
index 000000000000..4a2107c72f90
--- /dev/null
+++ b/net-misc/streamlink/Manifest
@@ -0,0 +1,11 @@
+DIST streamlink-0.1.0.tar.gz 960622 SHA256 0a792cfe35c36f13b851bb79dc92e8a9515334c49221297258c9998f191ccecd SHA512 78b5bd9d35c2fc9c1d9fe3954b439e56cfee48f2b73a95a2c08a53c3a66143938ba162f2d2ba29c8af989565c920756cab605ae772d73828a3dd5a41fc6d30c2 WHIRLPOOL 5ba5dc69aecb06d8b1ba5372a327033b06d88bd38040278df0cac06c84663f7dcef29ae0921c4f36959a53eac7621d8df184bf9ea9bf5cbf6e5b2b2d7b4c8f23
+DIST streamlink-0.4.0.tar.gz 30674625 SHA256 bb24ac2debc9efe5a0485db639621f45a854f686eee708a6bc8a3dc5f3807592 SHA512 58a4110b1e6b20f0b05842ee8450a93d646d523a284cf60ad878b460b8e80081d78658f5abb67744609cfdd0a88ebbf97faf6453b2b53709f259e4f9cc093eed WHIRLPOOL 21b47ad0bc96318218a83a9ee9bef29116c09f2384ef144f6910d2a08e6b3225f615576fa7a87a255be64b29ae24dad213a3b9f5e9a7b47d8497758c8ddfd222
+DIST streamlink-0.6.0.tar.gz 30696706 SHA256 ec4e8f1c6b6bd2fa1211f996d1a43439bbb2e16c996ba264b5f3add520c204a5 SHA512 b9f75bfd2cab577688ed84a6c690f776b2e3af38fa60edb7f2fd73f2c25246c81098652180c3adae61eec8798a7805988cad01c366989a961efdb1e12578af49 WHIRLPOOL a179476180333086e63ad7282cbade6408fa55670d84db0ec926f41154bb8e1990102a42467a12bb8893ef452097b57f3690eccfb70f881ac8802d7d2147d4d0
+DIST streamlink-0.7.0.tar.gz 30709251 SHA256 f43bc00694b79c0a572089996ec885afe52b63d6f177e89cddefe5cf4a0d5387 SHA512 6e908229295c4d129d2bb9bfc26c76b20d45c2c9dc8193528a259c572cddd4ea620f9f903fb639ddad206bcad05a416ccc50328d01489a7684ec724a8cf1c3c1 WHIRLPOOL 333d2729254f5d6ce09a2881cb2f55cdad72dd5fb127861225df236876d3664025c615817a12d39242a0eecb38c413b939a5d705ccab55152c1ed0650638387e
+EBUILD streamlink-0.1.0.ebuild 973 SHA256 6c74c505d5d477398ef791c0b29738977f067dd6dfb367a16aa8f1ecd157f3c6 SHA512 4a1e98fb0c7538490c6c8b11f99e5674e032f3ab8de0a7a1996cbea422c79ec150d09ee15069a2ef7e8e4dd504add42f2f9ec6acd3fc6d5c5945cb903f1962c1 WHIRLPOOL ce9167d853a1adfb1909f4d3a2eed37acde1949d7f583e4439488ced7820fa8c7c4daeec7cfd7eab5e7cbe57cc04f5ea3a7ecf3d39a8da7db015d46f64e7db30
+EBUILD streamlink-0.4.0.ebuild 1439 SHA256 0b90dea45215696b86770b57f813c3afb7522d2fe8c9baafd223a6345017ec53 SHA512 b7ffa7b4f89be630249571a8aecbe852689e1992b6075750a9bc7235e3a3c37dcd77a028155e6f120962e0de2173f6611a26a503c16df26796106885d3279c2c WHIRLPOOL dfc7eee032c589260116ccebfd283b3c67bf5108389edcae51fd93b84f224cb878f43b58c48423e6f7167bfb9a048d88372c51e5bdf33546ef48264ba3795032
+EBUILD streamlink-0.6.0.ebuild 1439 SHA256 0b90dea45215696b86770b57f813c3afb7522d2fe8c9baafd223a6345017ec53 SHA512 b7ffa7b4f89be630249571a8aecbe852689e1992b6075750a9bc7235e3a3c37dcd77a028155e6f120962e0de2173f6611a26a503c16df26796106885d3279c2c WHIRLPOOL dfc7eee032c589260116ccebfd283b3c67bf5108389edcae51fd93b84f224cb878f43b58c48423e6f7167bfb9a048d88372c51e5bdf33546ef48264ba3795032
+EBUILD streamlink-0.7.0.ebuild 1481 SHA256 f5d91a1c1c228db548897858555efb47cada645476f5f5f82a651ddc8d05f439 SHA512 d9fa66ff97771b07bcbf78800ec02ca3ad575a23228571b66ef45e674d379bfb55b2c11b71b5f6993d6108acf2d22a504c05f29c0948751290c02fc28ae21fa7 WHIRLPOOL 283ccaef436b4898fee0e61e56813bdb13560196a8c7c2a337d0bc1c57e7ed621f90d898c6cd8306be1284b85432ec7f0becb48639a2e6dd84c0cf7cc2bb4ec7
+EBUILD streamlink-9999.ebuild 1447 SHA256 f4d4027624cb7c1f167a5ab8a9ab85e3f21a5611f0772ec0cf5d46c051fd6a4f SHA512 3f3777d60d51b7e5ff4efdbf086d61f9afdba2a5a51047a297392ef1b865a12660346e145829c1bf07cff59f27d846c14d35c9872b2ea76c30801ad51a7ad0e1 WHIRLPOOL 46012f859f9efe67aae811152dda866bdc50671c260ecede771d5e236c9fb3f60689e022cca3a724c8b60d17969522780892eb3ca5ed89135d2c2b2c7296779e
+MISC ChangeLog 387 SHA256 816586ef9c3d84f854607ed1730ec1e6cc404b0ce9cef8847141b9fa3c00cd78 SHA512 e5622e720e25a96dc36ff92db8b34930e5494ac7df507840d5ce587251d07a7275d782933b0f5efb827befa5f2300bb70880a5aff0ac62c2a878e8b43cd1b921 WHIRLPOOL 025a1e2c7c17612209f5334b10c9964e5d65dfd5dd5f68c622424d5b9ecb48c689c84bde26d09703cc5e1f04a063c1bb01fb214cb1cfb80bf93aec0c29f33c49
+MISC metadata.xml 443 SHA256 d3abe4d43d28c06bcfd66457df78a057a7e77bcc9357cc6dc4529e8f41e6a04e SHA512 f5b30f24fc2574bdea1e1bbd0cf8dfd6173cdd56f913c018f6a93760d1df1e76e8f9a4730e2f2308b905b41688024fa48d7c9902a3dbb8dc8ac07fa439f32a9b WHIRLPOOL dc09e4bfd077bee8558dc362739e55a01d20a43043408649651e943891000b60f6783f4156bb49a4d2d6667d864d2802111d55e2a31dae054abd42e594bb9024
diff --git a/net-misc/streamlink/metadata.xml b/net-misc/streamlink/metadata.xml
new file mode 100644
index 000000000000..e6798e56f53a
--- /dev/null
+++ b/net-misc/streamlink/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fdsfgs@krutt.org</email>
+		<name>soredake</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">streamlink/streamlink</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/streamlink/streamlink-0.1.0.ebuild b/net-misc/streamlink/streamlink-0.1.0.ebuild
new file mode 100644
index 000000000000..7ce96657145b
--- /dev/null
+++ b/net-misc/streamlink/streamlink-0.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	media-video/rtmpdump"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/streamlink/streamlink-0.4.0.ebuild b/net-misc/streamlink/streamlink-0.4.0.ebuild
new file mode 100644
index 000000000000..885ed74fd2b4
--- /dev/null
+++ b/net-misc/streamlink/streamlink-0.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/backports-shutil_which[$(python_gen_usedep 'python2*')]
+	dev-python/backports-shutil_get_terminal_size[$(python_gen_usedep 'python2*')]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	media-video/rtmpdump
+	virtual/ffmpeg"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[$(python_gen_usedep 'python2*')]
+		${RDEPEND} )"
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/streamlink/streamlink-0.6.0.ebuild b/net-misc/streamlink/streamlink-0.6.0.ebuild
new file mode 100644
index 000000000000..885ed74fd2b4
--- /dev/null
+++ b/net-misc/streamlink/streamlink-0.6.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/backports-shutil_which[$(python_gen_usedep 'python2*')]
+	dev-python/backports-shutil_get_terminal_size[$(python_gen_usedep 'python2*')]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	media-video/rtmpdump
+	virtual/ffmpeg"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[$(python_gen_usedep 'python2*')]
+		${RDEPEND} )"
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/streamlink/streamlink-0.7.0.ebuild b/net-misc/streamlink/streamlink-0.7.0.ebuild
new file mode 100644
index 000000000000..65c5b4adf486
--- /dev/null
+++ b/net-misc/streamlink/streamlink-0.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/backports-shutil_which[$(python_gen_usedep 'python2*')]
+	dev-python/backports-shutil_get_terminal_size[$(python_gen_usedep 'python2*')]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	media-video/rtmpdump
+	virtual/ffmpeg"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[$(python_gen_usedep 'python2*')]
+		${RDEPEND} )"
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
+
+python_compile_all() {
+	use doc && emake -C docs html man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use doc; then
+		local HTML_DOCS=( docs/_build/html/. )
+		doman docs/_build/man/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
new file mode 100644
index 000000000000..4a297db743e5
--- /dev/null
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+
+KEYWORDS=""
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/backports-shutil_which[$(python_gen_usedep 'python2*')]
+	dev-python/backports-shutil_get_terminal_size[$(python_gen_usedep 'python2*')]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	media-video/rtmpdump
+	virtual/ffmpeg"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[$(python_gen_usedep 'python2*')]
+		${RDEPEND} )"
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
+
+python_compile_all() {
+	use doc && emake -C docs html man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use doc; then
+		local HTML_DOCS=( docs/_build/html/. )
+		doman docs/_build/man/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/streamtuner/Manifest b/net-misc/streamtuner/Manifest
new file mode 100644
index 000000000000..4598482dc33b
--- /dev/null
+++ b/net-misc/streamtuner/Manifest
@@ -0,0 +1,11 @@
+AUX streamtuner-0.99.99-audacious.patch 3192 SHA256 be7cd8744e2cfe1a37e453332e700284e5ef0e2a366dcbc3168e9e36042aec33 SHA512 a4aa03f1dc2e70fa4d5afbed87fd5d9a8090cc6bdab1d414e670a8244bf15976e88160ed9f3afc56392bfcef75f23421c36f93a3fcf5f1fc637115578a23deb8 WHIRLPOOL d638ed0a8486a927aace74a7e353a2e4cb7b8616092dacb285cd30837415ef76cb043e6c761e7a0179f6d8617680b9b4cb4f17e81ddb7bc1dbaa30984ec286e8
+AUX streamtuner-0.99.99-gentoo.patch 8666 SHA256 78f68d2394d0c50a7b6601b13c05d42cb39c0e880a662f5c75aeae259c0ceeb2 SHA512 eef1322aaa45963955d8232c7f634281ca52791dfd8b8dc39e5a46b537b763ede00ebdf7d47f2bcc5936cbca516b1ddf198bdc49439c4bb2dd8c8c360781304e WHIRLPOOL ac37db51ab498723bd2e293aadf7a221f31e080de625f5463374d531f09fad014db4acd4d91a0b6f6af721bcd6e4bb6c07aaafabe1ebbb93e5cc7f8d35e0af00
+AUX streamtuner-0.99.99-shoutcast-2.patch 208 SHA256 9a905c1381b0398ed8bb6a5a421780426364bf5f710454e326f9042a5c7ce0c5 SHA512 4f1f4d4dac8bacb29fd3a671aecb6ea795db8947315ff4131e76c3c930358753db48d6d035692deec1ac29964e40801d7e222421a3b36edce66fdf995a509fbd WHIRLPOOL b093f70e20c8a28b58e842faff7f4238089179adc9ac36d803e583960743144951b5cb59a141c7c59c5476f4b5201fefc2c598120830815aae1db2a44f5b8629
+AUX streamtuner-0.99.99-shoutcast.patch 1369 SHA256 8be277e0ec20903b924fbe3bf929318c7f70d2e897b94724956a879f020886a4 SHA512 9cf8f2be1f5a21bc7a6a1d6728c7ba104a9390fd0f772ec05a60916e211422781c28088b89b2407d6d219d616e8e8173a45c30fc390511cd566b6d712c2aa526 WHIRLPOOL d41949e3d04e8496aa59550ff992b7e73478e38bd96632aeb0390831f3f0dc3e5ef0340a3a37963f7e86844c1b3581cd7d003f4c5996444651403ce5962520dd
+AUX streamtuner-0.99.99-stack_increase.patch 188 SHA256 04229026eec1c02b4614b92672d2a724facf4a85a7a5a72d96c64e87358e06df SHA512 c0340219d24bf54c9043a9d07874899ac971ca69f40da976cb63b76256f848c07a41ee8be5a723df81308b7937021a68b18910eca791c954d0cbb1a2cdd894f7 WHIRLPOOL 8f5cc56c6ec6cf6dcbf7fa78bac52bdaf3faa451a059554c47be1deff49153b86ac488cc5869dd9aa5dbb0c5f41415fdaf6d59b5a633836ae1255220f574ab67
+DIST streamtuner-0.99.99-pygtk-2.6.diff 437 SHA256 8629df3b297f57b94afddf479c405b3922a74447318fbb8075cbdd0b91bac7ec SHA512 2471df9ba05d06b44f0f859d61799c92388bbe4ec78d334c1bb33f6f290b7991b4d4e8c53ecbed9052b3f1aa0cdac71f7bc6a1c183dd37e4f31918e50f17b7f7 WHIRLPOOL 5903121cb16a580fa869ef1e4c6c45910ef6d88518d02273e5a7ea4ac22b1ae8fae412a730d7a9e13858a43fa4aa2d71b6b9098e95d47d3e50f1b6d86e31941e
+DIST streamtuner-0.99.99.tar.gz 948075 SHA256 5c223a5e8dab9e504617bd221914e97bd2f0ae5f6ed8fe78b8ea8b427fee9123 SHA512 a0b185847e2c7b70f8e9c393c28379cac889b6508ace0d3db2ddf86afa4f705d1faebccc90c053123d139813730f25c033eac5c0545e9eb9a8ae4b70031cf7ef WHIRLPOOL 0efba3233b240e9868c936b5b793364693a7af3b764c95b1e19061ad13c1ef444dd94a046e40d67d50ae85c25c0ee8bbbd82b6d06fbd88ed577fd6475c0ca1b9
+EBUILD streamtuner-0.99.99-r5.ebuild 1440 SHA256 94c4b5ab0dbbc9659d70ebc7c15acd350cb85543088c4be8e8eb6325eff69a9d SHA512 0857e5799757a1480e28dba3c63fba72f706c4931ceae6b0eb20fe8dba01baee216091e59c593b12d2214736fcd448349afda6b95e105040eec46591d02732d3 WHIRLPOOL 3ddf4f39c2f05da5167573c0445b5812bba746080481d2f40aadcd44483ca0ffc4246bba7f0252449e375fd339b191132c25c4fc6a17bd575beacd994118d093
+MISC ChangeLog 3100 SHA256 fb23f756286db866eb1faec8f8cdd16846504382e0ed65b76de0adf63abb41d2 SHA512 865649cfac635dd0b4ba67fbc3030997ecdf4e7566162fc65a2dbaf862cc5717006648c88fcde166bb32e9d3ce4ef3923099dc7180e3e5c84762702eecf4362f WHIRLPOOL e19eb988d4010665349d99ae9b1ff592673853ca9cdfc2c8c8683dc94fa90d6c4bb4cbd6ee13db03b0f9e072d43c0c3b8450f664a1defdbcd8b57dc20762a0b8
+MISC ChangeLog-2015 6482 SHA256 690e41a8a3155a2a37eb0832e39e0345c88213b4decf5829197b55faa431d5e6 SHA512 31009e2bb6de8bf057363e60ef7e7bdaf9961f01c002513e66cf2d789e9002782ef657570966abef85f24d334e6f6cfbcbec1c2d48c3ec349323e377bb42bb4c WHIRLPOOL 5650df4e7eb3191d1423c2267605654cce7e319e8cbf87ad9047b3510842d1d454254702627a44ff61b62bf679f32e68661dbfdf3c3db5c10cf26b5276c57249
+MISC metadata.xml 386 SHA256 87207a67a664189316e677b7e8a1172ebd6273aa8e0cbbe9cd76febea7a0354d SHA512 a5e471c0089bd380eb6db90706378de06b4c98516d4f6e37ad7acf83f8577b248e9e0531b12706f26608cd0ca4a1b352ff9bb7ff179aaf23c88bc1ec8ab841fb WHIRLPOOL 0da3993f2eb25ef22e12e5b5dc111b15204db32f34aa03f4b6b7d1f3fbdd01e669c56710edb7300e43905566db0a78ffe5e3a6b093a5bff1b09ebdec323e9cfb
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-audacious.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-audacious.patch
new file mode 100644
index 000000000000..75eb2738e6b0
--- /dev/null
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-audacious.patch
@@ -0,0 +1,60 @@
+diff -ur streamtuner-0.99.99.orig/src/plugins/live365/live365.c streamtuner-0.99.99/src/plugins/live365/live365.c
+--- streamtuner-0.99.99.orig/src/plugins/live365/live365.c	2004-12-19 12:27:03.000000000 +0200
++++ streamtuner-0.99.99/src/plugins/live365/live365.c	2009-01-18 20:03:35.000000000 +0200
+@@ -1411,7 +1411,7 @@
+ 
+   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
+   st_action_register("view-web", _("Open a web page"), "epiphany %q");
+-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious2 %q");
+ 
+   return TRUE;
+ }
+diff -ur streamtuner-0.99.99.orig/src/plugins/local/local.c streamtuner-0.99.99/src/plugins/local/local.c
+--- streamtuner-0.99.99.orig/src/plugins/local/local.c	2004-12-13 09:39:29.000000000 +0200
++++ streamtuner-0.99.99/src/plugins/local/local.c	2009-01-18 20:03:49.000000000 +0200
+@@ -1057,7 +1057,7 @@
+ 
+   init_handler();
+ 
+-  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious2 %q");
+   st_action_register("view-web", _("Open a web page"), "epiphany %q");
+ 
+   return TRUE;
+diff -ur streamtuner-0.99.99.orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c
+--- streamtuner-0.99.99.orig/src/plugins/shoutcast/shoutcast.c	2004-12-19 17:21:00.000000000 +0200
++++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c	2009-01-18 20:03:42.000000000 +0200
+@@ -959,7 +959,7 @@
+ 
+   init_handler();
+   
+-  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious2 %q");
+   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
+   st_action_register("view-web", _("Open a web page"), "epiphany %q");
+ 
+diff -ur streamtuner-0.99.99.orig/src/plugins/xiph/xiph.c streamtuner-0.99.99/src/plugins/xiph/xiph.c
+--- streamtuner-0.99.99.orig/src/plugins/xiph/xiph.c	2004-12-13 11:57:33.000000000 +0200
++++ streamtuner-0.99.99/src/plugins/xiph/xiph.c	2009-01-18 20:04:17.000000000 +0200
+@@ -957,7 +957,7 @@
+   init_handler();
+ 
+   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
+-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious2 %q");
+ 
+   return TRUE;
+ }
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preselections.c streamtuner-0.99.99/src/streamtuner/st-preselections.c
+--- streamtuner-0.99.99.orig/src/streamtuner/st-preselections.c	2004-12-13 11:57:52.000000000 +0200
++++ streamtuner-0.99.99/src/streamtuner/st-preselections.c	2009-01-18 20:04:02.000000000 +0200
+@@ -390,7 +390,7 @@
+ {
+   st_preselections_init_handler();
+   
+-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious2 %q");
+   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
+   st_action_register("view-web", _("Open a web page"), "epiphany %q");
+ }
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch
new file mode 100644
index 000000000000..2e5d843420da
--- /dev/null
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch
@@ -0,0 +1,181 @@
+diff -ur streamtuner-0.99.99.orig/data/streamtuner.pc.in streamtuner-0.99.99/data/streamtuner.pc.in
+--- streamtuner-0.99.99.orig/data/streamtuner.pc.in	2004-12-11 04:03:20.000000000 +0200
++++ streamtuner-0.99.99/data/streamtuner.pc.in	2007-07-29 09:40:44.000000000 +0300
+@@ -1,9 +1,8 @@
+ prefix=@prefix@
+ includedir=@includedir@/streamtuner
+-oldincludedir=@includedir@
+ 
+ Name: @PACKAGE@
+ Description: A stream directory browser
+ Version: @VERSION@
+ Requires: gmodule-2.0 gtk+-2.0
+-Cflags: -I${includedir} -I${oldincludedir}
++Cflags: -I${includedir}
+diff -ur streamtuner-0.99.99.orig/docs/reference/Makefile.in streamtuner-0.99.99/docs/reference/Makefile.in
+--- streamtuner-0.99.99.orig/docs/reference/Makefile.in	2004-12-21 17:31:18.000000000 +0200
++++ streamtuner-0.99.99/docs/reference/Makefile.in	2007-07-29 09:41:15.000000000 +0300
+@@ -517,7 +517,7 @@
+ @ENABLE_GTK_DOC_TRUE@	rm -rf $(srcdir)/html 
+ @ENABLE_GTK_DOC_TRUE@	mkdir $(srcdir)/html
+ @ENABLE_GTK_DOC_TRUE@	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+-@ENABLE_GTK_DOC_TRUE@	sed -i "" -e \
++@ENABLE_GTK_DOC_TRUE@	sed -i -e \
+ @ENABLE_GTK_DOC_TRUE@		's/background: #ffeeee/background: #daffd1/g; \
+ @ENABLE_GTK_DOC_TRUE@		 s/border: solid 1px #ffaaaa/border: solid 1px #74ff54/g; \
+ @ENABLE_GTK_DOC_TRUE@		 s/background: #eeeeff/background: #feffde/g; \
+diff -ur streamtuner-0.99.99.orig/help/omf.make streamtuner-0.99.99/help/omf.make
+--- streamtuner-0.99.99.orig/help/omf.make	2004-03-23 18:17:10.000000000 +0200
++++ streamtuner-0.99.99/help/omf.make	2007-07-29 09:42:50.000000000 +0300
+@@ -42,7 +42,9 @@
+ 	for file in $(omffile); do \
+ 		$(INSTALL_DATA) $(srcdir)/$$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ 	done
+-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
++	if test -z "$(DESTDIR)"; then \
++		scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir); \
++	fi
+ 
+ uninstall-local-omf:
+ 	-for file in $(srcdir)/*.omf; do \
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-category-store.c streamtuner-0.99.99/src/streamtuner/st-category-store.c
+--- streamtuner-0.99.99.orig/src/streamtuner/st-category-store.c	2004-12-18 11:17:32.000000000 +0200
++++ streamtuner-0.99.99/src/streamtuner/st-category-store.c	2007-07-29 09:41:46.000000000 +0300
+@@ -356,7 +356,6 @@
+ {
+   STCategoryBag **bag = data;
+   STCategoryBag *this_bag;
+-  gboolean status;
+ 
+   gtk_tree_model_get(model, iter, ST_CATEGORY_STORE_COLUMN_BAG, &this_bag, -1);
+   if (! ST_CATEGORY_BAG_IS_STOCK(this_bag)
+@@ -376,8 +375,6 @@
+       g_object_unref(this_bag);
+       return FALSE;		/* continue */
+     }
+-
+-  return status;
+ }
+ 
+ static gboolean
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-network-preferences-page.c streamtuner-0.99.99/src/streamtuner/st-network-preferences-page.c
+--- streamtuner-0.99.99.orig/src/streamtuner/st-network-preferences-page.c	2004-12-16 15:05:07.000000000 +0200
++++ streamtuner-0.99.99/src/streamtuner/st-network-preferences-page.c	2007-07-29 09:43:21.000000000 +0300
+@@ -183,10 +183,10 @@
+   st_preferences_bind_boolean(GTK_TOGGLE_BUTTON(page->priv->proxy_check),
+ 			      &st_settings.proxy_enabled);
+   st_preferences_bind_int_radio(GTK_RADIO_BUTTON(page->priv->http_radio),
+-				(int *) &st_settings.proxy_type,
++				&st_settings.proxy_type,
+ 				ST_TRANSFER_PROXY_HTTP);
+   st_preferences_bind_int_radio(GTK_RADIO_BUTTON(page->priv->socks5_radio),
+-				(int *) &st_settings.proxy_type,
++				&st_settings.proxy_type,
+ 				ST_TRANSFER_PROXY_SOCKS5);
+   st_preferences_bind_string(GTK_ENTRY(page->priv->server_entry),
+ 			     &st_settings.proxy_server);
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preferences.c streamtuner-0.99.99/src/streamtuner/st-preferences.c
+--- streamtuner-0.99.99.orig/src/streamtuner/st-preferences.c	2004-10-17 20:43:18.000000000 +0300
++++ streamtuner-0.99.99/src/streamtuner/st-preferences.c	2007-07-29 09:43:21.000000000 +0300
+@@ -140,13 +140,13 @@
+ }
+ 
+ void
+-st_preferences_bind_int_radio (GtkRadioButton *radio, int *ptr, int value)
++st_preferences_bind_int_radio (GtkRadioButton *radio, void *ptr, int value)
+ {
+   g_return_if_fail(GTK_IS_RADIO_BUTTON(radio));
+   g_return_if_fail(ptr != NULL);
+ 
+   g_object_set_data(G_OBJECT(radio), "value", GINT_TO_POINTER(value));
+-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), value == *ptr);
++  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), value == *(int *)ptr);
+   g_signal_connect(radio, "toggled", G_CALLBACK(st_preferences_radio_toggled_h), ptr);
+ }
+ 
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preferences.h streamtuner-0.99.99/src/streamtuner/st-preferences.h
+--- streamtuner-0.99.99.orig/src/streamtuner/st-preferences.h	2004-10-17 20:42:06.000000000 +0300
++++ streamtuner-0.99.99/src/streamtuner/st-preferences.h	2007-07-29 09:43:21.000000000 +0300
+@@ -42,7 +42,7 @@
+ void st_preferences_bind_int_spin	(GtkSpinButton		*spin,
+ 					 int			*ptr);
+ void st_preferences_bind_int_radio	(GtkRadioButton		*radio,
+-					 int			*ptr,
++					 void			*ptr,
+ 					 int			value);
+ 
+ #endif /* _ST_PREFERENCES_H */
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-shell.c streamtuner-0.99.99/src/streamtuner/st-shell.c
+--- streamtuner-0.99.99.orig/src/streamtuner/st-shell.c	2004-12-20 18:09:03.000000000 +0200
++++ streamtuner-0.99.99/src/streamtuner/st-shell.c	2007-07-29 09:43:21.000000000 +0300
+@@ -465,8 +465,10 @@
+ static void
+ st_shell_make_window (STShell *shell)
+ {
++  union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->window };
++
+   shell->priv->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+-  g_object_add_weak_pointer(G_OBJECT(shell->priv->window), (gpointer *) &shell->priv->window);
++  g_object_add_weak_pointer(G_OBJECT(shell->priv->window), pun.gpp);
+ 
+   shell->priv->accel_group = gtk_accel_group_new();
+   gtk_window_add_accel_group(GTK_WINDOW(shell->priv->window), shell->priv->accel_group);
+@@ -1786,8 +1788,10 @@
+     gtk_window_present(GTK_WINDOW(shell->priv->find));
+   else
+     {
++      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->find };
++
+       shell->priv->find = sgtk_find_dialog_new(GTK_WINDOW(shell->priv->window));
+-      g_object_add_weak_pointer(G_OBJECT(shell->priv->find), (gpointer *) &shell->priv->find);
++      g_object_add_weak_pointer(G_OBJECT(shell->priv->find), pun.gpp);
+ 
+       sgtk_find_dialog_set_token(SGTK_FIND_DIALOG(shell->priv->find), st_settings.find_token ? st_settings.find_token : "");
+       sgtk_find_dialog_set_history(SGTK_FIND_DIALOG(shell->priv->find), st_settings.find_history);
+@@ -2101,8 +2105,9 @@
+     gtk_window_present(GTK_WINDOW(shell->priv->stream_properties));
+   else
+     {
++      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->stream_properties };
+       shell->priv->stream_properties = st_stream_properties_dialog_new(GTK_WINDOW(shell->priv->window));
+-      g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_properties), (gpointer *) &shell->priv->stream_properties);
++      g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_properties), pun.gpp);
+ 
+       g_signal_connect(shell->priv->stream_properties,
+ 		       "response",
+@@ -2161,9 +2166,10 @@
+   else
+     {
+       STBrowserTab *selected_tab;
++      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->stream_columns };
+ 
+       shell->priv->stream_columns = st_stream_columns_dialog_new(GTK_WINDOW(shell->priv->window));
+-      g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_columns), (gpointer *) &shell->priv->stream_columns);
++      g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_columns), pun.gpp);
+ 
+       selected_tab = st_shell_get_selected_tab(shell);
+       if (selected_tab)
+@@ -2195,8 +2201,10 @@
+     gtk_window_present(GTK_WINDOW(shell->priv->about));
+   else
+     {
++     union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->about };
++
+       shell->priv->about = st_about_dialog_new(GTK_WINDOW(shell->priv->window));
+-      g_object_add_weak_pointer(G_OBJECT(shell->priv->about), (gpointer *) &shell->priv->about);
++      g_object_add_weak_pointer(G_OBJECT(shell->priv->about), pun.gpp);
+ 
+       g_signal_connect(shell->priv->about,
+ 		       "response",
+@@ -2244,8 +2252,10 @@
+ 
+   if (! shell->priv->preferences)
+     {
++      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->preferences };
++
+       shell->priv->preferences = st_preferences_dialog_new(GTK_WINDOW(shell->priv->window));
+-      g_object_add_weak_pointer(G_OBJECT(shell->priv->preferences), (gpointer *) &shell->priv->preferences);
++      g_object_add_weak_pointer(G_OBJECT(shell->priv->preferences), pun.gpp);
+     }
+ 
+   if (handler)
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast-2.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast-2.patch
new file mode 100644
index 000000000000..dac5973f83e0
--- /dev/null
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast-2.patch
@@ -0,0 +1,5 @@
+--- a/src/plugins/shoutcast/shoutcast.c
++++ b/src/plugins/shoutcast/shoutcast.c
+@@ -40,1 +40,1 @@
+-#define SHOUTCAST_ROOT		"http://www.shoutcast.com/"
++#define SHOUTCAST_ROOT		"http://classic.shoutcast.com/"
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch
new file mode 100644
index 000000000000..41f80c4a9076
--- /dev/null
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch
@@ -0,0 +1,40 @@
+--- a/src/plugins/shoutcast/shoutcast.c.orig	2004-12-19 15:21:00.000000000 +0000
++++ b/src/plugins/shoutcast/shoutcast.c	2008-03-16 10:39:24.000000000 +0000
+@@ -94,6 +94,8 @@
+ 
+   GNode			*parent_node;
+   SHOUTcastStream	*stream;
++  
++  int parse_genres;
+ } ReloadInfo;
+ 
+ /*** variable declarations ***************************************************/
+@@ -518,6 +520,7 @@
+       info.npages = 0;
+       info.parent_node = NULL;
+       info.stream = NULL;
++      info.parse_genres = 0;
+ 
+       status = st_transfer_session_get_by_line(session,
+ 					       url,
+@@ -565,10 +568,16 @@
+       info->stream = stream_new_cb(NULL);
+       info->stream->url_postfix = st_sgml_ref_expand_len(s1, s2 - s1);
+     }
+-  else if (info->page < 2
+-	   && (((s1 = st_str_has_prefix_span(line, "\t<OPTION VALUE=\""))
+-		|| (s1 = st_str_has_prefix_span(line, "\t\t<OPTION VALUE=\"")))
+-	       && (s2 = strstr(s1, "\">"))))
++  else if (info->page < 2 && (s1 = st_strstr_span(line, "<OPTION VALUE=\"TopTen\">")))
++  {
++  	info->parse_genres = 1;
++  }
++  else if (info->page < 2 && info->parse_genres == 1 && (s1 = st_strstr_span(line, "</SELECT>")))
++  {
++  	info->parse_genres = 0;
++  }
++  else if (info->page < 2 && info->parse_genres == 1
++	   && ((s1 = st_strstr_span(line, "<OPTION VALUE=\""))  && (s2 = strstr(s1, "\">"))))
+     {
+       STCategory *category;
+       GNode *node;
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-stack_increase.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-stack_increase.patch
new file mode 100644
index 000000000000..2313915ad32f
--- /dev/null
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-stack_increase.patch
@@ -0,0 +1,5 @@
+--- a/src/streamtuner/st-thread.c
++++ b/src/streamtuner/st-thread.c
+@@ -108,1 +108,1 @@
+-			     0x18000, /* 96k, big enough for libcurl */
++			     0x40000, /* change from 96k to 256k */
diff --git a/net-misc/streamtuner/metadata.xml b/net-misc/streamtuner/metadata.xml
new file mode 100644
index 000000000000..1a364aa6f3da
--- /dev/null
+++ b/net-misc/streamtuner/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="shout">Enable shoutcast plug-in.</flag>
+    <flag name="xiph">Enable xiph.org plug-in.</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
new file mode 100644
index 000000000000..ea6fe4889066
--- /dev/null
+++ b/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Stream directory browser for browsing internet radio streams"
+HOMEPAGE="http://www.nongnu.org/streamtuner"
+SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz
+	 https://savannah.nongnu.org/download/${PN}/${P}-pygtk-2.6.diff"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="python +shout +xiph"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.4:2
+	net-misc/curl
+	xiph? ( dev-libs/libxml2:2 )
+	>=media-libs/taglib-1.2
+	python? ( dev-python/pygtk:2 )
+	x11-misc/xdg-utils
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-gentoo.patch
+	eapply "${FILESDIR}"/${P}-shoutcast.patch
+	eapply "${FILESDIR}"/${P}-shoutcast-2.patch
+	eapply "${FILESDIR}"/${P}-audacious.patch
+	eapply -p0 "${DISTDIR}"/${P}-pygtk-2.6.diff
+	eapply "${FILESDIR}"/${P}-stack_increase.patch
+
+	# Fix .desktop file
+	sed -i \
+		-e 's/streamtuner.png/streamtuner/' \
+		-e 's/Categories=Application;/Categories=/' \
+		data/streamtuner.desktop.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# live365 causes parse errors at connect time
+	# The right value for compile-warning for this is 'yes' (#481124)
+	gnome2_src_configure \
+		--enable-compile-warnings=yes \
+		--disable-live365 \
+		$(use_enable python) \
+		$(use_enable shout shoutcast) \
+		$(use_enable xiph)
+}
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
new file mode 100644
index 000000000000..094bdf9c1406
--- /dev/null
+++ b/net-misc/stunnel/Manifest
@@ -0,0 +1,19 @@
+AUX stunnel 1259 SHA256 7037f487f6f724cfe682ec89ba99f210f7424f50f25676785fbbad16ea872329 SHA512 c35855a20ca29d5277eaa597763db434ec069bc96e91bc7c2bbe3357c72ce792b84f653c59842cd2921cce810005cb79717fa4e728840766aff51656033585d6 WHIRLPOOL 790da1254bda9e03b413a27084a5319fee04d3003dafbf4a0a6f56c4313245b8381308d92a5f0f45fccf173de95e1a1dd6483ebcbfff28ebad4a47b26a1b2efb
+AUX stunnel-5.39-compat-libressl.patch 5329 SHA256 2c25e8d689c23a64a7eba06ed6f0c1646c1d35862e6278a8e7a0545baea10739 SHA512 a6390e1452f0cf7f2867b28ebc36e0b4f9f6ab8985b03f182625d1970a9bbc0228addaa966feb3c0df8925191b73fdaf48e1e65aef68d3d62962fd28760b3578 WHIRLPOOL 4d33a46ca4165260658b298d3bf984cb10c31f42ef52471281acd8f81acba49697f120d968c3f8d60844622d3e289b89b58d3d4349078c456a176fc78ccbce4d
+AUX stunnel-compat-libressl.patch 1871 SHA256 d0698eaa8abd8a356263c193a6f716fb49ce1453c98f981f1b20f9a90731acbd SHA512 590f6be1962ef3ca1c8f1c64c02b1e63b7211a2ba5cb5fd4eb09127e45ee5251a7ec701aae3eda25e34caa1977378ad5f7b75e826aee7d9d5ff8b9acbd298f36 WHIRLPOOL 4bc38410c98ae9448def47930ca10c2451535a738cd8faf33e725f9840213914d5b0cf094ed1850bbb757a7d95c1af41635f372b4ffc6b952553f335304b1acb
+AUX stunnel-r1 1437 SHA256 ef5a54719950d1adc48cd088eb39535f87f37c63722256edf2e407d8c2ebbd6c SHA512 6ccb1735770a4662e6fcb02bb7d0329cbed9aec16fc410f9d0f34f1a13dc5c9767eceafa406c55cca23b364c87c033bf5349d267838bbd5c560aaeec17ccd92c WHIRLPOOL fd115bc1a8933ab474030ccfd68df32bda4a15407a7c5329ae09187999e8d36003fec7e4a71ef03e4b4f1c5c40192a5957a9a4a3226a465abe14707a06027848
+AUX stunnel.conf 1419 SHA256 9ae90e10e9cb99e69183d908e6df3b56660eeefba8651988feaa9ab874a83c88 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826 WHIRLPOOL c5622e8c7785b9601126446d8b92419d3b671f001363683203bccbffece3b08b762d0db61f7a9ba7cc7de14114623d0ce415909bb957c824b2e7a8b14db5e3d1
+AUX stunnel.tmpfiles.conf 38 SHA256 68c9c963673a3bf0f3ce3f32751c9e36a3299251da12e9bcae929629657df135 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb WHIRLPOOL 5e070b27ed14c06efc8e66d23a9098d60cc16c01331824d910786c6fa7697f96b8704dc02af4f4346b4628dd22b8729a11756c7d85596ffcf916f36f9de8ec05
+DIST stunnel-5.36.tar.gz 645205 SHA256 eb8952fcfdfcdf5056a1f1a78e1ec5014b819c5f5f7599b924dc4490ffe4b5ea SHA512 663dd155aab17b628fd1ef8ae1c604efc0cdf026566e98fbff16ba4da5b12b06cd6801bf4f604a9b2ea98d993c184ce97c63c1f716fa86b5e630e5fd504e3317 WHIRLPOOL 12f95a119b840b6afdcaf4d41ee325896bc89feda9ed172651dee1b52a3231fe1599c8fb6c69c1a0f93b342a3b785fb3d002a94a31b14678052313f224c48d0e
+DIST stunnel-5.37.tar.gz 645336 SHA256 d0e3530e3effc64fdec792c71791d4937c6b8bd3b9ea4895c6bb6526dcd0d241 SHA512 b42dd9e0ea7d024ebbbb0729a0db9caeecfbe3296464f475caa9ee7927c42d762c51a597b6c3a261151bb863e4696fc7cc1c6fe270eb02731e11b29cd60e440a WHIRLPOOL db272f71cba5a7ff516c159c07adc953b7c1c5ce731161fd1bd9827e529ad64f7b7a5de6105ecee3fe225d9044846430c749fcd23b759098d7c7b63cc1b731ba
+DIST stunnel-5.38.tar.gz 647774 SHA256 09ada29ba1683ab1fd1f31d7bed8305127a0876537e836a40cb83851da034fd5 SHA512 29adae28955639ab7732ff0d7ea3c097211babcd0c8932717c582f5e38279811a0a209f1daa2c6a22cf69ef28b8b67439038625ba58683c268c322b19e43ac58 WHIRLPOOL ae549e6d498a0bf31591b32f56c4d97141e00485d66aa50be23c5022e9c73f5d51c91d685bf135bf12a365a9b56d53c2dded042ecd8810cbe19e74ca7f89cc5b
+DIST stunnel-5.39.tar.gz 647101 SHA256 288c087a50465390d05508068ac76c8418a21fae7275febcc63f041ec5b04dee SHA512 1a59ca3bedd00730598e5bdee61d1968e76d3b1c0bb666fcab5103f5ba6fac0585612198baab180ac0745f658041510fe0115ec8b111da6fd7c161a4ec301458 WHIRLPOOL b4cb9c164b65a6091cde9867cc2386083b5d7224d98f19a84021408b0827eb117a9fa1ef3c3d8e9c85d28d8988dbddaf37ed03235d115d9e284d0ef24ddbe5fa
+DIST stunnel-5.40.tar.gz 648828 SHA256 23acdb390326ffd507d90f8984ecc90e0d9993f6bd6eac1d0a642456565c45ff SHA512 2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2 WHIRLPOOL 5f9fa99d8e6e153abd15896bd704f42324a8f376633e65685fc7b3d80f06b52048eba923c16a8fbb57e09624a65f0f957fc169e1b9f89d683b67c1cee1ba71b0
+EBUILD stunnel-5.36.ebuild 2899 SHA256 475f2b780accbde57de2588ddc08fdd0904cbfb27579f77afc73524c9a96f39a SHA512 ffeac1d20a4a83fcda56ae36b81e7a230ae18ad786fdbd51024b0f87b013c9988538cb92d8757869b3337fc78cf25e605fa31fe3d54b437df59c3f1d4a8ec595 WHIRLPOOL 592ba8504c1ebf2394f870e6c5ed81b3a4b352de04f568b79aa72e8357a3aba8cd992e103b34b45c4d5e9048fddd0b2b78894562a28be06679746c4ed3f6acf5
+EBUILD stunnel-5.37.ebuild 2907 SHA256 d241208bd259f711ceaac804a6928db8f0bacfde78518473d7bace7e25fec063 SHA512 2019a829e86861b68f89fea8722d277b40807bf4288fd5c57150bb39766a48202a34ab51de027758d3e30c8aa9e13d5757c5e2c39835c19feff608f998db2d2e WHIRLPOOL d45aedbbe0d08f65f0466953a5b8c2338e0ab15f343d9a897b50d6273960a67d5ab63605b362beba94c9dd4ffcdd0de708630dfabc247a5dff1c1e3c1e21e7aa
+EBUILD stunnel-5.38.ebuild 2907 SHA256 d241208bd259f711ceaac804a6928db8f0bacfde78518473d7bace7e25fec063 SHA512 2019a829e86861b68f89fea8722d277b40807bf4288fd5c57150bb39766a48202a34ab51de027758d3e30c8aa9e13d5757c5e2c39835c19feff608f998db2d2e WHIRLPOOL d45aedbbe0d08f65f0466953a5b8c2338e0ab15f343d9a897b50d6273960a67d5ab63605b362beba94c9dd4ffcdd0de708630dfabc247a5dff1c1e3c1e21e7aa
+EBUILD stunnel-5.39.ebuild 2924 SHA256 9ef3492f38e0fede7abe3b04bcf2e804481dcd92a993c0c00e67c582a5a0c678 SHA512 4e57fbfbfc0512ca1bca34950efdb46714bd224dcde99af5d035b714195ee1c20b4b84b3dba0a16c8516b48aa276314fb630f9604b86050d8793652e5099c01f WHIRLPOOL bf87db34dfc3c53e5b0e13f71df516fdc76b509908a1dae1e9054a1218709713524a23cf6f25de221eda2820981d530eed686ebc52c348315d7f837d43d1645a
+EBUILD stunnel-5.40.ebuild 2930 SHA256 c3cdade831c16b023023aa447b8792d2612099591ce18666678d2aa1dd7e3298 SHA512 6034f34af01ed21b16474f1ec4a76249d9ee2f14e4312ecf8d7cb75f66f49e9e641328fa4904cc9adec6d9cb480e63187ed9bb9a6263846ef2eaf7a2d8f3eb20 WHIRLPOOL 08e459b4e1df09def86fe8eaed14bc3bc80994b4ab1b5ff3e5f0b10ae77389152d4b7d87050312f4d32ebd54d8c6cfd18de7342a6642e5626d2edd72bebbb90b
+MISC ChangeLog 12606 SHA256 c5b501f61863fd1c77809ce64f584f7e77903e5157e879dc1f0971bfe02141c5 SHA512 987fa6eaa7b306df3c3a5404f55da4c0af1ccfb394a692001dcb4f8aee2b47c2996be838d8042b0cbbf75d4aa38757160fce226a7e821adbb8342f5472a678c7 WHIRLPOOL 1c1625a5843e3342e60d5135de343b46078f3c15ab5e2dbb665322bc3fd5213ed5a3a4d5695d4911ab8fa69561719dc9260c276b9dcd5d833183767957af9e44
+MISC ChangeLog-2015 34370 SHA256 636446a702d05566e4e434df9b3e6c9aea40c80ae3f48d4b1128ea8d18612e0a SHA512 e4cccb20c0f33566041adf72e8076c2751750e7d3dc5e564b9a0d5bd6a76818c640a683a6c1c399b4f8ddad2ab85391113edf10dfafbed942e22905d7e8bb939 WHIRLPOOL 4b458cb26e02b1bf69ab24ae4b644d8f45045e3d96ec6ac501d3d0ea18f2d8facf86d9e72a9249167a327907426b3e11856a85110bea8867937a6eeeba5cb9a8
+MISC metadata.xml 712 SHA256 38e11e915a72c5440b76b9b09f5a91625d1f0316416c5da2b701175981ff4d30 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362 WHIRLPOOL 30cf850201d85eb1ee7d4655bf50ecd215ddb6cb9942bee32be7a77889d5ce703c37aeefb3346ccc3d4d0a562ad558975466705f25c792d983d123c07eeebc35
diff --git a/net-misc/stunnel/files/stunnel b/net-misc/stunnel/files/stunnel
new file mode 100644
index 000000000000..13887f911332
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel
@@ -0,0 +1,42 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SERVICENAME=${SVCNAME#*.}
+SERVICENAME=${SERVICENAME:-stunnel}
+STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf}
+
+depend() {
+    need net
+    before logger
+}
+
+get_config() {
+	if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then
+		eerror "You need to create ${STUNNEL_CONFIGFILE} first."
+		return 1
+	fi
+	CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	[ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}"
+	PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid}
+}
+
+start() {
+	get_config || return 1
+	checkpath -d -m 0775 -o root:stunnel /run/stunnel
+	if [ "$(dirname ${PIDFILE})" != "/run" ]; then
+		checkpath -d -m 0755 -o stunnel:stunnel -q $(dirname ${PIDFILE})
+	fi
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \
+	                  --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} ${STUNNEL_OPTIONS}
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+	get_config || return 1
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	eend $? "Failed to stop ${SVCNAME}"
+}
diff --git a/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch b/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch
new file mode 100644
index 000000000000..7c4f74351838
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch
@@ -0,0 +1,132 @@
+diff -Naur stunnel-5.30.orig/src/ctx.c stunnel-5.30/src/ctx.c
+--- stunnel-5.30.orig/src/ctx.c	2016-01-15 16:45:23.000000000 +0000
++++ stunnel-5.30/src/ctx.c	2016-05-14 15:16:47.392859450 +0000
+@@ -359,7 +359,7 @@
+ /**************************************** initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+     SSL_CONF_CTX *cctx;
+     NAME_LIST *curr;
+     char *cmd, *param;
+diff -Naur stunnel-5.30.orig/src/verify.c stunnel-5.30/src/verify.c
+--- stunnel-5.30.orig/src/verify.c	2016-01-15 16:45:23.000000000 +0000
++++ stunnel-5.30/src/verify.c	2016-05-14 15:16:10.369860180 +0000
+@@ -51,7 +51,7 @@
+ NOEXPORT int verify_callback(int, X509_STORE_CTX *);
+ NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *);
+ NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int);
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *);
+ #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
+ NOEXPORT int cert_check_local(X509_STORE_CTX *);
+@@ -280,7 +280,7 @@
+     }
+ 
+     if(depth==0) { /* additional peer certificate checks */
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+         if(!cert_check_subject(c, callback_ctx))
+             return 0; /* reject */
+ #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
+@@ -291,7 +291,7 @@
+     return 1; /* accept */
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) {
+     X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx);
+     NAME_LIST *ptr;
+diff --git a/src/common.h b/src/common.h
+index 93f165e..491d9de 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -448,7 +448,7 @@ extern char *sys_errlist[];
+ #define OPENSSL_NO_TLS1_2
+ #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #ifndef OPENSSL_NO_SSL2
+ #define OPENSSL_NO_SSL2
+ #endif /* !defined(OPENSSL_NO_SSL2) */
+@@ -474,7 +474,7 @@ extern char *sys_errlist[];
+ #include <openssl/des.h>
+ #ifndef OPENSSL_NO_DH
+ #include <openssl/dh.h>
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
+ #endif /* OpenSSL older than 1.1.0 */
+ #endif /* !defined(OPENSSL_NO_DH) */
+diff --git a/src/prototypes.h b/src/prototypes.h
+index 303ff77..ae22598 100644
+--- a/src/prototypes.h
++++ b/src/prototypes.h
+@@ -664,13 +664,13 @@ typedef enum {
+ #endif /* OPENSSL_NO_DH */
+     STUNNEL_LOCKS                           /* number of locks */
+ } LOCK_TYPE;
+-#if OPENSSL_VERSION_NUMBER < 0x10100004L
++#if OPENSSL_VERSION_NUMBER < 0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ typedef int STUNNEL_RWLOCK;
+ #else
+ typedef CRYPTO_RWLOCK *STUNNEL_RWLOCK;
+ #endif
+ extern STUNNEL_RWLOCK stunnel_locks[STUNNEL_LOCKS];
+-#if OPENSSL_VERSION_NUMBER>=0x10100004L
++#if OPENSSL_VERSION_NUMBER>=0x10100004L && !defined(LIBRESSL_VERSION_NUMBER)
+ #define CRYPTO_THREAD_read_unlock(type) CRYPTO_THREAD_unlock(type)
+ #define CRYPTO_THREAD_write_unlock(type) CRYPTO_THREAD_unlock(type)
+ #else
+diff --git a/src/ssl.c b/src/ssl.c
+index a7af7e6..1483734 100644
+--- a/src/ssl.c
++++ b/src/ssl.c
+@@ -50,7 +50,7 @@ NOEXPORT int add_rand_file(GLOBAL_OPTIONS *, const char *);
+ int index_cli, index_opt, index_redirect, index_addr;
+ 
+ int ssl_init(void) { /* init TLS before parsing configuration file */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
+         OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+ #else
+@@ -83,7 +83,7 @@ int ssl_init(void) { /* init TLS before parsing configuration file */
+ }
+ 
+ #ifndef OPENSSL_NO_DH
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ /* this is needed for dhparam.c generated with OpenSSL >= 1.1.0
+  * to be linked against the older versions */
+ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
+diff --git a/src/sthreads.c b/src/sthreads.c
+index 59c24a2..04fb256 100644
+--- a/src/sthreads.c
++++ b/src/sthreads.c
+@@ -47,7 +47,7 @@
+ STUNNEL_RWLOCK stunnel_locks[STUNNEL_LOCKS];
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ #define CRYPTO_THREAD_lock_new() CRYPTO_get_new_dynlockid()
+ #endif
+ 
+diff --git a/src/verify.c b/src/verify.c
+index ac1c3ee..3e3bda4 100644
+--- a/src/verify.c
++++ b/src/verify.c
+@@ -348,7 +348,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback_ctx) {
+     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
+     subject=X509_get_subject_name(cert);
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L
++#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #if OPENSSL_VERSION_NUMBER<0x10100006L
+ #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
+ #endif
diff --git a/net-misc/stunnel/files/stunnel-compat-libressl.patch b/net-misc/stunnel/files/stunnel-compat-libressl.patch
new file mode 100644
index 000000000000..1349484bf3df
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-compat-libressl.patch
@@ -0,0 +1,42 @@
+diff -Naur stunnel-5.30.orig/src/ctx.c stunnel-5.30/src/ctx.c
+--- stunnel-5.30.orig/src/ctx.c	2016-01-15 16:45:23.000000000 +0000
++++ stunnel-5.30/src/ctx.c	2016-05-14 15:16:47.392859450 +0000
+@@ -359,7 +359,7 @@
+ /**************************************** initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+     SSL_CONF_CTX *cctx;
+     NAME_LIST *curr;
+     char *cmd, *param;
+diff -Naur stunnel-5.30.orig/src/verify.c stunnel-5.30/src/verify.c
+--- stunnel-5.30.orig/src/verify.c	2016-01-15 16:45:23.000000000 +0000
++++ stunnel-5.30/src/verify.c	2016-05-14 15:16:10.369860180 +0000
+@@ -51,7 +51,7 @@
+ NOEXPORT int verify_callback(int, X509_STORE_CTX *);
+ NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *);
+ NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int);
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *);
+ #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
+ NOEXPORT int cert_check_local(X509_STORE_CTX *);
+@@ -280,7 +280,7 @@
+     }
+ 
+     if(depth==0) { /* additional peer certificate checks */
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+         if(!cert_check_subject(c, callback_ctx))
+             return 0; /* reject */
+ #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
+@@ -291,7 +291,7 @@
+     return 1; /* accept */
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) {
+     X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx);
+     NAME_LIST *ptr;
diff --git a/net-misc/stunnel/files/stunnel-r1 b/net-misc/stunnel/files/stunnel-r1
new file mode 100644
index 000000000000..a73527ed57e7
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-r1
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+SERVICENAME=${SVCNAME#*.}
+SERVICENAME=${SERVICENAME:-stunnel}
+STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf}
+
+depend() {
+    need net
+    before logger
+}
+
+get_config() {
+	if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then
+		eerror "You need to create ${STUNNEL_CONFIGFILE} first."
+		return 1
+	fi
+	CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	[ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}"
+	PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid}
+}
+
+start() {
+	get_config || return 1
+	checkpath -d -m 0775 -o root:stunnel /run/stunnel
+	if [ "$(dirname ${PIDFILE})" != "/run" ]; then
+		checkpath -d -m 0755 -o stunnel:stunnel -q $(dirname ${PIDFILE})
+	fi
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \
+	                  --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} ${STUNNEL_OPTIONS}
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+	get_config || return 1
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	eend $? "Failed to stop ${SVCNAME}"
+}
+
+reload() {
+	get_config || return 1
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile ${PIDFILE} --name stunnel
+	eend $?
+}
diff --git a/net-misc/stunnel/files/stunnel.conf b/net-misc/stunnel/files/stunnel.conf
new file mode 100644
index 000000000000..547ee963e4d1
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel.conf
@@ -0,0 +1,61 @@
+# Sample stunnel configuration file by Michal Trojnara 2002-2005
+# Some options used here may not be adequate for your particular configuration
+# Please make sure you understand them (especially the effect of chroot jail)
+
+# Certificate/key is needed in server mode and optional in client mode
+# cert = /etc/stunnel/stunnel.pem
+# key = /etc/stunnel/stunnel.pem
+
+# Some security enhancements for UNIX systems - comment them out on Win32
+# chroot = /chroot/stunnel/
+setuid = stunnel
+setgid = stunnel
+# PID is created inside chroot jail
+pid = /run/stunnel/stunnel.pid
+
+# Some performance tunings
+socket = l:TCP_NODELAY=1
+socket = r:TCP_NODELAY=1
+#compression = rle
+
+# Workaround for Eudora bug
+#options = DONT_INSERT_EMPTY_FRAGMENTS
+
+# Authentication stuff
+#verify = 2
+# Don't forget to c_rehash CApath
+# CApath is located inside chroot jail:
+#CApath = /certs
+# It's often easier to use CAfile:
+#CAfile = /etc/stunnel/certs.pem
+# Don't forget to c_rehash CRLpath
+# CRLpath is located inside chroot jail:
+#CRLpath = /crls
+# Alternatively you can use CRLfile:
+#CRLfile = /etc/stunnel/crls.pem
+
+# Some debugging stuff useful for troubleshooting
+#debug = 7
+#output = stunnel.log
+
+# Use it for client mode
+#client = yes
+
+# Service-level configuration
+
+#[pop3s]
+#accept  = 995
+#connect = 110
+
+#[imaps]
+#accept  = 993
+#connect = 143
+
+#[ssmtp]
+#accept  = 465
+#connect = 25
+
+#[https]
+#accept  = 443
+#connect = 80
+#TIMEOUTclose = 0
diff --git a/net-misc/stunnel/files/stunnel.tmpfiles.conf b/net-misc/stunnel/files/stunnel.tmpfiles.conf
new file mode 100644
index 000000000000..4433c8a75664
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel.tmpfiles.conf
@@ -0,0 +1 @@
+d /run/stunnel 0770 stunnel stunnel -
diff --git a/net-misc/stunnel/metadata.xml b/net-misc/stunnel/metadata.xml
new file mode 100644
index 000000000000..7b9debfb547e
--- /dev/null
+++ b/net-misc/stunnel/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name="stunnel3">Install the stunnel3 wrapper.</flag>
+	</use>
+	<longdescription lang="en">
+		Stunnel is a program that allows you to encrypt arbitrary TCP
+		connections inside SSL (Secure Sockets Layer) available on both Unix and
+		Windows. Stunnel can allow you to secure non-SSL aware daemons and
+		protocols (like POP, IMAP, LDAP, etc) by having Stunnel provide the
+		encryption, requiring no changes to the daemon's code.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/stunnel/stunnel-5.36.ebuild b/net-misc/stunnel/stunnel-5.36.ebuild
new file mode 100644
index 000000000000..d89336a81611
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.36.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ssl-cert eutils multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# libressl compat
+	epatch "${FILESDIR}"/stunnel-compat-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/stunnel/stunnel-5.37.ebuild b/net-misc/stunnel/stunnel-5.37.ebuild
new file mode 100644
index 000000000000..aa39f3e078f2
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.37.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ssl-cert eutils multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# libressl compat
+	epatch "${FILESDIR}"/stunnel-compat-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/stunnel/stunnel-5.38.ebuild b/net-misc/stunnel/stunnel-5.38.ebuild
new file mode 100644
index 000000000000..aa39f3e078f2
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.38.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ssl-cert eutils multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# libressl compat
+	epatch "${FILESDIR}"/stunnel-compat-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/stunnel/stunnel-5.39.ebuild b/net-misc/stunnel/stunnel-5.39.ebuild
new file mode 100644
index 000000000000..b9545a4ae91a
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.39.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# libressl compat
+	eapply "${FILESDIR}"/${P}-compat-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/stunnel/stunnel-5.40.ebuild b/net-misc/stunnel/stunnel-5.40.ebuild
new file mode 100644
index 000000000000..8f37b78d84f4
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.40.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# libressl compat
+	eapply "${FILESDIR}"/${PN}-5.39-compat-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/stuntman/Manifest b/net-misc/stuntman/Manifest
new file mode 100644
index 000000000000..6da224b8b4d3
--- /dev/null
+++ b/net-misc/stuntman/Manifest
@@ -0,0 +1,9 @@
+AUX stuntman.confd 403 SHA256 852e86282d1929533c595377cd4603b92b90821433500aa3c92b000e964ef4cd SHA512 eeb3d8cc7299cf0d42c5fc111207685bfd2e722dd4389f7fb37250313e9cf3c91d0037b19723bb1018a54daca677fe60f65aa8b5f7fff70e4f6325dc9b7e1e66 WHIRLPOOL 2ddb42d15c5e16f06ce372daf182de80117a5d08923562819a44dc03e1cec4acbfe719fad6a134ed0d14f50f3555f650a12b9bc5ed9a6d55e2b8f83cf5f20e42
+AUX stuntman.initd 272 SHA256 95a706ee8333358d0576ba2263c11fd616ced76d5be072e7400e2780e65fe577 SHA512 e8cb2d80573a57e582f4fd68f3772a93c74eb7abf96539acb1441eb1e94a6dcc7fad84f65d13d7ca7a4130801b69af9314fc78c4089c6d0f05a3b0366abedb18 WHIRLPOOL 9b0b3aed4db7a453a42eca5174b72a370b4f570722a08bb736d1feae74882f2bcce406f471745c9005679c1c204d1ad0a4181f7b8a5a36a01a409123ee293e13
+DIST stunserver-1.2.7.tgz 113853 SHA256 51415bf83339f059c6a65bbece9b758e3f198cb86063a0f1b4f12d825c87640e SHA512 b6adc1b237e8717f296201bf865bea39c759b978db954cc15e37c3be7c2e109607273d96bb88c42654d0b843ca1a557874d02ab58e16506534db30f52d7e6f51 WHIRLPOOL 67b19195b6f64420d9283241e7f51442b347020a55e46f405c3e875a6c59eca382bc680b3b17874a77df76ba8e64d1ecfa40367ef1713e83e96c25c4c6f441d1
+DIST stunserver-1.2.9.tgz 116797 SHA256 f63452869bccc6dc1ae55a9cce9e34fba3b96bb7b0f70ea33b211a0fb4eff49a SHA512 8e947dbe050f70e10615a23900dbd2151cd9fad36e343b4cf34c0b7a4e07debb8ced16fb7eac0469cd5ec3ef7a4c04cb9347f59c2a1326af3db400906198454f WHIRLPOOL 1da2c751ac28d0b80c3d88bfbccb7e9bc63791f85ac1c209d0ae9d2005d799d1f97471b8d54b0a7317599afb927cadc2c34b694e5c3a7b730ec643422187336f
+EBUILD stuntman-1.2.7.ebuild 670 SHA256 cc7e1839c4136b907f0c3454f4d73a5ddde1a88145df10d752bde013f97028fa SHA512 df2401d9d371e122ebdfb99c2e3d51473f85f2b4f117d24725f52dd7175b8964c75722a33d8a732bbfe23768a23c130c4cd1f61e71913e1a187af68def0eacd2 WHIRLPOOL fae2b34db6a315d117cdc56945173e9b183789d0c8f047675ad626490d47871769d817caa6d6edfc198d91f5f3616170921c059a1e588e943d40086d0fcfb6c5
+EBUILD stuntman-1.2.9.ebuild 670 SHA256 af03d9b1df63fe09dda4b25dbad5e388bdaa5ea8d2208b07fcda96c3718552c2 SHA512 f8b38864ac8d046bd19599ed8970330eb0f5e9c4b2d5c42bf3c66bc0d33616ee4a8c96c428392bb56168321f84424135afeceb4c159842c65bab067cc37334ac WHIRLPOOL fa991c0d414f280ebb28a9b34b1b793b51d30278b4515fd9bb428e6c2e0c3a755879d2128caba13c0eec352294584714dbd3c1c56b01d666d9ed21bc65a9d2aa
+MISC ChangeLog 2864 SHA256 1335fde4e4342daa4bc83de62995a5ad7a450bf44e0d8d72507a7c10a820b59d SHA512 e01e597918e7c130d43d7e64aacb4c9523454402e7fabcc9015edca5663e8d912f396df07a30519708dd285b7df18d230883822365b60454af299842e9223072 WHIRLPOOL d8638a52d708b49be1f95a7d134e6aa9581b0abbe7b7f73d9369d3b15453748e9a3ecdfd6ba9806b7e90d554655b31805309cb2c9f45c23fb70000fca61589b2
+MISC ChangeLog-2015 1290 SHA256 300d47effb4ff5c405526fd8abe4d3ce741c8551fdcb60b8ad0c465f24341b12 SHA512 efc730ae00c90d5d8ec1b2360c2b0efb7f05e744d17474fb979eed81481775514e84352045e6b2ae0ab9fc9466507f4464b16e69ce04da54e4627a47b0801995 WHIRLPOOL 22de215777603e9fa91dfbcc066bc3eb319827d699e7746a8d53539322f325e905162d1b91990a3e9b460007e3942d1a52d68524fa744d8b9b7385c6dd52d755
+MISC metadata.xml 251 SHA256 f6ff468128d9aa804b47d9a184c761b4123b908d302eec0953226acd00fc80df SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd WHIRLPOOL 1610f6ab9cfa21736bbc4643fec692b621f8889a5888b4189847af4aa6f5719829cfaba363c480483fe7e8fb2c40d417e986964b52cb21d564940c4b51f8554d
diff --git a/net-misc/stuntman/files/stuntman.confd b/net-misc/stuntman/files/stuntman.confd
new file mode 100644
index 000000000000..a49d512843e8
--- /dev/null
+++ b/net-misc/stuntman/files/stuntman.confd
@@ -0,0 +1,7 @@
+# Stuntman's stunserver normally starts in simple mode.
+# It's recommended to run stunserver in full mode, there are
+# basically two options, bind it to two separate interfaces,
+# or more conveniently, to IP addresses.  There are numerous
+# other options for stunserver, just run stunserver --help
+# for more information.
+#STUNTMAN_PARAMS="--mode full --primaryinterface 1.2.3.4 --altinterface 1.2.3.5"
diff --git a/net-misc/stuntman/files/stuntman.initd b/net-misc/stuntman/files/stuntman.initd
new file mode 100644
index 000000000000..d0730a017031
--- /dev/null
+++ b/net-misc/stuntman/files/stuntman.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/stunserver.pid"
+command="/usr/sbin/stunserver"
+command_args="${STUNTMAN_PARAMS}"
+command_background="true"
+
+depend() {
+	need net
+}
diff --git a/net-misc/stuntman/metadata.xml b/net-misc/stuntman/metadata.xml
new file mode 100644
index 000000000000..5087760546f6
--- /dev/null
+++ b/net-misc/stuntman/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/stuntman/stuntman-1.2.7.ebuild b/net-misc/stuntman/stuntman-1.2.7.ebuild
new file mode 100644
index 000000000000..dfb40eb4a220
--- /dev/null
+++ b/net-misc/stuntman/stuntman-1.2.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="STUNTMAN is an open source implementation of the STUN protocol"
+HOMEPAGE="http://www.stunprotocol.org"
+SRC_URI="http://www.stunprotocol.org/stunserver-${PV}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/boost
+	dev-libs/openssl:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/stunserver"
+
+src_compile() {
+	emake T=""
+}
+
+src_install() {
+	dobin stunclient
+	dosbin stunserver
+	dodoc HISTORY README
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
+
+src_test() {
+	./stuntestcode
+}
diff --git a/net-misc/stuntman/stuntman-1.2.9.ebuild b/net-misc/stuntman/stuntman-1.2.9.ebuild
new file mode 100644
index 000000000000..d391ab7e5ef0
--- /dev/null
+++ b/net-misc/stuntman/stuntman-1.2.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="STUNTMAN is an open source implementation of the STUN protocol"
+HOMEPAGE="http://www.stunprotocol.org"
+SRC_URI="http://www.stunprotocol.org/stunserver-${PV}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/boost
+	dev-libs/openssl:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/stunserver"
+
+src_compile() {
+	emake T=""
+}
+
+src_install() {
+	dobin stunclient
+	dosbin stunserver
+	dodoc HISTORY README
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
+
+src_test() {
+	./stuntestcode
+}
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
new file mode 100644
index 000000000000..b4855f974a43
--- /dev/null
+++ b/net-misc/suite3270/Manifest
@@ -0,0 +1,17 @@
+AUX Makefile.in 288 SHA256 c562d7dd6d1396a7fc1232f4d780d4eec4b95640e55a329f32918d20be789482 SHA512 e85cf2775af99af4d004a18f3580748866786544b69ca7191c0a2bee0ebb2a652aaf3024f9baaa029e9c730f1765b37ee07d6f8430649f79607369feca862d2d WHIRLPOOL d42368f46f433721c4ad6c24b4aff659c308d497ffb5f450578fb6d6a19a6fc8fe18481fb323c59ff0021a7669af69cbe988fc3ca3dfcdc03c33373a39e4b156
+AUX suite3270-3.5_p8-tinfo.patch 2793 SHA256 0a12c15ece65c336147bfbdf3a48593438d6b1287a27e57975fbe67592a5e393 SHA512 67a7fe63228dad755f73582eda7d1bc7efda18f454b99258f6bbfb45aa081a14c583797a6c940b80604eacfc719d4ba1be83ba2425c99de3afa4d1e027b3402b WHIRLPOOL 9988ff0c8dafadda5f349b3192039243fa710fe5668d7cb539e82c8210d1641a04d752ac2e203b7d77fbd9256b85c218dd72575298011b337c4372b6b0cfe67d
+DIST suite3270-3.3.15ga9-src.tgz 6960911 SHA256 e22f40360170acf70b6de521173c633072582315b4879aef276fb8c97102e848 SHA512 dd6ad0b42f935a9a25170d3ef765e8d31746b7c6a7d9c6f31630da77cc4fd2bde9f4861c86fb237211dd17e60423c4e1627871c8a710467076b99166e7774ccb WHIRLPOOL 79b5691995dd98e6821130df3df8fed2af04abb7ebce642a12d82fa67045c3a1e491d32b8dd43b574b35e80cf0c734f8ab007ece18130e7c373175fa672a8e46
+DIST suite3270-3.4ga10-src.tgz 3398730 SHA256 e9c1b46a61e4e727538fa942657c7eea7eef42de916a78c72a086b57330e2417 SHA512 d9ed4aa41c45a2e961d5c2d0c00c6b81526da64b9c1765b0c5e39cb647157026a787db2054b2feb55c57e5a458a31062141471447b1177fd46cbbeb7d71e3f28 WHIRLPOOL 0af05ca2bedf00595fb8f525f51be3d6595d320d8f199d677d684ed797c7d1a29e1e1bb93187136c4fd8679c00e0255e5178d5ea3a2357a6545124ce510ecc92
+DIST suite3270-3.4ga9-src.tgz 3400841 SHA256 49dfd73f930196c05bbc80709c2ac89b5c4f43745d6ce7a271c78a4624d93c1e SHA512 02c834d8a23bf3cde33dec017d5d8dcc6473ca43bb066d3d0315898de9a2685ad75986ec14e2c6234269b310121bb5f8c4a04df3694e02fcc6c0947cfc661f69 WHIRLPOOL bb3974b7b690fe6ca41830dc1cb89f2d8e08be7b85423d771af8b97ef49191ae96ce84d7c7de2f03c058d2aa9738ab8949ae99c7de32f9605b3064daba9ebe17
+DIST suite3270-3.5ga10-src.tgz 3412329 SHA256 e316638cfa317aec8c542b8c64b9a0adfa41889193aafb814371b633cbb94c03 SHA512 0cce1212ca7589595cd2f775d18086f231a9e6d621716be5a41123a379358d9ac08c9668de2bd6a2e401ae54d12a4905c3c260cb7ba90482bbce6790d8e3efb8 WHIRLPOOL b753f830dbda560018851e6b32e44adae5d80dbb001ecf6bc7b5e55d7d4381959c47934f3d7529a7be39b7d9d3a3d7dd54129a0e14acdb5a84216bdd57ed9222
+DIST suite3270-3.5ga8-src.tgz 3404504 SHA256 04d98c2644d8acc3b0089f85558074623500bc194c41609298b344b6e5d905d2 SHA512 f912afccaec7a489fcfb4e6d61729154c09a68df9478747d7b074d970fbe4b7ac8c809fb496b1cd329d6119a2dc45b2d67ef94f39679218858afc75a4a3dc072 WHIRLPOOL 9ed4b2f6f8fe028f40ff4d75bcde70c140e5afd00b82f861951385850873d114df594ceb3623716005c282d570c30f1407a50c353d142c542e3562ae29afe462
+DIST suite3270-3.5ga9-src.tgz 3409168 SHA256 654756cc1204fd69a861d416d350a0ab3c9cea317173a80b06aca0402a517d3e SHA512 b206f0f9a698922ca207d93cbd9d302c2fc9fd7f492de78f63fadaaee96dfeeebe3e06a51ca181f5785287832db7e1a3b6666db2cab1a23a138caab7e1eed634 WHIRLPOOL e20f6bd73888b945e9f9d4c99dda9d84ceee5ea776fc69593735b3fb07733703e656d102187206082e24b5995481386a88bd2a46b9618776ec80a0310dcb601f
+EBUILD suite3270-3.3.15_p9.ebuild 2480 SHA256 78c3f8529d29f12df1bd95b56fe65cb46093179d36df791c9b7d8c5ed1adf259 SHA512 099674bbc3cf77e6c4b829d0a14f9ad5ec88173b66df3f62b96143cc07f59100cd7a5653ee8e6af0fcb92efded9c92c18c07a042aa42ca89da91d85e9a0d116a WHIRLPOOL 2416932993a7a5581aecab80bf57a704a070f73ab08f396234531e94a1c5d2f36ea0b199975ad574f9b9f8d318e2cd470e22f4b3d234664b355e08977478f982
+EBUILD suite3270-3.4_p10.ebuild 2057 SHA256 901bcc9cc310b81ec2c1d3e049cb2f8d0e6e11e073f4f6107aa02534377812e4 SHA512 91e3015a1ac9460c037464b93d69339e4ec454cf72ee1bf37181d940fc6519086d7571d930c85db9878eb9b5bd01edd8d982a2526191bb48c1fc4096c0bf2759 WHIRLPOOL 189dc7dc2cda3e9f6a3f408d930120c921d32f492296f35feb15129ba8691d8aceb68b1bc3b8f5a8fca4ee96b9f61e63f752b6f900ff080ea1e6c835d1cbe787
+EBUILD suite3270-3.4_p9.ebuild 2057 SHA256 901bcc9cc310b81ec2c1d3e049cb2f8d0e6e11e073f4f6107aa02534377812e4 SHA512 91e3015a1ac9460c037464b93d69339e4ec454cf72ee1bf37181d940fc6519086d7571d930c85db9878eb9b5bd01edd8d982a2526191bb48c1fc4096c0bf2759 WHIRLPOOL 189dc7dc2cda3e9f6a3f408d930120c921d32f492296f35feb15129ba8691d8aceb68b1bc3b8f5a8fca4ee96b9f61e63f752b6f900ff080ea1e6c835d1cbe787
+EBUILD suite3270-3.5_p10.ebuild 2106 SHA256 26632e513b940384548ffdc4b6bb2d3982b4a171b6482a3b7659f89a26ea6b72 SHA512 30c12b4ad8cc2b57e633bcbe1b018828b743999ce7ba41dea369a703a520c2e1d8d2a42da0e4b2465b53136d06c8311ccdb70585e02851730ed0fdfab0865daf WHIRLPOOL d1d89321de205065c67585d376b5ea4df86cc77f6af431144c091327c4de08207182d7c2ecb067142a8d2f1a929832ebd8fc7511ce622bfdb9dadd1db7f9418a
+EBUILD suite3270-3.5_p8.ebuild 2106 SHA256 575b12fb6f22a3c712986fc5ad3d4dfb7e499a9efd76449107383e52d629a283 SHA512 9d9af1da4a812979256a3780191e1ff90020647e66e6c254bab3ca830aa311eaa8debb83457f2c4d26ac85af3bea785c4703fc3b96015681817fd7d8c2ab27e6 WHIRLPOOL 095c527ae98495f45c110859aa463f1bf44dc4bcf81628454dd7dac6348cd12702c7a29d7abb5aefbc83d7b5ceb549f6638567f8079ef789b6fabc996d34a829
+EBUILD suite3270-3.5_p9.ebuild 2106 SHA256 575b12fb6f22a3c712986fc5ad3d4dfb7e499a9efd76449107383e52d629a283 SHA512 9d9af1da4a812979256a3780191e1ff90020647e66e6c254bab3ca830aa311eaa8debb83457f2c4d26ac85af3bea785c4703fc3b96015681817fd7d8c2ab27e6 WHIRLPOOL 095c527ae98495f45c110859aa463f1bf44dc4bcf81628454dd7dac6348cd12702c7a29d7abb5aefbc83d7b5ceb549f6638567f8079ef789b6fabc996d34a829
+MISC ChangeLog 5833 SHA256 42a61bae7646d21093189451c5845b303db9b56642ef326f14221b7f074d8619 SHA512 ed7b98f634fabc452d7881a9212956be39a2404bca4221eda315968e71b2af6fcfc349e1e1977d1b6513b4d00525bb55393f790b9de1c112d3cdd82e3b8cc6eb WHIRLPOOL 1343b3eebb009ba7e5bba8524531d501e0dd83fc40d5a0b9d666e93b61521149d3a1dce44b4be3d8dd2fcd92ca4d5aca19dffc602b9dae5c79edd77b13716ba1
+MISC ChangeLog-2015 9504 SHA256 deb1bf789241e67dc896244da4fe0dc32386bbcdb124a2624f1e7d70614af33e SHA512 c10092541d813a39d33f814e91ac0339e1b4b05bdfe21af3d6a7b93d13e69365784c835ec7a02ba558a64b6c649f5a64c347640aaa577395d5a45bdb75bf371a WHIRLPOOL 24af3ac10b0bc2801a36f041c045f882b910569fb4fe518dcaab492d4416949d155e03e641344028b077087860b1c15adfb64eff13ffdb8929352ce72793e639
+MISC metadata.xml 817 SHA256 f5e976c898edaefdcb969c36454bd12e5ada1d5fde247a17604f0f318a43467f SHA512 35ae680ef866fb426e11f0a8cd1684cad37d73d1cb9b14d1af28c6dc5643074ef8c879075a39448e7b42cfab956245e7acfc66cbd87842965137fe603d26957f WHIRLPOOL 4bf273ab573da73ca3a8ade70bb36c1d4ad3dcb37ee2b05a684d4e756d231b4ef57917bf97ca54ab98262815bec57ebb3cc1ff3449716f2a78f3781843436321
diff --git a/net-misc/suite3270/files/Makefile.in b/net-misc/suite3270/files/Makefile.in
new file mode 100644
index 000000000000..154b470de801
--- /dev/null
+++ b/net-misc/suite3270/files/Makefile.in
@@ -0,0 +1,10 @@
+# DO NOT STARE AT THE SUN
+VER = @VER@
+_SUBDIRS = @SUBDIRS@
+SUBDIRS = $(_SUBDIRS:=-$(VER))
+all:
+%:; $(MAKE) `printf '%s_$@_ ' $(SUBDIRS)`
+_words = $(subst _, ,$1)
+_dir = $(firstword $(call _words,$@))
+_targ = $(lastword $(call _words,$@))
+%_:; $(MAKE) -C $(_dir) $(_targ) $(EXTRA_TARGETS)
diff --git a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch b/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch
new file mode 100644
index 000000000000..9235809f02ef
--- /dev/null
+++ b/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch
@@ -0,0 +1,87 @@
+From a28f70d7fa11907898887706df35c3c3831d901a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 10 May 2016 01:12:30 -0400
+Subject: [PATCH] c3270: autolink libtinfo when it exists
+
+The ncurses libs might split out core funcs into libtinfo.  Make sure we
+detect & link this when available otherwise the linker might complain the
+symbols are missing:
+ld: screen.o: undefined reference to symbol 'meta'
+/usr/lib64/libtinfo.so.6: error adding symbols: DSO missing from command line
+collect2: error: ld returned 1 exit status
+---
+ x3270/c3270/configure.in |  1 +
+ x3270/c3270/configure    | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 46 insertions(+)
+
+diff --git a/x3270/c3270/configure.in b/x3270/c3270/configure.in
+index d9f19e6..8c6d852 100644
+--- a/x3270/c3270/configure.in
++++ b/x3270/c3270/configure.in
+@@ -129,6 +129,7 @@ dnl first, so that objects in them can be used by subsequent libraries.
+ AC_SEARCH_LIBS(forkpty, util)
+ AC_CHECK_FUNCS(forkpty)
+ AC_CHECK_LIB(ncursesw, newterm, , [AC_CHECK_LIB(ncurses, newterm, , [AC_CHECK_LIB(curses, newterm, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)])])])
++AC_CHECK_LIB(tinfo, meta)
+ if test "$with_readline" != no; then
+ AC_CHECK_LIB(readline, rl_initialize)
+ fi
+diff --git a/x3270/c3270/configure b/x3270/c3270/configure
+index bef2dff..9946e83 100755
+--- a/x3270/c3270/configure
++++ b/x3270/c3270/configure
+@@ -4020,6 +4020,51 @@ fi
+ 
+ fi
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for meta in -ltinfo" >&5
++$as_echo_n "checking for meta in -ltinfo... " >&6; }
++if ${ac_cv_lib_tinfo_meta+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltinfo  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char meta ();
++int
++main ()
++{
++return meta ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_tinfo_meta=yes
++else
++  ac_cv_lib_tinfo_meta=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_meta" >&5
++$as_echo "$ac_cv_lib_tinfo_meta" >&6; }
++if test "x$ac_cv_lib_tinfo_meta" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBTINFO 1
++_ACEOF
++
++  LIBS="-ltinfo $LIBS"
++
++fi
++
+ if test "$with_readline" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_initialize in -lreadline" >&5
+ $as_echo_n "checking for rl_initialize in -lreadline... " >&6; }
+-- 
+2.7.4
+
diff --git a/net-misc/suite3270/metadata.xml b/net-misc/suite3270/metadata.xml
new file mode 100644
index 000000000000..bd77896aafc4
--- /dev/null
+++ b/net-misc/suite3270/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+    <description>Maintainer</description>
+  </maintainer>
+  <maintainer type="person">
+    <email>jieryn@gmail.com</email>
+    <name>Jesse Farinacci</name>
+    <description>Maintainer by proxy, please CC on all bugs.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>s390@gentoo.org</email>
+    <name>Gentoo Linux s390 Development</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">x3270</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/suite3270/suite3270-3.3.15_p9.ebuild b/net-misc/suite3270/suite3270-3.3.15_p9.ebuild
new file mode 100644
index 000000000000..c9907aa45180
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.3.15_p9.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S=${WORKDIR}/${FONT_PN}-${SUB_PV}
+
+inherit eutils font multiprocessing
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc s390 sparc x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ncurses? ( sys-libs/ncurses sys-libs/readline )
+	tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-misc/xbitmaps
+		x11-proto/xproto
+		app-text/rman
+		x11-apps/mkfontdir
+		x11-apps/bdftopcf
+	)"
+
+suite3270_makelist() {
+	echo pr3287 s3270 \
+		$(usex ncurses c3270 '') \
+		$(usex tcl tcl3270 '') \
+		$(usex X x3270 '')
+}
+
+src_prepare() {
+	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
+	# (they have the same contents).  Wrap that in a retry to avoid errors.
+	cat <<-EOF > _install
+	#!/bin/sh
+	for n in {1..5}; do
+		install "\$@" && exit
+		echo "retrying ..."
+	done
+	EOF
+	chmod a+rx _install
+	sed -i \
+		-e "s:@INSTALL@:${S}/_install:" \
+		*/Makefile.in
+
+	sed -i \
+		-e 's:CPPFunction:rl_completion_func_t:' \
+		c3270-*/c3270.c || die #503364
+}
+
+src_configure() {
+	local p myconf
+	# Run configures in parallel!
+	multijob_init
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}-${SUB_PV}"
+		if [[ ${p} == "x3270" ]] ; then
+			myconf=(
+				--without-xmkmf
+				$(use_with X x)
+				$(use_with X fontdir "${FONTDIR}")
+			)
+		else
+			myconf=()
+		fi
+		multijob_child_init econf \
+			--cache-file="${S}"/config.cache \
+			$(use_enable cjk dbcs) \
+			$(use_enable ssl) \
+			"${myconf[@]}"
+	done
+	sed \
+		-e "s:@SUBDIRS@:$(suite3270_makelist):" \
+		-e "s:@VER@:${SUB_PV}:" \
+		"${FILESDIR}"/Makefile.in > "${S}"/Makefile || die
+	multijob_finish
+}
+
+src_install() {
+	use X && dodir "${FONTDIR}"
+	EXTRA_TARGETS='install.man' default
+	local p
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}-${SUB_PV}"
+		docinto ${p}
+		local d=$(echo README*)
+		[[ -n ${d} ]] && dodoc ${d}
+		use doc && dohtml html/*
+	done
+	find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} +
+
+	use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.4_p10.ebuild b/net-misc/suite3270/suite3270-3.4_p10.ebuild
new file mode 100644
index 000000000000..d3e53d33da3d
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.4_p10.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}/${PN}-${SUB_PV}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S=${WORKDIR}/${FONT_PN}
+
+inherit eutils font
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc s390 sparc x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ncurses? (
+		sys-libs/ncurses:=
+		sys-libs/readline:0=
+	)
+	tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-misc/xbitmaps
+		x11-proto/xproto
+		app-text/rman
+		x11-apps/mkfontdir
+		x11-apps/bdftopcf
+	)"
+
+suite3270_makelist() {
+	echo pr3287 s3270 \
+		$(usex ncurses c3270 '') \
+		$(usex tcl tcl3270 '') \
+		$(usex X x3270 '')
+}
+
+src_prepare() {
+	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
+	# (they have the same contents).  Wrap that in a retry to avoid errors.
+	cat <<-EOF > _install
+	#!/bin/sh
+	for n in 1 2 3 4 5; do
+		install "\$@" && exit
+		echo "retrying ..."
+	done
+	exit 1
+	EOF
+	chmod a+rx _install
+	# Can't use the $INSTALL var as top level configure also uses it.
+	# https://sourceforge.net/p/x3270/bugs/15/
+	export ac_cv_path_install="${S}/_install"
+}
+
+src_configure() {
+	echo "${INSTALL}"
+	econf \
+		--cache-file="${S}"/config.cache \
+		--enable-s3270 \
+		--enable-pr3287 \
+		$(use_enable ncurses c3270) \
+		$(use_enable tcl tcl3270) \
+		$(use_enable X x3270) \
+		$(use_with X x) \
+		$(use_with X fontdir "${FONTDIR}")
+}
+
+src_install() {
+	use X && dodir "${FONTDIR}"
+	emake DESTDIR="${D}" install{,.man}
+
+	local p
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}"
+		docinto ${p}
+		dodoc README*
+		use doc && dohtml html/*
+	done
+
+	use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.4_p9.ebuild b/net-misc/suite3270/suite3270-3.4_p9.ebuild
new file mode 100644
index 000000000000..d3e53d33da3d
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.4_p9.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}/${PN}-${SUB_PV}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S=${WORKDIR}/${FONT_PN}
+
+inherit eutils font
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc s390 sparc x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ncurses? (
+		sys-libs/ncurses:=
+		sys-libs/readline:0=
+	)
+	tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-misc/xbitmaps
+		x11-proto/xproto
+		app-text/rman
+		x11-apps/mkfontdir
+		x11-apps/bdftopcf
+	)"
+
+suite3270_makelist() {
+	echo pr3287 s3270 \
+		$(usex ncurses c3270 '') \
+		$(usex tcl tcl3270 '') \
+		$(usex X x3270 '')
+}
+
+src_prepare() {
+	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
+	# (they have the same contents).  Wrap that in a retry to avoid errors.
+	cat <<-EOF > _install
+	#!/bin/sh
+	for n in 1 2 3 4 5; do
+		install "\$@" && exit
+		echo "retrying ..."
+	done
+	exit 1
+	EOF
+	chmod a+rx _install
+	# Can't use the $INSTALL var as top level configure also uses it.
+	# https://sourceforge.net/p/x3270/bugs/15/
+	export ac_cv_path_install="${S}/_install"
+}
+
+src_configure() {
+	echo "${INSTALL}"
+	econf \
+		--cache-file="${S}"/config.cache \
+		--enable-s3270 \
+		--enable-pr3287 \
+		$(use_enable ncurses c3270) \
+		$(use_enable tcl tcl3270) \
+		$(use_enable X x3270) \
+		$(use_with X x) \
+		$(use_with X fontdir "${FONTDIR}")
+}
+
+src_install() {
+	use X && dodir "${FONTDIR}"
+	emake DESTDIR="${D}" install{,.man}
+
+	local p
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}"
+		docinto ${p}
+		dodoc README*
+		use doc && dohtml html/*
+	done
+
+	use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.5_p10.ebuild b/net-misc/suite3270/suite3270-3.5_p10.ebuild
new file mode 100644
index 000000000000..f1c8a5a44734
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.5_p10.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}/${PN}-${SUB_PV}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S="${S}/${FONT_PN}"
+
+inherit eutils font
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ncurses? (
+		sys-libs/ncurses:=
+		sys-libs/readline:0=
+	)
+	tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-misc/xbitmaps
+		x11-proto/xproto
+		app-text/rman
+		x11-apps/mkfontdir
+		x11-apps/bdftopcf
+	)"
+
+suite3270_makelist() {
+	echo pr3287 s3270 \
+		$(usex ncurses c3270 '') \
+		$(usex tcl tcl3270 '') \
+		$(usex X x3270 '')
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
+
+	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
+	# (they have the same contents).  Wrap that in a retry to avoid errors.
+	cat <<-EOF > _install
+	#!/bin/sh
+	for n in 1 2 3 4 5; do
+		install "\$@" && exit
+		echo "retrying ..."
+	done
+	exit 1
+	EOF
+	chmod a+rx _install
+	# Can't use the $INSTALL var as top level configure also uses it.
+	# https://sourceforge.net/p/x3270/bugs/15/
+	export ac_cv_path_install="${S}/_install"
+}
+
+src_configure() {
+	echo "${INSTALL}"
+	econf \
+		--cache-file="${S}"/config.cache \
+		--enable-s3270 \
+		--enable-pr3287 \
+		$(use_enable ncurses c3270) \
+		$(use_enable tcl tcl3270) \
+		$(use_enable X x3270) \
+		$(use_with X x) \
+		$(use_with X fontdir "${FONTDIR}")
+}
+
+src_install() {
+	use X && dodir "${FONTDIR}"
+	emake DESTDIR="${D}" install{,.man}
+
+	local p
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}"
+		docinto ${p}
+		dodoc README*
+		use doc && dohtml html/*
+	done
+
+	use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.5_p8.ebuild b/net-misc/suite3270/suite3270-3.5_p8.ebuild
new file mode 100644
index 000000000000..896e6de13dd9
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.5_p8.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}/${PN}-${SUB_PV}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S="${S}/${FONT_PN}"
+
+inherit eutils font
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ncurses? (
+		sys-libs/ncurses:=
+		sys-libs/readline:0=
+	)
+	tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-misc/xbitmaps
+		x11-proto/xproto
+		app-text/rman
+		x11-apps/mkfontdir
+		x11-apps/bdftopcf
+	)"
+
+suite3270_makelist() {
+	echo pr3287 s3270 \
+		$(usex ncurses c3270 '') \
+		$(usex tcl tcl3270 '') \
+		$(usex X x3270 '')
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
+
+	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
+	# (they have the same contents).  Wrap that in a retry to avoid errors.
+	cat <<-EOF > _install
+	#!/bin/sh
+	for n in 1 2 3 4 5; do
+		install "\$@" && exit
+		echo "retrying ..."
+	done
+	exit 1
+	EOF
+	chmod a+rx _install
+	# Can't use the $INSTALL var as top level configure also uses it.
+	# https://sourceforge.net/p/x3270/bugs/15/
+	export ac_cv_path_install="${S}/_install"
+}
+
+src_configure() {
+	echo "${INSTALL}"
+	econf \
+		--cache-file="${S}"/config.cache \
+		--enable-s3270 \
+		--enable-pr3287 \
+		$(use_enable ncurses c3270) \
+		$(use_enable tcl tcl3270) \
+		$(use_enable X x3270) \
+		$(use_with X x) \
+		$(use_with X fontdir "${FONTDIR}")
+}
+
+src_install() {
+	use X && dodir "${FONTDIR}"
+	emake DESTDIR="${D}" install{,.man}
+
+	local p
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}"
+		docinto ${p}
+		dodoc README*
+		use doc && dohtml html/*
+	done
+
+	use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.5_p9.ebuild b/net-misc/suite3270/suite3270-3.5_p9.ebuild
new file mode 100644
index 000000000000..896e6de13dd9
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.5_p9.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}/${PN}-${SUB_PV}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S="${S}/${FONT_PN}"
+
+inherit eutils font
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ncurses? (
+		sys-libs/ncurses:=
+		sys-libs/readline:0=
+	)
+	tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-misc/xbitmaps
+		x11-proto/xproto
+		app-text/rman
+		x11-apps/mkfontdir
+		x11-apps/bdftopcf
+	)"
+
+suite3270_makelist() {
+	echo pr3287 s3270 \
+		$(usex ncurses c3270 '') \
+		$(usex tcl tcl3270 '') \
+		$(usex X x3270 '')
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
+
+	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
+	# (they have the same contents).  Wrap that in a retry to avoid errors.
+	cat <<-EOF > _install
+	#!/bin/sh
+	for n in 1 2 3 4 5; do
+		install "\$@" && exit
+		echo "retrying ..."
+	done
+	exit 1
+	EOF
+	chmod a+rx _install
+	# Can't use the $INSTALL var as top level configure also uses it.
+	# https://sourceforge.net/p/x3270/bugs/15/
+	export ac_cv_path_install="${S}/_install"
+}
+
+src_configure() {
+	echo "${INSTALL}"
+	econf \
+		--cache-file="${S}"/config.cache \
+		--enable-s3270 \
+		--enable-pr3287 \
+		$(use_enable ncurses c3270) \
+		$(use_enable tcl tcl3270) \
+		$(use_enable X x3270) \
+		$(use_with X x) \
+		$(use_with X fontdir "${FONTDIR}")
+}
+
+src_install() {
+	use X && dodir "${FONTDIR}"
+	emake DESTDIR="${D}" install{,.man}
+
+	local p
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}"
+		docinto ${p}
+		dodoc README*
+		use doc && dohtml html/*
+	done
+
+	use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/switzerland/Manifest b/net-misc/switzerland/Manifest
new file mode 100644
index 000000000000..33c2a3fdbf29
--- /dev/null
+++ b/net-misc/switzerland/Manifest
@@ -0,0 +1,6 @@
+AUX Makefile 178 SHA256 72028f9bfe85a24cb1ea7b6b9cdd20e6cfab677b43c0bb0c43fd1156a1976ef3 SHA512 5fd441aa419dedef9eab6848a1a5c6bc9b4748a9e8a19680cb110833a9cae58db1f810d37e2e6c383edee3c1d439e7f3f208a8bfa3bd6d3b2fcc8c26d2aaff0a WHIRLPOOL caaaf8ef68c53e1b8995276aeae6f670c3b2a59253f97c7956bf7f3fa6b285ca08c43e0e80080502fd5855e8aa62d785d97de4260e1abaf3b385d8e62e127bca
+DIST switzerland-0.1.0.tgz 592922 SHA256 759d7a3dfda9e71ee309410c741342393585e9a0328d8f0d7ebf2049f319bd60 SHA512 3a5474c005bf45cddf8eede7c1e2faa5855bf9017f5c732555cfe2c8b7b82381ea25c2ada000a9945a330ff3af19f1e861a11508ff057c81a78eab53de1d0cdb WHIRLPOOL 8ac597d03a7ab39af9aad817ea850a5376e5fdacc4879df97a46fccfd97e7cc418dfc70f964873e618d8e9eee967b37fa1de80b5c75def0eb768219103455e0c
+EBUILD switzerland-0.1.0.ebuild 805 SHA256 5b9438122d2d9838588e54ee3e52aaf024c85430e7780519c2e52be7f755c464 SHA512 8d15e4d57de128ad4005a3af97abeacf8124d72d1fc0f9bb8cb63dab64fb564732df03a97af3a96532fc916784e054ecbc48006b008a2da99fd3ec24cc470bc5 WHIRLPOOL 00ba2a5996d942ea90f5df33c47a21a30d55b260bfd006f4b89ebd2ff6f29ab6be6267d83731851de44583c8f409cc02a1034f746f2133beb459fbb8c2966aa4
+MISC ChangeLog 2456 SHA256 1b74e12ec3c6654fa05de016ed24f2bfda22589883c93d47616c4ae195280c41 SHA512 707680444e9e19117e3353e7048e81267aa4b4ddbed452f2440e690138d78e6fb77c912a49c871bd8e4cad1e2f6a526a4a1cc274444c91e8c989999b35d58881 WHIRLPOOL c43051a7b8fbfb141fb4abe299894cfec30c5cf7e2b697872c20be235a62e136d4ef9f6ebb1490967186a8b0dc267fa113b09dca2207927791a6c8438ac573f7
+MISC ChangeLog-2015 1010 SHA256 c08e30f1b38ac4853dd4b741362fb6187faca0275c57bb899e8e3f2d7e93ffc9 SHA512 6d72de7c260a309268e330f68eabc374beb8a2aecc1d515ca8d2d87953325566349b2c7d1e9eb12be4e7873278e3f183dc1ac1c5f296ba0fd11a252c1b751777 WHIRLPOOL d13f0c40b1d18688d1e9b5cf9c3f3407388ec6aa00819ff2791a874bcf6fb8ef0380c56249234b22e73f882a85a3d1e30d56b0ba67ac2af3040f8ef1e9433624
+MISC metadata.xml 673 SHA256 e325e7550c3eb5431720dad78e719b95c37e8f812f2483e72363120ad09e4390 SHA512 295754b6dec585585511b93a004f0e9857466a94b7c34c903ee55aa2a8557648dd2fd93e6bbfc790459d0c19d592fbeb49f8b749528a488014c89a3ad96313e4 WHIRLPOOL da9ef0fd78ef69b81711b241bee252621522e42c2d6e0927a728478c06d3933739758879d96d063349e0d53bb07a8b6cf6d34241e1600dfb1460c761772ba95a
diff --git a/net-misc/switzerland/files/Makefile b/net-misc/switzerland/files/Makefile
new file mode 100644
index 000000000000..c1e582d56dc4
--- /dev/null
+++ b/net-misc/switzerland/files/Makefile
@@ -0,0 +1,12 @@
+SRC = FastCollector.c
+OBJ = ${SRC:.c=.o}
+
+LIBS = -lpcap
+
+all: FastCollector
+
+.c.o:
+	$(CC) -c $(CFLAGS) $<
+
+FastCollector: $(OBJ)
+	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS)
diff --git a/net-misc/switzerland/metadata.xml b/net-misc/switzerland/metadata.xml
new file mode 100644
index 000000000000..e77e27bbace0
--- /dev/null
+++ b/net-misc/switzerland/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Switzerland is an open source software tool for testing the integrity of
+		data communications over networks, ISPs and firewalls. It will spot IP
+		packets which are forged or modified between clients, inform you, and
+		give you copies of the modified packets.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">switzerland</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/switzerland/switzerland-0.1.0.ebuild b/net-misc/switzerland/switzerland-0.1.0.ebuild
new file mode 100644
index 000000000000..2ff94e8d6285
--- /dev/null
+++ b/net-misc/switzerland/switzerland-0.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Network Testing Tool"
+HOMEPAGE="http://www.eff.org/testyourisp/switzerland/"
+SRC_URI="mirror://sourceforge/switzerland/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="net-libs/libpcap"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	cp "${FILESDIR}"/Makefile switzerland/client
+
+	sed -i \
+		-e "s/= find_binary()/= dest/" \
+		setup.py
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	cd switzerland/client
+	emake CC=$(tc-getCC)
+
+	cd "${S}"
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	dodoc BUGS.txt CREDITS
+
+	keepdir /var/log/switzerland-pcaps
+	keepdir /var/log/switzerland
+}
diff --git a/net-misc/taptap/Manifest b/net-misc/taptap/Manifest
new file mode 100644
index 000000000000..a475635c22d9
--- /dev/null
+++ b/net-misc/taptap/Manifest
@@ -0,0 +1,5 @@
+DIST taptap-1.0.tar.bz2 1640 SHA256 cb4273ee00ad488b648547aea39ecf345ad5badde613285347b9df5f3a84dd28 SHA512 ab9264823c470fd76530258fa3b8993799bd1170269b1e8e143ef072ac5749cc51716cd53ffec285b3a3266e4503be8d0d91094f82c30dd85607ef8cd368f53e WHIRLPOOL b7fcf9314516f7e5b86062426580764a87ff889b1ec0511f0fc6a5d3fe0b27c3a460b1625745182f3604bc678eba89d8dd198fb003920132339a05552d6b0355
+EBUILD taptap-1.0.ebuild 638 SHA256 faab5cafcdcaf2a72ffd8daecc12c220d5e151654f8795ba16544e22e3087abe SHA512 7143bf6d28af39bb52573a14ff55462ca0ed84079b1c4fd20a5156ee0005caf6ccdc8a354df4cb683d389c10b6dc7367d2a025b104efcf13f1bc9a27b9c836f4 WHIRLPOOL 77edaf43dd5d36cf19d6751cfa5a6391a42b51003aa42d06c17a2e1d98435628947b73c64ea6e4c8e38c28c12ef6fab2350f2feedca460bb4ef1034b4d8d47fc
+MISC ChangeLog 2515 SHA256 0ed0478dd27fb6dbfcef60da6dd2ae5c714d6cc031e0566b98ce41efe27faff1 SHA512 6005138376db8396498b2f8f68cf30144569f359d2e0b81ce864dfd5398e8f584dc4dca53fb75f2768c5fc8f406a7cc3e3b4c75f4b27c16375ebcfa31f509b69 WHIRLPOOL 7336182e1c2b589875fa47bb13a0a097387aacbee93c02a373fdba7a75f82ec686f8022afcb2ea5a6452802cc4113af8e1b3ccea7ba1eba737685a31cacf628f
+MISC ChangeLog-2015 450 SHA256 6a90c7be86adeebe54990942b899f26f1634b531b95b705ab42a2cd623885de6 SHA512 6325b65fc65898a35cff5bfd4e7797560bb23018d658bf2309284a7ebc53fc62b454084c7450ad8dc67fc9756cf77d23a26419accf057858ef51081e459a105a WHIRLPOOL dffa7739dccaca16abb85b228b49e47f9b898d9e2c6acb012e57ad84f999db7dec46cefccee578283e46d56978b59a0dd8d520afbfdad488061af0415532f459
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/taptap/metadata.xml b/net-misc/taptap/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/taptap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/taptap/taptap-1.0.ebuild b/net-misc/taptap/taptap-1.0.ebuild
new file mode 100644
index 000000000000..414b9b373c9f
--- /dev/null
+++ b/net-misc/taptap/taptap-1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="A program to link two /dev/net/tun to form virtual ethernet"
+HOMEPAGE="http://www.munted.org.uk/programming/taptap/"
+SRC_URI="http://www.munted.org.uk/programming/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i \
+		-e 's:= -Wall -s:+= -Wall:' \
+		-e 's:$(CFLAGS):$(LDFLAGS) &:' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
new file mode 100644
index 000000000000..83f260af0564
--- /dev/null
+++ b/net-misc/taylor-uucp/Manifest
@@ -0,0 +1,8 @@
+AUX taylor-uucp-1.07-fprintf.patch 188 SHA256 91fead8a78ef31ac9dc7f473a29ab0cb3455d730d97aa432de06958e35cd1a81 SHA512 468870a9e64f0ace876bc1254e264e634fc07011b9ffa5ca0ccecb23c925e2a4a5c4463e6741b265bc8df17d0a578710cc8ea135461a1dfcd1c782e991bc7623 WHIRLPOOL 7511ae276409bed699de6d2cf378a82442bc501183eb9df3a025ba168ba9ebb18373a1ba91ea2f51ee4208af7ce429db4b4f9b2b09459bf4279967d524facfba
+AUX taylor-uucp-1.07-gentoo.patch 5049 SHA256 9b36431077d349a0b9ca38a9f3d2bdec5f2bbc282ab690514f2bbdadab8cde6a SHA512 8d259ddf10c80ff6c349d3bec531f858d561f3f488fd6066d69ddb8d2242e9f22ff8781ce47dcdb10f3dbf4a073bc4bf3492f6fced30d8d129e6f81e860f971a WHIRLPOOL 7fbf4ab8a11c33d1641e888714a45c1481a2b4652e23691530820b4afb99a324fc0bf07c056a5f90ad7e3af3a4fcba71df17d0eafb61286c00f3ca098210cb22
+DIST uucp-1.07.tar.gz 1013234 SHA256 060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b WHIRLPOOL d46615bfcef6a5348c71a90525d642edcd61c3aadb43737070b27cfc2e30660284dadff44499b09d17ce34855dda8c6dd9633d637f1e81f6f916eaef6aaed46e
+EBUILD taylor-uucp-1.07-r2.ebuild 1335 SHA256 e96dbe1e0346b668344852fae2aa6a563e59b3b4db97eaa153d5e11bd986fe8e SHA512 9c9311da8d8771912a782bb53bb98863cef91f6bbbd8f3d6aefa6c46e28f8fa90a036c8e5befc58a71b26b6c1bba19a2b4b5a605388b7599a7c10a031d979e90 WHIRLPOOL cf6740c13f8b0cbf328bf5d679b5a350dbf991d61dc6923b354c55422172db7a3e6104ed8bc28d11be7ee80dd4f2afe3b14762304fafa737d51eaf4f8fdcb05f
+EBUILD taylor-uucp-1.07-r3.ebuild 1374 SHA256 5b20716f88933d863b35fd0e9de4aa1b79c196a15e2628bf6174cc7d0ca65802 SHA512 6bf7d8975e06d43554d7d8f94279d455cb247db0c246f7d1fd1a71cd5b64eb34047dc3039fcf1a97daa2260f3ea29f159c7dd621b103c239113dbbe0d05fac82 WHIRLPOOL bbf6ab994a011be7f0ef104f8e220b2e4a187be5292828d8fcf301a94074268730f1a58eb6dcc499a23dc514e6b629e47f5ee0119699b180a254933d9a356e32
+MISC ChangeLog 2805 SHA256 c015671a5ffbc9c4126998cb94abe605d75e805551b833bf3bda5e05291ec676 SHA512 f5542daf2e3e7ceb3787180db23797074e6eed1e986c39b34a284b66828bcc4d629201eaf1e0a4fc36f68c063bf0c6faceeef311655b1f30d3d88b4d00a5d445 WHIRLPOOL a96759d9eb43e3c2926ff88d147d1fdd1adfa2c87ef3d0ff5d0468049fb86ad38046b2df9cd9bd39a7e6c11fc3d052b523101557dd89226d20c25a77e61c971b
+MISC ChangeLog-2015 4637 SHA256 8f92ed5c0ddb78e20fe6c007ee2ba604f469b0d78212620339c3d6d977cc3efc SHA512 794994e892a027f9d909e45b6c8ecb38eab94b44767ed7dd955756527b3bcbabfdcf87d41f35d16accae70ead2fd9e7725118d56c591d08ce485cd5583dda865 WHIRLPOOL 79e7059966d9022ba7db5ecc588592439de164b1ec36cbe2b746d33f15b8d4839df44cc5f107c57a9d31c1a84ed988d920e6bda3fa2aa41d6ec31083d6fb67f5
+MISC metadata.xml 319 SHA256 86a63c383bfa854bb3e4de9f9dbcfa22c975e4ac280b52ab50e016da1a9f43cf SHA512 14fddbb3e6a6f0defe184c909d8ae29072782e3060dd5c91f852572039ca81be95f9cae98f6a4a011711cd991bcfa886638d725372463b3af4ee7f15654ad22d WHIRLPOOL 29099882f2bb80af396a115df8a15e0f30c46a5af905703b104acae8fddb2fa8af7b20004fcb2a087e2e9d703aeb99136ff094d107ca6af431411c2c01d9a422
diff --git a/net-misc/taylor-uucp/files/taylor-uucp-1.07-fprintf.patch b/net-misc/taylor-uucp/files/taylor-uucp-1.07-fprintf.patch
new file mode 100644
index 000000000000..5ac0304bf20f
--- /dev/null
+++ b/net-misc/taylor-uucp/files/taylor-uucp-1.07-fprintf.patch
@@ -0,0 +1,11 @@
+--- a/uuconv.c
++++ b/uuconv.c
+@@ -676,7 +676,7 @@
+     {
+       if ((*pz)[0] != '-' && pz != pzarg)
+ 	fprintf (e, " ");
+-      fprintf (e, *pz);
++      fprintf (e, "%s", *pz);
+     }
+ }
+ 
diff --git a/net-misc/taylor-uucp/files/taylor-uucp-1.07-gentoo.patch b/net-misc/taylor-uucp/files/taylor-uucp-1.07-gentoo.patch
new file mode 100644
index 000000000000..42839bab300c
--- /dev/null
+++ b/net-misc/taylor-uucp/files/taylor-uucp-1.07-gentoo.patch
@@ -0,0 +1,120 @@
+diff -Nru uucp-1.07.orig/Makefile.am uucp-1.07/Makefile.am
+--- uucp-1.07.orig/Makefile.am	2003-05-30 00:10:23.000000000 +0000
++++ uucp-1.07/Makefile.am	2009-03-06 18:41:48.000000000 +0000
+@@ -78,12 +78,12 @@
+ 
+ install-exec-hook:
+ 	for f in uucico uuxqt; do \
+-	  chown $(OWNER) $(DESTDIR)$(sbindir)/$${f}; \
+-	  chmod 4555 $(DESTDIR)$(sbindir)/$${f}; \
++	  chown $(OWNER):uucp $(DESTDIR)$(sbindir)/$${f}; \
++	  chmod 6555 $(DESTDIR)$(sbindir)/$${f}; \
+ 	done
+ 	for f in uux uucp uustat uuname cu; do \
+-	  chown $(OWNER) $(DESTDIR)$(bindir)/$${f}; \
+-	  chmod 4555 $(DESTDIR)$(bindir)/$${f}; \
++	  chown $(OWNER):uucp $(DESTDIR)$(bindir)/$${f}; \
++	  chmod 6555 $(DESTDIR)$(bindir)/$${f}; \
+ 	done
+ if HAVE_MKDIR
+ else
+diff -Nru uucp-1.07.orig/policy.h uucp-1.07/policy.h
+--- uucp-1.07.orig/policy.h	2003-05-29 06:08:45.000000000 +0000
++++ uucp-1.07/policy.h	2009-03-06 18:41:48.000000000 +0000
+@@ -302,8 +302,7 @@
+ /* #define LOCKDIR "/usr/spool/locks" */
+ /* #define LOCKDIR "/usr/spool/uucp/LCK" */
+ /* #define LOCKDIR "/var/spool/lock" */
+-/* #define LOCKDIR "/var/lock" */
+-
++#define LOCKDIR "/var/lock"
+ /* You must also specify the format of the lock files by setting
+    exactly one of the following macros to 1.  Check an existing lock
+    file to decide which of these choices is more appropriate.
+@@ -572,16 +571,14 @@
+ /* The name of the default spool directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``spool'' command in the
+    configuration file.  */
+-#define SPOOLDIR "/usr/spool/uucp"
+-/* #define SPOOLDIR "/var/spool/uucp" */
++#define SPOOLDIR "/var/spool/uucp"
+ 
+ /* The name of the default public directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``pubdir'' command in the
+    configuration file.  Also, a particular system may be given a
+    specific public directory by using the ``pubdir'' command in the
+    system file.  */
+-#define PUBDIR "/usr/spool/uucppublic"
+-/* #define PUBDIR "/var/spool/uucppublic" */
++#define PUBDIR "/var/spool/uucppublic" 
+ 
+ /* The default command path.  This is a space separated list of
+    directories.  Remote command executions requested by uux are looked
+@@ -644,23 +641,17 @@
+ /* The default log file when using HAVE_TAYLOR_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/Log"
+-/* #define LOGFILE "/var/spool/uucp/Log" */
+-/* #define LOGFILE "/var/log/uucp/Log" */
++#define LOGFILE "/var/log/uucp/Log" 
+ 
+ /* The default statistics file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``statfile'' command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/Stats"
+-/* #define STATFILE "/var/spool/uucp/Stats" */
+-/* #define STATFILE "/var/log/uucp/Stats" */
++#define STATFILE "/var/log/uucp/Stats" 
+ 
+ /* The default debugging file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``debugfile'' command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/Debug"
+-/* #define DEBUGFILE "/var/spool/uucp/Debug" */
+-/* #define DEBUGFILE "/var/log/uucp/Debug" */
++#define DEBUGFILE "/var/log/uucp/Debug" 
+ 
+ #endif /* HAVE_TAYLOR_LOGGING */
+ 
+@@ -669,17 +660,17 @@
+ /* The default log file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/LOGFILE"
++#define LOGFILE "/var/log/uucp/LOGFILE"
+ 
+ /* The default statistics file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``statfile''
+    command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/SYSLOG"
++#define STATFILE "/var/log/uucp/SYSLOG"
+ 
+ /* The default debugging file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``debugfile''
+    command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/DEBUG"
++#define DEBUGFILE "/var/log/uucp/DEBUG"
+ 
+ #endif /* HAVE_V2_LOGGING */
+ 
+@@ -692,16 +683,16 @@
+    be replaced by the system name (if there is no appropriate system,
+    "ANY" will be used).  No other '%' character may appear in the
+    string.  */
+-#define LOGFILE "/usr/spool/uucp/.Log/%s/%s"
++#define LOGFILE "/var/log/uucp/.Log/%s/%s"
+ 
+ /* The default statistics file when using HAVE_HDB_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``statfile''
+    command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/.Admin/xferstats"
++#define STATFILE "/var/log/uucp/.Admin/xferstats"
+ 
+ /* The default debugging file when using HAVE_HDB_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``debugfile''
+    command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/.Admin/audit.local"
++#define DEBUGFILE "/var/log/uucp/.Admin/audit.local"
+ 
+ #endif /* HAVE_HDB_LOGGING */
diff --git a/net-misc/taylor-uucp/metadata.xml b/net-misc/taylor-uucp/metadata.xml
new file mode 100644
index 000000000000..d2ab50187578
--- /dev/null
+++ b/net-misc/taylor-uucp/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-needed -->
+<longdescription>The standard UUCP package of the Free Software Foundation.
+It provides everything you need to make a UUCP connection.</longdescription>
+</pkgmetadata>
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
new file mode 100644
index 000000000000..2bbdfa55ecd6
--- /dev/null
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Taylor UUCP"
+HOMEPAGE="http://www.airs.com/ian/uucp.html"
+SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
+IUSE=""
+
+S="${WORKDIR}/uucp-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	mv configure.{in,ac} || die
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE -fno-strict-aliasing
+	econf --with-newconfigdir=/etc/uucp
+}
+
+src_install() {
+	dodir /usr/share/man/man{1,8}
+	dodir /usr/share/info
+	dodir /etc/uucp
+	dodir /usr/bin /usr/sbin
+	diropts -o uucp -g uucp -m 0750
+	keepdir /var/log/uucp /var/spool/uucp
+	diropts -o uucp -g uucp -m 0775
+	keepdir /var/spool/uucppublic
+
+	emake \
+		"prefix=${D}/usr" \
+		"sbindir=${D}/usr/sbin" \
+		"bindir=${D}/usr/bin" \
+		"man1dir=${D}/usr/share/man/man1" \
+		"man8dir=${D}/usr/share/man/man8" \
+		"newconfigdir=${D}/etc/uucp" \
+		"infodir=${D}/usr/share/info" \
+		install install-info
+	sed -i -e 's:/usr/spool:/var/spool:g' sample/config
+	cp sample/* "${ED}/etc/uucp" || die
+	dodoc ChangeLog NEWS README TODO
+}
+
+pkg_preinst() {
+	usermod -s /bin/bash uucp
+}
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
new file mode 100644
index 000000000000..2f85093cfb4a
--- /dev/null
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Taylor UUCP"
+HOMEPAGE="http://www.airs.com/ian/uucp.html"
+SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+S="${WORKDIR}/uucp-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-fprintf.patch
+	mv configure.{in,ac} || die
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE -fno-strict-aliasing
+	econf --with-newconfigdir=/etc/uucp
+}
+
+src_install() {
+	dodir /usr/share/man/man{1,8}
+	dodir /usr/share/info
+	dodir /etc/uucp
+	dodir /usr/bin /usr/sbin
+	diropts -o uucp -g uucp -m 0750
+	keepdir /var/log/uucp /var/spool/uucp
+	diropts -o uucp -g uucp -m 0775
+	keepdir /var/spool/uucppublic
+
+	emake \
+		"prefix=${D}/usr" \
+		"sbindir=${D}/usr/sbin" \
+		"bindir=${D}/usr/bin" \
+		"man1dir=${D}/usr/share/man/man1" \
+		"man8dir=${D}/usr/share/man/man8" \
+		"newconfigdir=${D}/etc/uucp" \
+		"infodir=${D}/usr/share/info" \
+		install install-info
+	sed -i -e 's:/usr/spool:/var/spool:g' sample/config
+	cp sample/* "${ED}/etc/uucp" || die
+	dodoc ChangeLog NEWS README TODO
+}
+
+pkg_preinst() {
+	usermod -s /bin/bash uucp
+}
diff --git a/net-misc/tcpsound/Manifest b/net-misc/tcpsound/Manifest
new file mode 100644
index 000000000000..293367b6703d
--- /dev/null
+++ b/net-misc/tcpsound/Manifest
@@ -0,0 +1,7 @@
+AUX tcpsound-0.3.1-makefile.patch 1573 SHA256 0f0a3369874e2ea3e4f8562b7d3dfab45e07a82227c8928c6f43622ed0bab688 SHA512 6ae771f09bebdf265ca8e4b7efb0201140088f76dbfc13187b362641c2eea033d4b4a1f9a58661bd6c678d86bf54740dad0b101700f546a56ae5a0801b58fbd0 WHIRLPOOL db561c48b52dfa8a2cfec3835bd6a7ee5b2417eb38880e73e173e1e66b3eaff284915498e5bb0ec155b01edf02f8717761d9063456c77926fe488470a8a04027
+AUX tcpsound-0.3.1-misc.patch 983 SHA256 740898a46780b56092c3523538c6752bf884b94209aaa6776128f9aed370b1c3 SHA512 48c37a7adba42c1a6279616ac05fa48794ad2ef2c5d810ca6866f74dedbc3b242841ef169007e0779e10f5db19bf1ae90fe87b595c543e34cb09998a84fc3156 WHIRLPOOL b997d0b5144faa0a066a998d50cf27e315484d72e2c0e2a06e26c040de89f2049e5a9aa7573156cae12eb9b86f4639ca62b8e3a52eb8296487dbeb2295469b01
+DIST tcpsound-0.3.1.tar.gz 155357 SHA256 358869ee017f9ccb62f8425bbc1ec70b65316b981dbf7a7b6b22042ae32b57c6 SHA512 9db7c03f57f0e95b5b6b947bdeff9664dda6f6039e1080611205ca15648cb9b31325f462b31cbb1462a4aa767a9c89d6125c17144bb0dd7d0acf89e24b2f3055 WHIRLPOOL e8bc4575bfaeeab075967cc797f50eb2e6a09c37d22e22a9ad5c11a3188db56f185d4c94268d5cee042155ea0205a8d86efd41642c7e65cb62e9543719b070da
+EBUILD tcpsound-0.3.1-r1.ebuild 604 SHA256 683a4885b36fe0002e3dbe0684e600a70a58053dd63519a418b43f90d7e3ceac SHA512 b2e9676da6c845170351aad0da754a5ff416e3f9945a1c3cca733a52beb60040064680860c54db396eb48211eb9a007a6318d54a4616303fe9542644928f0eee WHIRLPOOL 6221bfff4cf5697a65ed90809a96bc89e9d9a5c682c05b3405110185e883bbac31e7721a87479db66f97dc21b49e052947e56e973dc4e9d126d3ec30bd5602a7
+MISC ChangeLog 2510 SHA256 88d86ab41e27e263e61927240e38dbebe57c574fa422416d757a68e0d15663e5 SHA512 3b2ce2f5507190957314b187ea28bfaabb5757814d0328d3430e21c53b2805e37d551dec7244d873e097f27693ed6f2b9af44b112b8c2aceec653e1815f218dd WHIRLPOOL 63e291378752ee6a82e1807e2e9613b2c6f697ec1d713ede5c43726c7545d891e6a193dcf38264aa52d6735884497e891e5f47c420b4300468ce2e7e21ef2d9a
+MISC ChangeLog-2015 2266 SHA256 608336f6df9280491596b9c5d450c16309f94f5c73a1f455d8eb05f70732b579 SHA512 19ffadb3d3a9451ac10217fa08885f7599608ae4c4f091c8044380b8ee0cdf902cdcc15394468204fb91cbeaf8e83ebd14ad0a0baec8242ddc903a567503cfcf WHIRLPOOL e2ab1d2293f3c2a34e3d5434ec874026216a5b2d095e60e02bd9ff3e2160385a8cba24852d535f8282a920d8c4598d087c01dcecb7242d33f1e0fae6e6fb46d8
+MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328
diff --git a/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch b/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch
new file mode 100644
index 000000000000..83f694878376
--- /dev/null
+++ b/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch
@@ -0,0 +1,52 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,32 +1,35 @@
+ # Makefile for tcpsound
+ 
+-prefix     = /usr/local
++prefix     = $(DESTDIR)/usr
+ 
+ bindir     = $(prefix)/bin
+-wavdir     = $(prefix)/share/sounds
++wavdir     = $(prefix)/share/tcpsound
+ includedir = $(prefix)/include
+ libdir     = $(prefix)/lib
+-mandir     = $(prefix)/man
++mandir     = $(prefix)/share/man/man1
+ MAN        = tcpsound.1
+ MANGZ      = $(MAN:.1=.1.gz)
+-MKTOOL     = ./mktool
+-CFLAGS     = -c -v -g -W1 -I$(includedir) -L$(libdir) -lSDL -lmba -lpthread
+-CC         = $(MKTOOL)
++MKTOOL     = install
++CFLAGS     += -I$(includedir) 
++LIBS	    = -lSDL -lmba -lpthread
+ 
+ .SUFFIXES: .1 .1.gz
+ 
+-tcpsound: mktool src/tcpsound.c src/sound.h src/sound.c src/parse.h src/parse.c
+-	@$(CC) $(CFLAGS) src/sound.c src/parse.c src/tcpsound.c -o tcpsound
+-play: mktool src/play.c
+-	@$(CC) $(CFLAGS) src/play.c -o play
++tcpsound: src/tcpsound.c src/sound.h src/sound.c src/parse.h src/parse.c
++	$(CC) $(LDFLAGS) $(CFLAGS) src/sound.c src/parse.c src/tcpsound.c -o tcpsound $(LIBS)
++play: src/play.c
++	$(CC) $(LDFLAGS) $(CFLAGS) src/play.c -o play $(LIBS)
+ 
+ mktool:
+ 	cc -g -o mktool mktool.c
+ 
+-install: mktool
+-	$(MKTOOL) -i -m 0755 tcpsound $(bindir)
+-	$(MKTOOL) -i wavs/*.wav $(wavdir)
+-	-$(MKTOOL) -i docs/man/*.1.gz $(mandir)/man1
++install: tcpsound
++	$(MKTOOL) -d $(bindir)
++	$(MKTOOL) -d $(wavdir)
++	$(MKTOOL) -d $(mandir)
++	$(MKTOOL) -m 0755 tcpsound $(bindir)
++	$(MKTOOL) -m 0644 wavs/*.wav $(wavdir)
++	-$(MKTOOL) -m 0644 docs/man/tcpsound.1.gz $(mandir)
+ 	@echo
+ 	@echo installation successful
+ uninstall: mktool
diff --git a/net-misc/tcpsound/files/tcpsound-0.3.1-misc.patch b/net-misc/tcpsound/files/tcpsound-0.3.1-misc.patch
new file mode 100644
index 000000000000..7c7136fb954e
--- /dev/null
+++ b/net-misc/tcpsound/files/tcpsound-0.3.1-misc.patch
@@ -0,0 +1,22 @@
+--- a/src/tcpsound.c
++++ b/src/tcpsound.c
+@@ -16,7 +16,7 @@
+ #include "parse.h"
+ #include "sound.h"
+ 
+-static const char *DEFAULT_CONF = "searchpath = /usr/share/sounds:/usr/local/share/sounds\n\nsnd.default   = 1,0,0,generic.wav\nsnd.icmp      = 3,0,0,sonar.wav\nsnd.dns       = 2,53,53,warning.wav\nsnd.http.in   = 2,0,80,pop.wav\nsnd.http.out  = 2,80,0,info.wav\nsnd.win.nam   = 2,137,137,cuckoo.wav\n";
++static const char *DEFAULT_CONF = "searchpath = /usr/share/tcpsound\n\nsnd.default   = 1,0,0,generic.wav\nsnd.icmp      = 3,0,0,sonar.wav\nsnd.dns       = 2,53,53,warning.wav\nsnd.http.in   = 2,0,80,pop.wav\nsnd.http.out  = 2,80,0,info.wav\nsnd.win.nam   = 2,137,137,cuckoo.wav\n";
+ 
+ /* struct packet {
+  *     unsigned long time;
+--- a/elaborate.conf
++++ b/elaborate.conf
+@@ -7,7 +7,7 @@
+ # to searchpath).
+ # 
+ 
+-searchpath = /usr/share/sounds:/usr/local/share/sounds
++searchpath = /usr/share/tcpsound
+ 
+ snd.default   = 1,0,0,generic.wav
+ snd.icmp      = 3,0,0,sonar.wav
diff --git a/net-misc/tcpsound/metadata.xml b/net-misc/tcpsound/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/net-misc/tcpsound/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild b/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..f419b5a4eb9d
--- /dev/null
+++ b/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Play sounds in response to network traffic"
+LICENSE="BSD"
+HOMEPAGE="http://www.ioplex.com/~miallen/tcpsound/"
+SRC_URI="${HOMEPAGE}dl/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	dev-libs/libmba
+	media-libs/libsdl
+	net-analyzer/tcpdump
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.txt elaborate.conf )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-misc.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
new file mode 100644
index 000000000000..cc2c4f68822b
--- /dev/null
+++ b/net-misc/teamviewer/Manifest
@@ -0,0 +1,16 @@
+AUX teamviewer-9.0.32150-gentoo.patch 3876 SHA256 c8a9ee6772df79076c68bd3b47654d42d87fa5846e7f812fbf756d26ccc4fe65 SHA512 7eef0090c836ca304554dd064ef105a8ed141e8300a829ebeb6b73e233413efdbdf8662a48da340c11f4e8cddeb00d4cfe7d761e3adf532e48f61fccf642752f WHIRLPOOL 2f68646f536cff27becc20aab89e70a136a5b4f576026cb4e22e184e59cdc0449f322965e8649630ebc36c7cefb4cf089d896c685a8910752013dc6633de11a3
+AUX teamviewer.sh 1329 SHA256 bd55aeee66dc57fc3c38d3ff40117d5f5f41fa106f51ae21a8f471f0f043fee0 SHA512 44e9e519ed3056438952c448b40a0c231238379fc1a5737f0f4ae28860fb3cfa2d9abffbb7e2b9682dbd62a67ad672f4406c2696359ace8fc42d6d0171b0bab0 WHIRLPOOL bb30483b6af1f05bab98d0eb0cdee984cb3c013a6090887659482db93eb73723ad61a8220ecd0b9809961b9790d003e4bc4358d0c67689193bc9f5d11512a316
+AUX teamviewerd.conf 230 SHA256 5cd8485974ef1c62be8fbe4d92f31a03b616e1a3e46c11bcadef7bdb2c169d8a SHA512 31d412278f61fc943f474a02db6de802f53da8b2b424adb5c8a1720bff4316ccb36d5bfbb505c056ef031dcfd52fef5ea28da96b348a76ddf9c624ca1c3cf78f WHIRLPOOL f2bb0f80d15b3dce8db6d9e598e2e050c09aa64e255edfd43567245b7f208aed725e384bcb27b120d3e81655d25e13472ed39e4daefd3bc7d855d9a0bcd3d5c6
+AUX teamviewerd.init 785 SHA256 0b41c5dd3ed54424342a0948439f987bb3987aeced7019a59c59b513737edcb7 SHA512 79f0f5a274e53e6d058e6f0d24f9f9964992391e36a06264aaaba8e219238be9f24ebf64bb3b0aac91dc9e8625835b243e51fb6325d1b0e42242d7b7186ff20d WHIRLPOOL a77293bfa91c8cd7b9f2b67e79465d2b817aca4f1bb370ec3a408d57472b9f640f36fc2eef217ae8ae66b4c5a00e55a6de9f4c794ae0ec514cc8caba16f4e3b9
+AUX teamviewerd9.init 482 SHA256 a0dcbd88055a8594dea307d88c626b9ee2ebb2183d56172b66a5320aa487c281 SHA512 a229cf976e5ce7142dbb57989bb0e802a5b8cdf222f52ad768dfaaacb3ba160ab05d3e1ff1ca7770daf37d9c06e391c6a3c1843ec2be78a86450bcf2a3e4fca9 WHIRLPOOL 6a474b82d3466ceb53d7bbd5abc58e33cac77d6a74c87e5a88046acedbcfaa9465945c96a8e8989cf07a4f1881da5fdd955748805ad3338ef59827ca9581fb95
+DIST teamviewer-9.0.32150.deb 22898922 SHA256 66d9a69f7e1523a2e1b41ff2e55adac01b2dae9b8bdfabf9db6080fc21d24451 SHA512 3e72ed5cab7a754a0aa75e533da92292ad004f66c55ac4c386b6f4a65cc41b14a8d9d7a5410dccdb90c1172cd33e52383289339ab44f0847a061655498ab8e4d WHIRLPOOL fa48ff99a5df29072b1073f35e3f27aeba87b2b846813dca612212344a5b8e35f7f1e221e1fb4f7a12464fce4a185b8dad6dd8f48432e4c48ecd61d9cc6b7960
+DIST teamviewer_10.0.46203_i386.deb 43326592 SHA256 eb1fe811fd2dc1c8dc6fc2ebaae177072b65bc1a3b2a6bb88b9e25f633c51359 SHA512 2133194b180648685a9e179df1a2888277f3038d9098d0d12b72de92026bdb969d90262514996df60dfcf6986e291ecb756fde9e0781fca5c872b5c82e5494ea WHIRLPOOL b6bedba426954f74fb51dca51949508f7299f9bee2dea1abc442a8a8acf79b408455901fedda524851c69a6352ef5a7bb1c733233823d49a0adfec64561f61ce
+DIST teamviewer_11.0.67687_i386.deb 47341822 SHA256 b74542910ac574803905658787174b6a60055c6473d3c4e398da36d0dedaf416 SHA512 3fbb0a2fc1bccd41ba9798305fada7e8266e1c9ed8509492ccb75e6f85995538ddc05ad72648e9f6c31cd5f17ad34f1ed3a300eeb38a4a703d3414c113d3e5a9 WHIRLPOOL 2a6b1c04f67933a43ac2493a12c21b8a9eae95150b10d9e713e01efed98c397f44fdd77012407da2dffb8bf0b804374a60cce9d2646ff3c117041d13366be628
+DIST teamviewer_12.0.85001_i386.deb 46549564 SHA256 7a729557ef7618c41c8a94a6d668fa84422ecf9acf2b1889ea52c727849f7f07 SHA512 4db490568936ec58a37157019071cf61ed5dde8b5951f6e524d1f64aa23f46dd40c8eda1e96a9d47c756c1427d82ccb9c58773b53dfa0ae60bbb94e03b4522a0 WHIRLPOOL 9a33d37c30273eabf7321157f473c0ac1788d2567695a7da020f3e922e553f371dc7dc10e1fe4e20ada25bc2cf2f3eb29edaa1613fd513a0fb42a7b1599bf4e0
+EBUILD teamviewer-10.0.46203.ebuild 3520 SHA256 278b22990bd6ad26122c03a0d6a8243f00de0a459510ffb3a1cf6b1d879cfda5 SHA512 a2b9587b4c9fafaab23d67ca0dce7c99b8769f9663e865762fb95269e825c2ab269cf1b54d69949566c1cb04d5fd9df93e0fec4c4d5e455268f24752a11dfebe WHIRLPOOL 4c0fa1b5b3285f4f209409ed02ba31b2e6bad4fbeab4a4210aff46941e81c289987e0d8b35da656272bf85e7e3d4d84c8d842c832c3a910cb68a24200dd9546c
+EBUILD teamviewer-11.0.67687.ebuild 3610 SHA256 e4f07e347ec4732e9ff67ae64a9e02fd1a2683c55cd97c1f49abe2b87d1527c9 SHA512 df84cf8082d6626e5e2e212c7b9910bd953ac4346d06a74181813a4b0bcafcb2691912064d5a0cba6facca253f2782bbb99ad9103ed68a4ed3e8429561229f67 WHIRLPOOL c127485558474f5a0de1a796bc3d224a25a6ba9c2f9378afe74ee1f12d70b6cc2e6b9a366ec041f23b0e1f77d73fa1a466110f1f6c21c149b5cab74df272a443
+EBUILD teamviewer-12.0.85001.ebuild 3610 SHA256 d71b964336d614f3bbe7221c04e1accdf1ac0a6e8845e772cfe216ea1a6c3ce3 SHA512 2a6876746bb249e6e1e7ea6d215a74eb98cd4d323dd9a40cbd1a8eff4784568dda16521a163fa4c511479d95188b8fe649da55f92520579bcffe1c61299921e7 WHIRLPOOL e2f8856eae5d7f74f941bb7b3138c11159ba4848d04deb4789cd17a01969c529b0fa0f22573d00e4aafcfd24074d65f906d3ccfc09b05c439df37ed5db81323a
+EBUILD teamviewer-9.0.32150.ebuild 3260 SHA256 f02f4f956dde57e194dfc28d57356568b3b812b2bef19cfbe7f1d02fbd4d4443 SHA512 29b18f606daf48400ad770603ad735a917ad7aa50ce86b280f21ae6e36f978c5baa5ed34749a26206563f0d37c67a144365134d5ee61d8b8e21f61a996223c3c WHIRLPOOL 49909da9b99123c1923def710341f06dcd1681afd0e511c9a62c0f2708685ebc7bdcf336d2eecf8ce5911f4b32352c4c09a949a91e962f6ee516cbf2875b62fd
+MISC ChangeLog 4894 SHA256 c8b5387746e86753a0e59c503eb649133e7c53851c742e081e5272cdda01cc23 SHA512 80aff9327934eaf4d0c3dabdbba5d90b8c9b6d4e65aa043d88f54278abb5aa23d9e7eaba5711521fc7df3074d40a0b4f8bef45d7b32170220d11b3d80ff3e60a WHIRLPOOL a312fb7846044219e22f9fb71b9fbb58b0babc8605faa0b0232944fe0d0f17f83d8f37a436d544e633adb7bda4e7efb2c1608ccab228427b540cd17c91640776
+MISC ChangeLog-2015 5287 SHA256 c30e66aacb8fa20f0b575c2e1996a41bf321431eb2c84b8f3962927012e93d03 SHA512 3bc2ae794461ea8cfb65c4621eecc4bfe60dc1768e0007a3294bd041e89e887db24a1d0d21742ad86bb16a5e332121e1636e6ede4d3d54b6a82866f4b562d2d1 WHIRLPOOL c3afbc2b3f33a57454a405a95d5011832b6d36d9b61866d57887cb0f85613f8b36ce67f9f8e1fc9527f4439f838e9bb4f9165874cd5caeca2d4d4563ac8b8d24
+MISC metadata.xml 567 SHA256 f1f346b2f6c69ff147ab2766977db3a0cf34de1e5f53f4735d548341618c6f19 SHA512 e1b42cde0a8bff1b512960667fc428f3188609e30ad787b8c5bde1e1c8520d3810bd33f8f11d59ec314a3b0812a9aa4552ada29b465c34f8c0276d85176392f6 WHIRLPOOL 7105c5ec4162fb2dd2076ffe3b69e281528519ce59208bf304f6e134f368a8987593cf760b241d785402ca32a1ea65240bcee27b0b78695de74426ff2ecc5ada
diff --git a/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch b/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch
new file mode 100644
index 000000000000..1df4632795bc
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch
@@ -0,0 +1,138 @@
+diff --git a/opt/teamviewer9/tv_bin/script/tvw_extra b/opt/teamviewer9/tv_bin/script/tvw_extra
+index 71164aa..848cd25 100644
+--- a/opt/teamviewer9/tv_bin/script/tvw_extra
++++ b/opt/teamviewer9/tv_bin/script/tvw_extra
+@@ -16,13 +16,6 @@
+   isInstalledTV || return
+   ABecho "teamviewer --passwd [PASSWD]"	"set a password (useful when installing remote (ssh)"
+   echo
+-  ABecho "teamviewer --daemon status"	"show current status of the TeamViewer daemon"
+-  ABecho "teamviewer --daemon start"	"start		TeamViewer daemon"
+-  ABecho "teamviewer --daemon stop"		"stop		TeamViewer daemon"
+-  ABecho "teamviewer --daemon restart"	"stop/start	TeamViewer daemon"
+-  ABecho "teamviewer --daemon disable"	"disable	TeamViewer daemon - don't start daemon on system startup"
+-  ABecho "teamviewer --daemon enable"	"enable		TeamViewer daemon - start daemon on system startup (default)"
+-  echo
+ }
+ 
+ function PrintVersion()
+@@ -37,19 +30,6 @@
+   PrintDaemonStatus
+   echo
+   PrintTeamViewerID
+-}
+-
+-function PrintDaemonStatus()
+-{
+-  local cmd="$(daemonCtl 'status')"
+-  local txt="n/a"
+-
+-  if [ isInstalledTV ] ; then
+-    txt="$(eval "$cmd")"
+-    [ $? = 0 ] || txt='n/a (error)'
+-  fi
+-  
+-  ABecho "teamviewerd status" "$txt"
+ }
+ 
+ function PrintTeamViewerID()
+@@ -64,20 +44,21 @@
+   ABecho "TeamViewer ID:" "$tvid"
+ 
+   if [ -z "$tvid" ] && isInstalledTV; then
+-    echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)"
++    echo "Try restarting the TeamViewer daemon."
+   fi
+ }
+ 
+ function SetPasswd()
+ {
++  echo "Stop your teamviewer daemon first, then press enter."
++  read
++
+   local pwd="$1"
+   [ -n "$pwd" ] || die 'no password specified'
+ 
+   installedTVorDie
+   isSuperUser || die 'You need root permissions for this operation'
+ 
+-  Run_Daemon 'stop' > /dev/null
+-  
+   "$TV_BIN_DIR/teamviewerd" --passwd "$pwd"
+   case $? in
+     0  ) echo 'ok'	;;
+@@ -88,12 +69,14 @@
+     *  ) echo 'unknown response'	;;
+    esac
+   
+-  Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon'
+-  echo
++  echo "You may start your teamviewer daemon again."
+ }
+ 
+ function ExportLicense()
+ {
++  echo "Stop your teamviewer daemon first, then press enter."
++  read
++
+   local license="$1"
+   local path='/tmp/tv_global.conf'
+ 
+@@ -101,8 +84,6 @@
+ 
+   isSuperUser || die 'You need root permissions for this operation'
+ 
+-  Run_Daemon 'stop' > /dev/null
+-  
+   "$TV_BIN_DIR/teamviewerd" --export-license "$license" "$path"
+   case $? in
+     0  ) echo "ok - license exported to '$path'"		;;
+@@ -110,8 +91,7 @@
+     *  ) echo 'unknown response'	;;
+    esac
+   
+-  Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon'
+-  echo
++  echo "You may start your teamviewer daemon again."
+ }
+ 
+ function StripPersonalInformation()
+diff --git a/opt/teamviewer9/tv_bin/script/tvw_main b/opt/teamviewer9/tv_bin/script/tvw_main
+index 8984db0..c6dff8d 100644
+--- a/opt/teamviewer9/tv_bin/script/tvw_main
++++ b/opt/teamviewer9/tv_bin/script/tvw_main
+@@ -4,7 +4,6 @@
+ source "$TV_SCRIPT_DIR/tvw_config"
+ source "$TV_SCRIPT_DIR/tvw_exec"
+ source "$TV_SCRIPT_DIR/tvw_extra"
+-source "$TV_SCRIPT_DIR/tvw_daemon"
+ source "$TV_SCRIPT_DIR/tvw_profile"
+ 
+ function Main()
+@@ -18,7 +17,6 @@
+     --help )			PrintHelp				;;
+     --version )			PrintVersion			;;
+     --info )			PrintInfo				;;
+-    --daemon )			Run_Daemon $opt			;;
+     --winecfg )	shift;	Run_WineCfg "$@"		;;
+     --regedit )	shift;	Run_RegEdit "$@"		;;
+     --kill )			Run_KillTeamViewer		;;
+@@ -170,18 +168,3 @@
+   Init
+   wine regedit "$@"
+ }
+-
+-function Run_Daemon()
+-{
+-  local opt="$1"
+-  
+-  installedTVorDie
+-
+-  case "$opt" in
+-    ( disable )					removeDaemon	|| rootSuggest	;;
+-    ( enable  )					installDaemon	|| rootSuggest	;;
+-    ( start | stop | restart )	cmdDaemon $opt	|| rootSuggest	;;
+-    ( status )					cmdDaemon $opt					;;
+-    ( * )						echo "unknown option '$opt'"	;;
+-  esac
+-}
diff --git a/net-misc/teamviewer/files/teamviewer.sh b/net-misc/teamviewer/files/teamviewer.sh
new file mode 100644
index 000000000000..70fc4e8a80af
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewer.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+tv="$(basename $0)"
+tvdir="/opt/${tv}"
+version="@TVV@"
+tvw_version=""
+prefix="${HOME}/.wine-${tv}"
+arch="win32"
+native=true
+
+if $native; then
+	export WINEDLLPATH="${prefix}/drive_c/TeamViewer"
+else
+	export WINEDLLPATH="${tvdir}/tv_bin/wine/lib:${tvdir}/tv_bin/wine/lib/wine:${prefix}/drive_c/TeamViewer"
+	export PATH="${tvdir}/tv_bin/wine/bin:${PATH}"
+fi
+export WINEARCH="${arch}"
+export WINEPREFIX="${prefix}"
+
+if [ ! -d "${prefix}" ]; then
+	echo "Creating prefix..."
+	wineboot -i &> /dev/null
+	mkdir -p "${prefix}/drive_c/TeamViewer"
+fi
+
+if [ -e "${prefix}/tvw-version" ]; then
+	tvw_version=$(<"${prefix}/tvw-version")
+fi
+
+#If version has changed or new instance
+if [ "${version}" != "${tvw_version}" ]; then
+	echo "Copying TeamViewer files to prefix..."
+	cp -R "/opt/${tv}/wine/drive_c/TeamViewer" "${prefix}/drive_c/"
+	echo "Creating config and log directories in ~/.config/teamviewer@TVMV@"
+	mkdir -p "${HOME}"/.config/teamviewer@TVMV@/{config,logfiles}
+	echo "${version}" > "${prefix}/tvw-version"
+fi
+
+TV_BASE_DIR="${tvdir}"
+TV_BIN_DIR="${TV_BASE_DIR}/tv_bin"
+TV_PROFILE="${prefix}"
+TV_LOG_DIR="${TV_PROFILE}/logfiles"
+TV_CFG_DIR="${TV_PROFILE}/config"
+TV_USERHOME="${HOME}"
+
+wine "C:\\TeamViewer\\TeamViewer.exe" "\${[@]}" &> \
+	"${HOME}/.config/teamviewer@TVMV@/logfiles/$(date +%Y.%m.%d-%H:%M:%S)-wine.log"
diff --git a/net-misc/teamviewer/files/teamviewerd.conf b/net-misc/teamviewer/files/teamviewerd.conf
new file mode 100644
index 000000000000..e949660678be
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewerd.conf
@@ -0,0 +1,6 @@
+# This entry can be used to specify a default daemon password.
+# It is set by running /etc/init.d/teamviewerd@TVV@ passwd.
+# The password must be between 8 and 12 characters, and special characters should
+# be avoided.
+
+PASSWD=""
diff --git a/net-misc/teamviewer/files/teamviewerd.init b/net-misc/teamviewer/files/teamviewerd.init
new file mode 100644
index 000000000000..3ca37da3ebc4
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewerd.init
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/opt/teamviewer@TVV@/tv_bin/teamviewerd
+command_args=-d
+description="daemon for TeamViewer"
+pidfile=/var/run/teamviewerd.pid
+
+extra_stopped_commands="passwd"
+
+passwd() {
+	if [ -z "${PASSWD}" ]; then
+		eerror "No password specified."
+		exit 1
+	fi
+
+	ebegin "Attempting to change password."
+	/opt/teamviewer@TVV@/tv_bin/teamviewerd --passwd "${PASSWD}"
+	retr=$?
+	case $retr in
+		0)	einfo "Password successfully set." ;;
+		11|12)	eerror "Password must be between 8 and 12 characters.";;
+		13)	eerror "Invalid characters detected.";;
+		14)	eerror "Password invalid. Validation failed.";;
+		*)	eerror "Unknown error code";;
+	esac
+	eend $retr
+	exit $retr
+}
diff --git a/net-misc/teamviewer/files/teamviewerd9.init b/net-misc/teamviewer/files/teamviewerd9.init
new file mode 100644
index 000000000000..3a625c95d3b7
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewerd9.init
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="daemon for TeamViewer"
+
+PIDFILE="/var/run/teamviewerd.pid"
+
+start() {
+	ebegin "Starting Teamviewer Daemon"
+
+	start-stop-daemon \
+		--start \
+		--pidfile "${PIDFILE}" \
+		--background \
+		--exec /opt/teamviewer@TVV@/teamviewerd -- -d
+}
+
+stop() {
+	ebegin "Stopping Teamviewer Daemon"
+
+	start-stop-daemon \
+		--stop \
+		--pidfile "${PIDFILE}"
+}
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
new file mode 100644
index 000000000000..35e3a8613fbb
--- /dev/null
+++ b/net-misc/teamviewer/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>		
+	</maintainer>
+	<maintainer type="person">
+		<email>NP-Hardass@gentoo.org</email>
+		<name>NP-Hardass</name>		
+	</maintainer>
+	<maintainer type="project">
+		<email>wine@gentoo.org</email>
+		<name>Wine</name>
+	</maintainer>
+	<use>
+		<flag name="system-wine">Use <pkg>app-emulation/wine</pkg> instead of bundled wine.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/teamviewer/teamviewer-10.0.46203.ebuild b/net-misc/teamviewer/teamviewer-10.0.46203.ebuild
new file mode 100644
index 000000000000..3950aeb34533
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-10.0.46203.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils gnome2-utils systemd unpacker
+
+# Major version
+MV=${PV/\.*}
+MY_PN=${PN}${MV}
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i386.deb"
+
+IUSE="+system-wine"
+
+LICENSE="TeamViewer LGPL-2.1" #LGPL for bundled wine
+SLOT=${MV}
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	system-wine? ( app-emulation/wine[abi_x86_32(-)] )
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[abi_x86_32(-)]
+	dev-qt/qtwebkit:4[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdamage[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXfixes[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXtst[abi_x86_32(-)]"
+
+QA_PREBUILT="opt/teamviewer${MV}/*"
+
+S=${WORKDIR}/opt/teamviewer/tv_bin
+
+src_prepare() {
+	#epatch "${FILESDIR}/${P}-gentoo.patch"
+	sed \
+		-e "s/@TVV@/${MV}/g" \
+		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
+	sed \
+		-e "s:/opt/teamviewer:/opt/teamviewer${MV}:g" \
+		"script//${PN}d.service" > "${T}/${PN}d.service" || die
+	sed \
+		-e "s/@TVV@/${PV}/g" \
+		-e "s/@TVMV@/${MV}/g" \
+		"${FILESDIR}"/${PN}.sh > "${T}"/sh || die
+	if ! use system-wine; then
+		sed -i "s/native=true/native=false/g" "${T}/sh" || die
+	fi
+}
+
+src_install () {
+	local destdir="/opt/${MY_PN}"
+
+	# install wine prefix skeleton and reg keys
+	insinto "${destdir}/wine/drive_c/"
+	doins -r wine/drive_c/TeamViewer/
+	# install bundled wine if necessary
+	if ! use system-wine; then
+		insinto "${destdir}/tv_bin/wine"
+		doins -r wine/{lib,share}
+		exeinto "${destdir}/tv_bin/wine/bin"
+		doexe wine/bin/{wine,wine-preloader,wineserver}
+	fi
+	# fix permissions
+	fperms 755 ${destdir}/wine/drive_c/TeamViewer/TeamViewer.exe
+
+	# install wine wrapper
+	exeinto "/opt/bin"
+	newexe "${T}/sh" "${MY_PN}"
+
+	# install teamviewer linux binaries
+	exeinto "${destdir}/tv_bin"
+	doexe TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32
+	use amd64 && doexe TVGuiSlave.64
+
+	# install daemon binary and scripts
+	exeinto "${destdir}/tv_bin"
+	doexe ${PN}d
+	newinitd "${T}/init" ${PN}d${MV}
+	newconfd "${FILESDIR}/${PN}d.conf" ${PN}d${MV}
+	systemd_newunit "${T}/${PN}d.service" ${PN}d${MV}.service
+
+	# set up logdir
+	keepdir /var/log/${MY_PN}
+	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
+
+	# set up config dir
+	keepdir /etc/${MY_PN}
+	dosym /etc/${MY_PN} /opt/${MY_PN}/config
+
+	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
+	#dodoc ../doc/linux_FAQ_{EN,DE}.txt
+	make_desktop_entry ${MY_PN} "TeamViewer ${MV}" ${MY_PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "TeamViewer from upstream uses an overly-complicated set of bash"
+	elog "scripts to start the program.  This has been simplified for Gentoo"
+	elog "use.  Any issues should be reported via bugzilla."
+	if use system-wine; then
+		elog
+		elog "Due to bug #552016, when using system wine, one is not able to"
+		elog "share one's own screen.  At this time, this may be remedied by"
+		elog "toggling the system-wine USE flag."
+	fi
+	elog
+	elog "The end-user client requires running the accompanying daemon,"
+	elog "available via init-scripts."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/teamviewer/teamviewer-11.0.67687.ebuild b/net-misc/teamviewer/teamviewer-11.0.67687.ebuild
new file mode 100644
index 000000000000..07243d0be1e6
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-11.0.67687.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils gnome2-utils systemd unpacker
+
+# Major version
+MV=${PV/\.*}
+MY_PN=${PN}${MV}
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i386.deb"
+
+IUSE="+system-wine"
+
+LICENSE="TeamViewer LGPL-2.1" #LGPL for bundled wine
+SLOT=${MV}
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	system-wine? ( app-emulation/wine[abi_x86_32(-),png] )
+	!system-wine? ( media-libs/libpng:1.2[abi_x86_32(-)] )
+	sys-apps/dbus[abi_x86_32(-)]
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[abi_x86_32(-)]
+	dev-qt/qtwebkit:4[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdamage[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXfixes[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXtst[abi_x86_32(-)]"
+
+QA_PREBUILT="opt/teamviewer${MV}/*"
+
+S=${WORKDIR}/opt/teamviewer/tv_bin
+
+src_prepare() {
+	#epatch "${FILESDIR}/${P}-gentoo.patch"
+	sed \
+		-e "s/@TVV@/${MV}/g" \
+		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
+	sed \
+		-e "s:/opt/teamviewer:/opt/teamviewer${MV}:g" \
+		"script//${PN}d.service" > "${T}/${PN}d.service" || die
+	sed \
+		-e "s/@TVV@/${PV}/g" \
+		-e "s/@TVMV@/${MV}/g" \
+		"${FILESDIR}"/${PN}.sh > "${T}"/sh || die
+	if ! use system-wine; then
+		sed -i "s/native=true/native=false/g" "${T}/sh" || die
+	fi
+}
+
+src_install () {
+	local destdir="/opt/${MY_PN}"
+
+	# install wine prefix skeleton and reg keys
+	insinto "${destdir}/wine/drive_c/"
+	doins -r wine/drive_c/TeamViewer/
+	# install bundled wine if necessary
+	if ! use system-wine; then
+		insinto "${destdir}/tv_bin/wine"
+		doins -r wine/{lib,share}
+		exeinto "${destdir}/tv_bin/wine/bin"
+		doexe wine/bin/{wine,wine-preloader,wineserver}
+	fi
+	# fix permissions
+	fperms 755 ${destdir}/wine/drive_c/TeamViewer/TeamViewer.exe
+
+	# install wine wrapper
+	exeinto "/opt/bin"
+	newexe "${T}/sh" "${MY_PN}"
+
+	# install teamviewer linux binaries
+	exeinto "${destdir}/tv_bin"
+	doexe TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32
+	use amd64 && doexe TVGuiSlave.64
+
+	# install daemon binary and scripts
+	exeinto "${destdir}/tv_bin"
+	doexe ${PN}d
+	newinitd "${T}/init" ${PN}d${MV}
+	newconfd "${FILESDIR}/${PN}d.conf" ${PN}d${MV}
+	systemd_newunit "${T}/${PN}d.service" ${PN}d${MV}.service
+
+	# set up logdir
+	keepdir /var/log/${MY_PN}
+	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
+
+	# set up config dir
+	keepdir /etc/${MY_PN}
+	dosym /etc/${MY_PN} /opt/${MY_PN}/config
+
+	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
+	#dodoc ../doc/linux_FAQ_{EN,DE}.txt
+	make_desktop_entry ${MY_PN} "TeamViewer ${MV}" ${MY_PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "TeamViewer from upstream uses an overly-complicated set of bash"
+	elog "scripts to start the program.  This has been simplified for Gentoo"
+	elog "use.  Any issues should be reported via bugzilla."
+	if use system-wine; then
+		elog
+		elog "Due to bug #552016, when using system wine, one is not able to"
+		elog "share one's own screen.  At this time, this may be remedied by"
+		elog "toggling the system-wine USE flag."
+	fi
+	elog
+	elog "The end-user client requires running the accompanying daemon,"
+	elog "available via init-scripts."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/teamviewer/teamviewer-12.0.85001.ebuild b/net-misc/teamviewer/teamviewer-12.0.85001.ebuild
new file mode 100644
index 000000000000..28819fde7126
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-12.0.85001.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils gnome2-utils systemd unpacker
+
+# Major version
+MV=${PV/\.*}
+MY_PN=${PN}${MV}
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i386.deb"
+
+IUSE="+system-wine"
+
+LICENSE="TeamViewer LGPL-2.1" #LGPL for bundled wine
+SLOT=${MV}
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	system-wine? ( app-emulation/wine[abi_x86_32(-),png] )
+	!system-wine? ( media-libs/libpng:1.2[abi_x86_32(-)] )
+	sys-apps/dbus[abi_x86_32(-)]
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[abi_x86_32(-)]
+	dev-qt/qtwebkit:4[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdamage[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXfixes[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXtst[abi_x86_32(-)]"
+
+QA_PREBUILT="opt/teamviewer${MV}/*"
+
+S=${WORKDIR}/opt/teamviewer/tv_bin
+
+src_prepare() {
+	#epatch "${FILESDIR}/${P}-gentoo.patch"
+	sed \
+		-e "s/@TVV@/${MV}/g" \
+		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
+	sed \
+		-e "s:/opt/teamviewer:/opt/teamviewer${MV}:g" \
+		"script//${PN}d.service" > "${T}/${PN}d.service" || die
+	sed \
+		-e "s/@TVV@/${PV}/g" \
+		-e "s/@TVMV@/${MV}/g" \
+		"${FILESDIR}"/${PN}.sh > "${T}"/sh || die
+	if ! use system-wine; then
+		sed -i "s/native=true/native=false/g" "${T}/sh" || die
+	fi
+}
+
+src_install () {
+	local destdir="/opt/${MY_PN}"
+
+	# install wine prefix skeleton and reg keys
+	insinto "${destdir}/wine/drive_c/"
+	doins -r wine/drive_c/TeamViewer/
+	# install bundled wine if necessary
+	if ! use system-wine; then
+		insinto "${destdir}/tv_bin/wine"
+		doins -r wine/{lib,share}
+		exeinto "${destdir}/tv_bin/wine/bin"
+		doexe wine/bin/{wine,wine-preloader,wineserver}
+	fi
+	# fix permissions
+	fperms 755 ${destdir}/wine/drive_c/TeamViewer/TeamViewer.exe
+
+	# install wine wrapper
+	exeinto "/opt/bin"
+	newexe "${T}/sh" "${MY_PN}"
+
+	# install teamviewer linux binaries
+	exeinto "${destdir}/tv_bin"
+	doexe TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32
+	use amd64 && doexe TVGuiSlave.64
+
+	# install daemon binary and scripts
+	exeinto "${destdir}/tv_bin"
+	doexe ${PN}d
+	newinitd "${T}/init" ${PN}d${MV}
+	newconfd "${FILESDIR}/${PN}d.conf" ${PN}d${MV}
+	systemd_newunit "${T}/${PN}d.service" ${PN}d${MV}.service
+
+	# set up logdir
+	keepdir /var/log/${MY_PN}
+	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
+
+	# set up config dir
+	keepdir /etc/${MY_PN}
+	dosym /etc/${MY_PN} /opt/${MY_PN}/config
+
+	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
+	#dodoc ../doc/linux_FAQ_{EN,DE}.txt
+	make_desktop_entry ${MY_PN} "TeamViewer ${MV}" ${MY_PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "TeamViewer from upstream uses an overly-complicated set of bash"
+	elog "scripts to start the program.  This has been simplified for Gentoo"
+	elog "use.  Any issues should be reported via bugzilla."
+	if use system-wine; then
+		elog
+		elog "Due to bug #552016, when using system wine, one is not able to"
+		elog "share one's own screen.  At this time, this may be remedied by"
+		elog "toggling the system-wine USE flag."
+	fi
+	elog
+	elog "The end-user client requires running the accompanying daemon,"
+	elog "available via init-scripts."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/teamviewer/teamviewer-9.0.32150.ebuild b/net-misc/teamviewer/teamviewer-9.0.32150.ebuild
new file mode 100644
index 000000000000..0d584b497c5f
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-9.0.32150.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils gnome2-utils systemd unpacker
+
+# Major version
+MV=${PV/\.*}
+MY_PN=${PN}${MV}
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="http://www.teamviewer.com"
+SRC_URI="http://www.teamviewer.com/download/version_${MV}x/teamviewer_linux.deb -> ${P}.deb"
+
+LICENSE="TeamViewer !system-wine? ( LGPL-2.1 )"
+SLOT=${MV}
+KEYWORDS="~amd64 ~x86"
+IUSE="system-wine"
+
+RESTRICT="mirror"
+
+RDEPEND="
+	app-shells/bash
+	x11-misc/xdg-utils
+	!system-wine? (
+		media-libs/alsa-lib[abi_x86_32(-)]
+		media-libs/freetype[abi_x86_32(-)]
+		sys-libs/zlib[abi_x86_32(-)]
+		x11-libs/libX11[abi_x86_32(-)]
+		x11-libs/libXau[abi_x86_32(-)]
+		x11-libs/libXdamage[abi_x86_32(-)]
+		x11-libs/libXext[abi_x86_32(-)]
+		x11-libs/libXfixes[abi_x86_32(-)]
+		x11-libs/libXrandr[abi_x86_32(-)]
+		x11-libs/libXrender[abi_x86_32(-)]
+		x11-libs/libSM[abi_x86_32(-)]
+		x11-libs/libXtst[abi_x86_32(-)]
+	)
+	system-wine? ( app-emulation/wine )"
+
+QA_PREBUILT="opt/teamviewer${MV}/*"
+
+S=${WORKDIR}/opt/teamviewer${MV}/tv_bin
+
+make_winewrapper() {
+	cat << EOF > "${T}/${MY_PN}"
+#!/bin/sh
+export WINEDLLPATH=/opt/${MY_PN}
+exec wine "/opt/${MY_PN}/TeamViewer.exe" "\$@"
+EOF
+	chmod go+rx "${T}/${MY_PN}"
+	exeinto /opt/bin
+	doexe "${T}/${MY_PN}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	sed \
+		-e "s#@TVV@#${MV}/tv_bin#g" \
+		"${FILESDIR}"/${PN}d${MV}.init > "${T}"/${PN}d${MV} || die
+}
+
+src_install () {
+	if use system-wine ; then
+		make_winewrapper
+		exeinto /opt/${MY_PN}
+		doexe wine/drive_c/TeamViewer/*
+	else
+		# install scripts and .reg
+		insinto /opt/${MY_PN}/tv_bin
+		doins -r *
+
+		exeinto /opt/${MY_PN}/tv_bin
+		doexe TeamViewer_Desktop
+		exeinto /opt/${MY_PN}/tv_bin/script
+		doexe script/teamviewer script/tvw_{aux,config,exec,extra,main,profile}
+
+		dosym /opt/${MY_PN}/tv_bin/script/${PN} /opt/bin/${MY_PN}
+
+		# fix permissions
+		fperms 755 /opt/${MY_PN}/tv_bin/wine/bin/wine{,-preloader,server}
+		fperms 755 /opt/${MY_PN}/tv_bin/wine/drive_c/TeamViewer/TeamViewer.exe
+		find "${D}"/opt/${MY_PN} -type f -name "*.so*" -execdir chmod 755 '{}' \;
+	fi
+
+	# install daemon binary
+	exeinto /opt/${MY_PN}/tv_bin
+	doexe ${PN}d
+
+	# set up logdir
+	keepdir /var/log/${MY_PN}
+	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
+
+	# set up config dir
+	keepdir /etc/${MY_PN}
+	dosym /etc/${MY_PN} /opt/${MY_PN}/config
+
+	doinitd "${T}"/${PN}d${MV}
+	systemd_newunit script/${PN}d.service ${PN}d${MV}.service
+
+	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
+	dodoc ../doc/linux_FAQ_{EN,DE}.txt
+	make_desktop_entry ${MY_PN} TeamViewer ${MY_PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if use system-wine ; then
+		echo
+		eerror "IMPORTANT NOTICE!"
+		elog "Using ${PN} with system wine is not supported and experimental."
+		elog "Do not report gentoo bugs while using this version."
+		echo
+	fi
+
+	eerror "STARTUP NOTICE:"
+	elog "You cannot start the daemon via \"teamviewer --daemon start\"."
+	elog "Instead use the provided gentoo initscript:"
+	elog "  /etc/init.d/${PN}d${MV} start"
+	elog
+	elog "Logs are written to \"/var/log/teamviewer${MV}\""
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
new file mode 100644
index 000000000000..de4fcc246378
--- /dev/null
+++ b/net-misc/telnet-bsd/Manifest
@@ -0,0 +1,7 @@
+AUX telnet-bsd-1.2-fbsd.patch 2523 SHA256 8f8045774c525c978b877dafe3728548b6a5e0105338338b899b560619a0d835 SHA512 15082f7c3c71b6f0860061d5c8b32dabcd54e7956919c328870c3cbb32fb96dd59c06931216e43beaa39a8c056088b6a73737ae8f7973136ba08f0c67aed2939 WHIRLPOOL 3b7230735097486d1f09841bf5983d419a9da0188200be8e923a38ff58895ccc969ccd649f7cbf2db8ad1deaedc634fe42f304cf9ec529891c407abdf28e9855
+AUX telnetd.xinetd 205 SHA256 cb8fe24c1f6113ca397e712898d3decc5ba901994c68262b0ff9e2b091e4576c SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c WHIRLPOOL f38f70e9cefd57878088867babf3831b46063851fc116fb45a51e0e2c41a1398498cacd8dde2d4d4a1c21f968c26c539e7629eb88727f253a3cd677f44afedbc
+DIST telnet-bsd-1.2.tar.bz2 194518 SHA256 d6a9d26740ef75565cb1ed8ff11e327d240e6734748b2d1d2e96c126849e4733 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d WHIRLPOOL 673a5178f7c2305c9ad1ece9151d8d6c874ace147640f2d0e02a39f2641935af02fe42861c9ccc17b9f84e328c7e821f93ecf37dc3a86a9d1cf49700e7527f20
+EBUILD telnet-bsd-1.2-r1.ebuild 1117 SHA256 f4295410d5d686850a5f859bdaf2c083fd2ed68930ef30460cfae483f03ad2f3 SHA512 5b2d4bbf07f229972da1e200b361cd456306c7ec5fdab129e34ea445c376031bfe679e1ab90b2c1b41990d84bf55441ccfad3d52cc1dafc0d4c1906218725292 WHIRLPOOL 1912fe72ba767aeeba1d38d270fd541b93d478c71d9649336f0cee8a29ac76f59233d35b7eae348c96be2054eaad619da7790fecc66fc16c6e47ad10d72b31df
+MISC ChangeLog 2751 SHA256 1f0c9d780806e5c054feba7054f83abbfda0602f9850c9c9dc23cd052d7e694b SHA512 a8cbc0db3d462c29dbabbdd26a87dc5e56912b4c40eda617329b14dfaf2195864c61c32a997140a095ea53a4c0de5521d9afcaf1b3552daac256f2a70a1008cf WHIRLPOOL 4a887640b941761fe6243f895cf61c048ff592da06378e22e9b779cf744a3c7bc5ce12c8a1d037f65027791b95ed5647f39e8653c2ad067ef6ea37756037e107
+MISC ChangeLog-2015 6271 SHA256 3b54a6ba62115289f478fceccda9a44bca22101b6fd252baaffb7e5b82173433 SHA512 6efc13700766ece7dea835dba79b67ce68b4bead9fa43178d4d87b5b821068e0bfee12e4f67f6ccaa620bf6458d6bc51eca60f53341caa872fe4e05876a68763 WHIRLPOOL 761055351536338613c08ecf3e57a4c9811adbaa52595b192d7449ba25832dc8d1f7385a4bab0d9f383fdd689bc7744d88652775dffd640302b20860bb92a2e9
+MISC metadata.xml 218 SHA256 5a6d2571ad58999a8651603cbfd52e8e2676131114edf04f417329759851c41d SHA512 c1894fa0ad03968827a0eb6410381bdaa9491a4b450f9a50959a93700f803ddc83f020040f4db06ed3ba68c12adb4a73b192525ef7e70c0bd10125e3da578c65 WHIRLPOOL 218ecdf4a7fff5dbe3672e8651cce6b247ae0af2d257876b386e3596d9c19e4bd461efc7a965d8d88ad15a0c563dffad181e5bfd5fe601ccc7e9ad0435a45b00
diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch
new file mode 100644
index 000000000000..7c39d6ad81cb
--- /dev/null
+++ b/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch
@@ -0,0 +1,105 @@
+diff --git a/configure.in b/configure.in
+index 1547e9b..eda5fb1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -12,6 +12,8 @@ ALL_LINGUAS="de"
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+ 
++AC_CHECK_HEADERS([pty.h utmp.h])
++
+ if test x"$ac_default_prefix" = x"/usr"
+ then
+ 	if test x"${mandir}" = x'${prefix}/man'
+diff --git a/telnet/commands.c b/telnet/commands.c
+index c0d349c..fa2cf8a 100644
+--- a/telnet/commands.c
++++ b/telnet/commands.c
+@@ -29,11 +29,13 @@
+ 
+ #include "telnet_locl.h"
+ #include <err.h>
++#include <unistd.h>
+ 
+ #if	defined(IPPROTO_IP) && defined(IP_TOS)
+ int tos = -1;
+ #endif /* defined(IPPROTO_IP) && defined(IP_TOS) */
+ 
++extern char **environ;
+ char *hostname;
+ 
+ typedef int (*intrtn_t) __P ((int, char **));
+diff --git a/telnet/ring.h b/telnet/ring.h
+index 66f7191..9ef8fb8 100644
+--- a/telnet/ring.h
++++ b/telnet/ring.h
+@@ -29,6 +29,7 @@
+  */
+ 
+ #include <sys/cdefs.h>
++#include <sys/types.h>
+ #define P __P
+ 
+ /*
+diff --git a/telnetd/setproctitle.c b/telnetd/setproctitle.c
+index f332277..b2adc92 100644
+--- a/telnetd/setproctitle.c
++++ b/telnetd/setproctitle.c
+@@ -72,6 +72,7 @@ char setproctitle_rcsid[] =
+ static char **Argv = NULL;		/* pointer to argument vector */
+ static char *LastArgv = NULL;		/* end of argv */
+ static char Argv0[128];			/* program name */
++extern char **environ;
+ 
+ void
+ initsetproctitle(int argc, char **argv, char **envp)
+@@ -86,10 +87,10 @@ initsetproctitle(int argc, char **argv, char **envp)
+ 
+ 	for (i = 0; envp[i] != NULL; i++)
+ 		continue;
+-	__environ = (char **) malloc(sizeof (char *) * (i + 1));
++	environ = (char **) malloc(sizeof (char *) * (i + 1));
+ 	for (i = 0; envp[i] != NULL; i++)
+-		__environ[i] = strdup(envp[i]);
+-	__environ[i] = NULL;
++		environ[i] = strdup(envp[i]);
++	environ[i] = NULL;
+ 
+ 	/*
+ 	**  Save start and extent of argv for setproctitle.
+diff --git a/telnetd/sys_term.c b/telnetd/sys_term.c
+index 1235428..6fcc601 100644
+--- a/telnetd/sys_term.c
++++ b/telnetd/sys_term.c
+@@ -27,8 +27,15 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include <config.h>
++
++#include <sys/types.h>
++#ifdef HAVE_UTMP_H 
+ #include <utmp.h>
++#endif
++#ifdef HAVE_PTY_H
+ #include <pty.h>
++#endif
+ 
+ #include "telnetd.h"
+ #include "pathnames.h"
+@@ -820,6 +827,7 @@ addarg (struct argv_stuff *avs, const char *val)
+ void
+ cleanup (int sig)
+ {
++#if !defined(__FreeBSD__) || __FreeBSD__ < 9
+   sigset_t sigset;
+   char *p;
+   (void) sig;
+@@ -847,6 +855,7 @@ cleanup (int sig)
+   *p = 'p';
+   chmod (line, 0666);
+   chown (line, 0, 0);
++#endif
+   shutdown (net, 2);
+   exit (1);
+ }
diff --git a/net-misc/telnet-bsd/files/telnetd.xinetd b/net-misc/telnet-bsd/files/telnetd.xinetd
new file mode 100644
index 000000000000..63dd6dac9e7f
--- /dev/null
+++ b/net-misc/telnet-bsd/files/telnetd.xinetd
@@ -0,0 +1,10 @@
+service telnet
+{
+	flags           = REUSE
+	socket_type     = stream
+	wait            = no
+	user            = root
+	server          = /usr/sbin/in.telnetd
+	log_on_failure += USERID
+	disable         = yes
+}
diff --git a/net-misc/telnet-bsd/metadata.xml b/net-misc/telnet-bsd/metadata.xml
new file mode 100644
index 000000000000..56df135ff5a0
--- /dev/null
+++ b/net-misc/telnet-bsd/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 type="person">
+		<email>mschiff@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
new file mode 100644
index 000000000000..6b62c3f28171
--- /dev/null
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools toolchain-funcs
+
+DESCRIPTION="Telnet and telnetd ported from OpenBSD with IPv6 support"
+HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/"
+SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="nls xinetd"
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}
+	!net-misc/netkit-telnetd
+	xinetd? ( sys-apps/xinetd )
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fbsd.patch
+	eaclocal
+	eautoreconf
+}
+
+src_configure() {
+	# FreeBSD doesn't seem to support PIE neither does hppa
+	if use kernel_FreeBSD; then
+		export libc_cv_fpie="no"
+	fi
+
+	econf
+	emake LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/telnetd.xinetd telnetd
+	fi
+
+	dodoc README THANKS NEWS AUTHORS ChangeLog INSTALL
+}
diff --git a/net-misc/termpkg/Manifest b/net-misc/termpkg/Manifest
new file mode 100644
index 000000000000..e7d5e39ae713
--- /dev/null
+++ b/net-misc/termpkg/Manifest
@@ -0,0 +1,12 @@
+AUX termnetd.confd 347 SHA256 700809ffcaacb4debdaa4cf6b437a4284aee71a6ba383388ad8fdf49d412876a SHA512 7d872b40c3d3372538ad87d554d181a7fd0e153143c1741d6b0098dca6c691c0f103b6013289a49c801664f7347da25c3910b109fdd3cc890fea2e4b00aa278b WHIRLPOOL e45c00442c2149f95120da761d07421f041292a21495dcae5deb24cb4cbbf806012740d00620144eba1dbec7acb22d178227e0e151c4106ce167ec4c716f0c89
+AUX termnetd.initd 1327 SHA256 1420b9b6eab143910545db50a4375d6847dd4732e431d429e822d43de71a83a2 SHA512 e52af8ca5452b3cb5790a021597b97109872dab3871374669c36bbb71b44b9f86d31846c8a5dd52844607f50f609464916b0db7dc83d6b025deeee6ec1cd1eb8 WHIRLPOOL 72f135a5d8d390c20abf80f47b52609ba2e8b44b3a981a1a77e9851335c6c99447c6f926dce6fb26c691ed13554e0956750465651911c688ca7eac484c6c0d58
+AUX termpkg-3.3-ttydforfax.diff 1076 SHA256 33162e2c3ef11200e90fecdc21dbcf4daa472157e627bf30a2fab9a2d6f7b7b7 SHA512 8c9eb065cc0e9bb9709750b71dd22ee8da1f7945f23ac5a9d419b08e4d9168111b812767341e3bdaf86c0e2edd2fc0ad18500b4a68dd2b74aba426f4d189c176 WHIRLPOOL 48ae22a8351b72373abd4a9553dbdde29c53ff00378287557a649c14a9db076e1e160afe647d25fce17bb5a726ded2ed40b0c0d2f9d8b7d80ac653741d1c9825
+AUX termpkg-3.3.9.1-gcc43.diff 379 SHA256 40d52ff971cd72e3062d33632d29a767810ee9aed529bb51897b39db9fd097dc SHA512 73154f1ad78a4afd4a2d2289e2f6e36f23f76accd18b70a94212bf535dbbad1b072ec6e86f39f7d0c06252ef417c73c55a0b1d6d1d79bd239c95aed3f71074e4 WHIRLPOOL cfba55eb3700ec19bd0f9e1effefae2e09ca30e9328e1efcf2a13a2c12e24af7e6445f260bd980347a5845fab7e9ef51d695bcbbab104c05ac1c5e61d8dd26f7
+AUX ttyd.confd 1894 SHA256 5f93f41220aeff6510afc74b7d6afdf2bee22c92f9bc0e29ff206db10f5bfde6 SHA512 17f13c9191858f3b620a84f91b3596fcd29ef8706064ff18d8e44b50adccb5d91494b61417e296da59671d78465b324cf5c12538c70e8fd783f2c86de8ef779e WHIRLPOOL f9084cacc6f49697e4355d988a92ae25973a6bd3e72575d168e2cfe72ffeb45f0e0cf705418d4b7c2ea340d7191c741e69a88569824be87fee9cf16646d739d4
+AUX ttyd.initd 2222 SHA256 d413721cc65fe8b2a208ca99eb855a4d35303fbd71005876ae2c4d5d47835807 SHA512 d778644393722fa00837f542bbbd772afc86801bf875430321d287adb7129b605bd12d8dd3a49a79795b58b188b4e7febc13546e7181a1ede278f9fbb40e47bd WHIRLPOOL cffb6ce26fb7287e6194922d3c69c3db7b6d096861586691dbd693a888a810b26679080079f69f27d3e5e598a9a984cbefae4d38d026bf77e387e6c47dff8ca8
+DIST termpkg_3.3-9.1.diff.gz 6759 SHA256 3ece3bc9ae469c45a8eba24ccd46c9460e2f03a215e4ec5f7c8fb0d41598b211 SHA512 dbcba1bc020ead0ef5e4f2fb2e7ee50937dbd6d614e53547bf2473dc3cbf0f4f3100a15bcd200b815a4fcbfd454a08a3185cdb305c4f3bde389070b5545293d4 WHIRLPOOL 87cb0182b4ff5124e43d3fcc16557a7d0dbd888a3d89b466f8b89b785073eb383b29d78ad28bdcdf4f0fa36c1a4353a1dc5a5b82c970d4bc2f3fc53e2c734a4b
+DIST termpkg_3.3.orig.tar.gz 65807 SHA256 0497f30d3fdac114080b65476d2757211a21276ae32c269d91314e3d54b9eff0 SHA512 4dc1152af27af5edda66622435f5c5d46e9bbba9dc3e9e0d6349792efef9488993d9ea02eb8780bc05a0a29756a0ba3cf45bf8d1799906b55d166c287432c22c WHIRLPOOL 0a5f789d2521e3b460fd174bc647efef00d89ea2e53668002ac210ee859e810cb04d8ab7bd0b41e653d2d4a105566fa045ced92231ca6e0b8567c4efa049ca0b
+EBUILD termpkg-3.3.9.1-r2.ebuild 1327 SHA256 f5ab2cbb5fa8b75ddcc7238cf9c21bb71d86f20fb1a53bf1d8ebc3c86cac0a16 SHA512 cb038190abf59b53f32b563a3bf7aefe8dd8652fdc5ed5f2521d94428e77fdd2dc7236830215add79abc2f943e19b019c6202e84d8fa19f04d16d4faae9f5b8a WHIRLPOOL b4c6aad89851c97835f2a297ae05aca94636eb00e7f1cad42ff1911976c84c821ef5731f7dd90bbf67535a61e66ee61c39d9544fd9c57ba3944328f0cc379850
+MISC ChangeLog 3536 SHA256 2c27fba6afef293a149df2d7d5594fb4bddd3ff0ef86293f5d0fe0872eaeb74e SHA512 b6b5a94ba0e23ac2642e3fe20e4b3873853b1cb448a0a6c8c33520aa2aae16b2553b898d0d2942a150b67ad1c26ed2dd6f3652714a6512444e852c441de37d30 WHIRLPOOL 539d840c061e521f320ead3b4d767f0be050295643b4e9a60e6342b9c53437ade7ad8dbbd542fa7c66ef896e724f1765a64a97b2e3349fa4fc9d022bbdebbf44
+MISC ChangeLog-2015 1007 SHA256 1ca8c24fdaafdab217e04f2f0603e4211e64cd2f3cab2486c2297907624f4a5f SHA512 e298d53d09e07870edc7b78afa32ff48b6c84a077dc4492868ae2e906646e60ea4607998e13333c46c223cde04adb02e9a8fede6313dad4262f551573da83a31 WHIRLPOOL 60f3377cc460af8c8d8477b2d45cdb7cdd9fe678a04e69cd63776139480865aec5993dd1097cad336dcc90859201e837eadcab64cbc6e7e13d29f5350f3a8770
+MISC metadata.xml 618 SHA256 72102dd4e1e5d85cca4d0c5323091083caa423270ab092a8bd683cc016429fc9 SHA512 b82080f75078bb82c6ba021c631e8ddd4af719a523a70b1f921e3221a37b1e766918680cb77f9fbc9af74aacf9c196c3264720a95cbdd902f042b88f1c21f75f WHIRLPOOL d3862250a4f090074ca925aaf8152e4906fa39797309f7eb9d932448b5effe1a35fc7c61222567f463424065886a78abcba9d4f664cf97affe31d1f16b0f632e
diff --git a/net-misc/termpkg/files/termnetd.confd b/net-misc/termpkg/files/termnetd.confd
new file mode 100644
index 000000000000..4eb95a989d41
--- /dev/null
+++ b/net-misc/termpkg/files/termnetd.confd
@@ -0,0 +1,14 @@
+# Config file for /etc/init.d/termnetd
+
+# Set the configuration file to one other than the default of /etc/termnetd.conf
+#
+#CONFIG_FILE="/etc/termnetd.conf"
+
+# Sets the IP port to listen to for the control port (default = none).
+#
+#CONTROL_PORT=""
+
+# see the termnetd(1) manual page for additional options you can configure here
+#
+#EXTRA_OPTS=""
+
diff --git a/net-misc/termpkg/files/termnetd.initd b/net-misc/termpkg/files/termnetd.initd
new file mode 100644
index 000000000000..dfc422be6671
--- /dev/null
+++ b/net-misc/termpkg/files/termnetd.initd
@@ -0,0 +1,51 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Terminal Server daemon (${RC_SVCNAME#*.})"
+command="/usr/sbin/termnetd"
+name="${RC_SVCNAME}"
+
+extra_started_commands="reload"
+description_reload="Reread configuration file and make the appropriate changes"
+start_stop_daemon_args="--quiet --exec ${command} --name ${name}"
+
+depend() {
+	use logger
+	need net
+}
+
+config_check() {
+	command_args="${EXTRA_OPTS}"
+	CONFIG_FILE_DEFAULT="/etc/termnetd.conf"
+
+	[ -z "${CONFIG_FILE}" ] && CONFIG_FILE="${CONFIG_FILE_DEFAULT}"
+	[ -n "${CONTROL_PORT}" ] && command_args="${command_args} -s ${CONTROL_PORT}"
+	[ "${CONFIG_FILE}" != "${CONFIG_FILE_DEFAULT}" ] && command_args="${command_args} -c ${CONFIG_FILE}"
+
+	if [ ! -f "${CONFIG_FILE}" ]; then
+		eerror "Please create ${CONFIG_FILE}"
+		eerror "Sample conf: ${CONFIG_FILE_DEFAULT}.dist"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	config_check || return ${?}
+	ebegin "Starting ${description}"
+	start-stop-daemon --start ${start_stop_daemon_args} -- ${command_args}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping ${description}"
+	start-stop-daemon --stop ${start_stop_daemon_args}
+	eend ${?}
+}
+
+reload() {
+	ebegin "Reloading ${description}"
+	start-stop-daemon --signal HUP ${start_stop_daemon_args}
+	eend ${?}
+}
diff --git a/net-misc/termpkg/files/termpkg-3.3-ttydforfax.diff b/net-misc/termpkg/files/termpkg-3.3-ttydforfax.diff
new file mode 100644
index 000000000000..0471fde13154
--- /dev/null
+++ b/net-misc/termpkg/files/termpkg-3.3-ttydforfax.diff
@@ -0,0 +1,28 @@
+--- termpkg-3.3/termnet/ttyd.c.orig	2005-09-29 08:59:05.000000000 -1000
++++ termpkg-3.3/termnet/ttyd.c	2005-09-29 08:51:33.000000000 -1000
+@@ -340,7 +340,10 @@
+                      char *cp;
+                      int x;
+                      for (cp = commbuf, x = 0; x < cnt; x++, cp++)
++if (isprint(*cp))
+                         syslog(LOG_DEBUG, "ttyd: Have net char 0x%x, |%c|", *cp, *cp);
++else
++syslog(LOG_DEBUG, "ttyd: Have net char 0x%x", *cp);
+                   }
+                   write(fd, commbuf, cnt);
+                }
+@@ -366,9 +369,13 @@
+                      char *cp;
+                      int x;
+                      for (cp = commbuf, x = 0; x < cnt; x++, cp++)
++if (isprint(*cp))
+                         syslog(LOG_DEBUG, "ttyd: Have key char 0x%x, |%c|", *cp, *cp);
++else
++syslog(LOG_DEBUG, "ttyd: Have key char 0x%x", *cp);
+                   }
+-                  inputTerminal(commbuf, cnt);
++//                  inputTerminal(commbuf, cnt);
++write(fileno(tnlout), commbuf, cnt);
+                }
+                else
+                   break;
diff --git a/net-misc/termpkg/files/termpkg-3.3.9.1-gcc43.diff b/net-misc/termpkg/files/termpkg-3.3.9.1-gcc43.diff
new file mode 100644
index 000000000000..8d17fc5dd8b9
--- /dev/null
+++ b/net-misc/termpkg/files/termpkg-3.3.9.1-gcc43.diff
@@ -0,0 +1,11 @@
+diff -Naur termpkg-3.3.orig/libtn/SocketIO.c termpkg-3.3/libtn/SocketIO.c
+--- termpkg-3.3.orig/libtn/SocketIO.c	2008-09-03 18:21:28.881220673 +0200
++++ termpkg-3.3/libtn/SocketIO.c	2008-09-03 18:23:29.106343243 +0200
+@@ -25,6 +25,7 @@
+ #endif
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <fcntl.h>
+ #include <string.h>
+ #include <stdlib.h>
diff --git a/net-misc/termpkg/files/ttyd.confd b/net-misc/termpkg/files/ttyd.confd
new file mode 100644
index 000000000000..5b0e2b8c0002
--- /dev/null
+++ b/net-misc/termpkg/files/ttyd.confd
@@ -0,0 +1,63 @@
+# Configfile for /etc/init.d/ttyd
+
+# HINT: if you only need one virtual TTY, then you can use this config.
+# Otherwise you should use it as a template for specific configurations.
+# Just copy /etc/conf.d/ttyd to /etc/conf.d/ttyd.<foo> and symlink
+# /etc/init.d/ttyd to /etc/init.d/ttyd.<foo>
+
+
+# Master pseudo tty device to open and wait for a connection on.
+# For reference, in Linux the master pseudo tty devices are the
+# devices /dev/pty[a-ep-z][0-9a-f] and the slave devices are
+# /dev/tty[a-ep-z][0-9a-f].
+#
+PTY="/dev/ptyp0"
+
+# The host and port parameters specify the host and IP port to
+# connect to when the slave pseudo device is opened.
+#
+HOST="host.example.com"
+PORT=3000
+
+# The optional mode and user options specify the filesystem
+# permissions of the slave pseudo device. We set them right
+# after the ttyd daemon has started. After stopping, we reset
+# them to the permissions of the master pseudo device.
+#
+#MODE=660
+#USER="root:uucp"
+
+# Sets the initial baud-rate of the device (optional).
+#
+#BAUDRATE=115200
+
+# Optional port settings. Specified by a string of one of
+# more of the following concatenated together with no
+# intervening spaces:
+#
+# 8: 8 bits/character
+# 7: 7 bits/character
+# 6: 6 bits/character
+# 5: 5 bits/character
+# N: No parity
+# E: Even parity
+# O: Odd parity
+# C0: No hardware flow control
+# C1: Hardware flow control
+# S0: No software flow control
+# S1: Software flow control
+#
+#PORT_SETTINGS="8NC0"
+
+# You can create symlinks to the slave pseudo device, so you
+# have an easy to remember name for your virtual device. You
+# can add as many links as you want, if you blank-seperate the
+# names. All links *must* be relative and beneath to /dev.
+#
+#SYMLINK="ttyd/modem ttyNET0"
+
+# Some odd programs just don't work with symlinks, so you
+# can also create hardlinks (even in addition to symlinks).
+# Same rules apply as for symlinks.
+#
+#HARDLINK="ttyS5"
diff --git a/net-misc/termpkg/files/ttyd.initd b/net-misc/termpkg/files/ttyd.initd
new file mode 100644
index 000000000000..971789047a3d
--- /dev/null
+++ b/net-misc/termpkg/files/ttyd.initd
@@ -0,0 +1,95 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Remote Modem Utility (${RC_SVCNAME#*.})"
+command="/usr/sbin/ttyd"
+name="${RC_SVCNAME}"
+
+start_stop_daemon_args="--quiet --exec ${command} --name ${name}"
+
+depend() {
+	use logger
+	need net
+}
+
+config_check() {
+	# sanitize PTY/TTY names
+	DEV_PTY="/dev/${PTY/\/dev\/}"
+	DEV_TTY="${DEV_PTY/\/pty//tty}"
+
+	# create command args
+	command_args="-d ${DEV_PTY}"
+	[ -n "${BAUDRATE}" ] && command_args="${command_args} -b ${BAUDRATE}"
+	[ -n "${PORT_SETTINGS}" ] && command_args="${command_args} -p ${PORT_SETTINGS}"
+	command_args="${command_args} ${HOST} ${PORT}"
+}
+
+device_check() {
+	if [ ! -e "${DEV_PTY}" ]; then
+		eerror "PTY doesn't exist: ${DEV_PTY}"
+		return 1
+	fi
+	if [ ! -e "${DEV_TTY}" ]; then
+		eerror "TTY doesn't exist: ${DEV_TTY}"
+		return 1
+	fi
+	return 0
+}
+
+linkrel() {  # <from> <to>
+	local LINK="${1%/*}/${2/\/dev\/}"
+	echo "${LINK/\/dev\/}" | sed "s:[^/]\+/:../:g"
+}
+
+setup_links() {
+	local LINK NODE
+	for LINK in ${SYMLINK}; do
+		NODE="/dev/${LINK/\/dev\/}"
+		mkdir -p -- "${NODE%/*}" && ln -snf -- $(linkrel "${NODE}" "${DEV_TTY}") "${NODE}"
+	done
+	for LINK in ${HARDLINK}; do
+		NODE="/dev/${LINK/\/dev\/}"
+		mkdir -p -- "${NODE%/*}" && ln -nf -- "${DEV_TTY}" "${NODE}"
+	done
+}
+
+unset_links() {
+	local LINK LIST=""
+	for LINK in ${SYMLINK} ${HARDLINK}; do
+		LIST="${LIST} /dev/${LINK/\/dev\/}"
+	done
+	[ -n "${LIST}" ] && rm -f -- ${LIST}
+}
+
+setup_perms() {
+	[ -n "${MODE}" ] && chmod "${MODE}" -- "${DEV_TTY}"
+	[ -n "${USER}" ] && chown "${USER}" -- "${DEV_TTY}"
+}
+
+unset_perms() {
+	[ -n "${USER}" ] && chown --reference "${DEV_PTY}" -- "${DEV_TTY}"
+	[ -n "${MODE}" ] && chmod --reference "${DEV_PTY}" -- "${DEV_TTY}"
+}
+
+start() {
+	config_check || return ${?}
+	device_check || return ${?}
+	ebegin "Starting ${description}"
+	start-stop-daemon --start ${start_stop_daemon_args} -- ${command_args}
+	if eend ${?}; then
+		setup_perms
+		setup_links
+		return 0  # from here we never fail
+	fi
+}
+
+stop() {
+	config_check || return ${?}
+	ebegin "Stopping ${description}"
+	start-stop-daemon --stop ${start_stop_daemon_args}
+	eend ${?}
+	unset_links
+	unset_perms
+	return 0  # never fail
+}
diff --git a/net-misc/termpkg/metadata.xml b/net-misc/termpkg/metadata.xml
new file mode 100644
index 000000000000..e8581ff71c57
--- /dev/null
+++ b/net-misc/termpkg/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-needed -->
+	<longdescription lang="en">
+		Termpkg is a terminal server daemon and simple telnet like client.
+		Allows access to one or more serial ports through the telnet protocol.
+		Can be configured to connect in a one to one relation of telnet ports
+		to serial ports or in a round-robin fashion where one telnet port
+		serves many serial ports.
+	</longdescription>
+	<use>
+		<flag name="uucp">
+			Adds support for uucp style device locking
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild b/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
new file mode 100644
index 000000000000..9b4e786d429a
--- /dev/null
+++ b/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit base versionator
+
+MY_PV=$(get_version_component_range 1-2)
+MY_PF=$(replace_version_separator 2 '-')
+
+DESCRIPTION="Termpkg, the Poor Man's Terminal Server"
+HOMEPAGE="http://www.linuxlots.com/~termpkg/"
+SRC_URI="mirror://debian/pool/main/t/termpkg/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/t/termpkg/${PN}_${MY_PF}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+uucp"
+
+DEPEND="sys-devel/flex"
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DOCS=(
+	"README"
+	"CHANGES"
+	"termpkg.lsm"
+)
+
+PATCHES=(
+	# debian patches
+	"${WORKDIR}/${PN}_${MY_PF}.diff"
+
+	# gentoo patches
+	"${FILESDIR}/${P}-gcc43.diff"
+
+	# iaxmodem patches
+	"${FILESDIR}/${PN}-${MY_PV}-ttydforfax.diff"
+)
+
+src_configure() {
+	./configure LINUX $(use uucp && echo UUCP_LOCKING)
+}
+
+src_compile() {
+	emake -C linux CC=$(tc-getCC) LIBS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	local X
+	base_src_install_docs
+	dobin linux/bin/termnet
+	dosbin linux/bin/{termnetd,ttyd}
+	newdoc debian/changelog ChangeLog.debian
+	doman doc/*.1
+	insinto /etc
+	newins debian/termnetd.conf termnetd.conf.dist
+	for X in termnetd ttyd; do
+		newinitd "${FILESDIR}/${X}.initd" "${X}"
+		newconfd "${FILESDIR}/${X}.confd" "${X}"
+	done
+}
diff --git a/net-misc/throttle/Manifest b/net-misc/throttle/Manifest
new file mode 100644
index 000000000000..d9a0d30ff090
--- /dev/null
+++ b/net-misc/throttle/Manifest
@@ -0,0 +1,5 @@
+DIST throttle-1.2.tar.gz 72501 SHA256 6d90e4dcd6c604846020d60e82df1576e0a022cb96716a709db4ebfa143d6772 SHA512 ec0a639e6fed5e4a5fbb32498a77e08e0b53f3d6ffdb1788a6b52480387c87c43a5d17507941c9660406721bdbd5d4eedd4d6f1c0153dc41dc44a2aae0f9492f WHIRLPOOL 073e04a3b0cd4c354f189a667d3ffc06e1dd2074f35ff1b3c93f6fd128c153888821f228d70193a5ded944c1eb3de06c1d37f007b6fb2800b36fe886137f4063
+EBUILD throttle-1.2.ebuild 420 SHA256 c9894b394ce86c080ebc919220f053c591b501704051d68f34a17774fea87d7b SHA512 19c5d1b5d0e7aa8a648249f8c99ab9af92afba6460f1bd8d6b07f1e9e7543ad4bf3c428f835f1b1c18869b9608bcd3adbe9ceaa3365feede38ce0a36add4af0b WHIRLPOOL a76e52fd69078f8b9b4bc389fc9794b41d0be479278049b7b3061c294de14010eb617a9de8bdabf896904ed764d755c8dde67d77e884b72df548ed72a0d61ac4
+MISC ChangeLog 2175 SHA256 9ef12462b47e3e0013a3defcfa6b1cd66bdcb09fdcc0bc1200c24c37fba75d7b SHA512 5d0d9f1cc3f24bd46a636aad84e4b812aec99cae8b22d5607d8810273c0886ecb8be75a43050d88b5141c61284d68e7ba3c350a2bc6d8f873f84656e3f598f41 WHIRLPOOL f32bfa4437bda6eb20898441ad29b0b85a8557a8a5e8c2fd2bdc503d0783c946a07e69f07aae66b988fc3ed697971c4fec01c0d43007684bd30d055d02fbb501
+MISC ChangeLog-2015 715 SHA256 3a07eda1de14e428ec1235cde02ae7f6cf77e78eea38758eb6ba32097b07845a SHA512 a1a9f1f4f131d15fed7a8e5351e572d18b12ac77319821d5665e741fbfc716baf33f087a87de156c1db832b0493827c96465c9dd137e3f6f81dc9ee045e42736 WHIRLPOOL fc62bbe1ae10c90acf3d2ed999cb2fce8d7429e6d4352e3bbd5c92c7b6f13b4f9f9f7ec63d0a22c3d52b0adb1948df188093ba48c19959383655e1b70ec869fb
+MISC metadata.xml 370 SHA256 6c89422c44e866852237e51fded52cf46bdb2537e76cdfe0a42ad4ca84988875 SHA512 39d066692873cf85dc75f2d6f5c566ac799aa1e2fdc6743915d19167913f92800ade4be1d101780fc011362757531d8f59615e3d150a160f7196a43314d64c69 WHIRLPOOL fda4f21fdc938296bd2f3262d0258ed35ef60b2cf3137ccebce681832a1341a61cfb77ffd29d85a726e8cf5ef0fe2bddbfcc376a34748fbae14314e002ed99c8
diff --git a/net-misc/throttle/metadata.xml b/net-misc/throttle/metadata.xml
new file mode 100644
index 000000000000..686de21a97d3
--- /dev/null
+++ b/net-misc/throttle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		throttle copies the standard input to the standard output while
+		limiting bandwidth to the specified maximum.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/throttle/throttle-1.2.ebuild b/net-misc/throttle/throttle-1.2.ebuild
new file mode 100644
index 000000000000..56d55b2cc616
--- /dev/null
+++ b/net-misc/throttle/throttle-1.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Bandwidth limiting pipe"
+HOMEPAGE="http://klicman.org/throttle/"
+SRC_URI="http://klicman.org/throttle/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README ChangeLog
+}
diff --git a/net-misc/tiers/Manifest b/net-misc/tiers/Manifest
new file mode 100644
index 000000000000..9d9f9a03d404
--- /dev/null
+++ b/net-misc/tiers/Manifest
@@ -0,0 +1,8 @@
+AUX tiers-1.1-gcc43.patch 3170 SHA256 6a21f9746322ba88dcae0db73c954e192c1aedd2bccad6dd20d8c214b8dd3e59 SHA512 6dfd0fe2f74403f1ee51bf0a4c86bd1a54518f362377f4d61e603639b90e44aac00aadfaa243d6f52a07b9eb2bb690e248895cf43ce888e424217d7a49d95fa5 WHIRLPOOL e62e60b150ad4c09a64b82958d13b4375bf038d07eb869b8eef6e213893be715bdebcb12788e36bf07a78801e7f99cf1cfabf064b4debdb1252bcdf0aba05945
+AUX tiers1.1-gccfixes.patch 5840 SHA256 6d8df49d28d422c3bd9d22b08d152584472de433e819dfa416fa0de2d91dc5aa SHA512 81913aa857d3251c358e91aa1644324399e60cf1bf7811ccc96d482ee4d56c5ba38138b882380f39d842e78f44d9d985465221b98283d2654bb8f4898552775e WHIRLPOOL a5f26344635ca23bfd4905e15be94f612deee6ddd7dc037008274bcee2230ce6414685bad10b7b31d7112290e35f7a7e6a42a62da20a33228d3ba9aeedbea596
+DIST tiers1.1.tar.gz 392532 SHA256 d7c44866fdfa70efe22f69942e1624ffeaa4ba1be47e335f8422f1b50a18c017 SHA512 b72a98aeeb3e1799536e1424e8f60bffcef59c61cc709232a670174c80d23fb4c3b60249c7ff2a33442b62b81a493b7ecef4bf0e950147fa8fe81bb9eabb9a08 WHIRLPOOL fbfbe71652239c2ca664340814b883187c037634012aa21ae4c4fb456185b2215dc97a3b5c03c017014f2fe5566dafece520a81f3a5483dcf238ffafd2245eaf
+DIST tiers2ns-lan.awk 3258 SHA256 675540db87c0ab24fb1a0b67fdd48d6b981de5d1bcb2da808ca69ed29d4bf583 SHA512 562204765e0e7c973e6d88c494e5aba9cd47d79c68309359cd232c34be6175f727411a64a6033a246a042987f1ad423008857eaf25c6254bd006c4a3ff4d083e WHIRLPOOL 4533e6811c783307e20d796d95c7aa0cd3adca7729ca24b001a1a6cb65c620e13c0a81fe28ead3a80ad5d317d893684579dabc567296a217842df835a7de13ab
+EBUILD tiers-1.1.ebuild 1305 SHA256 bd5e11bc9a85b1beef18c060939bf2467f0d526a267415567c4898183d5cfadc SHA512 acf71c4258556615789062c608dc430740ad85adf553700b479a03985fdc2fa4186d11fb62b85ef2d0a762c662789ecfca500c2c47644941e03240b722c8de1d WHIRLPOOL e597adcff17ee83b77e433a6b05c98301c0d2cdaa549bc67f8a5a0e04780e09c8482a0d410098f1617f5a83bf82b532c5b0474588da53616624ad2b4b7c641cd
+MISC ChangeLog 2230 SHA256 b6719d251798cfa62b8e0d36160280d7d15b11190a8838abcee1220c5c51f875 SHA512 e2aaff584912dfcd96448847ed7ad47b2e32b0c99baf5fd39ccbe7e461d012abed801578475b36da9c9b11d7c0e2c3ac974c9a27e1f6f9ed09c75b3d1813ed4d WHIRLPOOL 35175c270346c84e6142081c118678547ddc543ff9f470b6c712fcde0304bcfa7f925c41c1b2a81d80a17f177251911f0b97b9300d58bd4466ff0b4926188da6
+MISC ChangeLog-2015 1953 SHA256 331e875a6e559e1bbb00d546db8f384543ebf9d3ea2de05fbb7918600e59690c SHA512 d510294259cdc744bf850181b6b800beca1d8a25da73193247ebd72d0351fe24fa5777d892955cefe6001d5246f2e70db06d6f74f708e939d9bbe9c4aa9fe144 WHIRLPOOL f631a8f1ed9e91e08922405af2a8ee385c9e2bdd2e2e18ad707578da998e1a5507586f50bfa297c808f77a20c8b02d1cb363a817a237627eeb2400275e51d391
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
diff --git a/net-misc/tiers/files/tiers-1.1-gcc43.patch b/net-misc/tiers/files/tiers-1.1-gcc43.patch
new file mode 100644
index 000000000000..4f167daf13ce
--- /dev/null
+++ b/net-misc/tiers/files/tiers-1.1-gcc43.patch
@@ -0,0 +1,118 @@
+--- tiers1.1b/src/tiers_create.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_create.cc	2009-01-21 03:57:39.000000000 -0400
+@@ -16,7 +16,7 @@
+ //////////////////////////////////////////////////////////////////////////////
+ 
+ // tiers.cc
+-#include <iostream.h>
++#include <iostream>
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers.cc	2009-01-21 03:57:22.000000000 -0400
+@@ -17,8 +17,9 @@
+ 
+ // tiers.cc
+ 
+-#include <iostream.h>
+-#include <limits.h>
++#include <iostream>
++#include <cstdlib>
++#include <climits>
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers_misc.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_misc.cc	2009-01-21 04:07:21.000000000 -0400
+@@ -16,9 +16,9 @@
+ //////////////////////////////////////////////////////////////////////////////
+ 
+ // tiers_misc.cc
+-#include <iostream.h>
+-#include <math.h>
+-#include <limits.h>	// for ULONG_MAX
++#include <iostream>
++#include <cmath>
++#include <climits>	// for ULONG_MAX
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers_main.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_main.cc	2009-01-21 04:08:13.000000000 -0400
+@@ -17,9 +17,9 @@
+ 
+ // tiers_main.cc
+ 
+-#include <iostream.h>
+-#include <stdlib.h>	// for strtoul
+-#include <math.h>		// for random
++#include <iostream>
++#include <cstdlib>	// for strtoul
++#include <cmath>	// for random
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers_output.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_output.cc	2009-01-21 04:00:09.000000000 -0400
+@@ -17,7 +17,7 @@
+ 
+ // tiers_output.cc
+ 
+-#include <iostream.h>
++#include <iostream>
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+ #endif
+--- tiers1.1b/src/tiers_output_gnuplot.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_output_gnuplot.cc	2009-01-21 04:00:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ 
+ // tiers_output_gnuplot.cc
+ 
+-#include <iostream.h>
++#include <iostream>
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+ #endif
+--- tiers1.1b/src/tiers_prims.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_prims.cc	2009-01-21 04:10:24.000000000 -0400
+@@ -17,9 +17,9 @@
+ 
+ // tiers_prims.cc
+ 
+-#include <iostream.h>
+-#include <math.h>	// for random
+-#include <limits.h>	// for ULONG_MAX
++#include <iostream>
++#include <cmath>	// for random
++#include <climits>	// for ULONG_MAX
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers_red_intra.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_red_intra.cc	2009-01-21 04:01:21.000000000 -0400
+@@ -17,8 +17,8 @@
+ 
+ // tiers_red_intra.cc
+ 
+-#include <iostream.h>
+-#include <limits.h>	// for ULONG_MAX
++#include <iostream>
++#include <climits>	// for ULONG_MAX
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
+--- tiers1.1b/src/tiers_red_inter.cc	2009-01-21 03:56:28.000000000 -0400
++++ tiers1.1/src/tiers_red_inter.cc	2009-01-21 04:01:46.000000000 -0400
+@@ -17,8 +17,8 @@
+ 
+ // tiers_red_inter.cc
+ 
+-#include <iostream.h>
+-#include <limits.h>	// for ULONG_MAX
++#include <iostream>
++#include <climits>	// for ULONG_MAX
+ 
+ #ifndef _TIERS_HH
+ #include "tiers.hh"
diff --git a/net-misc/tiers/files/tiers1.1-gccfixes.patch b/net-misc/tiers/files/tiers1.1-gccfixes.patch
new file mode 100644
index 000000000000..db340cad1f04
--- /dev/null
+++ b/net-misc/tiers/files/tiers1.1-gccfixes.patch
@@ -0,0 +1,201 @@
+diff -urN tiers1.1/src/Makefile tiers1.1.new/src/Makefile
+--- tiers1.1/src/Makefile	1997-07-12 23:22:30.000000000 -0700
++++ tiers1.1.new/src/Makefile	2004-01-11 04:56:33.000000000 -0800
+@@ -31,7 +31,9 @@
+ # flags
+ #
+ #FLAGS= -fconserve-space -fno-inline -Wall -Winline -Wpointer-arith -g -DDEBUG
+-FLAGS= -g -fconserve-space
++FLAGS = $(CFLAGS) -fPIC #-g -fconserve-space
++CONFIGFILE = ./tiers_config
++FLAGS += -DCONFIGFILE="\"$(CONFIGFILE)\""
+ 
+ #
+ # tools
+diff -urN tiers1.1/src/tiers.cc tiers1.1.new/src/tiers.cc
+--- tiers1.1/src/tiers.cc	1997-03-04 13:54:18.000000000 -0800
++++ tiers1.1.new/src/tiers.cc	2004-01-11 04:56:33.000000000 -0800
+@@ -24,6 +24,7 @@
+ #include "tiers.hh"
+ #endif
+ 
++#include "tiers_vars.hh"
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////
+@@ -506,4 +507,3 @@
+ }
+   
+ // end of file
+-
+diff -urN tiers1.1/src/tiers.hh tiers1.1.new/src/tiers.hh
+--- tiers1.1/src/tiers.hh	1998-01-12 02:10:46.000000000 -0800
++++ tiers1.1.new/src/tiers.hh	2004-01-11 04:56:33.000000000 -0800
+@@ -20,6 +20,8 @@
+ #ifndef _TIERS_HH
+ #define _TIERS_HH
+ 
++using namespace std;
++
+ 
+ ////////////////////////////////////////////////////////////////////////
+ // Model
+@@ -264,46 +266,46 @@
+ // Defined in tiers_config.cc
+ 
+ // Type of output produced by the model, e.g. Model::GENERIC, Model::GNUPLOT
+-Model::OpType OP_TYPE;
++extern Model::OpType OP_TYPE;
+ 
+ // If set, TIERS_VERBOSE causes the output to contain the
+ // parameters used to generate the model and helpful headings
+ // If undefined, the output is a simple list of nodes and edges
+-bool TIERS_VERBOSE;
++extern bool TIERS_VERBOSE;
+ 
+ // If set, TIERS_LABEL_XXX causes the output to contain a label for
+ // each of the nodes of type XXX
+-bool TIERS_LABEL_WAN;
+-bool TIERS_LABEL_MAN;
+-bool TIERS_LABEL_LAN;
++extern bool TIERS_LABEL_WAN;
++extern bool TIERS_LABEL_MAN;
++extern bool TIERS_LABEL_LAN;
+ 
+ 
+ // If defined as true, the operation of the model is more verbose
+ // If undefined, the model should run with no debugging output
+-bool TIERS_DEBUG;
++extern bool TIERS_DEBUG;
+ 
+ // If defined as true, then an undirected list of edges is produced in the 
+ // output, i.e. the edges (i,j) and (j,i) only appear once in the output
+ // Note that all LAN edges are assumed bidirectional
+-bool REMOVE_DUP_EDGES;
++extern bool REMOVE_DUP_EDGES;
+ 
+ // Set these true to apply proxmity tests to nodes in each network type
+-bool PROXIMITY_TEST_WAN;
+-bool PROXIMITY_TEST_MAN;
+-bool PROXIMITY_TEST_LAN;
++extern bool PROXIMITY_TEST_WAN;
++extern bool PROXIMITY_TEST_MAN;
++extern bool PROXIMITY_TEST_LAN;
+ 
+ // The size of a unit in WAN, MAN and LAN grids
+ // e.g. 1000km, 1km, 1m would be best, but the current values fit with 
+ // typical int sizes
+-unsigned long int WAN_SCALE;
+-unsigned long int MAN_SCALE;
+-unsigned long int LAN_SCALE;	
++extern unsigned long int WAN_SCALE;
++extern unsigned long int MAN_SCALE;
++extern unsigned long int LAN_SCALE;	
+ 
+ // GRID is the size of the square grid on which points are placed
+-unsigned long int GRID;
++extern unsigned long int GRID;
+ 
+ // The comment character for output
+-char COM;
++extern char COM;
+ 
+ 
+ //
+@@ -311,13 +313,13 @@
+ //
+ 
+ // The output directory for results from gnuplot
+-char *title;
++extern char *title;
+ 
+ // The title for results from gnuplot
+-char *outputdir;
++extern char *outputdir;
+ 
+ // Create a unique identifier for each model
+-long int ModelId;
++extern long int ModelId;
+ 
+ // Forward declaration
+ unsigned long int max(unsigned long int A, unsigned long int B);
+diff -urN tiers1.1/src/tiers_config.cc tiers1.1.new/src/tiers_config.cc
+--- tiers1.1/src/tiers_config.cc	1997-07-13 02:55:53.000000000 -0700
++++ tiers1.1.new/src/tiers_config.cc	2004-01-11 04:58:36.000000000 -0800
+@@ -17,7 +17,8 @@
+ 
+ // tiers_config.cc
+ 
+-#include <fstream.h>	// for ifstream
++#include <fstream>	// for ifstream
++#include <iostream>	// for ifstream
+ #include <string.h>	// for strcpy
+ #include <stdlib.h>	// for strtoul
+ 
+@@ -36,10 +37,13 @@
+ {
+   bool ret = true;
+ 
+-  ifstream config_file("./tiers_config");
++#ifndef CONFIGFILE
++#error You need to define CONFIGFILE on the commandline
++#endif
++  ifstream config_file(CONFIGFILE);
+   if (!config_file)
+ 	{
+-	  cerr << "Tiers:: cannot open file './tiers_config'" << endl;
++	  cerr << "Tiers:: cannot open file '" << CONFIGFILE << "'" << endl;
+ 	}
+ 
+   // Read the contents of the file in, skipping blank lines or lines which 
+diff -urN tiers1.1/src/tiers_main.cc tiers1.1.new/src/tiers_main.cc
+--- tiers1.1/src/tiers_main.cc	1997-07-06 00:58:31.000000000 -0700
++++ tiers1.1.new/src/tiers_main.cc	2004-01-11 04:56:33.000000000 -0800
+@@ -25,11 +25,11 @@
+ #include "tiers.hh"
+ #endif
+ 
+-extern "C" 
+-{
+-  long int time(int dummy);
+-  char * initstate(unsigned seed, char *state, int n);
+-}
++//extern "C" 
++//{
++//  long int time(int dummy);
++//  char * initstate(unsigned seed, char *state, int n);
++//}
+ 
+ unsigned long int NW;	// maximum number of WANs, currently 1
+ unsigned long int NM;	// maximum number of MANs per WAN
+@@ -63,7 +63,7 @@
+   cout.setf( ios::unitbuf );
+ 
+ // TIERS_VERBOSE
+-#ifdef 0 
++#ifdef FALSE
+   cout << "Main:: Processing arguments. Arguments are:"
+        << endl;
+   for (int i = 0; i < argc; i++)
+diff -urN tiers1.1/src/tiers_vars.hh tiers1.1.new/src/tiers_vars.hh
+--- tiers1.1/src/tiers_vars.hh	1969-12-31 16:00:00.000000000 -0800
++++ tiers1.1.new/src/tiers_vars.hh	2004-01-11 04:56:33.000000000 -0800
+@@ -0,0 +1,18 @@
++Model::OpType OP_TYPE;
++bool TIERS_VERBOSE;
++bool TIERS_LABEL_WAN;
++bool TIERS_LABEL_MAN;
++bool TIERS_LABEL_LAN;
++bool TIERS_DEBUG;
++bool REMOVE_DUP_EDGES;
++bool PROXIMITY_TEST_WAN;
++bool PROXIMITY_TEST_MAN;
++bool PROXIMITY_TEST_LAN;
++unsigned long int WAN_SCALE;
++unsigned long int MAN_SCALE;
++unsigned long int LAN_SCALE;	
++unsigned long int GRID;
++char COM;
++char *title;
++char *outputdir;
++long int ModelId;
diff --git a/net-misc/tiers/metadata.xml b/net-misc/tiers/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/net-misc/tiers/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 type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/tiers/tiers-1.1.ebuild b/net-misc/tiers/tiers-1.1.ebuild
new file mode 100644
index 000000000000..fc8a2d38b9dc
--- /dev/null
+++ b/net-misc/tiers/tiers-1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+MY_P="${PN}${PV}"
+DESCRIPTION="Random network topography generator"
+HOMEPAGE="http://www.isi.edu/nsnam/ns/ns-topogen.html#tiers"
+SRC_URI="http://www.isi.edu/nsnam/dist/topogen/${MY_P}.tar.gz
+		 http://www.isi.edu/nsnam/dist/topogen/tiers2ns-lan.awk"
+
+LICENSE="mapm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="sys-devel/gcc"
+RDEPEND="virtual/awk
+	sci-visualization/gnuplot"
+
+S=${WORKDIR}/${PN}${PV}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${MY_P}-gccfixes.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	sed -e '1a\#!/bin/sh' -e '1d' -e "s|-f |-f /usr/share/${PN}/|g" -i "${S}"/bin/strip4gnuplot3.5
+}
+
+src_compile() {
+	cd "${S}"/src
+	emake CFLAGS="${CFLAGS}" CONFIGFILE="/etc/tiers-gnuplot.conf" EXEC="../bin/tiers-gnuplot" || die
+	# cleanup for a sec
+	rm *.o
+	emake CFLAGS="${CFLAGS}" CONFIGFILE="/etc/tiers.conf" EXEC="../bin/tiers" || die
+}
+
+src_install() {
+	dobin bin/tiers bin/tiers-gnuplot bin/strip4gnuplot3.5
+	insinto /etc
+	newins src/tiers_config.generic tiers.conf
+	newins src/tiers_config.gnuplot tiers-gnuplot.conf
+	insinto /usr/share/${PN}
+	doins bin/*.awk "${DISTDIR}"/tiers2ns-lan.awk
+	dodoc CHANGES COPYRIGHT README docs/*
+}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
new file mode 100644
index 000000000000..66e42fd5640a
--- /dev/null
+++ b/net-misc/tigervnc/Manifest
@@ -0,0 +1,15 @@
+AUX tigervnc-1.7.1-xserver119-compat.patch 13889 SHA256 b40580c3fa81285da14cfe3b0377165682d6f49785a6af36812fc7477970844e SHA512 3be73f862020220b82de65e03c5678c623b2295f44a70afd577136b0c8358b8512b08604753c74dcd7a49977ed164e6a2e76f6c400b304f8aad7f8b2d999e544 WHIRLPOOL e4e47da39c18c2d64e7bc2b92c72334ccef2346542173fc58291e7fb2e201273c94f7ea8fa33b49a8fdc269f3a048a9343b4628b926036176f124d167b66f91a
+AUX tigervnc.confd 346 SHA256 48b6ae4f3e9e528b3cd4bc1349ceed3cd1a403ab0f3a2a8dd57a4769f88ceafc SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4 WHIRLPOOL 9911713196cb57057b2200c0303b832fe7708520453cbf4ca1b9ed945738c734afff3f4d1f96e361e487e59b39f3ef44ac939234e1ea56e2e9e4e612cd5d70ee
+AUX tigervnc.initd 1974 SHA256 8e516bc12f88e238b1aebac39ed47a6123b4130d5977ca3fb4d7fcc0c04f32a0 SHA512 b0d43352551cf3cbcfe404dcbfe5617965e08674d5af0f7ec801c9124d7ab0279d9bb8f76b6141b5ad96a70df9c99d5b6cfff0ba29211a37a344906d105e1bc8 WHIRLPOOL 3846dd60cf6193a69bd4813152cad24c893e53591a3154edeac74f5ad1aa2af3fa232a313b7584ccc5e32b5832df8fe2b6f11325aad06d7969ad688d40e4f35b
+AUX xserver119.patch 3681 SHA256 7f130baaf463dfae50206840a0e216236154d7ba43c8d9900df1b721358079da SHA512 531c3b99c5402a66f95ed5743dd37ae9de493cd9bb2e63b39afdd2d536ae438b3c5e2618226f070adc62e41b169837ae7a3302b7bb131b181361a7b142a9e93f WHIRLPOOL 10df9ab432cd342e6d19b2c0cb0d552bb876fb96ed3a71424369a68a73530708af94af3666df3dafdd9d368c16f65a078b375ef8a10d89faa77250ebd48199b1
+DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
+DIST tigervnc-1.7.1.tar.gz 1406032 SHA256 3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc SHA512 babdc362b28d7af80c7efbb3a1aadf158d7f29621afe36d785748af45e515e2718cf1011359db7b39c218770b3f3ee2767e08abc58091f018c08ba9739a3e68d WHIRLPOOL 178d6b3fb7569cfb2de5dd144031b441b02a865574928d20f1589fd6f933b9276477292182cde56e948ab75d2fc0bea4d79f71bcddb33f6057970a7caa08b2cc
+DIST tigervnc-1.8.0.tar.gz 1433830 SHA256 9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a WHIRLPOOL 4001182ec2da3551b0eb2d6ee863c225340b474dc6d32cbe4c0941e421852a10913ee80706009b1a59043b6983ac2bc42f070d1a5aa97eefe1cff3c97497b2f0
+DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
+DIST xorg-server-1.19.1.tar.bz2 6041792 SHA256 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7 WHIRLPOOL 9fab4118e866e11a7742ba63d7f681490d43718a329416fb742e268fdf56f348bc9f1f2b5229fbaac98ce78f41fc1e9e5aa7587ee120fcccaba752ff4bac1555
+EBUILD tigervnc-1.7.1-r2.ebuild 4637 SHA256 249210856391fe17a3d7b07056d38aa8fbe843be20959091effb7da3a3677e39 SHA512 4ccc3ece00c4c9bd4e35f7160cd85effb66c3f2c90c844447e3e1a02cd009bc435cf9be58e5a6b478be11b832adcc0f4bc58385d2cb4f6d8510b0eefa9c155c7 WHIRLPOOL 13aef55fa4da3b483f9f4c35a24d4527cf82aeae3955e4dddae67f890f4facaf80571e3223360ac5c5818ac664da47cea5db9ad3d52e5fc165de868f73ad098f
+EBUILD tigervnc-1.7.1-r4.ebuild 4722 SHA256 466b11c47fbc7147e068f4ac65da00b61603ee347040c7c5b65a43589cace47d SHA512 8852901f22f45a263f6d5b7d6a58e56a926306fab94836826fbcb65a6ba3428c82a7b25db6476a6dbb3428b4374684649a18959cc029aa5574e9ca20113d5286 WHIRLPOOL db1ce346de70416b12bd0b7bd0a50aae773999e6d37495894322f60ae83941fec8a75a9f680b0dabefbb8e01d8ef1d3a14b73754eec1c0e582d67dd3ed45d672
+EBUILD tigervnc-1.8.0.ebuild 4526 SHA256 79754f7e609b3444ec63d458849591be416dfb3dae70bb9c066c9f354a31e116 SHA512 b0749605633022f185df75d65f04f04ebf21f1d9a0bdbb06f3a19947c9c9167e93b3e0e2ca19602b7ffe56763008cfe6156cce0949335328ff6f15a56899c6b2 WHIRLPOOL d72e2cb6f58db5c22ad46052e7d1a0071775375d9f64858cc146f02c381f9b726e1f1611fc4e18faa7ee842749a853b995392e9eb26c38a91324da7b49b45e2b
+MISC ChangeLog 8410 SHA256 bd682137413d956f17d33752f2cc480623e91c92a6e209bd902ba173fe451809 SHA512 877b097f78fb01467b31decde5dfd34b66b984feb5df398effc3447b1fe90800e380d80919babad8deb6ba54d828f8e6542915f46dda24e42495221aed2c57d6 WHIRLPOOL 47292baea39ebb7a25b1e2d71a4721be78e2c5cf48e4d0bb6240a452e93824f70283afcf9c443cd11ee9f3feec8bfdcf37c0f897258de23e7f763629a886d27e
+MISC ChangeLog-2015 28816 SHA256 2accf9b750570af369f0a2b8bb23db0a4f032fbf9ff5a8761ddbc604ec74d281 SHA512 1d645ee4e13d8639b6e27685b78e5b0a41167bd76ab5e4375404e6e106548dff000fe2b309a249557afdbdb4dc6dc7dbaf3ba15c3acb9088a71d9520490f1b68 WHIRLPOOL 20f0137d3ef189d90bdf7663c82172cb54c25149539e709dcd4b1201edecafa6256bb20097d3081d77778529f22c120767b7c30cfcf4abd8c2b33cba325d63ac
+MISC metadata.xml 671 SHA256 d98d7ab061b2970005b38a491a5c6cbf46e81e4a149b540ec3e390c715c083b0 SHA512 e2416162e344db1025f15b89754c6f84f9b69217b86abe15bb6d048ae80bcc0a84df6943ada53c71f6bc6236f13f7add3e5f03a9e52cc61da060a391b8a69a44 WHIRLPOOL d9a1ca79d5f1b3340ff40db17cb88a21e7c578250ebab1758fb0ee73e1687e9620bb819a3fb3142d43e77778cc1f978b6deab6bbd62364e10d7af3a042eae356
diff --git a/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch b/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch
new file mode 100644
index 000000000000..192344257a5e
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch
@@ -0,0 +1,446 @@
+From 3fed95eda27dfbeee6535f987f5d14a66f64749b Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 5 Oct 2016 11:15:27 +0200
+Subject: [PATCH] Add xorg-xserver 1.19 support
+
+---
+ unix/xserver/hw/vnc/XserverDesktop.cc | 183 ++++++++++++++++++++++++++++++++++
+ unix/xserver/hw/vnc/XserverDesktop.h  |   7 ++
+ unix/xserver/hw/vnc/vncBlockHandler.c |  19 ++++
+ unix/xserver/hw/vnc/vncExtInit.cc     |  13 +++
+ unix/xserver/hw/vnc/vncExtInit.h      |   5 +
+ unix/xserver/hw/vnc/vncHooks.c        |  21 +++-
+ unix/xserver/hw/vnc/xorg-version.h    |   4 +-
+ unix/xserver119.patch                 |  95 ++++++++++++++++++
+ 8 files changed, 343 insertions(+), 4 deletions(-)
+ create mode 100644 unix/xserver119.patch
+
+diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
+index 4f82a54..8cc0b0b 100644
+--- a/unix/xserver/hw/vnc/XserverDesktop.cc
++++ b/unix/xserver/hw/vnc/XserverDesktop.cc
+@@ -90,6 +90,30 @@ class FileHTTPServer : public rfb::HTTPServer {
+   XserverDesktop* desktop;
+ };
+ 
++#if XORG >= 119
++extern "C" {
++/*
++ * xserver NotifyFd callbacks. Note we also expect write notifies to work,
++ * which only works with xserver >= 1.19.
++ */
++#include "os.h"
++
++static void HandleListenFd(int fd, int xevents, void *data)
++{
++  XserverDesktop *desktop = (XserverDesktop *)data;
++
++  desktop->handleListenFd(fd);
++}
++
++static void HandleSocketFd(int fd, int xevents, void *data)
++{
++  XserverDesktop *desktop = (XserverDesktop *)data;
++
++  desktop->handleSocketFd(fd, xevents);
++}
++
++}
++#endif
+ 
+ XserverDesktop::XserverDesktop(int screenIndex_,
+                                std::list<network::TcpListener*> listeners_,
+@@ -111,15 +135,35 @@ XserverDesktop::XserverDesktop(int screenIndex_,
+ 
+   if (!httpListeners.empty ())
+     httpServer = new FileHTTPServer(this);
++
++#if XORG >= 119
++  for (std::list<TcpListener*>::iterator i = listeners.begin();
++       i != listeners.end();
++       i++) {
++    SetNotifyFd((*i)->getFd(), HandleListenFd, X_NOTIFY_READ, this);
++  }
++
++  for (std::list<TcpListener*>::iterator i = httpListeners.begin();
++       i != httpListeners.end();
++       i++) {
++    SetNotifyFd((*i)->getFd(), HandleListenFd, X_NOTIFY_READ, this);
++  }
++#endif
+ }
+ 
+ XserverDesktop::~XserverDesktop()
+ {
+   while (!listeners.empty()) {
++#if XORG >= 119
++    RemoveNotifyFd(listeners.back()->getFd());
++#endif
+     delete listeners.back();
+     listeners.pop_back();
+   }
+   while (!httpListeners.empty()) {
++#if XORG >= 119
++    RemoveNotifyFd(listeners.back()->getFd());
++#endif
+     delete httpListeners.back();
+     httpListeners.pop_back();
+   }
+@@ -389,6 +433,140 @@ void XserverDesktop::add_copied(const rfb::Region &dest, const rfb::Point &delta
+   }
+ }
+ 
++#if XORG >= 119
++void XserverDesktop::handleListenFd(int fd)
++{
++  std::list<TcpListener*>::iterator i;
++  SocketServer *fd_server = NULL;
++  bool is_http = false;
++
++  for (i = listeners.begin(); i != listeners.end(); i++) {
++    if ((*i)->getFd() == fd) {
++      fd_server = server;
++      break;
++    }
++  }
++  if (httpServer && !fd_server) {
++    for (i = httpListeners.begin(); i != httpListeners.end(); i++) {
++      if ((*i)->getFd() == fd) {
++        fd_server = httpServer;
++        is_http = true;
++        break;
++      }
++    }
++  }
++  if (!fd_server) {
++    vlog.error("XserverDesktop::handleListenFd: Error cannot find fd");
++    return;
++  }
++
++  Socket* sock = (*i)->accept();
++  sock->outStream().setBlocking(false);
++  vlog.debug("new %sclient, sock %d", is_http ? "http " : "", sock->getFd());
++  fd_server->addSocket(sock);
++  SetNotifyFd(sock->getFd(), HandleSocketFd, X_NOTIFY_READ, this);
++}
++
++void XserverDesktop::handleSocketFd(int fd, int xevents)
++{
++  std::list<Socket*> sockets;
++  std::list<Socket*>::iterator i;
++  SocketServer *fd_server = NULL;
++  bool is_http = false;
++
++  server->getSockets(&sockets);
++  for (i = sockets.begin(); i != sockets.end(); i++) {
++    if ((*i)->getFd() == fd) {
++      fd_server = server;
++      break;
++    }
++  }
++  if (httpServer && !fd_server) {
++    httpServer->getSockets(&sockets);
++    for (i = sockets.begin(); i != sockets.end(); i++) {
++      if ((*i)->getFd() == fd) {
++        fd_server = httpServer;
++        is_http = true;
++        break;
++      }
++    }
++  }
++  if (!fd_server) {
++    vlog.error("XserverDesktop::handleSocketFd: Error cannot find fd");
++    return;
++  }
++
++  if (xevents & X_NOTIFY_READ)
++    fd_server->processSocketReadEvent(*i);
++
++  if (xevents & X_NOTIFY_WRITE)
++    fd_server->processSocketWriteEvent(*i);
++
++  if ((*i)->isShutdown()) {
++    vlog.debug("%sclient gone, sock %d", is_http ? "http " : "", fd);
++    RemoveNotifyFd(fd);
++    fd_server->removeSocket(*i);
++    if (!is_http)
++      vncClientGone(fd);
++    delete (*i);
++  }
++}
++
++void XserverDesktop::blockHandler(int* timeout)
++{
++  // We don't have a good callback for when we can init input devices[1],
++  // so we abuse the fact that this routine will be called first thing
++  // once the dix is done initialising.
++  // [1] Technically Xvnc has InitInput(), but libvnc.so has nothing.
++  vncInitInputDevice();
++
++  try {
++    std::list<Socket*> sockets;
++    std::list<Socket*>::iterator i;
++    server->getSockets(&sockets);
++    for (i = sockets.begin(); i != sockets.end(); i++) {
++      int fd = (*i)->getFd();
++      if ((*i)->isShutdown()) {
++        vlog.debug("client gone, sock %d",fd);
++        server->removeSocket(*i);
++        vncClientGone(fd);
++        delete (*i);
++      } else {
++        /* Update existing NotifyFD to listen for write (or not) */
++        if ((*i)->outStream().bufferUsage() > 0)
++          SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ | X_NOTIFY_WRITE, this);
++        else
++          SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ, this);
++      }
++    }
++    if (httpServer) {
++      httpServer->getSockets(&sockets);
++      for (i = sockets.begin(); i != sockets.end(); i++) {
++        int fd = (*i)->getFd();
++        if ((*i)->isShutdown()) {
++          vlog.debug("http client gone, sock %d",fd);
++          httpServer->removeSocket(*i);
++          delete (*i);
++        } else {
++          /* Update existing NotifyFD to listen for write (or not) */
++          if ((*i)->outStream().bufferUsage() > 0)
++            SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ | X_NOTIFY_WRITE, this);
++          else
++            SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ, this);
++        }
++      }
++    }
++
++    int nextTimeout = server->checkTimeouts();
++    if (nextTimeout > 0 && (*timeout == -1 || nextTimeout < *timeout))
++      *timeout = nextTimeout;
++  } catch (rdr::Exception& e) {
++    vlog.error("XserverDesktop::blockHandler: %s",e.str());
++  }
++}
++
++#else
++
+ void XserverDesktop::readBlockHandler(fd_set* fds, struct timeval ** timeout)
+ {
+   // We don't have a good callback for when we can init input devices[1],
+@@ -603,10 +781,15 @@ void XserverDesktop::writeWakeupHandler(fd_set* fds, int nfds)
+   }
+ }
+ 
++#endif
++
+ void XserverDesktop::addClient(Socket* sock, bool reverse)
+ {
+   vlog.debug("new client, sock %d reverse %d",sock->getFd(),reverse);
+   server->addSocket(sock, reverse);
++#if XORG >= 119
++  SetNotifyFd(sock->getFd(), HandleSocketFd, X_NOTIFY_READ, this);
++#endif
+ }
+ 
+ void XserverDesktop::disconnectClients()
+diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
+index c069028..9e77627 100644
+--- a/unix/xserver/hw/vnc/XserverDesktop.h
++++ b/unix/xserver/hw/vnc/XserverDesktop.h
+@@ -38,6 +38,7 @@
+ #include <rfb/VNCServerST.h>
+ #include <rdr/SubstitutingInStream.h>
+ #include "Input.h"
++#include "xorg-version.h"
+ 
+ namespace rfb {
+   class VNCServerST;
+@@ -69,10 +70,16 @@ class XserverDesktop : public rfb::SDesktop, public rfb::FullFramePixelBuffer,
+                  const unsigned char *rgbaData);
+   void add_changed(const rfb::Region &region);
+   void add_copied(const rfb::Region &dest, const rfb::Point &delta);
++#if XORG >= 119
++  void handleListenFd(int fd);
++  void handleSocketFd(int fd, int xevents);
++  void blockHandler(int* timeout);
++#else
+   void readBlockHandler(fd_set* fds, struct timeval ** timeout);
+   void readWakeupHandler(fd_set* fds, int nfds);
+   void writeBlockHandler(fd_set* fds, struct timeval ** timeout);
+   void writeWakeupHandler(fd_set* fds, int nfds);
++#endif
+   void addClient(network::Socket* sock, bool reverse);
+   void disconnectClients();
+ 
+diff --git a/unix/xserver/hw/vnc/vncBlockHandler.c b/unix/xserver/hw/vnc/vncBlockHandler.c
+index 4e44478..baebc3d 100644
+--- a/unix/xserver/hw/vnc/vncBlockHandler.c
++++ b/unix/xserver/hw/vnc/vncBlockHandler.c
+@@ -30,6 +30,23 @@
+ 
+ #include "vncExtInit.h"
+ #include "vncBlockHandler.h"
++#include "xorg-version.h"
++
++#if XORG >= 119
++
++static void vncBlockHandler(void* data, void* timeout)
++{
++  vncCallBlockHandlers(timeout);
++}
++
++void vncRegisterBlockHandlers(void)
++{
++  if (!RegisterBlockAndWakeupHandlers(vncBlockHandler,
++                                      (ServerWakeupHandlerProcPtr)NoopDDA, 0))
++    FatalError("RegisterBlockAndWakeupHandlers() failed\n");
++}
++
++#else
+ 
+ static void vncBlockHandler(void * data, OSTimePtr t, void * readmask);
+ static void vncWakeupHandler(void * data, int nfds, void * readmask);
+@@ -144,3 +161,5 @@ static void vncWriteWakeupHandlerFallback(void)
+ 
+   vncWriteWakeupHandler(ret, &fallbackFds);
+ }
++
++#endif
+diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
+index dea3cb8..9d70e44 100644
+--- a/unix/xserver/hw/vnc/vncExtInit.cc
++++ b/unix/xserver/hw/vnc/vncExtInit.cc
+@@ -249,6 +249,17 @@ int vncExtensionIsActive(int scrIdx)
+   return (desktop[scrIdx] != NULL);
+ }
+ 
++#if XORG >= 119
++
++void vncCallBlockHandlers(int* timeout)
++{
++  for (int scr = 0; scr < vncGetScreenCount(); scr++)
++    if (desktop[scr])
++      desktop[scr]->blockHandler(timeout);
++}
++
++#else
++
+ void vncCallReadBlockHandlers(fd_set * fds, struct timeval ** timeout)
+ {
+   for (int scr = 0; scr < vncGetScreenCount(); scr++)
+@@ -277,6 +288,8 @@ void vncCallWriteWakeupHandlers(fd_set * fds, int nfds)
+       desktop[scr]->writeWakeupHandler(fds, nfds);
+ }
+ 
++#endif
++
+ int vncGetAvoidShiftNumLock(void)
+ {
+   return (bool)avoidShiftNumLock;
+diff --git a/unix/xserver/hw/vnc/vncExtInit.h b/unix/xserver/hw/vnc/vncExtInit.h
+index 9785d11..3164528 100644
+--- a/unix/xserver/hw/vnc/vncExtInit.h
++++ b/unix/xserver/hw/vnc/vncExtInit.h
+@@ -22,6 +22,7 @@
+ #include <stdint.h>
+ #include <stddef.h>
+ #include <sys/select.h>
++#include "xorg-version.h"
+ 
+ // Only from C++
+ #ifdef __cplusplus
+@@ -50,10 +51,14 @@ extern int vncInetdSock;
+ void vncExtensionInit(void);
+ int vncExtensionIsActive(int scrIdx);
+ 
++#if XORG >= 119
++void vncCallBlockHandlers(int* timeout);
++#else
+ void vncCallReadBlockHandlers(fd_set * fds, struct timeval ** timeout);
+ void vncCallReadWakeupHandlers(fd_set * fds, int nfds);
+ void vncCallWriteBlockHandlers(fd_set * fds, struct timeval ** timeout);
+ void vncCallWriteWakeupHandlers(fd_set * fds, int nfds);
++#endif
+ 
+ int vncGetAvoidShiftNumLock(void);
+ 
+diff --git a/unix/xserver/hw/vnc/vncHooks.c b/unix/xserver/hw/vnc/vncHooks.c
+index 22ea9ea..29f3f8b 100644
+--- a/unix/xserver/hw/vnc/vncHooks.c
++++ b/unix/xserver/hw/vnc/vncHooks.c
+@@ -128,9 +128,11 @@ static Bool vncHooksDisplayCursor(DeviceIntPtr pDev,
+ #if XORG <= 112
+ static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
+                                  pointer pReadmask);
+-#else
++#elif XORG <= 118
+ static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout,
+                                  void * pReadmask);
++#else
++static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout);
+ #endif
+ #ifdef RENDER
+ static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, 
+@@ -716,9 +718,11 @@ static Bool vncHooksDisplayCursor(DeviceIntPtr pDev,
+ #if XORG <= 112
+ static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
+                                  pointer pReadmask)
+-#else
++#elif XORG <= 118
+ static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout,
+                                  void * pReadmask)
++#else
++static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout)
+ #endif
+ {
+ #if XORG <= 112
+@@ -731,8 +735,10 @@ static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout,
+ 
+ #if XORG <= 112
+   (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+-#else
++#elif XORG <= 118
+   (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
++#else
++  (*pScreen->BlockHandler) (pScreen, pTimeout);
+ #endif
+ 
+   vncHooksScreen->ignoreHooks--;
+@@ -1033,12 +1039,21 @@ static void vncHooksCopyClip(GCPtr dst, GCPtr src) {
+ 
+ // Unwrap and rewrap helpers
+ 
++#if XORG >= 116
++#define GC_OP_PROLOGUE(pGC, name)\
++    vncHooksGCPtr pGCPriv = vncHooksGCPrivate(pGC);\
++    const GCFuncs *oldFuncs = pGC->funcs;\
++    pGC->funcs = pGCPriv->wrappedFuncs;\
++    pGC->ops = pGCPriv->wrappedOps; \
++    DBGPRINT((stderr,"vncHooks" #name " called\n"))
++#else
+ #define GC_OP_PROLOGUE(pGC, name)\
+     vncHooksGCPtr pGCPriv = vncHooksGCPrivate(pGC);\
+     GCFuncs *oldFuncs = pGC->funcs;\
+     pGC->funcs = pGCPriv->wrappedFuncs;\
+     pGC->ops = pGCPriv->wrappedOps; \
+     DBGPRINT((stderr,"vncHooks" #name " called\n"))
++#endif
+ 
+ #define GC_OP_EPILOGUE(pGC)\
+     pGCPriv->wrappedOps = pGC->ops;\
+diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
+index 60610cb..9d1c0eb 100644
+--- a/unix/xserver/hw/vnc/xorg-version.h
++++ b/unix/xserver/hw/vnc/xorg-version.h
+@@ -50,8 +50,10 @@
+ #define XORG 117
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000))
+ #define XORG 118
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (19 * 100000) + (99 * 1000))
++#define XORG 119
+ #else
+-#error "X.Org newer than 1.18 is not supported"
++#error "X.Org newer than 1.19 is not supported"
+ #endif
+ 
+ #endif
diff --git a/net-misc/tigervnc/files/tigervnc.confd b/net-misc/tigervnc/files/tigervnc.confd
new file mode 100644
index 000000000000..e651dbbe7889
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc.confd
@@ -0,0 +1,9 @@
+# Config file for /etc/init.d/tigervnc
+
+# Specify the user(s) Xvnc(1) should be run for. The syntax is: "username:display".
+# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space.
+# DISPLAYS="myuser:1"
+
+# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information.
+# VNC_OPTS=""
+
diff --git a/net-misc/tigervnc/files/tigervnc.initd b/net-misc/tigervnc/files/tigervnc.initd
new file mode 100644
index 000000000000..06a154257e6f
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc.initd
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ -n "${DISPLAYS}" ]; then
+		if [ $1 = "start" ]; then
+			local user
+			for user in $DISPLAYS; do
+				if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then
+					eerror "There are no passwords defined for user ${user%%:*}."
+					return 1
+				elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then
+					eerror "Display :${user##*:} appears to be already in use because of /tmp/.X11-unix/X${user##*:}"
+					eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
+					return 1
+				elif [ -e "/tmp/.X${user##*:}-lock" ]; then
+					eerror "Display :${user##*:} appears to be already in use because of /tmp/.X${user##*:}-lock"
+					eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
+					return 1
+				fi
+			done
+		fi
+		return 0
+	else
+		eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc'
+		return 1
+	fi
+}
+
+start() {
+	checkconfig start || return 1
+	ebegin "Starting TigerVNC server"
+	for user in $DISPLAYS; do
+		usrname=${user%%:*}
+		usropts=VNC_OPTS_${usrname}
+		usrdisp=${user##*:}
+		usrvar=$usropts"["$usrdisp"]"
+		[ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar}
+
+		# A user may have an invalid shell, so we default to /bin/sh if its the case
+		if [ -x /usr/bin/getent ] ; then
+			usrshell=`getent passwd ${user%%:*} | cut -d: -f 7`
+			case "$usrshell" in
+				*/bash|*/ksh|*/sh|*/csh|*/tcsh) ;;          
+				*) shell="-s /bin/sh" ;;
+			esac
+			echo $usrshell $shell
+		fi
+
+		su ${shell} ${user%%:*} -c "source /etc/profile && cd ~${user%%:*} && vncserver :${user##*:} $vnc_opts" &>/dev/null
+	done
+	eend $?
+}
+
+stop() {
+	checkconfig stop || return 2
+	ebegin "Stopping TigerVNC server"
+	for user in $DISPLAYS; do
+		su -s /bin/sh ${user%%:*} -c "vncserver -kill :${user##*:}" &>/dev/null
+	done
+	eend $?
+}
+
+restart() {
+        svc_stop
+        svc_start
+}
diff --git a/net-misc/tigervnc/files/xserver119.patch b/net-misc/tigervnc/files/xserver119.patch
new file mode 100644
index 000000000000..614f104a4d4d
--- /dev/null
+++ b/net-misc/tigervnc/files/xserver119.patch
@@ -0,0 +1,95 @@
+diff -up xserver/configure.ac.xserver116-rebased xserver/configure.ac
+--- xserver/configure.ac.xserver116-rebased	2016-09-29 13:14:45.595441590 +0200
++++ xserver/configure.ac	2016-09-29 13:14:45.631442006 +0200
+@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
+ AC_CONFIG_HEADERS(include/version-config.h)
+ 
+ AM_PROG_AS
++AC_PROG_CXX
+ AC_PROG_LN_S
+ LT_PREREQ([2.2])
+ LT_INIT([disable-static win32-dll])
+@@ -1863,6 +1864,10 @@ if test "x$XVFB" = xyes; then
+ 	AC_SUBST([XVFB_SYS_LIBS])
+ fi
+ 
++dnl Xvnc DDX
++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
++AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
+ 
+ dnl Xnest DDX
+ 
+@@ -1898,6 +1903,8 @@ if test "x$XORG" = xauto; then
+ fi
+ AC_MSG_RESULT([$XORG])
+ 
++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
++
+ if test "x$XORG" = xyes; then
+ 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
+ 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+@@ -2116,7 +2123,6 @@ if test "x$XORG" = xyes; then
+ 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+ 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+ 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+ 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+@@ -2691,6 +2697,7 @@ hw/dmx/Makefile
+ hw/dmx/man/Makefile
+ hw/vfb/Makefile
+ hw/vfb/man/Makefile
++hw/vnc/Makefile
+ hw/xnest/Makefile
+ hw/xnest/man/Makefile
+ hw/xwin/Makefile
+diff -up xserver/hw/Makefile.am.xserver116-rebased xserver/hw/Makefile.am
+--- xserver/hw/Makefile.am.xserver116-rebased	2016-09-29 13:14:45.601441659 +0200
++++ xserver/hw/Makefile.am	2016-09-29 13:14:45.631442006 +0200
+@@ -38,7 +38,8 @@ SUBDIRS =			\
+ 	$(DMX_SUBDIRS)		\
+ 	$(KDRIVE_SUBDIRS)	\
+ 	$(XQUARTZ_SUBDIRS)	\
+-	$(XWAYLAND_SUBDIRS)
++	$(XWAYLAND_SUBDIRS)	\
++	vnc
+ 
+ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
+ 
+diff -up xserver/mi/miinitext.c.xserver116-rebased xserver/mi/miinitext.c
+--- xserver/mi/miinitext.c.xserver116-rebased	2016-09-29 13:14:45.618441855 +0200
++++ xserver/mi/miinitext.c	2016-09-29 13:14:45.631442006 +0200
+@@ -114,6 +114,10 @@ SOFTWARE.
+ #include "micmap.h"
+ #include "globals.h"
+ 
++#ifdef TIGERVNC
++extern void vncExtensionInit(INITARGS);
++#endif
++
+ /* The following is only a small first step towards run-time
+  * configurable extensions.
+  */
+@@ -238,6 +242,9 @@ EnableDisableExtensionError(const char *
+ 
+ /* List of built-in (statically linked) extensions */
+ static const ExtensionModule staticExtensions[] = {
++#ifdef TIGERVNC
++    {vncExtensionInit, "VNC-EXTENSION", NULL},
++#endif
+     {GEExtensionInit, "Generic Event Extension", &noGEExtension},
+     {ShapeExtensionInit, "SHAPE", NULL},
+ #ifdef MITSHM
+--- xserver/include/os.h~	2016-10-03 09:07:29.000000000 +0200
++++ xserver/include/os.h	2016-10-03 14:13:00.013654506 +0200
+@@ -621,7 +621,7 @@
+ extern _X_EXPORT void
+ LogClose(enum ExitCode error);
+ extern _X_EXPORT Bool
+-LogSetParameter(LogParameter param, int value);
++LogSetParameter(enum _LogParameter param, int value);
+ extern _X_EXPORT void
+ LogVWrite(int verb, const char *f, va_list args)
+ _X_ATTRIBUTE_PRINTF(2, 0);
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
new file mode 100644
index 000000000000..8dfc0c1b9f1d
--- /dev/null
+++ b/net-misc/tigervnc/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>otakuto.gentoo@gmail.com</email>
+        <name>Takuto Yoshida</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+  <use>
+    <flag name="drm">build with DRM support</flag>
+    <flag name="server">Build TigerVNC server</flag>
+    <flag name="xorgmodule">Build the Xorg module</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">TigerVNC/tigervnc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..297e4521dbd1
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
+
+XSERVER_VERSION="1.19.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
+	mirror://gentoo/${PN}.png
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+IUSE="+drm gnutls java +opengl pam server +xorgmodule"
+
+CDEPEND="virtual/jpeg:0
+	sys-libs/zlib
+	>=x11-libs/libXtst-1.0.99.2
+	>=x11-libs/fltk-1.3.1
+	gnutls? ( net-libs/gnutls:= )
+	pam? ( virtual/pam )
+	server? (
+		dev-lang/perl
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXfont-1.4.2
+		>=x11-libs/libxkbfile-1.0.4
+		x11-libs/libXrender
+		>=x11-libs/pixman-0.27.2
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+		drm? ( x11-libs/libdrm )
+	)"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.5:* )
+	!net-misc/vnc
+	!net-misc/tightvnc
+	!net-misc/xf4vnc"
+
+DEPEND="${CDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/xextproto-7.2.99.901
+	>=x11-proto/xproto-7.0.31
+	x11-libs/libXfont2
+	java? ( >=virtual/jdk-1.5 )
+	server?	(
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-proto/bigreqsproto-1.1.0
+		>=x11-proto/compositeproto-0.4
+		>=x11-proto/damageproto-1.1
+		>=x11-proto/fixesproto-5.0
+		>=x11-proto/fontsproto-2.1.3
+		>=x11-proto/glproto-1.4.17
+		>=x11-proto/randrproto-1.4.0
+		>=x11-proto/renderproto-0.11
+		>=x11-proto/resourceproto-1.2.0
+		>=x11-proto/scrnsaverproto-1.1
+		>=x11-proto/videoproto-2.2.2
+		>=x11-proto/xcmiscproto-1.2.0
+		>=x11-proto/xineramaproto-1.1.3
+		>=x11-libs/xtrans-1.3.3
+		>=x11-proto/dri2proto-2.8
+		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+	)"
+
+PATCHES=(
+	"${WORKDIR}"/patches/010_libvnc-os.patch
+	"${WORKDIR}"/patches/030_manpages.patch
+	"${WORKDIR}"/patches/055_xstartup.patch
+)
+
+src_prepare() {
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	default
+
+	if use server; then
+		eapply "${FILESDIR}/${PN}-1.7.1-xserver119-compat.patch"
+		cd unix/xserver || die
+		eapply "${FILESDIR}/xserver119.patch"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use arm || use hppa && append-flags "-fPIC"
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_PAM=$(usex pam)
+		-DBUILD_JAVA=$(usex java)
+	)
+
+	cmake-utils_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			--disable-dri3 \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-silent-rules \
+			--disable-static \
+			--disable-tslib \
+			--disable-unit-tests \
+			--disable-xephyr \
+			--disable-xinerama \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--disable-xwayland \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--disable-unit-tests
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
+			composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
+	make_desktop_entry vncviewer vncviewer vncviewer Network
+
+	if use server ; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die
+		else
+			rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		systemd_douserunit contrib/systemd/user/vncserver@.service
+	else
+		local f
+		cd "${ED}" || die
+		for f in vncserver vncpasswd x0vncserver vncconfig; do
+			rm usr/bin/$f || die
+			rm usr/share/man/man1/$f.1 || die
+		done
+	fi
+}
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild
new file mode 100644
index 000000000000..40b8ab883d80
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
+
+XSERVER_VERSION="1.19.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
+	mirror://gentoo/${PN}.png
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="+drm gnutls nls java +opengl pam server +xorgmodule"
+
+CDEPEND="virtual/jpeg:0
+	sys-libs/zlib
+	>=x11-libs/libXtst-1.0.99.2
+	>=x11-libs/fltk-1.3.1
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	pam? ( virtual/pam )
+	server? (
+		dev-lang/perl
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXfont-1.4.2
+		>=x11-libs/libxkbfile-1.0.4
+		x11-libs/libXrender
+		>=x11-libs/pixman-0.27.2
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+		drm? ( x11-libs/libdrm )
+	)"
+
+RDEPEND="${CDEPEND}
+	!net-misc/tightvnc
+	!net-misc/vnc
+	!net-misc/xf4vnc
+	java? ( >=virtual/jre-1.5:* )"
+
+DEPEND="${CDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/xextproto-7.2.99.901
+	>=x11-proto/xproto-7.0.31
+	x11-libs/libXfont2
+	nls? ( sys-devel/gettext )
+	java? ( >=virtual/jdk-1.5 )
+	server?	(
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-proto/bigreqsproto-1.1.0
+		>=x11-proto/compositeproto-0.4
+		>=x11-proto/damageproto-1.1
+		>=x11-proto/fixesproto-5.0
+		>=x11-proto/fontsproto-2.1.3
+		>=x11-proto/glproto-1.4.17
+		>=x11-proto/randrproto-1.4.0
+		>=x11-proto/renderproto-0.11
+		>=x11-proto/resourceproto-1.2.0
+		>=x11-proto/scrnsaverproto-1.1
+		>=x11-proto/videoproto-2.2.2
+		>=x11-proto/xcmiscproto-1.2.0
+		>=x11-proto/xineramaproto-1.1.3
+		>=x11-libs/xtrans-1.3.3
+		>=x11-proto/dri2proto-2.8
+		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+	)"
+
+PATCHES=(
+	"${WORKDIR}"/patches/010_libvnc-os.patch
+	"${WORKDIR}"/patches/030_manpages.patch
+	"${WORKDIR}"/patches/055_xstartup.patch
+)
+
+src_prepare() {
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	default
+
+	if use server; then
+		eapply "${FILESDIR}/${PN}-1.7.1-xserver119-compat.patch"
+		cd unix/xserver || die
+		eapply "${FILESDIR}/xserver119.patch"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use arm || use hppa && append-flags "-fPIC"
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PAM=$(usex pam)
+		-DBUILD_JAVA=$(usex java)
+	)
+
+	cmake-utils_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			--disable-dri3 \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-silent-rules \
+			--disable-static \
+			--disable-tslib \
+			--disable-unit-tests \
+			--disable-xephyr \
+			--disable-xinerama \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--disable-xwayland \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--disable-unit-tests
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
+			composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
+	make_desktop_entry vncviewer vncviewer vncviewer Network
+
+	if use server ; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die
+		else
+			rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		systemd_douserunit contrib/systemd/user/vncserver@.service
+	else
+		local f
+		cd "${ED}" || die
+		for f in vncserver x0vncserver vncconfig; do
+			rm usr/bin/$f || die
+			rm usr/share/man/man1/$f.1 || die
+		done
+	fi
+}
diff --git a/net-misc/tigervnc/tigervnc-1.8.0.ebuild b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
new file mode 100644
index 000000000000..e4ab6ef621c3
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
+
+XSERVER_VERSION="1.19.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
+
+CDEPEND="virtual/jpeg:0
+	sys-libs/zlib
+	>=x11-libs/libXtst-1.0.99.2
+	>=x11-libs/fltk-1.3.1
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	pam? ( virtual/pam )
+	server? (
+		dev-lang/perl
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXfont-1.4.2
+		>=x11-libs/libxkbfile-1.0.4
+		x11-libs/libXrender
+		>=x11-libs/pixman-0.27.2
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+		drm? ( x11-libs/libdrm )
+	)"
+
+RDEPEND="${CDEPEND}
+	!net-misc/tightvnc
+	!net-misc/vnc
+	!net-misc/xf4vnc
+	java? ( >=virtual/jre-1.5:* )"
+
+DEPEND="${CDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/xextproto-7.2.99.901
+	>=x11-proto/xproto-7.0.31
+	x11-libs/libXfont2
+	nls? ( sys-devel/gettext )
+	java? ( >=virtual/jdk-1.5 )
+	server?	(
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-proto/bigreqsproto-1.1.0
+		>=x11-proto/compositeproto-0.4
+		>=x11-proto/damageproto-1.1
+		>=x11-proto/fixesproto-5.0
+		>=x11-proto/fontsproto-2.1.3
+		>=x11-proto/glproto-1.4.17
+		>=x11-proto/randrproto-1.4.0
+		>=x11-proto/renderproto-0.11
+		>=x11-proto/resourceproto-1.2.0
+		>=x11-proto/scrnsaverproto-1.1
+		>=x11-proto/videoproto-2.2.2
+		>=x11-proto/xcmiscproto-1.2.0
+		>=x11-proto/xineramaproto-1.1.3
+		>=x11-libs/xtrans-1.3.3
+		>=x11-proto/dri2proto-2.8
+		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+	)"
+
+PATCHES=(
+	"${WORKDIR}"/patches/030_manpages.patch
+	"${WORKDIR}"/patches/055_xstartup.patch
+)
+
+src_prepare() {
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	default
+
+	if use server; then
+		cd unix/xserver || die
+		eapply "${FILESDIR}/xserver119.patch"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use arm || use hppa && append-flags "-fPIC"
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PAM=$(usex pam)
+		-DBUILD_JAVA=$(usex java)
+	)
+
+	cmake-utils_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			--disable-dri3 \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-silent-rules \
+			--disable-static \
+			--disable-tslib \
+			--disable-unit-tests \
+			--disable-xephyr \
+			--disable-xinerama \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--disable-xwayland \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--disable-unit-tests
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
+			composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
+		else
+			rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		if use systemd; then
+			systemd_douserunit contrib/systemd/user/vncserver@.service
+		else
+			newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		fi
+	else
+		local f
+		cd "${ED}" || die
+		for f in vncserver x0vncserver vncconfig; do
+			rm usr/bin/$f || die
+			rm usr/share/man/man1/$f.1 || die
+		done
+	fi
+}
diff --git a/net-misc/tipcutils/Manifest b/net-misc/tipcutils/Manifest
new file mode 100644
index 000000000000..72a880160bed
--- /dev/null
+++ b/net-misc/tipcutils/Manifest
@@ -0,0 +1,8 @@
+AUX tipcutils-2.0.0-rename_configuration_message_field.patch 510 SHA256 a209e47e828d98c08ae6add00d21cf30be6f39ae598c83b5ca9634ad7687995a SHA512 0ec3e56cf79482a8c4f99d3eb5a7c984022c1ae934a2b4bb1f2c8acfeddabbf7f85559b503125bd439aa3040be7c7a6f6703736286897b0f66855d9cb9354c2d WHIRLPOOL 30c91a1b7c29e8a64006e4a8e3a9dac98384df47a642af5bdd8da571e63d1ed19853dd544e4ca501ca1788b5de1f676e884398a52ae0bff851194a4e7f8720a4
+DIST tipcutils-2.0.0.tar.gz 66495 SHA256 e8d2afcc3471f652f9469a65e1c385eb5fbe925c4108c74ee1abbfdee5117d61 SHA512 40d25d7bb23359ef1c5caeef30f15166deb24772034ec34a69600764c0445d9e7023254e19a2a76e75a46643f5c710b881341d3f32e42e2d9c58d4a94e17c49a WHIRLPOOL 3467a1566abebef408056790592f266c508f5e3fc7b5e3d7dc4f78e1d95657f7147b015b7554f6c9092cc1df2b75af701962221495488650f13c0a0502090301
+DIST tipcutils-2.0.3.tar.gz 166337 SHA256 6a2295d4cfe7c02e7cae13194f180855105a0e26c09f522a6a29da1787525997 SHA512 7f07b4729dbd2c0c93cd69ffe6d2d082cd10f8de8bda335555548d14bd6287229da3686d288be3c10024cc6b607e6e4be983716f734f2d049352f924409511ec WHIRLPOOL 2347fb571003b6f1567d4c0956e3aac54885d5dd15eab9471e69e9531704cb8d1d3f471edee5ad02f53467fd60fcc32ab64e719cd1ffa46ce777ce1ec59922b4
+EBUILD tipcutils-2.0.0.ebuild 815 SHA256 fe5efc4e23161a242e0143e63dba068d4337cf9aadb74cad44693ff4f0d2f130 SHA512 3eaf4ec70c756f43780d2cef705a72ad9722445b294052c753edc99818e1a985b2f0593a92cede845e749d368e9e160154d15aa3bd97a3f03b238238223d02a5 WHIRLPOOL 45c2538b7f5bfa9598e31e69ae6a7bb0685e659e914b45842b2b80264d75fe0fe8c661483242dee48c326336621ed7fc4ccbb720c9073319db8ee5d72fe3b751
+EBUILD tipcutils-2.0.3.ebuild 449 SHA256 7a15cab099ffaa2feba24585581480ba9de7f93237141805e2239ceaf1669f09 SHA512 6b805810c2ccfdbacfff7015e09956dee32be3ae598f5eaa15ceeadef794cba1b7781eedcc0bd935d0ea86bfa0664eff08de6bf95d7dc1471ebed3adc3acd715 WHIRLPOOL dafca10bd64ef93ef4fcfb32db41e68b8694e3d7af4361c27ec0ae0c8a88f9d82804a99e1df14f7c36e8e0d17df7620c9b75129e400b054c70aede6d053bc7fa
+MISC ChangeLog 2556 SHA256 1dcbf1fa461cf9c2f105f7932ec856e6ffaf2c12554468c9c3ec11ed4b5a1643 SHA512 ee224821443c0b0f4df7ffc940c47ce212f65de2e1d3f6e8e4b1756c5555da57d05f0acfe6fd57f5672d42c158022b32fe4cb825c8f5746477014fe1604295fd WHIRLPOOL b9dfdbe60e8b32cc1b0238f3bd950f3d2ef54b58500c033c4e79111ebea045d8e3cf2c5bc1a71c934b16e0d7bb9d82fe093ceb352087c253ce7fab51fc7ab601
+MISC ChangeLog-2015 1725 SHA256 38efcd680268d611c955245bb157409666f5da5aba41124ec11f77b22ec69171 SHA512 1c4cbc5a919eb793314afd5dff54ed6eee650ee4c5648eef20ed046a1c51bf02cf5e580c420960ec0fcde3c5014cfabe4c58b76b206207e81d7a6fd0486d1cf8 WHIRLPOOL 7352fd557edccadf2ce4b4f30352d377ee93c6e517629ddc7a4e82c64d33a2acb31f26569670c53ede0abdfa07dae9bc198f1a53312adcfb5653271f94b7237d
+MISC metadata.xml 471 SHA256 e4bf6051e5534fa97b851e2546c1a33ddb817881440335544407fa12d2ba2dd9 SHA512 f5fc8f8202d2ada92b9bee28301c89f08d56834368c6404d3907325b2b6bf5370afff6c536e8dc8294237f770647ab812cd09bb3846caa8705af5cb9c42bf7ff WHIRLPOOL 3988f3f9b55def9499fc99fc7e65d59f5dad8fa3b4f313d66d4885209c1e68ff004be5fea1da0729cb1c3a1cf4bef29257dfe55f1bef72c96312c4173a4cdaba
diff --git a/net-misc/tipcutils/files/tipcutils-2.0.0-rename_configuration_message_field.patch b/net-misc/tipcutils/files/tipcutils-2.0.0-rename_configuration_message_field.patch
new file mode 100644
index 000000000000..e5dacb485f67
--- /dev/null
+++ b/net-misc/tipcutils/files/tipcutils-2.0.0-rename_configuration_message_field.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/383807
+http://tipc.git.sourceforge.net/git/gitweb.cgi?p=tipc/tipcutils;a=commit;h=44efb87cb453c16a31ceef27164b0f0394ae4433
+
+--- tipc-config.c
++++ tipc-config.c
+@@ -1150,7 +1150,7 @@ static void enable_bearer(char *args)
+ 			a, for_dest(), addr2str(domain), pri);
+ 
+ 		req_tlv.priority = htonl(pri);
+-		req_tlv.detect_scope = htonl(domain);
++		req_tlv.disc_domain = htonl(domain);
+ 		strncpy(req_tlv.name, a, TIPC_MAX_BEARER_NAME - 1);
+ 		req_tlv.name[TIPC_MAX_BEARER_NAME - 1] = '\0';
+ 
diff --git a/net-misc/tipcutils/metadata.xml b/net-misc/tipcutils/metadata.xml
new file mode 100644
index 000000000000..6331698d16ae
--- /dev/null
+++ b/net-misc/tipcutils/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tokiclover@gmail.com</email>
+		<description>Maintainer. Assign bugs on him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tipc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/tipcutils/tipcutils-2.0.0.ebuild b/net-misc/tipcutils/tipcutils-2.0.0.ebuild
new file mode 100644
index 000000000000..4cb376facabb
--- /dev/null
+++ b/net-misc/tipcutils/tipcutils-2.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs # linux-info
+
+DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)"
+HOMEPAGE="http://tipc.sourceforge.net"
+SRC_URI="mirror://sourceforge/tipc/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=sys-kernel/linux-headers-2.6.39"
+
+S=${WORKDIR}/${P}/tipc-config
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-rename_configuration_message_field.patch
+	sed -i -e '/OFLAGS/s:-O2::' Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	# inherit linux-info and add IFLAGS="${KERNEL_DIR}/include" below in order
+	# to build against headers in /usr/src/linux
+	emake EXTRAS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin tipc-config
+}
diff --git a/net-misc/tipcutils/tipcutils-2.0.3.ebuild b/net-misc/tipcutils/tipcutils-2.0.3.ebuild
new file mode 100644
index 000000000000..9ae8f0d29192
--- /dev/null
+++ b/net-misc/tipcutils/tipcutils-2.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)"
+HOMEPAGE="http://tipc.sourceforge.net"
+SRC_URI="mirror://sourceforge/tipc/${P}.tar.gz"
+
+LICENSE="|| ( BSD-2 GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=sys-kernel/linux-headers-2.6.39"
+
+DOCS=( README )
+
+src_prepare() {
+	epatch_user
+}
diff --git a/net-misc/tlsdate/Manifest b/net-misc/tlsdate/Manifest
new file mode 100644
index 000000000000..400e1117e835
--- /dev/null
+++ b/net-misc/tlsdate/Manifest
@@ -0,0 +1,12 @@
+AUX tlsdate-0.0.13-tlsdated-service.patch 674 SHA256 85014d654c04aa2df3fc38024e24e50024f336605634e15104333e54c169b4bc SHA512 ff24e073306bcedf014f0c3734f6ca17e7b4663409744e9960e832215a83a1954cf2c84cc7ef752de5c28d8814ec4bcc7f840bcbe78b18226380a3afc09c0706 WHIRLPOOL fb2a818d5accb6507e0674718f5448d5e8cd53365dabe14138b6063ce29678c6ebec2990af3766cbefb5cae0441e56ee0b544b5d2b2e8d70d6f868d0b8b95273
+AUX tlsdate.confd 247 SHA256 d3e4f1ca2941813cdee93ef039a5156db410cea2dc4b0e1a738a9bae89835d63 SHA512 62149e3a9f26a71624bd851780f92a41c9aaf138793b5da762aa3002bcc5a409686d1bbe687b4abf1fc2e12205720a3825d9603cab0b0d978c2d0fd41422efe7 WHIRLPOOL b7c99243741e31cebf30550ec410dffbf0bcee5f47213cdc6f6daeb5e2764feba95e16706f575c493a6d1b23a2e9d49ac5f9285db204205f79d6f582afd4599f
+AUX tlsdate.rc 349 SHA256 8d9965af5a5de9aefb2056a9e19c34ce30fb3d5a47820cb22743f0892dc573d8 SHA512 2f0bca7251fbd1ae0def2287c7470bee85a2ee0c6baa25ff724ef6880ae7a8a8793460056139d0f1add0003958b2e5dcbddb562b7ac99abdf130032f764d335d WHIRLPOOL 37c6369d188d4a8013a3ccb14615a7079c04076d680277cf9123f8c17602dd96d8cb571cbeb3d0de0ca0c18fc3c861bc84e751d14cab056b32cc18f70671c0d3
+AUX tlsdated.confd 469 SHA256 1c52ff7bc7ce0fbd876a4f594948a70e30e6197bae2b9bc1b55cc6d398091131 SHA512 38bd7d64473ab487eea2539b11a7acadfc3fa5a627fb12e78931b62c46d3ebedab4c75d56839b0dee9fd8f42d4b7ae9ace08ea3f58941b8e2d183828c6a4fef2 WHIRLPOOL 07a8bec2ccf63bacb141b51ca9050eb656fe7b8b03f63e4f06ac3d5b0958345388b23a200080180e6cf8e43ad0c71d9db8c5db2700aeb050157d5a29f8df6c77
+AUX tlsdated.default 114 SHA256 6deea41ebc0aa8c4340c2ffe5e1ede787042bac0ce0964a88c6f388d6b31469c SHA512 f18138f0980f2c02405597eccb03d3031129ca622ebccf80d6090697857853823ae69e06afff65275304d25f6cb31121b93c21575990e5008f0646b28d37bfcd WHIRLPOOL 9781010b39d48bd1c1a261d9569e6b6a5fd1c8f3813a5a64dbc422777cfcb4a7d184dfc5a102d5fd7fa3787df101f159d0ce534d84dce160f055bdd096daf244
+AUX tlsdated.rc 430 SHA256 d2fdce1aa3fb39de3f05116ced1a7adff97d7b2049c009805045a18e2e48ea00 SHA512 d3defb743ff9413d7f3b209590f25914715aa19dd02a39ee03aa1cb51607c83100db1eee5a3fe3ce8b21d334dc02a07ca1656416acec800f7c95d98f69b1fe23 WHIRLPOOL 2725881e3531e38dbd99135db7fca1902e3f97c0f010cc0cbe338c3aa637ae8f50d497fc66c510bb3607ec9c69f835115f6ad003bdc48ba3dce6a96eeca4b206
+AUX tlsdated.tmpfiles.conf 45 SHA256 40ac6b68d24e9c5e91393ed53a974e16cb2b63a30f17a5f145b92330d6edf8fe SHA512 c9b5c682032efb16e8b182aafa5a768a210f04c598ab313fe66fceda9f8d496720d5d9e614a165c90fe82aed8c1327bee2a2706c2185fbe70b348349f9ea7ede WHIRLPOOL 04c415aff92f393bf47da1dd210af22e30ac344091e559760a1be75e8073465aea69a62cca8c43a82c642f035eeb0d2bd738b999165216836fcb2bfcac41472e
+DIST tlsdate-0.0.13.tar.gz 264228 SHA256 482640a5efb8489f287da1018176fb1196adf7cb1b81ac0c7f2b419b43d44258 SHA512 9c4fd51439976a8541fdf1bb70afa5333b43b2e43b801a65b3b1ac3e4a437fd3021ef2aaeeb13fc1ba63ccd119f6eff4c10e3a5a28cf0cfd96bbc7a174dbb789 WHIRLPOOL db91755d4751e64ca6285c9f1492d1b82a06f97921a47168398377818407efe6a0fcb901ef93272f0ff66121893873bb360868207998d054c5a550734b05db06
+EBUILD tlsdate-0.0.13.ebuild 1928 SHA256 3d42a9316d9b58804d51ce07a8dfae94085ac254417a34e427df9b413e470f2e SHA512 7f8dcd5f4c3c351c32a7755ae0402e4b3b72e670d26f429a457eeae9b42ad636ddbb8ef67736a16d7cb77385935d7c34e1ab4557ffda65b59fd53948866eac02 WHIRLPOOL 95445e6d789753391c1f00fc3fd0cfc1b39f135efb08ec0700ae803f7c4b2b4d943370a878f61b574c03ccc5118f5f2ea5fad4719a714b2c5f6baa7a649d44b6
+MISC ChangeLog 4419 SHA256 396afc350ae2c9e8b988715126b0e47aed3e307d1ecf9d3e7dee7c2fe6e03329 SHA512 3511a100ec07fcdcac3c3a8e9ff23060d2844ea387ac2bf2bc7a5110e133e77e8705f5673813be8e694f9060c87a607f542aa8e1f30cb57bdaf430c0e9f9a7c8 WHIRLPOOL 27a937f467c3b59d6f8c7019b5f5aea54b3491a14a44b52dd490a2afe9f5e61b7b804264acefb56e531bb5e2c4edc083a82eb1129f3ca4a3ff7ccbcfa4d97de0
+MISC ChangeLog-2015 3439 SHA256 f5830d31423c1d678db09660eefbb80bf0ad23aef543eb6d996a69397eff9d4a SHA512 22cd87c61ea8c0ddd793df7f44222227543e2a4333aa1f14a69b2d06b5a583d7e1e26bff8aa0ada4edf5d3a8ed191e51f9cb8ae8d2c33ec8f72d5b8882993572 WHIRLPOOL f452d2fb0c3c1803ab5d2795a976117f44d8b3145f7b90ab1d1d59fa0647738f8dcedb549ce2f36af8d729de98ca26fd592fe95a00eea69f868e1da9f4bddaa0
+MISC metadata.xml 350 SHA256 9d4b286f62431d7dc0af14c28a3ff6e6f97616187642c9c0cef22159ec357a1f SHA512 7b8c7b1ac7814de92b04658aaff6e22a146ce6c5b23db7ac49383a97acbce819f0732e317ae55affd6e9f87070d3fffba70434cbe6aa749f8a580803864fcba7 WHIRLPOOL 0ce998ea28a4402900eb712b033b6559ed8840e1da8bff9829f5f7229d112011c41bd2815534141fb95b427f00ddd689ab3d6e41e75f24b7a25ba0891d12db7a
diff --git a/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch b/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch
new file mode 100644
index 000000000000..df03833f7cd5
--- /dev/null
+++ b/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch
@@ -0,0 +1,22 @@
+From: Dominik Kriegner <dominik.kriegner@gmail.com>
+Date: Tue, 26 Jan 2016 12:12:26 +0000
+Subject: [PATCH] Fix systemd unit file
+
+Project-Bug-URL: https://github.com/ioerror/tlsdate/pull/162
+Gentoo-Bug-URL: https://bugs.gentoo.org/533380
+
+--- a/systemd/tlsdated.service
++++ b/systemd/tlsdated.service
+@@ -5,6 +5,9 @@ After=network.target
+ [Service]
+ Type=simple
+ EnvironmentFile=/etc/default/tlsdated
+-ExecStart=/usr/sbin/tlsdated ${DAEMON_OPTS}
+-ExecReload=/bin/kill -HUP ${MAINPID}
+-ExecStop=/bin/kill -INT ${MAINPID}
++ExecStart=/usr/sbin/tlsdated $DAEMON_OPTS
++ExecReload=/bin/kill -HUP $MAINPID
++ExecStop=/bin/kill -INT $MAINPID
++
++[Install]
++WantedBy=multi-user.target
diff --git a/net-misc/tlsdate/files/tlsdate.confd b/net-misc/tlsdate/files/tlsdate.confd
new file mode 100644
index 000000000000..2d7ed030de33
--- /dev/null
+++ b/net-misc/tlsdate/files/tlsdate.confd
@@ -0,0 +1,8 @@
+# config file for /etc/init.d/tlsdate
+
+# Command to execute to set the time.
+# This are some common tlsdate options:
+#  -l: leap (set time regardless of difference)
+#  -H: hostname to sync with
+#  -x: proxy URL
+TLSDATE_OPTS="-l -H www.google.com"
diff --git a/net-misc/tlsdate/files/tlsdate.rc b/net-misc/tlsdate/files/tlsdate.rc
new file mode 100644
index 000000000000..3c5163ac92b5
--- /dev/null
+++ b/net-misc/tlsdate/files/tlsdate.rc
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="set time once when started"
+
+depend() {
+	use net
+}
+
+start() {
+	: ${TLSDATE_CMD:=tlsdate}
+	ebegin "Setting clock via tlsdate '${TLSDATE_CMD}'"
+	"${TLSDATE_CMD}" ${TLSDATE_OPTS}
+	eend $? "Failed to set clock"
+}
diff --git a/net-misc/tlsdate/files/tlsdated.confd b/net-misc/tlsdate/files/tlsdated.confd
new file mode 100644
index 000000000000..d257289cc58d
--- /dev/null
+++ b/net-misc/tlsdate/files/tlsdated.confd
@@ -0,0 +1,15 @@
+# config file for /etc/init.d/tlsdated
+
+# Command to execute to set the time.
+# This are some common tlsdate options:
+#  -l: leap (set time regardless of difference)
+#  -H: hostname to sync with
+#  -x: proxy URL
+TLSDATED_CMD="/usr/bin/tlsdate -l -H www.google.com"
+
+# Additional options; see `man tlsdated` for reference.
+TLSDATED_OPTS=""
+
+# Cache dir.  Probably don't need to change this.
+# It matches the compiled-in default.
+TLSDATED_CACHE_DIR="/var/cache/tlsdated"
diff --git a/net-misc/tlsdate/files/tlsdated.default b/net-misc/tlsdate/files/tlsdated.default
new file mode 100644
index 000000000000..08186f75ef31
--- /dev/null
+++ b/net-misc/tlsdate/files/tlsdated.default
@@ -0,0 +1,4 @@
+# defaults file for /etc/default/tlsdated
+
+# Additional options; see `man tlsdated` for reference.
+DEAMON_OPTS=""
diff --git a/net-misc/tlsdate/files/tlsdated.rc b/net-misc/tlsdate/files/tlsdated.rc
new file mode 100644
index 000000000000..d0814c874b4e
--- /dev/null
+++ b/net-misc/tlsdate/files/tlsdated.rc
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="start a daemon to continuously set time via a helper"
+
+command="tlsdated"
+command_args="${TLSDATED_OPTS} -- ${TLSDATED_CMD}"
+command_background="true"
+pidfile="/var/run/${SVCNAME}.pid"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath -d -m 0700 -o tlsdate:tlsdate "${TLSDATED_CACHE_DIR}"
+}
diff --git a/net-misc/tlsdate/files/tlsdated.tmpfiles.conf b/net-misc/tlsdate/files/tlsdated.tmpfiles.conf
new file mode 100644
index 000000000000..07a7966cc873
--- /dev/null
+++ b/net-misc/tlsdate/files/tlsdated.tmpfiles.conf
@@ -0,0 +1 @@
+d /var/cache/tlsdated 0700 tlsdate tlsdate -
diff --git a/net-misc/tlsdate/metadata.xml b/net-misc/tlsdate/metadata.xml
new file mode 100644
index 000000000000..82f04441d92c
--- /dev/null
+++ b/net-misc/tlsdate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vapier@gentoo.org</email>
+		<description>feel free to fix things</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ioerror/tlsdate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/tlsdate/tlsdate-0.0.13.ebuild b/net-misc/tlsdate/tlsdate-0.0.13.ebuild
new file mode 100644
index 000000000000..135c195e304e
--- /dev/null
+++ b/net-misc/tlsdate/tlsdate-0.0.13.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils systemd vcs-snapshot user
+
+DESCRIPTION="Update local time over HTTPS"
+HOMEPAGE="https://github.com/ioerror/tlsdate"
+SRC_URI="https://github.com/ioerror/tlsdate/tarball/${P} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips s390 sh sparc x86"
+IUSE="dbus +seccomp static-libs"
+
+DEPEND="dev-libs/openssl:0=
+	dev-libs/libevent:=
+	dbus? ( sys-apps/dbus )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tlsdated-service.patch
+)
+
+src_prepare() {
+	# Use the system cert store rather than a custom one specific
+	# to the tlsdate package. #534394
+	sed -i \
+		-e 's:/tlsdate/ca-roots/tlsdate-ca-roots.conf:/ssl/certs/ca-certificates.crt:' \
+		Makefile.am || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		$(use_enable dbus) \
+		$(use_enable seccomp seccomp-filter) \
+		--disable-hardened-checks \
+		--without-polarssl \
+		--with-unpriv-user=tlsdate \
+		--with-unpriv-group=tlsdate
+}
+
+src_install() {
+	default
+
+	# Use the system cert store; see src_prepare. #446426 #534394
+	rm "${ED}"/etc/tlsdate/ca-roots/tlsdate-ca-roots.conf || die
+	rmdir "${ED}"/etc/tlsdate/ca-roots || die
+
+	newinitd "${FILESDIR}"/tlsdated.rc tlsdated
+	newconfd "${FILESDIR}"/tlsdated.confd tlsdated
+	newinitd "${FILESDIR}"/tlsdate.rc tlsdate
+	newconfd "${FILESDIR}"/tlsdate.confd tlsdate
+
+	systemd_newunit "${S}"/systemd/tlsdated.service tlsdated.service
+	systemd_newtmpfilesd "${FILESDIR}"/tlsdated.tmpfiles.conf tlsdated.conf
+	insinto /etc/default
+	newins "${FILESDIR}"/tlsdated.default tlsdated
+
+	insinto /etc/dbus-1/system.d/
+	doins dbus/org.torproject.tlsdate.conf
+
+	use static-libs || \
+		find "${ED}"/usr '(' -name '*.la' -o -name '*.a' ')' -delete
+}
+
+pkg_preinst() {
+	enewgroup tlsdate 124
+	enewuser tlsdate 124 -1 /dev/null tlsdate
+}
diff --git a/net-misc/tn5250/Manifest b/net-misc/tn5250/Manifest
new file mode 100644
index 000000000000..fc728c63ac79
--- /dev/null
+++ b/net-misc/tn5250/Manifest
@@ -0,0 +1,8 @@
+AUX disable-sslv2-and-sslv3.patch 2333 SHA256 d17c7b9d1b3977c65135289252207aa3ace6b5296159e919a9ba0a8849283e9f SHA512 938130a2211409ab179499f1b7b50f5517d609a0ad73051a6c1a89493b44cca28200723693698beb516733e3099976f5ec0335f290553e903604c5a1eee652bd WHIRLPOOL 65c7a4b8cede1fffe2660a66356eecaa39419e29cc73866ae8891291a9191bd28cb8f69d186244fcaaf128fa09c671377ccb86cb201d8c4aab62988cb00f0ff8
+AUX fix-Wformat-security-warnings.patch 2283 SHA256 191cc567b06cd38b87445ac8a8b2caeb82719b768a82a1fa0bdcc4739755a537 SHA512 da9114d26e838e822d8c63faa68f8157e03404f86e03c38f9f557416199c5ae96a35f4dbf47717c2588a6f29549b69a84ec66f5b7de848803b90759cae1fda04 WHIRLPOOL 522c04da841e79a4a328cbeef5fcace53d2c4a4e7658cac7f27bd83b1aefcdb338bd63a12a6872c251a0bf3896ba4b34ef093351a27264bc2bf86d195d533448
+DIST tn5250-0.17.4.tar.gz 648452 SHA256 354237d400dc46af887cb3ffa4ed1f2c371f5b8bee8be046a683a4ac9db4f9c5 SHA512 7c41bc47658f792fe7c6c6186d93095ac2eca67868070d84502bcff7de0cbc97afea1bd9987d2dbc5a340a444fdf1fbff81c7b844f5c205ec603f24c5e6c0804 WHIRLPOOL 00bedcc21c2a4c8d08b96c559ca9b0a46f960d41cc572e123189c8c18f8f70d3d39942543cc093e5a50b4bf5b782638ace91aab67f6444b29f5aaff28a5243a9
+EBUILD tn5250-0.17.4-r1.ebuild 1247 SHA256 174b56e9e5409be097a4be14b3ca81936f7e2484f345dbb599f5247e4d87e801 SHA512 e57461bf744d4ffffad3c8046a9faf674d0cef81d6baf1ea88546d5155a1eef7668931955599ab64a4ff4566990591edb41aba55a45f5ccb54dccfac7319e722 WHIRLPOOL 9b1d6c4936a1539fd92dfa906da3c0383b962fe964b17df604529e6fd35a9db66611440149720fb7fb5ae4b5842dae46909e07fe4464514f0bb86c6f19ced3a7
+EBUILD tn5250-0.17.4-r2.ebuild 1322 SHA256 d7fa30bf2204fa1734a5df97075c4602d8ab9bec1e09deba138c129141b8dbae SHA512 da737d6c37c56867cae53f893259f941fd07fe3d19fa77ab4f4f81cd2b432b0ee30cd643187729aab9ba709c2c5753a7398d38c828c44a1090e5d9be6d3a70e5 WHIRLPOOL f1bb84bb5e0cfb95cf1f9a7032b87025199ff372dbd4ec5c28a4d49ff875425aacb219bab5499ee9b4d420636eec4f7284cff5af48b178e7f4d05ab7337ff373
+MISC ChangeLog 3458 SHA256 c0fe445ec595195bf6e0a9f16b5e144fb0063a27521f5193539a050208c7d43e SHA512 e2e24d2c29828d6ddd9c7df05d7a54bd324a56a4fd09595d53e3193590f9185d4c7398477747d6bb056b8f9099a4832dc6c2d7dad382a98bd4166d785668ac34 WHIRLPOOL f0cdf96eead6513059e7ff53b8e24b560e930c883f9a866b26f9572f70b2a935595c3f69252bb517dcaa86926ac895bd9bec127a166d70b747c1457f26078083
+MISC ChangeLog-2015 2851 SHA256 38ea2bf6199077353b18854e007b8a4dcebdc9ad20c4e70296c01ed31cbe4be7 SHA512 4cc0beeda93a95f494ecc395f87b66bb09cf8bed0a5ab19fb1c0c66cc9f2bb95f4b32712db6a7751be9ccd716ef48e1ebed8799dceaa9d500416e4f3ba7e5e63 WHIRLPOOL 1165be6e5dacbfb98ec004d02924eef5a2c345e51ff465a24a531fffd139acac38afa3ec41280fc178aa20503a473935fbe33fb47a2c1a23adbbb5185e9b15b1
+MISC metadata.xml 215 SHA256 8702054536601c761875f96c7d84928954dfc82105b4de76b23285987a06cac9 SHA512 0e99f231bdcff1306e232af176e4ce38c754ea988c072324093f2ac5bca81432abeb12af3e5f1960d0047bcd6d8c558fc995d1e6670556e00e443ebb1b6fe09c WHIRLPOOL 641c5cf70de7bae4ac91040b9e33b846b6df62718ce6efd95921b11180e9b81d4f537b69978a710c4a16e546a113aab90a00cba9ffabd22d9ae2175d54d9b7ae
diff --git a/net-misc/tn5250/files/disable-sslv2-and-sslv3.patch b/net-misc/tn5250/files/disable-sslv2-and-sslv3.patch
new file mode 100644
index 000000000000..9c8d04f55851
--- /dev/null
+++ b/net-misc/tn5250/files/disable-sslv2-and-sslv3.patch
@@ -0,0 +1,61 @@
+From 1acfebd966e8804e6573cbe9287b8b6f028a646c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 23 Aug 2016 18:13:47 -0400
+Subject: [PATCH 1/1] sslstream.c: ignore the user's choice of ssl_method.
+
+The SSLv2 and SSLv3 protocols are insecure, and people have begun to
+operate without them. LibreSSL, for example, does not have them
+enabled, and it is possible to build OpenSSL in the same manner.
+
+If SSLv[23] are disabled, the user would not be able to choose "ssl2"
+or "ssl3" as his "ssl_method", an option that was undocumented
+anywhere. Therefore there is not much lost, and some security to gain,
+by removing the option completely. This commit does that, and uses the
+automatic protocol choice that is capable of negotiating TLSv1,
+TLSv1.1 and TLSv1.2.
+
+Gentoo-Bug: 591940
+---
+ lib5250/sslstream.c | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c
+index 7181566..2f91d1a 100644
+--- a/lib5250/sslstream.c
++++ b/lib5250/sslstream.c
+@@ -362,22 +362,16 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
+ 
+ /*  which SSL method do we use? */
+ 
+-   strcpy(methstr,"auto");
+-   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_method")) {
+-        strncpy(methstr, tn5250_config_get (This->config, "ssl_method"), 4);
+-        methstr[4] = '\0';
+-   }
+-
+-   if (!strcmp(methstr, "ssl2")) {
+-        meth = SSLv2_client_method();         
+-        TN5250_LOG(("SSL Method = SSLv2_client_method()\n"));
+-   } else if (!strcmp(methstr, "ssl3")) {
+-        meth = SSLv3_client_method();         
+-        TN5250_LOG(("SSL Method = SSLv3_client_method()\n"));
+-   } else {
+-        meth = SSLv23_client_method();         
+-        TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
+-   }
++    /* Ignore the user's choice of ssl_method (which isn't documented
++     * anyway...) if it was either "ssl2" or "ssl3". Both are insecure,
++     * and this is only safe supported method left.
++     *
++     * This is a Gentoo-specific modification that lets us build
++     * against LibreSSL and newer OpenSSL with its insecure protocols
++     * disabled.
++     */
++    meth = SSLv23_client_method();
++    TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
+ 
+ /*  create a new SSL context */
+ 
+-- 
+2.7.3
+
diff --git a/net-misc/tn5250/files/fix-Wformat-security-warnings.patch b/net-misc/tn5250/files/fix-Wformat-security-warnings.patch
new file mode 100644
index 000000000000..4927bce546f2
--- /dev/null
+++ b/net-misc/tn5250/files/fix-Wformat-security-warnings.patch
@@ -0,0 +1,62 @@
+From 1bc9cac45be4bac46f58e325779bdb8c7b7bf502 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 23 Aug 2016 20:20:15 -0400
+Subject: [PATCH 1/1] Fix format-security warnings.
+
+Newer versions of GCC have the ability to warn you (or throw errors)
+about insecure format strings. Generally this is due to an omitted
+format string in the printf family of functions, and a few of those
+issues existed in the code base. They were all fixed by adding a
+trivial "%s" format string. The project now builds with
+-Werror=format-security.
+---
+ curses/cursesterm.c | 4 ++--
+ lib5250/sslstream.c | 2 +-
+ lib5250/telnetstr.c | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/curses/cursesterm.c b/curses/cursesterm.c
+index bf20f05..3032966 100644
+--- a/curses/cursesterm.c
++++ b/curses/cursesterm.c
+@@ -640,9 +640,9 @@ static void curses_terminal_update(Tn5250Terminal * This, Tn5250Display *display
+       if(This->data->is_xterm) {
+          if (This->data->font_132!=NULL) {
+                if (tn5250_display_width (display)>100)
+-                    printf(This->data->font_132);
++		    printf("%s", This->data->font_132);
+                else
+-                    printf(This->data->font_80);
++		    printf("%s", This->data->font_80);
+          }
+ 	 printf ("\x1b[8;%d;%dt", tn5250_display_height (display)+1,
+ 	       tn5250_display_width (display));
+diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c
+index 2f91d1a..7f3009e 100644
+--- a/lib5250/sslstream.c
++++ b/lib5250/sslstream.c
+@@ -307,7 +307,7 @@ static void ssl_log_SB_buf(unsigned char *buf, int len)
+ 
+    if (!tn5250_logfile)
+       return;
+-   fprintf(tn5250_logfile,ssl_getTelOpt(type=*buf++));
++   fprintf(tn5250_logfile,"%s",ssl_getTelOpt(type=*buf++));
+    switch (c=*buf++) {
+       case IS:
+ 		fputs("<IS>",tn5250_logfile);
+diff --git a/lib5250/telnetstr.c b/lib5250/telnetstr.c
+index 9ad2624..cf1576f 100644
+--- a/lib5250/telnetstr.c
++++ b/lib5250/telnetstr.c
+@@ -282,7 +282,7 @@ static void log_SB_buf(unsigned char *buf, int len)
+ 
+    if (!tn5250_logfile)
+       return;
+-   fprintf(tn5250_logfile,getTelOpt(type=*buf++));
++   fprintf(tn5250_logfile,"%s",getTelOpt(type=*buf++));
+    switch (c=*buf++) {
+       case IS:
+ 		fputs("<IS>",tn5250_logfile);
+-- 
+2.7.3
+
diff --git a/net-misc/tn5250/metadata.xml b/net-misc/tn5250/metadata.xml
new file mode 100644
index 000000000000..46bc7afa2da1
--- /dev/null
+++ b/net-misc/tn5250/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="sourceforge">tn5250</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/tn5250/tn5250-0.17.4-r1.ebuild b/net-misc/tn5250/tn5250-0.17.4-r1.ebuild
new file mode 100644
index 000000000000..5ae73def9bfd
--- /dev/null
+++ b/net-misc/tn5250/tn5250-0.17.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Telnet client for the IBM AS/400 that emulates 5250 terminals and printers"
+HOMEPAGE="http://tn5250.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="X libressl ssl"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+
+DEPEND="${RDEPEND}
+	X? ( x11-libs/libXt )
+"
+
+src_prepare() {
+	default
+	# Next, the Makefile for the terminfo settings tries to remove
+	# some files it doesn't have access to.	 We can just remove those
+	# lines.
+	cd "${S}/linux"
+	sed -i \
+		-e "/rm -f \/usr\/.*\/terminfo.*5250/d" Makefile.in \
+		|| die "sed Makefile.in failed"
+	cd "${S}"
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--without-python \
+		$(use_with X x) \
+		$(use_with ssl)
+}
+
+src_install() {
+	# The TERMINFO variable needs to be defined for the install
+	# to work, because the install calls "tic."	 man tic for
+	# details.
+	dodir /usr/share/terminfo
+	emake DESTDIR="${D}" \
+		 TERMINFO="${D}/usr/share/terminfo" install
+
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/net-misc/tn5250/tn5250-0.17.4-r2.ebuild b/net-misc/tn5250/tn5250-0.17.4-r2.ebuild
new file mode 100644
index 000000000000..3bcbdbd72cb6
--- /dev/null
+++ b/net-misc/tn5250/tn5250-0.17.4-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="IBM AS/400 telnet client which emulates 5250 terminals/printers"
+HOMEPAGE="http://tn5250.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="X libressl ssl"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+
+DEPEND="${RDEPEND}
+	X? ( x11-libs/libXt )
+"
+
+PATCHES=(
+	"${FILESDIR}/disable-sslv2-and-sslv3.patch"
+	"${FILESDIR}/fix-Wformat-security-warnings.patch"
+)
+
+src_prepare() {
+	default
+
+	# Next, the Makefile for the terminfo settings tries to remove
+	# some files it doesn't have access to.	 We can just remove those
+	# lines.
+	sed -i \
+		-e "/rm -f \/usr\/.*\/terminfo.*5250/d" linux/Makefile.in \
+		|| die "sed Makefile.in failed"
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--without-python \
+		$(use_with X x) \
+		$(use_with ssl)
+}
+
+src_install() {
+	# The TERMINFO variable needs to be defined for the install
+	# to work, because the install calls "tic."	 man tic for
+	# details.
+	dodir /usr/share/terminfo
+	emake DESTDIR="${D}" TERMINFO="${D}/usr/share/terminfo" install
+
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/net-misc/tokyotyrant/Manifest b/net-misc/tokyotyrant/Manifest
new file mode 100644
index 000000000000..c3bd055bbfde
--- /dev/null
+++ b/net-misc/tokyotyrant/Manifest
@@ -0,0 +1,9 @@
+AUX fix_makefiles-1.4.41.patch 3247 SHA256 253d02436a3f8cb9f0826ec9380ee89ab9b1ff7451de33095b283f717e5880ee SHA512 0b9a1cc16f999a0a89c5e58fdc7e9aa98c66c9357804c46bb4657279434d59c3928d37ddc774fba53a8bccdd1fd530efa5f418388cb18805a5ffc81fc3405a4b WHIRLPOOL 79272a29fc6a51aa1133d13643703570798237c6b08afd6a04a2ce1465fb07f3e851a3e9102346499c6811769f7ceeead2fe859279b4c260a2a98f676f89b5b2
+AUX fix_testsuite.patch 6590 SHA256 c7d031aa0588ab77d0e37742a0001def4e6671860ae7368df7a8229b68427d92 SHA512 a22dc39f3abe870f6c3219b945411e38035a00e403a477440d11232215e30df03a85eb315f3957dc6d9c494a92a1f4caa641d520744e8bd728b088ea05d3c459 WHIRLPOOL f9533ea95af3ce7541af586569b93143983a19434c5923b447d8cc53c1f8c2f18d2a4da1689932d37b7842cf737e2a58cb65fa91266303a3060e8560821d2432
+AUX tokyotyrant.confd 361 SHA256 cc40f58e8de8cb4b17d7e065ee605f0c558fdbe10ca370ca511498a9005bfe90 SHA512 5e762267eba0f214a47d385c41d32b9a2a82c7ece41c42266ad980a936080528b42d7f86fd2b32679f65e97f6b1b6a3a74d8d7c4465cc9b2739c4d1746f04cf0 WHIRLPOOL 8047daad6f383f683ed82cdbc43299915e0caeb567907f22cfc2c3a8d554ab78c6eecf3269dac014c773ed06623aa0de1e2485af23f03471e56f42a7008eb4ab
+AUX tokyotyrant.initd 800 SHA256 9e8c146c4deaaed7ed3f3949ed9faed60a894bba31c2925ab116b630cbe4ba6f SHA512 e00874a33eeab7228815e303d9a028e9ce50dde96012db397bcf11a530acecbb9a3252468d2745e239e1b7a7e873f3bb87962c585cea122e011a981fdf0ba9bf WHIRLPOOL 045a86e3dca7c6faf353a1b5a44b06a88cbc96bb2964d920bde9b78af063e932ef093167946e07bfc09137028ddc5a3441d4c6edf27b85d48b67d4e2ab944e0a
+DIST tokyotyrant-1.1.41.tar.gz 196196 SHA256 42af70fb9f2795d4e05c3e37941ce392a9eaafc991e230c48115370f6d64b88f SHA512 fb181ecab19981733b4b478614f9b28d7f1f776bafe6c58c4bc3e26ed294301a6242d7cd1d47b7d6b55a93305474d2e8e0a75f2f01af21a8bc93d158c8f8179e WHIRLPOOL a4bc53f222e3a210af6b4c1d7ed7a6f345e457b84de166535758a9459ceab9b07ee9a2654affd85980bdec1ebaaf9c287f80d7938276dc24e3be959a408b5320
+EBUILD tokyotyrant-1.1.41-r1.ebuild 1316 SHA256 2fab0dd483edd69f0d456e7e9f5d18496cddcc0028f3fc1624033664290c78b0 SHA512 951748d4f910e55cfc6f4927b2e53fc25b810313413b519226bcab62c3266814b4977bb3094931521af07c089923a5a1b849e42772aa1e031c054a641a589570 WHIRLPOOL 80f87ecda00c9f910c6447063e9ecb99f23ccdd9abce7e23c54955c0725bf52585fae62e557fb31fdcb5d297526160eb377f47b7ffd7cdbe63b2b2419488c741
+MISC ChangeLog 2449 SHA256 4e7e9ac54e33dfb914b66b27834d71d3153928eb441a027940c019f20e1da66f SHA512 0301dfc3dc19ab9cbd0a793786e8a83db32043b838846f99dc1173e048b5c9c86b95fe6476c175c54837f301e4d96a094aef24925971911ee9e9725d4788222e WHIRLPOOL 84978c73a052affed5765a2fb2a0ef5dbd8b622e7606d254fbb33f9d3622ad070ded19dcbc04a4a3d252c163dc5c976378cc6efb72dd0ff234c76b1e95731778
+MISC ChangeLog-2015 2279 SHA256 81e0814d178ded1a338b76c32d101870885b9b478048345237d93624e18d0711 SHA512 235b11c4f83321aec03d435b3d78c151a4c63298a0bf295cbf99a2540e438f3e82d684ab9982794e04105aa5e90a219a3d4bdc9e1e16a38ac83d8953026a39b1 WHIRLPOOL 97a1981804517b06396ca070f249eb5d5dda1609b80bb5135434592087f1de0795a47d523923c96403d796a1981b23fdf193990be847e06b0b9c0960e1d0ecd8
+MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
diff --git a/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch b/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch
new file mode 100644
index 000000000000..40d26cc5f93a
--- /dev/null
+++ b/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch
@@ -0,0 +1,85 @@
+diff --git a/Makefile.in b/Makefile.in
+index b388455..52d3bc3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -58,8 +58,8 @@ CFLAGS = @MYCFLAGS@
+ LDFLAGS = @MYLDFLAGS@
+ CMDLDFLAGS = @MYCMDLDFLAGS@
+ LIBS = @LIBS@
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
+-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
++LDENV = 
++RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
+ POSTCMD = @MYPOSTCMD@
+ 
+ 
+@@ -120,10 +120,6 @@ install :
+ 	cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR)
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR)
+-	mkdir -p $(DESTDIR)$(SBINDIR)
+-	cp -Rf $(INITFILES) $(DESTDIR)$(SBINDIR)
+-	mkdir -p $(DESTDIR)$(DATADIR)
+-	cp -Rf $(SCREXTFILES) $(DOCUMENTFILES) $(DESTDIR)$(DATADIR)
+ 	mkdir -p $(DESTDIR)$(MAN1DIR)
+ 	cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
+ 	mkdir -p $(DESTDIR)$(MAN3DIR)
+@@ -132,7 +128,6 @@ install :
+ 	cd man && cp -Rf $(MAN8FILES) $(DESTDIR)$(MAN8DIR)
+ 	mkdir -p $(DESTDIR)$(PCDIR)
+ 	cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
+-	[ "$$UID" == 0 ] && ldconfig || true
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
+ 	@printf '# Thanks for using Tokyo Tyrant.\n'
+diff --git a/configure.in b/configure.in
+index fbe0c71..809a839 100644
+--- a/configure.in
++++ b/configure.in
+@@ -28,33 +28,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANKS doc tokyotyrant.idl"
+ MYPCFILES="tokyotyrant.pc"
+ 
+ # Building flags
+-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
++MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
+ MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
+ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
+-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
++MYLDFLAGS="-L. -L\$(LIBDIR)"
+ MYCMDLDFLAGS=""
+ MYRUNPATH="\$(LIBDIR)"
+ MYLDLIBPATHENV="LD_LIBRARY_PATH"
+ MYPOSTCMD="true"
+ 
+-# Building paths
+-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
+-fi
+-
+-
+-
+ #================================================================
+ # Options
+ #================================================================
+diff --git a/tokyotyrant.pc.in b/tokyotyrant.pc.in
+index efb3749..efec1f6 100644
+--- a/tokyotyrant.pc.in
++++ b/tokyotyrant.pc.in
+@@ -10,5 +10,5 @@ datadir=@datadir@
+ Name: Tokyo Tyrant
+ Description: network interface of Tokyo Cabinet
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -ltokyotyrant @LIBS@
++Libs: -L${libdir} -ltokyotyrant
+ Cflags: -I${includedir}
diff --git a/net-misc/tokyotyrant/files/fix_testsuite.patch b/net-misc/tokyotyrant/files/fix_testsuite.patch
new file mode 100644
index 000000000000..d48825381777
--- /dev/null
+++ b/net-misc/tokyotyrant/files/fix_testsuite.patch
@@ -0,0 +1,104 @@
+--- Makefile.in	2009-10-14 10:33:16.000000000 +0200
++++ Makefile.in.new	2009-10-14 10:27:39.000000000 +0200
+@@ -166,48 +166,49 @@
+ 
+ 
+ check :
++	$(RUNENV) $(RUNCMD) ./ttserver -dmn -host 127.0.0.1 -port 19781 -pid /tmp/tttest.pid /tmp/tttest.tch
+ 	$(RUNENV) $(RUNCMD) ./tcrmgr version
+-	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 -rnd 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 -nr -rnd 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest read -cnum 5 -tout 5 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrtest read -cnum 5 -tout 5 -mul 5 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrtest remove -cnum 5 -tout 5 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -shl 50 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -dad 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -ext putcat -xlr 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest misc -cnum 5 -tout 5 127.0.0.1 5000
+-	$(RUNENV) $(RUNCMD) ./tcrtest wicked -cnum 5 -tout 5 127.0.0.1 5000
+-	$(RUNENV) $(RUNCMD) ./tcrmgr inform 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrmttest write -tnum 5 127.0.0.1 5000
+-	$(RUNENV) $(RUNCMD) ./tcrmttest read -tnum 5 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrmttest remove -tnum 5 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrmttest write -tnum 5 -ext putcat -rnd 127.0.0.1 5000
+-	$(RUNENV) $(RUNCMD) ./tcrmttest typical -tnum 5 127.0.0.1 5000
+-	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 one first
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 two second
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put -dk 127.0.0.1 three third
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 four fourth
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put -dk 127.0.0.1 five fifth
+-	$(RUNENV) $(RUNCMD) ./tcrmgr out 127.0.0.1 one
+-	$(RUNENV) $(RUNCMD) ./tcrmgr out 127.0.0.1 two
+-	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 three > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 four > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 five > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr mget 127.0.0.1 one two three four five > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 putlist six sixth seven seventh
+-	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 outlist six
+-	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 getlist three four five six > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr list -pv 127.0.0.1 > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr list -pv -fm f 127.0.0.1 > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr http -ih http://127.0.0.1:1978/five > check.out
++	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 -rnd 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 -nr -rnd 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest read -port 19781 -cnum 5 -tout 5 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrtest read -port 19781 -cnum 5 -tout 5 -mul 5 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrtest remove -port 19781 -cnum 5 -tout 5 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -shl 50 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -dad 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -ext putcat -xlr 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest misc -port 19781 -cnum 5 -tout 5 127.0.0.1 5000
++	$(RUNENV) $(RUNCMD) ./tcrtest wicked -port 19781 -cnum 5 -tout 5 127.0.0.1 5000
++	$(RUNENV) $(RUNCMD) ./tcrmgr inform -port 19781 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrmttest write -port 19781 -tnum 5 127.0.0.1 5000
++	$(RUNENV) $(RUNCMD) ./tcrmttest read -port 19781 -tnum 5 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrmttest remove -port 19781 -tnum 5 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrmttest write -port 19781 -tnum 5 -ext putcat -rnd 127.0.0.1 5000
++	$(RUNENV) $(RUNCMD) ./tcrmttest typical -port 19781 -tnum 5 127.0.0.1 5000
++	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 one first
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 two second
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dk 127.0.0.1 three third
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 four fourth
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dk 127.0.0.1 five fifth
++	$(RUNENV) $(RUNCMD) ./tcrmgr out -port 19781 127.0.0.1 one
++	$(RUNENV) $(RUNCMD) ./tcrmgr out -port 19781 127.0.0.1 two
++	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 three > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 four > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 five > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr mget -port 19781 127.0.0.1 one two three four five > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 putlist six sixth seven seventh
++	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 outlist six
++	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 getlist three four five six > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr list -port 19781 -pv 127.0.0.1 > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr list -port 19781 -pv -fm f 127.0.0.1 > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr http -ih http://127.0.0.1:19781/five > check.out
+ 	rm -rf ulog ; mkdir -p ulog
+ 	$(RUNENV) $(RUNCMD) ./ttultest write -lim 10000 ulog 5000
+ 	$(RUNENV) $(RUNCMD) ./ttultest write -lim 10000 -as ulog 5000
+@@ -215,6 +216,10 @@
+ 	rm -rf ulog ; mkdir -p ulog
+ 	$(RUNENV) $(RUNCMD) ./ttultest thread -lim 10000 ulog 5 5000
+ 	$(RUNENV) $(RUNCMD) ./ttultest thread -lim 10000 -as ulog 5 5000
++
++	kill `cat /tmp/tttest.pid`
++	rm /tmp/tttest.tch
++
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
+ 	@printf '# Checking completed.\n'
diff --git a/net-misc/tokyotyrant/files/tokyotyrant.confd b/net-misc/tokyotyrant/files/tokyotyrant.confd
new file mode 100644
index 000000000000..b6417134f47c
--- /dev/null
+++ b/net-misc/tokyotyrant/files/tokyotyrant.confd
@@ -0,0 +1,15 @@
+# Tokyo tyrant config
+
+# Listening options
+TT_HOST=127.0.0.1
+TT_PORT=1978
+
+# Database file - please refer to man ttserver for alternatives
+TT_DB="/var/lib/tokyotyrant/casket.tch#bnum=1000000#opts=ld"
+
+# ttserver accepts a wide range of options, put them here
+TT_OPTS=""
+
+# don't change these
+TT_PID=/var/run/tokyotyrant/db.pid
+TT_LOG=/var/log/tokyotyrant/db.log
\ No newline at end of file
diff --git a/net-misc/tokyotyrant/files/tokyotyrant.initd b/net-misc/tokyotyrant/files/tokyotyrant.initd
new file mode 100644
index 000000000000..f754d4901bfc
--- /dev/null
+++ b/net-misc/tokyotyrant/files/tokyotyrant.initd
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+
+extra_commands="configtest reload"
+
+depend() {
+	need net
+}
+
+start() {
+	configtest || return 1
+	ebegin "Starting tokyo tyrant"
+	start-stop-daemon --start --exec /usr/bin/ttserver -- \
+		-pid ${TT_PID} -dmn -host ${TT_HOST} -log ${TT_LOG} \
+		-port ${TT_PORT} ${TT_OPTS} ${TT_DB}
+	eend $? "Failed to start tokyo tyrant"
+}
+
+stop() {
+	configtest || return 1
+	ebegin "Stopping tokyo tyrant"
+	start-stop-daemon --stop --pidfile ${TT_PID}
+	eend $? "Failed to stop tokyo tyrant"
+	rm -f ${TT_PID}
+}
+
+reload() {
+	configtest || return 1
+	ebegin "Gracefully restarting tokyo tyrant"
+	kill -HUP `cat ${TT_PID}` &>/dev/null
+	eend $? "Failed to reload tokyo tyrant"
+}
+
+configtest() {
+	if [ -z "${TT_DB}" ] || [ -z "${TT_PORT}" ] ; then
+		eerror "Please check your configuration"
+		eend $?
+	fi
+}
diff --git a/net-misc/tokyotyrant/metadata.xml b/net-misc/tokyotyrant/metadata.xml
new file mode 100644
index 000000000000..40aa45df2b01
--- /dev/null
+++ b/net-misc/tokyotyrant/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/tokyotyrant/tokyotyrant-1.1.41-r1.ebuild b/net-misc/tokyotyrant/tokyotyrant-1.1.41-r1.ebuild
new file mode 100644
index 000000000000..3aebae8184ac
--- /dev/null
+++ b/net-misc/tokyotyrant/tokyotyrant-1.1.41-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils user
+
+DESCRIPTION="A network interface to Tokyo Cabinet"
+HOMEPAGE="http://fallabs.com/tokyotyrant/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86 ~ppc-macos ~x86-macos"
+IUSE="debug examples lua"
+
+DEPEND="dev-db/tokyocabinet
+	sys-libs/zlib
+	app-arch/bzip2
+	lua? ( dev-lang/lua )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if use !prefix ; then
+		enewgroup tyrant
+		enewuser tyrant -1 -1 /var/lib/${PN} tyrant
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix_makefiles-1.4.41.patch
+	epatch "${FILESDIR}"/fix_testsuite.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable lua)
+}
+
+src_install() {
+	rm ttservctl || die "Install failed"
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	for x in /var/{lib,run,log}/${PN}; do
+		dodir "${x}" || die "Install failed"
+		use prefix || fowners tyrant:tyrant "${x}"
+	done
+
+	if use examples; then
+		insinto /usr/share/${PF}/example
+		doins example/* || die "Install failed"
+	fi
+
+	dohtml doc/* || die
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed"
+	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
+
+}
+
+src_test() {
+	emake -j1 check || die "Tests failed"
+}
diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest
new file mode 100644
index 000000000000..bc6d61153466
--- /dev/null
+++ b/net-misc/trackma/Manifest
@@ -0,0 +1,4 @@
+DIST trackma-0.7.3.tar.gz 142450 SHA256 c11da6157d1008a38469f1eaa0fe325230c0d4db0ba861c8a2600d5a63c08dee SHA512 73a7caa1e740e96f29edfcdfc5dbcaf26f280371c176bba69947fff37ca935d56e280a6d3e12c0a7f6283fecdad3d8e8e82c0d45a75d1962e58fdd7458630791 WHIRLPOOL 863688a495abb5e03980d1b3cae023ee24217889cb3cb528acd9339b5601c2e463e82365addb99881765331f4cb34d02d56018bd0c4d9a5c72eb1cab5413e3d3
+EBUILD trackma-0.7.3.ebuild 1982 SHA256 0a33432cafff99c2d8f4185e2ff96064bd586193baf4a8cabdf8853a3f8e77ad SHA512 b4927b0864f1e94d3fafe92d731e9f835cea28cb1e84778a3571e51cd70338624b3b650fd5b6a6c1f0f8fc2e77068caefd41ec02cad6184dbb8949f482dc9217 WHIRLPOOL 71edb267d9a386e0c7c027f54b2ef9d5b6b60de0d05cf2063c52153b70e62edb988363a2544c243d728bfb7467be4614f7418134bb4c930af69a73a3e3cabb56
+EBUILD trackma-9999.ebuild 1934 SHA256 0b9c63e5dbcd4552b7a43ad7a723198295df703cf4bc1bbcdcc5365324713d50 SHA512 7bc242e65fc0fe8c109c3fd449fe57a91bc14d51fbc1780f48bc8034c8d3902dcf388af2598c14b585e506835b60f841871f016f23f31ce3e7fe3caab1c64544 WHIRLPOOL f4c582804e524b42c7b714fbe551805e35a6c66744d89bfcc6ecd965a516d3353794ed806a978f2b85aabb7376043451b3fe62e18eded21a65c1a77cf9527dba
+MISC metadata.xml 762 SHA256 aafd7db6855a50f5211a44ef7f21717d2e1b1c6c94a09713f32b83f9cfaf93f9 SHA512 f8229d99e027ce81938d220325147dae3df9fdc5b0fa5619ba73d4f437b885cca474483a29ade8817fe4ab06ae225f3c11bc170408ea933779c04ffb49901733 WHIRLPOOL d9b16a0dc216e5e841ab929b5f2ff96102dfa4415069df288f75d3078547d9bfb1e4c13d1949498601120de658b0d949056552b30c9006940accfb22c0a474ea
diff --git a/net-misc/trackma/metadata.xml b/net-misc/trackma/metadata.xml
new file mode 100644
index 000000000000..70c3dfa9d170
--- /dev/null
+++ b/net-misc/trackma/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<longdescription>
+	Trackma aims to be a lightweight and simple but feature-rich program for Unix based systems for fetching, updating and using data from personal lists hosted in several media tracking websites.
+</longdescription>
+<use>
+	<flag name="cli">Enable cli version</flag>
+	<flag name="ncurses">Enable curses version</flag>
+</use>
+<maintainer type="person">
+	<email>fdsfgs@krutt.org</email>
+	<name>soredake</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">z411/trackma</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/net-misc/trackma/trackma-0.7.3.ebuild b/net-misc/trackma/trackma-0.7.3.ebuild
new file mode 100644
index 000000000000..ffaed1f4ad6f
--- /dev/null
+++ b/net-misc/trackma/trackma-0.7.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Open multi-site list manager for media tracking sites"
+HOMEPAGE="https://github.com/z411/trackma"
+SRC_URI="https://github.com/z411/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ncurses cli gtk inotify qt5"
+REQUIRED_USE="|| ( cli gtk ncurses qt5 )"
+
+DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] )
+	gtk? (
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+RDEPEND="sys-process/lsof
+	inotify? ( || ( dev-python/inotifyx dev-python/pyinotify ) )
+	${DEPEND}"
+
+python_configure_all() {
+	sed -i -e '/trackma-qt4/d' "${S}/setup.py" || die
+	rm "${S}/trackma/ui/qt4ui.py" || die
+	if ! use qt5; then
+		sed -i -e '/trackma-qt/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/qtui.py" || die
+	fi
+	if ! use gtk; then
+		sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/gtkui.py" || die
+	fi
+	if ! use ncurses; then
+		sed -i -e '/trackma-curses/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/curses.py" || die
+	fi
+	if ! use cli; then
+		sed -i -e '/trackma.ui.cli:main/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/cli.py" || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon "${S}/trackma/data/icon.png" trackma.png
+	use cli && make_desktop_entry "${PN}" "${PN^} (cli)" "${PN}" "Network" "Terminal=true"
+	use ncurses && make_desktop_entry "${PN}-curses" "${PN^} (ncurses)" "${PN}" "Network" "Terminal=true"
+	use gtk && make_desktop_entry "${PN}-gtk" "${PN^} (gtk3)" "${PN}" "Network" "StartupWMClass=trackma-gtk3"
+	use qt5 && make_desktop_entry "${PN}-qt" "${PN^} (qt5)" "${PN}" "Network" "StartupWMClass=trackma-qt5"
+}
diff --git a/net-misc/trackma/trackma-9999.ebuild b/net-misc/trackma/trackma-9999.ebuild
new file mode 100644
index 000000000000..b93d9e2ed7c8
--- /dev/null
+++ b/net-misc/trackma/trackma-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit distutils-r1 eutils git-r3
+
+DESCRIPTION="Open multi-site list manager for media tracking sites"
+HOMEPAGE="https://github.com/z411/trackma"
+EGIT_REPO_URI="https://github.com/z411/${PN}"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ncurses cli gtk inotify qt5"
+REQUIRED_USE="|| ( cli gtk ncurses qt5 )"
+
+DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] )
+	gtk? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+RDEPEND="sys-process/lsof
+	inotify? ( || ( dev-python/inotifyx dev-python/pyinotify ) )
+	${DEPEND}"
+
+python_configure_all() {
+	sed -i -e '/trackma-qt4/d' "${S}/setup.py" || die
+	rm "${S}/trackma/ui/qt4ui.py" || die
+	if ! use qt5; then
+		sed -i -e '/trackma-qt/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/qtui.py" || die
+	fi
+	if ! use gtk; then
+		sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/gtkui.py" || die
+	fi
+	if ! use ncurses; then
+		sed -i -e '/trackma-curses/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/curses.py" || die
+	fi
+	if ! use cli; then
+		sed -i -e '/trackma.ui.cli:main/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/cli.py" || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon "${S}/trackma/data/icon.png" trackma.png
+	use cli && make_desktop_entry "${PN}" "${PN^} (cli)" "${PN}" "Network" "Terminal=true"
+	use ncurses && make_desktop_entry "${PN}-curses" "${PN^} (ncurses)" "${PN}" "Network" "Terminal=true"
+	use gtk && make_desktop_entry "${PN}-gtk" "${PN^} (gtk3)" "${PN}" "Network" "StartupWMClass=trackma-gtk3"
+	use qt5 && make_desktop_entry "${PN}-qt" "${PN^} (qt5)" "${PN}" "Network" "StartupWMClass=trackma-qt5"
+}
diff --git a/net-misc/ttytter/Manifest b/net-misc/ttytter/Manifest
new file mode 100644
index 000000000000..1fc5ae0bb84d
--- /dev/null
+++ b/net-misc/ttytter/Manifest
@@ -0,0 +1,5 @@
+DIST ttytter-2.1.00.txt 238320 SHA256 86c6e7767c65e3179d4ed6368e27df5c4b200285207c3df3164c5a84a73517b1 SHA512 06b52275c454b7ad772baddcc64c311633fa35cc038e5a62895bbe056bc117e60feaae5a3e83917ec506ca3411e66619c84fbcb8cc7db6428082d14182813cc4 WHIRLPOOL df83cb418635eedd0bb4cd9aefe8af5057d36bf9776d701a4e541fc933c89ed108e0f8e501a30fd20626c32ca55eb5d44631344a0ffd70c6e2db75afa4398e38
+EBUILD ttytter-2.1.00.ebuild 756 SHA256 995ac116aa1fe43a7e2e48028281c03ea9e33ab39254654254b3a9838568b13a SHA512 9de8e9208d1c02d914aa6d2cc100a3d31e3d3fb942214df8b9c089c2985689077447b1bd08ab2b5e432b05182fcb6c38ce946cab1b513e1172297a31ac58a7a5 WHIRLPOOL e55d7330d265b25828cc72971510f25fd12a372f67b82e5ab9fe1b36a42cfb54f32b54e86d2ba442d3ccbe86c1cc952ffc177c53005c7c5315d8fbe9f40b37d2
+MISC ChangeLog 2571 SHA256 46a71fef90899e631c5712c933b6dce64242dd99207460c06d0ba600695856d5 SHA512 a7dade583b4b7fa9fb3fbd3f326c1ac822dc32fe90ac7d8f62e51a05ca3f5ad4dc54327ff9f20f1849f8e50d29ba3f55054618f8ea1abfb264828aeaa088a874 WHIRLPOOL b74d2a22a53390a57fb43d7aab4a2b910f7421a716b8229e3b8f414fac31e9ccaa1232d7798b8d83509a58671caffe46ae3cb8844544471d501ace2c90a2f750
+MISC ChangeLog-2015 1525 SHA256 2ab6a6c8714b341d3ec0fb6a8cc3eeac572896c3c6740cdb939d86a2a0daae95 SHA512 7d15d2d4c1db69f2f94fee1a9bb0b6e9b0b205d2c5be538971fd1f4aea46bfd3149b5bbb972ca80d61107a31d415b20b78d46bd67ec3a55e31d8665b4a711396 WHIRLPOOL 9abc1a1e40309a555dcd7789eb997897f8a68c5f440ca3439abcbb89b9809b945b313ec3429d59dac4da66b80d95c771d570f614982c76adb1bfca0f21d96e7b
+MISC metadata.xml 244 SHA256 218c89997b706a1af5ae06826d5c44f6cd3b1271deadac69bbbe897de31b22e2 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117 WHIRLPOOL b1b2977b3b499a8169afe610ee2da26a72fa3d58f72e055fb9263c24ac0bec835e2c62685698fb6f712b7b7bbf48567adeacdf4e6eb244770a70632f64cec009
diff --git a/net-misc/ttytter/metadata.xml b/net-misc/ttytter/metadata.xml
new file mode 100644
index 000000000000..2028cee3c389
--- /dev/null
+++ b/net-misc/ttytter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/ttytter/ttytter-2.1.00.ebuild b/net-misc/ttytter/ttytter-2.1.00.ebuild
new file mode 100644
index 000000000000..585c023d30e2
--- /dev/null
+++ b/net-misc/ttytter/ttytter-2.1.00.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="A multi-functional, console-based Twitter client"
+HOMEPAGE="http://www.floodgap.com/software/ttytter/"
+SRC_URI="http://www.floodgap.com/software/ttytter/dist2/${PV}.txt -> ${P}.txt"
+
+LICENSE="FFSL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.8
+	|| ( net-misc/curl www-client/lynx )"
+
+S=${WORKDIR}
+
+src_install() {
+	newbin "${DISTDIR}/${A}" ${PN}
+
+	local DOC_CONTENTS="
+		Please consult the following webpage on how to
+		configure your client.
+		http://www.floodgap.com/software/ttytter/dl.html"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/ucarp/Manifest b/net-misc/ucarp/Manifest
new file mode 100644
index 000000000000..2644ce2ec670
--- /dev/null
+++ b/net-misc/ucarp/Manifest
@@ -0,0 +1,15 @@
+AUX ucarp.8 6311 SHA256 18a7178c1362d514d8bacb56eb4c89d3987f936397a1dec72376e16179a7fe8b SHA512 4aab5f072663501e90a504e47e30c7cf3a89c6996addb6a23c7d0b3688688141f90d6134c79d2746fef1934a63588723bafb375777b2a12a6715257681baf28f WHIRLPOOL c83a3231dd15cd277c6833c9f7aa871136bbf2b12914c160568df45b8ff8b4b6cf8721672b0df0c52eee687d742730900761fef6b148721465d6a52aef52ebeb
+AUX ucarp.confd 880 SHA256 234ce139aef7b7c24ad7ab7d9901c65e602180bc7bbdba06bb36ffa9379fcfab SHA512 e72594f6292dcc4e17c13c07f12d5cd9ef791ea91ee2c22d5023d0aa574990b6ec6c6714dc45d678ba70ec8395790cd80272a8a57adbd8c735f296e580a298a1 WHIRLPOOL b2b6cdcc7edcc8f73c052e75ce835216b1c06fa2214828a180d20dac7b0189e602f2987c8274e01bf7741b251c17204e3f959c495df535d6eabd2292a5fcb986
+AUX ucarp.initd-r1 1902 SHA256 5597782bc29f2b9f1e9acce81f6e8b18d8fc39fbb28a5e2fde37735e3bf59168 SHA512 6e5a7a1ec245c6c89ce61b189768594a42b630b94d882f79357475a62f63b3198c036f1cdbc09a91b3d3509d6f6b0c621b56f107dbfca76fecf79fae3e0a66db WHIRLPOOL 9c65682981400c2b63abfa436549eebe58d8136443ee2f3d0026897ef07de5246fd73b8102745d088e5ee26d59a7eda38c8e9a344c6942a304312b3679b33bda
+AUX ucarp.initd-r2 1880 SHA256 05e987c6f656ceada35fbd37cfe586d894fedc7de549f17be09eef4c7933eca8 SHA512 cf7dd9bdc148fb737a78701b5b9d2a705048cf4064f3be439e11b8dabd012f6628970461b2fa46e93813e246f200c2672c281e021b987765ba3ebb0fbf78d566 WHIRLPOOL e9a38d54626827cc69a3d84cef0ad44bbd99b6a02b3416bc6cbd3a265ce89a5ff575faf99c469ccacd746767f480c5f2a234d1508eaceb307076da172d72f019
+AUX vip-down-default.sh 119 SHA256 864b62a05eadf0b1bcd097d31803ba019ad5e6e8e3776bd38c56e073ab4b7f00 SHA512 026988d259ab07568995e0609ee0b22245abcf26c65e7c3ddeea8efc801a78eb2796e7423c52731b8070db99e410db4de8217d0a3b7b8681d399fef25c64e56f WHIRLPOOL 1e77c2af43769fbbb0de7f9d5f1baffe9186b635710c9fd59f46b39a36f5926334460942be3e9963c05dc256adbe87fbef6ae26d7705a53850747c9853bab346
+AUX vip-down-default.sh-r1 118 SHA256 7b822d0a641d3da7f108c3f73794d935d1b4670bb6f3056587be375182f7d7c1 SHA512 ddbee9c02601d32f6660b1f769b0cc87595c6417a8ade66f31d0815fa21d54291809f004ee4ce36d097789b6e5f5a0aaba77426bef54c2a824e6af334baf904b WHIRLPOOL 4248fd0d9d7c3efcd9ea2190b1c63a7f8492e6e654536ef89895d293070982b86fa3ba91e943f020c73058808c4c2cbdd85b1579b6c9ea9dde37c7369583b9bf
+AUX vip-up-default.sh 132 SHA256 41cdfdf20f802dcdf7bed9206752d9f232fdc47891ee5103a10a8344131a555f SHA512 4db8a047c39671578d0fa0e0dfadf3ce6e4f5881a85811c5c8e986f26c97b5de64cc58578cd77ba9ee93e2c6659b178c69575d3006934da56736441c30c703ce WHIRLPOOL 0ee0c3d448244ce358a99667b5157d9b567d6a2c947ab5b2bee3eca4534a19be3e1d1c63e0d881026155dbf8b86b0e9a4192274ac28d6f10a0af3f39d42ce365
+AUX vip-up-default.sh-r1 131 SHA256 b448dd2d8e22a1f9bc7ce349abda20a5730c12f9fc8ee659d3d302de09fdfa85 SHA512 d00a2acaa44567f936e029af96a841bf815b75e18f5d2563800e996acdea68ef3265e7ea7b67e7cba3fe671e7809ec905e9cc39ad5fe2c807170cfa1fa6595ff WHIRLPOOL 344292b6c302d4bbee0aa71d975f42661bc319aaf33f6ea82a611a4dd081a7d7ffd09ee1dce3bac9f13d4ad902abff8c5112437d59770c47b1541a50c72507bf
+DIST ucarp-1.5.2.tar.gz 429089 SHA256 f3cc77e28481fd04f62bb3d4bc03104a97dd316c80c0ed04ad7be24b544112f3 SHA512 568ff2061e59d314c72a160ccb42eb099bf7cdf04bc30f405b5b62322dff3ceb4fa037c2b430fdb4cee25f0dcacf9309a15bd814b4b70b640840400bda20b253 WHIRLPOOL b763e7c7023f1364e735baf2df2855bd6bbbbd937267c1a411da22b2ad109b01807f8f7c798662ed0e86f1137a1c8a9ed601eb2a3242a444ba5560d8f47bc285
+EBUILD ucarp-1.5.2-r3.ebuild 1247 SHA256 c5c09a4278ca409ba9b297dddce07752bb687f1d2c265e95d0192803ceac8af8 SHA512 66ab66b2db551c97bee096a2f1d81767c10e6beb96c2268504db219c2b01b4edae118c82ca04c3fa2d153d486673ab108caba5ff43d5168530f9a5a0eea75bc4 WHIRLPOOL aa1d93a022af5ed6d14416b694c8c1eeab37fcac0c4dad4419ac4a04edbf0ec7853fe45f308d1a84cf92a4741f252eb16942b2b3a6bc8280f0ccfa720dfaa7f3
+EBUILD ucarp-1.5.2-r4.ebuild 1294 SHA256 bcac117d3171cf9db2e6a5859448e203f30a56ff714abf8aeefcd865cdbd960e SHA512 e0176e08f11170c9ea5523b2e644eefdf0c2d1178333ed547587407454cfb94e8cfdc287d4b76e7c7ed1fc602d146c707083effdb4b72e03174e5fbbed841261 WHIRLPOOL be0a66fd7cecbe095ee1896374006e118dc7003a1924a19f6e86f177b8f13ce9b27074df088e429c8156aee4cc5984209bc896aac048723fff2d9291c1db491d
+EBUILD ucarp-1.5.2-r5.ebuild 1294 SHA256 a2fdd4d15b11f06a70e0a604cc21fa2df99d5355fca7ae64b2f3443acb3a718f SHA512 0da1ba75ab1b8e877067814e8fb7551f6bdd19c430e6e2a85381ac4e284a642d261c9f41ebb7509ca71737e105b1a24efc06bfb3896c42663759ce99244bbea8 WHIRLPOOL 0abe1fa74c2ac9f72b0b6bc708d051f6fd4422ef462ddf42cf05ea86c78ba3d3a9970adfa634291a6032bc61ff01c5402ce3375ead0188bf0b10841a74653785
+MISC ChangeLog 2999 SHA256 390b4abb1b37154340204802d89756a05d07897a7a02d3c89a6010fb2e7112e7 SHA512 a1f49c92eb851a7d654d98dd9c2bb079761f5c5a723f3ceba55c52a7d2b86e9a0bbd14d2092c36b66e131aa0adb29d76daacc77de78b36140929ba03e5d76e07 WHIRLPOOL 02386119aff7df82d4b360f41826b42e3d72b249be3aecbe28ce82e96764e27a31e8af454ab2b0a7e31aa33825ebedfe38d34671726d6d6f2dad02bfd1df9a39
+MISC ChangeLog-2015 4233 SHA256 ab2429c4e934ffe6970d52e2411d30e5dafce9c2dda44b29f91a2e7082506bf9 SHA512 add16028936d16d6b0529802177ab366ce8f74f95253b7c4fc2671d5005a24cb6cc5f93a7ce0802216fe728865cab72e141360d31651481ed173487ddf47010e WHIRLPOOL 2f8b567988b6c1e6dcd46c9ea7f32355ed5002ab265a62e79a1ccca3de4d896a8e1c0e07c2a870a489f4a6f980679996547f0d1eb0e5608d9fd2cdd4454ff8e4
+MISC metadata.xml 253 SHA256 5030a84d36a522ae62530f6406dbda5099255457f76b3ed419dcffc6d7383667 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba WHIRLPOOL c55ba84102cbd078e50dd719902811669b3913122f44e982c90039b27067446810d881e73a22ed410edc41a409a273fd355be8a6d627bb0e67717b6a33d5fe1e
diff --git a/net-misc/ucarp/files/ucarp.8 b/net-misc/ucarp/files/ucarp.8
new file mode 100644
index 000000000000..756c5e6eca8a
--- /dev/null
+++ b/net-misc/ucarp/files/ucarp.8
@@ -0,0 +1,148 @@
+.TH "UCARP" "8"
+.SH "NAME"
+ucarp \(em Automatic IP failover
+.SH "SYNOPSIS"
+.PP
+\fBucarp\fR [\fB-i, \-\-interface=\fIINTERFACE\fR\fP]  [\fB-s, \-\-srcip=\fIIPADDRESS\fR\fP]
+.br
+[\fB-v, \-\-vhid=\fIVHID\fR\fP]  [\fB-p, \-\-pass=\fIPASSWORD\fR\fP]  [\fB-o, \-\-passfile=\fIPASSFILE\fR\fP]
+.br
+[\fB-P, \-\-preempt\fP]  [\fB-n, \-\-neutral\fP]  [\fB-a, \-\-addr=\fIIPADDR\fR\fP]  [\fB-h, \-\-help\fP]
+.br
+[\fB-b, \-\-advbase=\fISECS\fR\fP]  [\fB-k, \-\-advskew=\fISKEW\fR\fP]  [\fB-u, \-\-upscript=\fISCRIPT\fR\fP]
+.br
+[\fB-d, \-\-downscript=\fISCRIPT\fR\fP]  [\fB-r, \-\-deadratio=\fIRATIO\fR\fP]  [\fB-z, \-\-shutdown\fP]
+.br
+[\fB-B, \-\-daemonize\fP]  [\fB-f, \-\-facility=\fIFACILITY\fR\fP]  [\fB-x, \-\-xparam \fIPARAM\fR\fP]
+.br
+[\fB-S, \-\-ignoreifstate\fP]  [\fB-M, \-\-nomcast\fP]
+.SH "DESCRIPTION"
+.PP
+ucarp allows a pair of hosts to share common IP addresses in
+order to provide automatic failover of an address from one machine to
+another. It is a portable userland implementation of the secure and
+patent-free Common Address Redundancy Protocol, (CARP), OpenBSD's
+alternative to VRRP.
+.SH "OPTIONS"
+.PP
+ucarp supports the following command line options:
+.IP "\fB-i \fIINTERFACE\fR\fP\fB \-\-interface=\fIINTERFACE\fR\fP" 10
+The network interface to bind to.
+.IP "\fB-s \fIIPADDRESS\fR\fP\fB \-\-srcip=\fIIPADDRESS\fR\fP" 10
+The persistent source address, (real IP), associated with this
+interface.
+.IP "\fB-v \fIVHID\fR\fP\fB \-\-vhid=\fIVHID\fR\fP" 10
+The id of the virtual server [1-255].
+.IP "\fB-p \fIPASSWORD\fR\fP\fB \-\-pass=\fIPASSWORD\fR\fP" 10
+The shared password, (this gets encrypted and is not sent in the
+clear).
+.IP "\fB-o \fIPASSFILE\fR\fP\fB \-\-passfile=\fIPASSFILE\fR\fP" 10
+File to read the shared password from. The file specified
+should contain the password on the first line of the file.
+.IP "\fB-P \fP\fB\-\-preempt\fP" 10
+Turn on preemptive failover. This causes an instance of
+ucarp to assume master status right immediately.
+.IP "\fB-n \fP\fB\-\-neutral\fP" 10
+Do not run the downscript on startup when the
+initial state is backup.
+.IP "\fB-a \fIIPADDRESS\fR\fP\fB \-\-addr=\fIIPADDRESS\fR\fP" 10
+The IP address of the virtual server.
+.IP "\fB-h \fP\fB\-\-help\fP" 10
+Display a brief summary of the command line options.
+.IP "\fB-b \fISECONDS\fR\fP\fB \-\-advbase=\fISECONDS\fR\fP" 10
+Interval in seconds that advertisements will occur, (defaults
+to 1 second).
+.IP "\fB-k \fISKEW\fR\fP\fB \-\-advskew=\fISKEW\fR\fP" 10
+Advertisement skew [1-255], (defaults to 0).
+.IP "\fB-u \fICOMMAND\fR\fP\fB \-\-upscript=\fICOMMAND\fR\fP" 10
+Specifies the command to run after ucarp has successfully
+become master, the interface name gets passed as an argument.
+Typically a script used to bring up the virtual address, log the
+result, add routes, clear arp cache entries, etc.
+.IP "\fB-d \fICOMMAND\fR\fP\fB \-\-downscript=\fICOMMAND\fR\fP" 10
+Specifies the command that is run after ucarp has
+transitioned to the backup state, the interface name is passed
+as an argument. This is typically a script used to bring down
+the virtual interface, log the action, remove routes, etc.
+.IP "\fB-r \fIRATIO\fR\fP\fB \-\-deadratio=\fIRATIO\fR\fP" 10
+Ratio used by the backup to determine how long to wait for an
+unresponsive master before considering it dead.
+.IP "\fB-z\fP\fB \-\-shutdown\fP" 10
+Use of this command causes the command specified by the \-d
+argument to be invoked when ucarp shuts down.
+.IP "\fB-B\fP\fB \-\-daemonize\fP" 10
+Causes ucarp to detach from the terminal and run in the
+background as a daemon.
+.IP "\fB-f\fP\fB \-\-facility\fP" 10
+Set the syslog facility, defaults to daemon.
+.IP "\fB-x \fIPARAMETER\fR\fP\fB \-\-xparam=\fIPARAMETER\fR\fP" 10
+Specify an extra parameter to be supplied to the up/down
+scripts.
+.IP "\fB-S\fP\fB \-\-ignoreifstate\fP" 10
+Ignore unplugged network cables. This option is useful when
+ucarp nodes are connected with a crossover cable. Without
+this option the master will transition to backup when the other
+node is powered down, as it no longer has a link (NO-CARRIER).
+
+.IP "\fB-M\fP\fB \-\-nomcast\fP" 10
+Use broadcast instead of multicast advertisements.
+.SH "EXAMPLES"
+.PP
+A host with a real IP of 10.1.1.10 configured to be the master
+in a preemptive configuration with a virtual IP of 10.1.1.252.
+.PP
+.nf
+\fB    \fPucarp \-i eth0 \-s 10.1.1.10 \-v 10 \-p secret \-a 10.1.1.252 \\
+\fB    \fP\-\-upscript=/etc/vip-up.sh \-\-downscript=/etc/vip-down.sh \-P
+.fi
+.PP
+The backup might be configured something like this.
+.PP
+.nf
+\fB    \fPucarp \-i eth0 \-s 10.1.1.11 \-v 10 \-p secret \-a 10.1.1.252 \\
+\fB    \fP\-\-upscript=/etc/vip-up.sh \-\-downscript=/etc/vip-down.sh
+.fi
+.PP
+A machine with a real IP of 192.168.1.19 is the preferred master for
+a virtual IP of 10.1.12.7, broadcasts are sent every 5 seconds.
+.PP
+.nf
+\fB    \fPucarp \-b 5 \-s 192.168.1.19 \-v 27 \-p badpass \-a 10.1.12.7 \\
+\fB    \fP-u /etc/vip-up.sh \-d /etc/vip-down.sh \-z
+.fi
+.PP
+The hot standby with an IP of 192.168.1.20 uses the following
+command, (note the advskew of 50 putting it at a disadvantage and making
+the first machine preferred).
+.PP
+.nf
+\fB    \fPucarp \-b 5 \-k 50 \-s 192.168.1.20 \-v 27 \-p badpass \-a 10.1.12.7 \\
+\fB    \fP-u /etc/vip-up.sh \-d /etc/vip-down.sh \-z
+.fi
+.SH "SIGNALS"
+.PP
+Sending the ucarp process a SIGUSR1 will have it log a status
+line to syslog, eg "Sep 13 12:59:56 localhost ucarp[2654]: [INFO]
+MASTER on eth0 id 1" or "Sep 13 13:00:25 localhost ucarp[2644]: [INFO]
+BACKUP on eth0 id 1"
+.PP
+Sending the ucarp process a SIGUSR2 will cause it to demote itself
+from master to backup, pause 3 seconds, then proceed as usual to listen
+for other masters, and promote itself if necessary. This could be useful
+if you wish another node to take over master.
+
+.SH "AUTHOR"
+.PP
+ucarp was written by Frank Denis, <j@ucarp.org>.
+.PP
+This manual page was written by Eric Evans <eevans@debian.org>
+for the \fBDebian\fP system (but may be used by others).  Permission is
+granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 or any
+later version published by the Free Software Foundation.
+
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.
+
+.\" created by instant / docbook-to-man, Wed 10 Aug 2011, 17:40 
\ No newline at end of file
diff --git a/net-misc/ucarp/files/ucarp.confd b/net-misc/ucarp/files/ucarp.confd
new file mode 100644
index 000000000000..1a8cdb156973
--- /dev/null
+++ b/net-misc/ucarp/files/ucarp.confd
@@ -0,0 +1,30 @@
+# /etc/conf.d/ucarp: config file for /etc/init.d/ucarp
+
+# The network interface to bind to, for example 'eth0'
+UCARP_INTERFACE=
+
+# The persistent source address, (real IP), associated with this interface.
+UCARP_SOURCEADDRESS=
+
+# The IP address of the virtual server.
+UCARP_VIRTUALADDRESS=
+
+# The prefix length of the virtual server IP address
+# For example 24 for a netmask of 255.255.255.0
+UCARP_VIRTUALPREFIX=
+
+# The id of the virtual server [1-255].
+UCARP_VHID=123
+
+# File to read the shared password from.
+UCARP_PASSFILE=/etc/ucarp/ucarp.pass
+
+# Specifies the command to run after ucarp has successfully become master.
+UCARP_UPSCRIPT=/usr/libexec/ucarp/vip-up-default.sh
+
+# Specifies the command that is run after ucarp has transitioned to the backup
+# state.
+UCARP_DOWNSCRIPT=/usr/libexec/ucarp/vip-down-default.sh
+
+# Additional ucarp options to pass
+UCARP_OPTS="--shutdown"
diff --git a/net-misc/ucarp/files/ucarp.initd-r1 b/net-misc/ucarp/files/ucarp.initd-r1
new file mode 100644
index 000000000000..14d84dc01ea4
--- /dev/null
+++ b/net-misc/ucarp/files/ucarp.initd-r1
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="UCARP is a portable implementation of the CARP protocol"
+description_logstatus="Logs the status of ${SVCNAME} to syslog"
+description_demote="Demotes ${SVCNAME} from master to backup"
+
+extra_started_commands="logstatus demote"
+
+command="/usr/sbin/ucarp"
+command_args="--interface=${UCARP_INTERFACE} \
+              --srcip=${UCARP_SOURCEADDRESS} \
+              --vhid=${UCARP_VHID} \
+              --passfile=${UCARP_PASSFILE} \
+              --addr=${UCARP_VIRTUALADDRESS} \
+              --upscript=${UCARP_UPSCRIPT} \
+              --downscript=${UCARP_DOWNSCRIPT} \
+              --xparam=${UCARP_VIRTUALPREFIX} \
+              ${UCARP_OPTS}"
+
+pidfile="/var/run/${SVCNAME}.pid"
+command_background="yes"
+
+required_files="${UCARP_PASSFILE} ${UCARP_UPSCRIPT} ${UCARP_DOWNSCRIPT}"
+
+depend() {
+        need net
+        use logger
+        provide ucarp
+}
+
+start_pre() {
+        local required_vars='UCARP_INTERFACE UCARP_SOURCEADDRESS UCARP_VHID
+                             UCARP_PASSFILE UCARP_VIRTUALADDRESS UCARP_UPSCRIPT
+                             UCARP_DOWNSCRIPT UCARP_VIRTUALPREFIX'
+
+        local config_var=''
+        for config_var in $required_vars; do
+                if test -z  "$(eval echo \$$config_var)"; then
+                        eerror "Missing or empty config variable '$config_var'"
+                        ewarn  "You have to edit /etc/conf.d/${SVCNAME} first"
+                        return 1
+                fi
+        done
+}
+
+logstatus() {
+        ebegin "Logging status of ${SVCNAME} to syslog"
+        start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
+        eend $?
+}
+
+demote() {
+        ebegin "Demote ${SVCNAME} from master to backup"
+        start-stop-daemon --signal SIGUSR2 --pidfile "${pidfile}"
+        eend $?
+}
diff --git a/net-misc/ucarp/files/ucarp.initd-r2 b/net-misc/ucarp/files/ucarp.initd-r2
new file mode 100644
index 000000000000..cc6537e1226e
--- /dev/null
+++ b/net-misc/ucarp/files/ucarp.initd-r2
@@ -0,0 +1,57 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="UCARP is a portable implementation of the CARP protocol"
+description_logstatus="Logs the status of ${SVCNAME} to syslog"
+description_demote="Demotes ${SVCNAME} from master to backup"
+
+extra_started_commands="logstatus demote"
+
+command="/usr/sbin/ucarp"
+command_args="--interface=${UCARP_INTERFACE} \
+              --srcip=${UCARP_SOURCEADDRESS} \
+              --vhid=${UCARP_VHID} \
+              --passfile=${UCARP_PASSFILE} \
+              --addr=${UCARP_VIRTUALADDRESS} \
+              --upscript=${UCARP_UPSCRIPT} \
+              --downscript=${UCARP_DOWNSCRIPT} \
+              --xparam=${UCARP_VIRTUALPREFIX} \
+              ${UCARP_OPTS}"
+
+pidfile="/var/run/${SVCNAME}.pid"
+command_background="yes"
+
+required_files="${UCARP_PASSFILE} ${UCARP_UPSCRIPT} ${UCARP_DOWNSCRIPT}"
+
+depend() {
+        need net
+        use logger
+}
+
+start_pre() {
+        local required_vars='UCARP_INTERFACE UCARP_SOURCEADDRESS UCARP_VHID
+                             UCARP_PASSFILE UCARP_VIRTUALADDRESS UCARP_UPSCRIPT
+                             UCARP_DOWNSCRIPT UCARP_VIRTUALPREFIX'
+
+        local config_var=''
+        for config_var in $required_vars; do
+                if test -z  "$(eval echo \$$config_var)"; then
+                        eerror "Missing or empty config variable '$config_var'"
+                        ewarn  "You have to edit /etc/conf.d/${SVCNAME} first"
+                        return 1
+                fi
+        done
+}
+
+logstatus() {
+        ebegin "Logging status of ${SVCNAME} to syslog"
+        start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
+        eend $?
+}
+
+demote() {
+        ebegin "Demote ${SVCNAME} from master to backup"
+        start-stop-daemon --signal SIGUSR2 --pidfile "${pidfile}"
+        eend $?
+}
diff --git a/net-misc/ucarp/files/vip-down-default.sh b/net-misc/ucarp/files/vip-down-default.sh
new file mode 100644
index 000000000000..cf5bfe5ce3a1
--- /dev/null
+++ b/net-misc/ucarp/files/vip-down-default.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+exec 2> /dev/null
+
+/sbin/ip addr del "$2"/"$3" dev "$1"
+
+# or alternatively:
+# /sbin/ifconfig "$1":254 down
diff --git a/net-misc/ucarp/files/vip-down-default.sh-r1 b/net-misc/ucarp/files/vip-down-default.sh-r1
new file mode 100644
index 000000000000..5e1862b3a14b
--- /dev/null
+++ b/net-misc/ucarp/files/vip-down-default.sh-r1
@@ -0,0 +1,7 @@
+#! /bin/sh
+exec 2> /dev/null
+
+/bin/ip addr del "$2"/"$3" dev "$1"
+
+# or alternatively:
+# /sbin/ifconfig "$1":254 down
diff --git a/net-misc/ucarp/files/vip-up-default.sh b/net-misc/ucarp/files/vip-up-default.sh
new file mode 100644
index 000000000000..763a56170a85
--- /dev/null
+++ b/net-misc/ucarp/files/vip-up-default.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+exec 2> /dev/null
+
+/sbin/ip addr add "$2"/"$3" dev "$1"
+
+# or alternatively:
+# /sbin/ifconfig "$1":254 "$2" netmask "$3"
diff --git a/net-misc/ucarp/files/vip-up-default.sh-r1 b/net-misc/ucarp/files/vip-up-default.sh-r1
new file mode 100644
index 000000000000..4b44dafde734
--- /dev/null
+++ b/net-misc/ucarp/files/vip-up-default.sh-r1
@@ -0,0 +1,7 @@
+#! /bin/sh
+exec 2> /dev/null
+
+/bin/ip addr add "$2"/"$3" dev "$1"
+
+# or alternatively:
+# /sbin/ifconfig "$1":254 "$2" netmask "$3"
diff --git a/net-misc/ucarp/metadata.xml b/net-misc/ucarp/metadata.xml
new file mode 100644
index 000000000000..4a09d7ba8d61
--- /dev/null
+++ b/net-misc/ucarp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/ucarp/ucarp-1.5.2-r3.ebuild b/net-misc/ucarp/ucarp-1.5.2-r3.ebuild
new file mode 100644
index 000000000000..7a09ba18faf4
--- /dev/null
+++ b/net-misc/ucarp/ucarp-1.5.2-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
+HOMEPAGE="http://www.ucarp.org"
+SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="nls"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	doman "${FILESDIR}"/ucarp.8
+
+	exeinto /usr/libexec/ucarp
+	doexe "${FILESDIR}"/vip-up-default.sh
+	doexe "${FILESDIR}"/vip-down-default.sh
+
+	keepdir /etc/ucarp
+
+	newinitd "${FILESDIR}"/ucarp.initd-r1 ucarp
+	newconfd "${FILESDIR}"/ucarp.confd ucarp
+}
+
+pkg_postinst() {
+	elog "The provided init script needs to be configured first."
+	elog "Edit /etc/conf.d/ucarp to suite your environment."
+	elog "You will also have to set a shared password within /etc/ucarp/ucarp.pass"
+	elog "or whatever file you have set \$UCARP_PASSFILE to."
+
+	elog "If you need more than one instance of ucarp running, simply symlink"
+	elog "the init script and create a copy of the init script configuration"
+	elog "which corresponds to the name of the init script."
+}
diff --git a/net-misc/ucarp/ucarp-1.5.2-r4.ebuild b/net-misc/ucarp/ucarp-1.5.2-r4.ebuild
new file mode 100644
index 000000000000..7fbb7e97c10b
--- /dev/null
+++ b/net-misc/ucarp/ucarp-1.5.2-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
+HOMEPAGE="http://www.ucarp.org"
+SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	doman "${FILESDIR}"/ucarp.8
+
+	exeinto /usr/libexec/ucarp
+	newexe "${FILESDIR}"/vip-up-default.sh-r1 vip-up-default.sh
+	newexe "${FILESDIR}"/vip-down-default.sh-r1 vip-down-default.sh
+
+	keepdir /etc/ucarp
+
+	newinitd "${FILESDIR}"/ucarp.initd-r1 ucarp
+	newconfd "${FILESDIR}"/ucarp.confd ucarp
+}
+
+pkg_postinst() {
+	elog "The provided init script needs to be configured first."
+	elog "Edit /etc/conf.d/ucarp to suite your environment."
+	elog "You will also have to set a shared password within /etc/ucarp/ucarp.pass"
+	elog "or whatever file you have set \$UCARP_PASSFILE to."
+
+	elog "If you need more than one instance of ucarp running, simply symlink"
+	elog "the init script and create a copy of the init script configuration"
+	elog "which corresponds to the name of the init script."
+}
diff --git a/net-misc/ucarp/ucarp-1.5.2-r5.ebuild b/net-misc/ucarp/ucarp-1.5.2-r5.ebuild
new file mode 100644
index 000000000000..00283bf58e82
--- /dev/null
+++ b/net-misc/ucarp/ucarp-1.5.2-r5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
+HOMEPAGE="http://www.ucarp.org"
+SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	doman "${FILESDIR}"/ucarp.8
+
+	exeinto /usr/libexec/ucarp
+	newexe "${FILESDIR}"/vip-up-default.sh-r1 vip-up-default.sh
+	newexe "${FILESDIR}"/vip-down-default.sh-r1 vip-down-default.sh
+
+	keepdir /etc/ucarp
+
+	newinitd "${FILESDIR}"/ucarp.initd-r2 ucarp
+	newconfd "${FILESDIR}"/ucarp.confd ucarp
+}
+
+pkg_postinst() {
+	elog "The provided init script needs to be configured first."
+	elog "Edit /etc/conf.d/ucarp to suite your environment."
+	elog "You will also have to set a shared password within /etc/ucarp/ucarp.pass"
+	elog "or whatever file you have set \$UCARP_PASSFILE to."
+
+	elog "If you need more than one instance of ucarp running, simply symlink"
+	elog "the init script and create a copy of the init script configuration"
+	elog "which corresponds to the name of the init script."
+}
diff --git a/net-misc/udpcast/Manifest b/net-misc/udpcast/Manifest
new file mode 100644
index 000000000000..dcbef07174f2
--- /dev/null
+++ b/net-misc/udpcast/Manifest
@@ -0,0 +1,8 @@
+AUX udpcast-20120424-fd_set.patch 253 SHA256 48f39b94787516af303f03df8028c11c8cda9cebeb95813c01095089a842865b SHA512 8986f45356c25ae1c5104bea7be39284d5f37e626e20b000df0492d60fcb7a781a8adcf9d43b8af4707573a5dd474521148706e0b0c69a0a0fd93edd5146744a WHIRLPOOL 1ccfba61f0ccbf35f864716d4903abc27cd81d7df43b9cd31b6bb4d6ff77f8700a2ffe66ec68dedfe060eaffc7ffb662da8f0cf76e05eefb320659fed1f76a69
+AUX udpcast-20120424-gentoo.patch 384 SHA256 b313b3e5a4794c74ac053a961005e134028aa5eb7eecea8a2fb5f909eeaf35b3 SHA512 a04594ffb92b06a0b35f8cbdb10fab1def767ea7bf892a1edf6226fe8947f5f261bb6def8e9bf775ba12f3ab1dfad475eef337a93e769da3f07a106dc1e018bf WHIRLPOOL 99aa50f667d448facf42d98ca96c95f04a4e41493704b7be8b1b66548a685dc43f61a659a1b826ab3d5c759af78902411b2ca9e61f1ac77eb90116f3cea58e78
+DIST udpcast-20120424.tar.bz2 138955 SHA256 d6c30352571a3215f00f8451d0fe932ba24ed5f98653d3aeb554e3c43c079677 SHA512 b28ada43f9f3cba498ffff3032cff6a673584836439275604c1201a18fe2e37f2c847a48b72783065b1656a7a2f9e9739d8a376e90df8b05749bc2e2f64278de WHIRLPOOL 9d8d48fabe30f462e49d2b1dc0b2d190fd5b0e6d1e68f801209a61782185464a952dd46ffbed9a6d39a3da8fce6de99f68916b3ef447db6d0fcc1523a83cc4de
+EBUILD udpcast-20120424-r1.ebuild 598 SHA256 ac7f8416a56093664083b3b0ec590e830cef925d9ba980297e0069b642ce72a2 SHA512 bf5a998a79b9bbf83d90f45175147514f68d901dea0c664b06ff1293b41025de87a31dd65bf066880ae3366e00d628d504c22fc7bf476d27c42236e367949827 WHIRLPOOL 87be6cea9267d5f5f2cabf8c5c0fabf312a0a6dd30c2a7994167c873ba3877d83f81dbf489075d47415ed61d4ececd0444ca5c040f2c7cf47665cfaae17492d8
+EBUILD udpcast-20120424.ebuild 489 SHA256 f45f56978208b9a06d13409c91bc23c405ab8ea4acc67bc9048ee66134a061e0 SHA512 7737a85d20b1023059ea3ddbb4b2403ab70d1dd4fd87cf3c0cd2efb576330bd63132a10b3c917429fa1ce10a7254f38fa00c1f18d5c314a4178a13e64149710e WHIRLPOOL bb19721462365ee431bd0b2c03ef1487b982fc3f6ae9a3fa654fa3ef4aca57bca0c5f57ba1166f7abc7cb5b93156ab0327139bd6933df3b00a414db85e7d11ab
+MISC ChangeLog 2575 SHA256 975e67aab769d9353c190a0835841f1f698e7a960dac22a3feafef786a674351 SHA512 e079c3653110307e3cf4e8509a0e1ae3185405b6cf55f28876e0d5b2fdd78a4fbb9cb254303b74ce313734a793bb17322d642c17b77e8684f11dd1180edcb6de WHIRLPOOL 4fc52c803a0420072818d20745a579c6ad92bc49f7b49be8bc543b0e20556344effff4d9886561a3e8bb636d1d017f551b3602ed87025172ef0c3bfe27dc37f4
+MISC ChangeLog-2015 4239 SHA256 9f52072a6f891cc8ed5d3d396893cdbe180c1ba6dc5262deed71cbdb27999bf2 SHA512 8c980471cf9bfb9503b7a43faf95d7fdeea2b9e7116d620d8ec8fbbf117627170a585afd33a619abd93ab1ca6cd859af37cb2f89108cb547c6676a310628b6d2 WHIRLPOOL 9c05f714123e0f5bf8dc204340a0590c63bb8dd7622016a79604662c51fa12cc23f7d6adfbaafcb10f0897ac2f7d893435da73a2b315a0a37eddf67fdf88a90b
+MISC metadata.xml 692 SHA256 8b5f6d67e54ceea7bf2afbb9a827dc37ee3f8db058f69c20dc1536b135b678e6 SHA512 7bca2ea7d909286fc510e6ac35ba860ec20a46093b4dc93ac74b29bdb9fdf8acdd8af9111a6614fff15247cd7f739281d12bc19755958dee2c0a20e22cdb43f5 WHIRLPOOL 79586ec7bf66853a6c5303f8c4436c0a46cd374496766defb2c7d3a5af9e4b2059ecc1de87ef28823e06beb1d97cd6c766641aa119e0f36f99d9dfcd367ef43f
diff --git a/net-misc/udpcast/files/udpcast-20120424-fd_set.patch b/net-misc/udpcast/files/udpcast-20120424-fd_set.patch
new file mode 100644
index 000000000000..2bd5bd5ce801
--- /dev/null
+++ b/net-misc/udpcast/files/udpcast-20120424-fd_set.patch
@@ -0,0 +1,11 @@
+--- a/console.h
++++ b/console.h
+@@ -6,6 +6,8 @@
+ #include <winbase.h>
+ #endif /* __MINGW32__ */
+ 
++#include <sys/select.h>
++
+ #define prepareConsole udpc_prepareConsole
+ #define getConsoleFd udpc_getConsoleFd
+ #define restoreConsole udpc_restoreConsole
diff --git a/net-misc/udpcast/files/udpcast-20120424-gentoo.patch b/net-misc/udpcast/files/udpcast-20120424-gentoo.patch
new file mode 100644
index 000000000000..e4269a0873a6
--- /dev/null
+++ b/net-misc/udpcast/files/udpcast-20120424-gentoo.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -30,8 +30,7 @@
+ 
+ # For additional warnings & checks, add -Wstrict-prototypes -Wshadow to the
+ # following:
+-CFLAGS +=-Wall -DBB_FEATURE_UDPCAST_FEC -D_FILE_OFFSET_BITS=64 -DUSE_SYSLOG -DUSE_ASSEMBLER -O6
+-LDFLAGS +=-s
++CFLAGS +=-Wall -DBB_FEATURE_UDPCAST_FEC -D_FILE_OFFSET_BITS=64 -DUSE_SYSLOG
+ LIBS +=@LIBS@
+ 
+ BUSYBOX=../udp-busybox/busybox
diff --git a/net-misc/udpcast/metadata.xml b/net-misc/udpcast/metadata.xml
new file mode 100644
index 000000000000..024fcc67894b
--- /dev/null
+++ b/net-misc/udpcast/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+UDPcast is a file transfer tool that can send data simultaneously to 
+many destinations on a LAN. This can for instance be used to install 
+entire classrooms of PC's at once. The advantage of UDPcast over using 
+other methods (nfs, ftp, whatever) is that UDPcast uses Ethernet's 
+multicast abilities: it won't take longer to install 15 machines than it 
+would to install just 2.
+</longdescription>
+</pkgmetadata>
diff --git a/net-misc/udpcast/udpcast-20120424-r1.ebuild b/net-misc/udpcast/udpcast-20120424-r1.ebuild
new file mode 100644
index 000000000000..a1002dbc1ac8
--- /dev/null
+++ b/net-misc/udpcast/udpcast-20120424-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="Multicast file transfer tool"
+HOMEPAGE="http://www.udpcast.linux.lu/"
+SRC_URI="http://www.udpcast.linux.lu/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hardened"
+
+DEPEND="dev-lang/perl"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-fd_set.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_configure() {
+	use hardened || append-cflags -DUSE_ASSEMBLER
+
+	default
+}
+
+src_install() {
+	default
+	dodoc *.txt
+}
diff --git a/net-misc/udpcast/udpcast-20120424.ebuild b/net-misc/udpcast/udpcast-20120424.ebuild
new file mode 100644
index 000000000000..e60e56db9b2c
--- /dev/null
+++ b/net-misc/udpcast/udpcast-20120424.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Multicast file transfer tool"
+HOMEPAGE="http://www.udpcast.linux.lu/"
+SRC_URI="http://www.udpcast.linux.lu/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-lang/perl"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-fd_set.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	default
+	dodoc *.txt
+}
diff --git a/net-misc/udpxy/Manifest b/net-misc/udpxy/Manifest
new file mode 100644
index 000000000000..ff5d91e2b6a3
--- /dev/null
+++ b/net-misc/udpxy/Manifest
@@ -0,0 +1,8 @@
+AUX udpxy.confd 1196 SHA256 0fcb0dfdf984f04465cf51da8705cb98248521a67f93a677bf7a1619c85a23c1 SHA512 e9b96fd4402f951918633578a2fc78b7730366bc3db64dd45127fe06a9fd945c92a4dbb9dcdc70defa53bf28dd5e8bd7c3e1c8516bb1707972f547ee02de438e WHIRLPOOL 6c2a17ca6424bde0564c0aa69c902989fffa19d6758a226b624dd9d5f95721f042473f3d870d1052debd9eec202505c81375b9a18bce7379a1372a7b794283bb
+AUX udpxy.initd 357 SHA256 ea11d4c466fa84a3fde0dd0d3fb119c66bd30898d6caae9b47ca2c90dd41792e SHA512 0fbd4235e585d3d23e238e30060a3968ad17090a3232ca6ef316115ec98b8ae1528f8da757bc3e1dde1ce529ba159463f4814b0f13ef3c3f88b74164e389f379 WHIRLPOOL e5fb3a277499968162112ac141467ee83d5ed0afaacf94767938fa18cec15c9748d7186f6979876290d3801e8f2dbda7fd3c48d1f5049b14de14b4d829b12fa3
+AUX udpxy.service 182 SHA256 22dc199736c9116ea78a8098aba3b3bc2ee04d135885023ac806fa9e0a0c7f58 SHA512 b9d32158657ec27362e9dea4704757a91543eff4b15aa0d256c934ae119545053ee21f32c87e0da85fc30c53bd807de19a26593cd63472edd5819601fd2b0ac9 WHIRLPOOL d66580548f143cff72abecbe08a3fc6fa673c347afdae39b778a38c6085395ff824552c2badb096fdf6864ec8a74a1d59cba65e2c7552b0151988dfe58d800a4
+DIST udpxy.1.0.23-7-prod.tar.gz 77591 SHA256 da13dab43b9b0e10a4f3e606d8b33ad5d0096901d9b59d1196177751cab5e5e0 SHA512 5bd37822f1d861b3828339175b7daebbf3ccb3969e808a319d3d3f054afbf7769d5f2705d25780a76819b3b7963af3a81af7d71556ba61274141142167907a23 WHIRLPOOL 03638c0fd0402e568ecd7c88d1339d486bc274c6310887d47b8df31e21f2d634511ac8e6c05de2f279a50c423c1a1d09ce848d6ade92389d9dbc86766b72ea5e
+EBUILD udpxy-1.0.23.7-r2.ebuild 779 SHA256 690f52cb70f4e2d3ce8013afe5c8a2c41380baa385b5100a3a40bff4bff7a75e SHA512 bc37b4d0184fb943217bda25be7a32906c9ccc007148a3d0f844d3696d0e2d766a392f1c1b4832e397487cc710cbe32da5a8f1701ccb531607efab186151affb WHIRLPOOL 129aaedfc3ca464c0f918dc6be03905f57eeb0ff2edfa39eb7084a21dbdf88e09d1cc0868c41ed3e8a12520f2cc7c32543e4cc3f825db5fab52ebda17d21cf6d
+MISC ChangeLog 3703 SHA256 20014fc00dede988aa0e349302063afd987ab3336224c93ea10f259112dfbab6 SHA512 d9879dc4fc9d5a8dbc019a1d61440560cf2bd17b10174d33bb45667708820182bac8ef22323f861ad334d79afffea3fa12c3da3483efbf0881091409f542fb85 WHIRLPOOL 1664ae304b71dfa3bf782cc0b500b51ae8349cba69a2c748a4ace07411efca911fc7f1a4a142f86208f2004cf226fd3e8471d930ac2b030eddf3cfb47a73be66
+MISC ChangeLog-2015 1184 SHA256 83b860add499f74d794e96565d0a9988b880ecf4c7af94248c125cb5fb6c2945 SHA512 abd6bc5a70d61b21ccba92692814fbed8561b52b867878385a2698cac75a9cdf9152eb5ad8a398487af2eae2b13c749b721edc6fe98b5ef4d2d8ca6d1cf3af13 WHIRLPOOL 256823d8fc264e9425a3379a7b9b8e24c64f4b3d2435b02826f3d40f78876e48a75bd8013778e12d32103fbc273c3ae42f90e5cd83fdb18af07cba0a621b4bba
+MISC metadata.xml 247 SHA256 348b3a6a82e9ea0c4634d49d11a54703099b198e06e97caa887d9a2156504955 SHA512 56a7183705aa925bc656b1dcf564cad1074bf122c8c00b6436fba46e321110c3f6fd8f1a3f75fff04323f2ea334d24f772699d2061366dabc7d7cb8ef6f625f9 WHIRLPOOL c42efa1c18cdf20db59f6dc723b7d2237f05678d1e9a0b642c0064aa5614448eefd8c18b2877180bc40bea47178ecdc7a79abb7511fbaeb28bd115282fc77254
diff --git a/net-misc/udpxy/files/udpxy.confd b/net-misc/udpxy/files/udpxy.confd
new file mode 100644
index 000000000000..e8e12ddf2f0d
--- /dev/null
+++ b/net-misc/udpxy/files/udpxy.confd
@@ -0,0 +1,24 @@
+
+#udpxy 1.0_Chipmunk (build 8) standard
+#usage: udpxy [-vTS] [-a listenaddr] -p port [-m mcast_ifc_addr] [-c clients] [-l logfile] [-B sizeK] [-n nice_incr]
+#	-v : enable verbose output [default = disabled]
+#	-S : enable client statistics [default = disabled]
+#	-T : do NOT run as a daemon [default = daemon if root]
+#	-a : (IPv4) address/interface to listen on [default = 0.0.0.0]
+#	-p : port to listen on
+#	-m : (IPv4) address/interface of (multicast) source [default = 0.0.0.0]
+#	-c : max clients to serve [default = 3, max = 16]
+#	-l : log output to file [default = stderr]
+#	-B : cache size (65536, 32Kb, 1Mb) for inbound (multicast) data [default = 65536 bytes]
+#	-R : maximum messages to cache in buffer (-1 = all) [default = -1]
+#	-H : maximum time (sec) to hold data in buffer (-1 = unlimited) [default = 4]
+#	-n : nice value increment [default = 0]
+#	-M : periodically renew multicast subscription (skip if 0 sec) [default = 0 sec]
+#Examples:
+#  udpxy -p 4022 
+#	listen for HTTP requests on port 4022, all network interfaces
+#  udpxy -a lan0 -p 4022 -m lan1
+#	listen for HTTP requests on interface lan0, port 4022;
+#	subscribe to multicast groups on interface lan1
+
+UDPXYOPTS="-p 4022"
diff --git a/net-misc/udpxy/files/udpxy.initd b/net-misc/udpxy/files/udpxy.initd
new file mode 100644
index 000000000000..57d61cc93983
--- /dev/null
+++ b/net-misc/udpxy/files/udpxy.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting udpxy"
+	start-stop-daemon --start --exec /usr/bin/udpxy -- ${UDPXYOPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping udpxy"
+	start-stop-daemon --stop --exec /usr/bin/udpxy
+	eend $?
+}
+
diff --git a/net-misc/udpxy/files/udpxy.service b/net-misc/udpxy/files/udpxy.service
new file mode 100644
index 000000000000..35ee208ed5dc
--- /dev/null
+++ b/net-misc/udpxy/files/udpxy.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=UDP-to-HTTP multicast traffic relay daemon
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/udpxy -T -p 4022
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/udpxy/metadata.xml b/net-misc/udpxy/metadata.xml
new file mode 100644
index 000000000000..baa619002d23
--- /dev/null
+++ b/net-misc/udpxy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">udpxy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild b/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild
new file mode 100644
index 000000000000..8d67b7f4467f
--- /dev/null
+++ b/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd toolchain-funcs versionator
+
+MY_PV=$(replace_version_separator 3 -)
+DESCRIPTION="Small daemon to relay multicast UDP traffic to client's TCP (HTTP) connection"
+HOMEPAGE="https://sourceforge.net/projects/udpxy/"
+SRC_URI="http://www.udpxy.com/download/1_23/${PN}.${MY_PV}-prod.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	dobin udpxy
+	dosym udpxy /usr/bin/udpxrec
+
+	doman doc/en/*.1
+	dodoc CHANGES README
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
new file mode 100644
index 000000000000..2a763c9582ac
--- /dev/null
+++ b/net-misc/uftp/Manifest
@@ -0,0 +1,13 @@
+AUX logrotate 166 SHA256 4ef8569348608157260604a75a7bf919cb2c06a78e3e617cb641b9a983d2e0ea SHA512 77c7b0e17123432f39d43048d7c51b88b20cb5ef297d36e2be50f8816f956dda6ca300fa3053756ac9f9480699cec9c28fb5ad77e81eeac667ace55dbc61e88f WHIRLPOOL ade858ce8c191a5a3ea106c1df1080c05975452497aeeccdca505e74b655d8beba27394d351ad2b10cb1d88e879a3be69bcf4e07bd7201b232f259d51eb1aa20
+AUX uftp-3.7_makefile.patch 2037 SHA256 1d6c2c28fb531671f32e374bf70c55410aeb9ee3e1ad479c228442c3678c13e5 SHA512 1fc5109626a8a46bd9bd05348cbfc957a524827c5f165f1f991f7887319f735ae90dab6bad91a96d7c6bae7e2c07e26ebcbd91b9a595b97d8b1b6d79e496e899 WHIRLPOOL 8066ff72c2859635d2811340eef85b71fafa394d9d279cdc80324b32454a057d9f697d0fb56fc3bbff918d1d6094fb4eb6c9469cddab3c81781d58fc4ced1a2d
+AUX uftpd.conf 169 SHA256 d7822dfb35072db3a76d93cbd7761e9ca723772176c5e8ded26f731535f9b836 SHA512 732a3e7f5eb1eec609f05d6c075ea11b16bdd9abcdc9528dacf7fbc148e2249306226fd5975b39956758d0b237b0d59b97e7c602451639fe7db19c43ae4f39f9 WHIRLPOOL daf25257e52c53b6c03dee42f3090145deb33330fb83a0da01578f077cf74f911a85a7680191c654c6a61f2dacebb326b30273cfcb3a284e356ee9b8f26fdea0
+AUX uftpd.init 518 SHA256 0aeaa345001e987c3c0c8a8aa06314ead268ccc1663a21555109492cba03543b SHA512 4008611d6a8f7e4c960269526761b9c5b2b7446bf1795983a62fb5fc12b4525ecd2e0e42ff2fb7d937e427d9d77834a2b6836db1242269fad7b09f92952c53b8 WHIRLPOOL 72cc9c9c418d68d53b6b14e1ee242d077501103cc8eedfa5699917de7f6baf908a7cc4e5773896d1099c14e2f455e1b6799d2867083b7b07072f4b27d4652d8c
+AUX uftpproxyd.conf 121 SHA256 90f9956120b1139d8e7dc554db5e5100b587f9d893f6650b35ac6ab6c54a3c5f SHA512 c61441d048ce99a50b5224cea7c4f9f1a2532fff8083a9a71e6099a98cba1fe79b43825188034efd402b47ac28bbe341827cb21872c17550419db36a8da7bb35 WHIRLPOOL f47ed7e515bb13cccffe05374525fbb6c192fa1aefc29021244eecdaad71d794d776c1a45954cd058d3e45745ce3ebab851c17f86031b9beedb37b0a90901215
+AUX uftpproxyd.init 522 SHA256 bc312e076a3b3c5c867df7ba8e0f51bfc40c2bf7c14ef817905b2dfb1febd450 SHA512 2d69f0b84750cb62fb96b7fc7a042fe54b6f658074f9c4c49a2bf4957507fce333862ae95fd0498e60240490ce44cd299b8fba851d4d7c9a67dcdf1e7f29d7f5 WHIRLPOOL 1d9e49607b82c1b1036d4e753de249721589480d2e9fdd9e33a7c81172a83bf5a0aea2efe022c391fb5e728335ffdf0b431216f12805c1c2a80f2dd0318d2c5b
+DIST uftp-3.7.1.tar 849920 SHA256 9010317b53b68dc67408077d56d02becbe2e2a1027d4d27df5378c99fee27433 SHA512 93fefe1d4c5310bfa6470a78011e63aea8cc9cf59a73ea24920d3ad8c835476bbc410b3669ee79c847eba7d21d61f600e09529d5e6f2ed24076f663a34d99c15 WHIRLPOOL 7a4cbd8092ef1439ea4c11b96c5eb2504968f689f0a099208e0a0ba066e72394aa5fcbfb6ca9b9f382702b9631fc27cf80293f13d5e07d8b08818d39a371b1c9
+DIST uftp-3.7.tar 849920 SHA256 c5da4236e57dc152bc8dbb27110a4f504c2525ec079fa285c4f9309a798eca26 SHA512 8e154ea196b34995bc3831c375237a4d98f0627ca79fb6714b66763f64748810e5151efdc40773044a127a0e875ffcc8b985e6f7babd359ae38280a219c4d610 WHIRLPOOL 0a46c5588027ce67777fdfec3b45a27d97c4b95c9cbba9ebdb7704cee5d28b2db29e499ae1f3fcb5d29dec99ec54ade86a1bcaa5f5b8abc178e38768d910ab8d
+EBUILD uftp-3.7.1.ebuild 1079 SHA256 4373816079511c68b820a08baa19a68518ec52187c7229a4ee469f4011fb33a9 SHA512 29499af4e9c9747f56686fd9f39cd79f4af9dccb19560b1470a431a3a6ba1943e60eebc9a6eef760e0e82448474fc0e9e6da757503b4090e8ef3e623a0634ee9 WHIRLPOOL 729042c45c5e8773ee0772575ee701b5973b040bbf90b7c637e63d03caec4980d8112b4ac9679d2b6b764353e3b0be0a354c06ba0e6d56eb4bf7aef651fb5de3
+EBUILD uftp-3.7.ebuild 1074 SHA256 681df0f1465ad2b789b50c7cded12acd411334b2d5b16847c6386dd61395374d SHA512 abe662c5b454aa24d3b001b5fe1b5ac905573a03bd00a75607bbdacd31f98c83da7beb4b5b3b4965982b756c9cffdc4e9369f67463f20ce59b856d4d03250d57 WHIRLPOOL 2d2024b211eb17313d24fefcb904cf415fb945dd415560733d0f644f61990c3c2d4898bd8f55293de2996b9ebd9a4c1e18355daadb9621f1205419e2baf9220a
+MISC ChangeLog 2752 SHA256 fbb4750112e16dcb85a02738fed802f4aab38547677742fb128d30d38ff1a423 SHA512 980f785ef1aef1b6930c1498b46cc9f780857ee03be72e1ef65ba690f15f6dffdc076d208ffa83773b53ee04d56ec2a78ac17b208cfcec322d5b895599608d04 WHIRLPOOL a9b233ba5b2302fea69a179f09d8ca123e42c37789601fbd1a7b3ed2cb82f1fa2d364f9255061bb37ee9d28ac4cb274918d6ff3269b7b42f0163a0201cedfc68
+MISC ChangeLog-2015 669 SHA256 9a0bb9a4202dd9463b33f425a6ba4168163479c9814b1e582d04679d529b181e SHA512 272130205249e5c37dfb5a8ecfbbec24a2528dc2c8ac8e2c9880615c92e963743b072bff714b9edafe41048c4b98dd65d8bf10471d17cd61e29533d015afed10 WHIRLPOOL 2df904a54f9430428e35ea3aa7f0f942d8d028b327afcd04378be7b2ec1036308a3efcaaec20e5f8d17db2502c9b69692e743cc35dc28e08bdd01ac40a4b790e
+MISC metadata.xml 433 SHA256 cf5df0e99a53a8f2ca8e1d8f86291f8a6b66289002ce674b97a62a1fa01fa9c0 SHA512 7e63ff9bed7a90bc94ac2f0441b6f089e5f38d08afb47c5513b09bb6ee2b5fca756a20401d622548c129b540a0b93dba882c38e5ac69dcca9ec72e4c4c9e7686 WHIRLPOOL 4f4bb8a542268c5f791a0e2265525d64cc807bf79ef56513f6d7cf222a148267fb23d2ca8dcd35cd0174ec130d3b68058f872fedb7ba0f13f1e1c41ef52fec85
diff --git a/net-misc/uftp/files/logrotate b/net-misc/uftp/files/logrotate
new file mode 100644
index 000000000000..8dd18f7c2aa9
--- /dev/null
+++ b/net-misc/uftp/files/logrotate
@@ -0,0 +1,16 @@
+#
+#      /etc/logrotate.d/uftpd
+#
+/var/log/uftpd.log {
+	daily
+	rotate 5
+	notifempty
+	missingok
+}
+
+/var/log/uftpproxyd.log {
+	daily
+	rotate 5
+	notifempty
+	missingok
+}
diff --git a/net-misc/uftp/files/uftp-3.7_makefile.patch b/net-misc/uftp/files/uftp-3.7_makefile.patch
new file mode 100644
index 000000000000..81afe8b9baae
--- /dev/null
+++ b/net-misc/uftp/files/uftp-3.7_makefile.patch
@@ -0,0 +1,79 @@
+diff -Nuar uftp-3.7.orig//makefile uftp-3.7/makefile
+--- uftp-3.7.orig//makefile	2012-08-10 17:00:22.566403478 +0600
++++ uftp-3.7/makefile	2012-08-10 17:04:47.523386683 +0600
+@@ -39,25 +39,26 @@
+ endif
+ 
+ # defaults
+-CC = gcc
+-OPTIONS=-g -Wall $(ENC_OPTS)
++CC ?= gcc
++OPTIONS=$(ENC_OPTS)
+ LDLIBS=-lc -lm $(CRYPT_LIB)
+-CFLAGS=
++CFLAGS?=
++LDFLAGS?=
+ 
+ # FreeBSD
+ ifeq ("FreeBSD", "$(UNAME_S)")
+-OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
++OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
+ endif
+ 
+ # OSX, aka Darwin
+ ifeq ("Darwin", "$(UNAME_S)")
+-OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
++OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
+ endif
+ 
+ # Sun
+ ifeq ("SunOS", "$(UNAME_S)")
+-CC = cc
+-OPTIONS=-g -DBSD_COMP $(ENC_OPTS)
++CC ?= cc
++OPTIONS=-DBSD_COMP $(ENC_OPTS)
+ LDLIBS=-lnsl -lsocket -lm $(CRYPT_LIB)
+ CFLAGS=`getconf LFS_CFLAGS`
+ OPENSSL=/usr/sfw
+@@ -65,9 +66,9 @@
+ 
+ # Linux
+ ifeq ("Linux", "$(UNAME_S)")
+-OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
++OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
+ LDLIBS=-lm $(CRYPT_LIB)
+-CFLAGS=`getconf LFS_CFLAGS`
++CFLAGS?=`getconf LFS_CFLAGS`
+ endif
+ 
+ ifdef OPENSSL
+@@ -82,7 +83,7 @@
+ testclient_multi.o: testclient_multi.c uftp.h uftp_common.h encryption.h
+ 
+ testclient_multi: testclient_multi.o encrypt_openssl.o uftp_common.o
+-	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
++	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
+ 
+ clean:
+ 	rm -f testclient_multi uftp uftpd uftpproxyd uftp_keymgt *.o
+@@ -176,16 +177,16 @@
+ endif
+ 
+ uftp: $(UFTP_OBJS)
+-	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
++	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
+ 
+ uftpd: $(UFTPD_OBJS)
+-	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
++	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
+ 
+ uftpproxyd: $(UFTPPROXYD_OBJS)
+-	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
++	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
+ 
+ uftp_keymgt: $(UFTP_KEYMGT_OBJS)
+-	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
++	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
+ 
+ %.o: %.c
+ 	$(CC) $(OPTIONS) $(INCLUDE) $(CFLAGS) -c $<
diff --git a/net-misc/uftp/files/uftpd.conf b/net-misc/uftp/files/uftpd.conf
new file mode 100644
index 000000000000..c38336c54bdc
--- /dev/null
+++ b/net-misc/uftp/files/uftpd.conf
@@ -0,0 +1,8 @@
+# conf.d file for uftpd
+
+# Destionation dir for downloaded files
+UFTPD_DIR="/tmp"
+
+# Options to pass to the uftpd process
+# For more info see man utfpd(1)
+UFTPD_OPTS=""
diff --git a/net-misc/uftp/files/uftpd.init b/net-misc/uftp/files/uftpd.init
new file mode 100644
index 000000000000..38a6ea3779a4
--- /dev/null
+++ b/net-misc/uftp/files/uftpd.init
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PROGRAM=/usr/sbin/uftpd
+PIDFILE=/var/run/uftpd.pid
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting uftpd"
+	start-stop-daemon --start --exec ${PROGRAM} -- \
+		-L /var/log/uftpd.log -P ${PIDFILE} -D ${UFTPD_DIR} ${UFTPD_OPTS}
+	eend $? "Failed to start uftpd"
+}
+
+stop() {
+	ebegin "Stopping uftpd"
+	start-stop-daemon --stop --exec ${PROGRAM} -p ${PIDFILE}
+	eend $? "Failed to stop uftpd"
+}
diff --git a/net-misc/uftp/files/uftpproxyd.conf b/net-misc/uftp/files/uftpproxyd.conf
new file mode 100644
index 000000000000..37c094d7d7ba
--- /dev/null
+++ b/net-misc/uftp/files/uftpproxyd.conf
@@ -0,0 +1,5 @@
+# conf.d file for uftpd
+
+# Options to pass to the uftpd process
+# For more info see man utfpproxyd(1)
+UFTPPROXYD_OPTS=""
diff --git a/net-misc/uftp/files/uftpproxyd.init b/net-misc/uftp/files/uftpproxyd.init
new file mode 100644
index 000000000000..a4b1107d9d0e
--- /dev/null
+++ b/net-misc/uftp/files/uftpproxyd.init
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PROGRAM=/usr/sbin/uftpproxyd
+PIDFILE=/var/run/uftpproxyd.pid
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting uftpd"
+	start-stop-daemon --start --exec ${PROGRAM} -- \
+		-L /var/log/uftpproxyd.log -P ${PIDFILE} ${UFTPPROXYD_OPTS}
+	eend $? "Failed to start uftpd"
+}
+
+stop() {
+	ebegin "Stopping uftpd"
+	start-stop-daemon --stop --exec ${PROGRAM} -p ${PIDFILE}
+	eend $? "Failed to stop uftpd"
+}
diff --git a/net-misc/uftp/metadata.xml b/net-misc/uftp/metadata.xml
new file mode 100644
index 000000000000..2a33d8eedc97
--- /dev/null
+++ b/net-misc/uftp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>azamat.hackimov@gmail.com</email>
+	<name>Azamat Hackimov</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<use>
+	<flag name="server">Install uftp server daemon</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/uftp/uftp-3.7.1.ebuild b/net-misc/uftp/uftp-3.7.1.ebuild
new file mode 100644
index 000000000000..21d1dd7ac57d
--- /dev/null
+++ b/net-misc/uftp/uftp-3.7.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Encrypted UDP based FTP with multicast"
+HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html"
+SRC_URI="http://www.tcnj.edu/~bush/downloads/${P}.tar"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+server ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.7_makefile.patch"
+}
+
+src_compile() {
+	use ssl || local opt="NO_ENCRYPTION=1"
+	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
+	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
+}
+
+src_install() {
+	dobin uftp uftp_keymgt
+	dodoc ReadMe.txt
+	doman uftp.1 uftp_keymgt.1
+
+	if use server ; then
+		dosbin uftpd uftpproxyd
+		newinitd "${FILESDIR}/uftpd.init" uftpd
+		newconfd "${FILESDIR}/uftpd.conf" uftpd
+		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
+		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
+		doman uftpd.1 uftpproxyd.1
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/logrotate" uftpd
+	fi
+}
diff --git a/net-misc/uftp/uftp-3.7.ebuild b/net-misc/uftp/uftp-3.7.ebuild
new file mode 100644
index 000000000000..4ce34926ad04
--- /dev/null
+++ b/net-misc/uftp/uftp-3.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Encrypted UDP based FTP with multicast"
+HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html"
+SRC_URI="http://www.tcnj.edu/~bush/downloads/${P}.tar"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+server ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}_makefile.patch"
+}
+
+src_compile() {
+	use ssl || local opt="NO_ENCRYPTION=1"
+	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
+	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
+}
+
+src_install() {
+	dobin uftp uftp_keymgt
+	dodoc ReadMe.txt
+	doman uftp.1 uftp_keymgt.1
+
+	if use server ; then
+		dosbin uftpd uftpproxyd
+		newinitd "${FILESDIR}/uftpd.init" uftpd
+		newconfd "${FILESDIR}/uftpd.conf" uftpd
+		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
+		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
+		doman uftpd.1 uftpproxyd.1
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/logrotate" uftpd
+	fi
+}
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
new file mode 100644
index 000000000000..086a368e1c6b
--- /dev/null
+++ b/net-misc/unison/Manifest
@@ -0,0 +1,11 @@
+DIST unison-2.48.3-manual.html 278156 SHA256 500d8f83770fc3b07cf443dfb1579281d4379002d51523aa73451e03f6cdbe1a SHA512 50924c624abd86f231ad8cbcfd4e383322a55733108685255df21df6da26d9ad1ac7d4f7d7dcd82faf4696f3f0136c0ff3c8cf5ffda4042f63451f2b7c8e9502 WHIRLPOOL 9a48a23049cd8753ebfd71e2f396107039b1fdc76877a8dc4f229ef8dda6a9481b80156e66c27015c96e7a752dedb2ca7781f42c01a8839ec0361f150910dfcd
+DIST unison-2.48.3-manual.pdf 516703 SHA256 cba2946656e04b856d98184b539e382ed85d987d24458a39e156946125f7b578 SHA512 3a16d6e0df6370784f960d37749f56a223c5eaab24ded299f6a61058f7692139239d0d64436d93268b4cbd8031de6139e187aca0beb54345a615e71253bce977 WHIRLPOOL fd57fec2e5a2605bca216bc4ae441ecd122faa26cd5abdfb39ea19ca4f44961691d266e86b702536dd7326b4072718d9c67739d7a264f9b4127330a41aff6823
+DIST unison-2.48.3.tar.gz 1172646 SHA256 f40d3cfbe82078d79328b51acab3e5179f844135260c2f4710525b9b45b15483 SHA512 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d WHIRLPOOL a903f1f5e996655e3e001f33b959d839d2540d0a5c0584fded7aa483a774d8b07b3e7997357f03426f41ef6505cf3d40dec18616252c02add4a417dfef4c8df4
+DIST unison-2.48.4-manual.html 278110 SHA256 2b5674e2fd7751148784a716ce5a03f8cd0a321c8a3bd4343832ed9b83d2d404 SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68 WHIRLPOOL c843519b90faf440e1ef6c2a5cd2e4a64fe7044e76f55be26ca61ff54d8ca0ee5f4c2e9e827df27a2af03351d1532ccb22a36010f0420cd7ee476dc451650e6f
+DIST unison-2.48.4-manual.pdf 516093 SHA256 eaf9bf89967eb17c59b98f0a7ba6b6ff260b6c6de73277a633d954ceb42f5f93 SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9 WHIRLPOOL a2fd465e13c7d5832684e2ddf194c24d5e4e278ed5c8b53f2e7acac8f4ae2810bf74a3db0674ef73e2a686cf3a66db5b28dbf1320f78b8dc7568ee3cec4cd152
+DIST unison-2.48.4.tar.gz 1200861 SHA256 30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8 SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024 WHIRLPOOL 73d8637106cf43ab945a026310276f3636867f609e7d4491a80ff4b7dc98d5d737ee56d00987253e98200e13d971d09e41164b40283530df19f681000bf4733e
+EBUILD unison-2.48.3.ebuild 2194 SHA256 a6555a1aabf065cfce0101802d7385f8a76589682994e8caa846f60a0c8339f0 SHA512 602cfa6731ff3844c5abdd03b8b4e4e327fc80ac9c1aee7fd8a8292c81f880472748741f09e4ec43ddab71e739036a4f494c0eafd38073a535cd160eb3ef09d7 WHIRLPOOL 6df006c0a6a76bd3551ca6a153cfdb29a512fb9ec5d47623163927638965abb7f0f46395a146cb3412fd776aa356d59d6d8fee3fa893406bf2ad15444d772aaa
+EBUILD unison-2.48.4.ebuild 2249 SHA256 a91add94c8ec4135620cbfacd6115e9b17860276a6f7c7581ee628b12fa352c9 SHA512 e3513c2b6bc46df34fb68103b6fb785093ba2b9252a7f0481701de6fd04b5a2d162ef1f66f4f3c9759d82b2c28884501c494a4ff095f28c658ebfee2d08c36ff WHIRLPOOL c852a3501b39a1a850914ab8d31f4a156ca9ba6ba538833e34ae0bac067400431c884ce669c72246588b05013a7a2a866529cdf13ebed0c4ae18f6ac2cd388a3
+MISC ChangeLog 3687 SHA256 1f9c193957af831b7449b5ae18693fc3c77b1649b40f3c68cfec96bf0d5d27bb SHA512 33f8b1bfe50e5985ea2eb55954f67c87f480838b90440733add0bcfc8a78c7aeb654b0064084c99ea75529acb830c21558c47f752f4370cae85a5d78c7617d15 WHIRLPOOL 1a68015e6b2bdfbe155654bb2df94865778eed82a09a10fd2a7878dc77d4b1582d75058807069d7d925d5b581a21b37aad7c2f602c736dff986da6f892b563a1
+MISC ChangeLog-2015 11268 SHA256 d7c0324a2251676c6453a0713a9e00536bc2be8ea0ef0f99cbf392cb03e96de6 SHA512 58044c03a0d728fb0a85b87c2e2b2794151e00699c52d51661b967b52b0b47ad281fcef717af19ade76fd63c80ffc642d3bb54a24665fbbcc72153c46dfe5d16 WHIRLPOOL 069d779860f2d062bf1ec186a9eee52fa77daa17145a7e0715baf6433663d6828c46919d50ad93ad42613a8783173d6fc854459d3b46e7d089182b9dd72d1c2f
+MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/net-misc/unison/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/unison/unison-2.48.3.ebuild b/net-misc/unison/unison-2.48.3.ebuild
new file mode 100644
index 000000000000..19d3bb695fb9
--- /dev/null
+++ b/net-misc/unison/unison-2.48.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils versionator
+
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
+LICENSE="GPL-2"
+SLOT="$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+	gtk? ( >=dev-ml/lablgtk-2.2 )
+	test? ( || ( dev-util/ctags virtual/emacs ) )"
+
+RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	!net-misc/unison:0
+	app-eselect/eselect-unison"
+
+#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
+
+SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+	doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+		http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
+
+src_compile() {
+	local myconf
+
+	if use threads; then
+		myconf="$myconf THREADS=true"
+	fi
+
+	if use static; then
+		myconf="$myconf STATIC=true"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
+
+	if use gtk; then
+		myconf="$myconf UISTYLE=gtk2"
+	else
+		myconf="$myconf UISTYLE=text"
+	fi
+
+	use ocamlopt || myconf="$myconf NATIVE=false"
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake $myconf CFLAGS="" buildexecutable
+}
+
+src_test() {
+	emake selftest
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	newbin unison unison-${SLOT}
+	dodoc BUGS.txt CONTRIB INSTALL NEWS \
+		  README ROADMAP.txt TODO.txt
+
+	if use doc; then
+		dohtml "${DISTDIR}/${P}-manual.html"
+		dodoc "${DISTDIR}/${P}-manual.pdf"
+	fi
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+}
+
+pkg_postinst() {
+	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
+	elog "in your profile files to access exactly this version over ssh."
+	elog "Or you can use 'eselect unison' to set the version."
+}
diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
new file mode 100644
index 000000000000..3a685747ee20
--- /dev/null
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils versionator
+
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+LICENSE="GPL-2"
+SLOT="$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND="dev-lang/ocaml[ocamlopt?]
+	gtk? ( dev-ml/lablgtk )
+	test? ( || ( dev-util/ctags virtual/emacs ) )"
+
+RDEPEND="gtk? ( dev-ml/lablgtk
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	!net-misc/unison:0
+	app-eselect/eselect-unison"
+
+#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
+
+SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
+S="${WORKDIR}"/src
+
+src_compile() {
+	local myconf
+
+	if use threads; then
+		myconf="$myconf THREADS=true"
+	fi
+
+	if use static; then
+		myconf="$myconf STATIC=true"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
+
+	if use gtk; then
+		myconf="$myconf UISTYLE=gtk2"
+	else
+		myconf="$myconf UISTYLE=text"
+	fi
+
+	use ocamlopt || myconf="$myconf NATIVE=false"
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake $myconf CFLAGS="" buildexecutable
+}
+
+src_test() {
+	emake selftest
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	newbin unison unison-${SLOT}
+	dobin unison-fsmonitor
+	dodoc BUGS.txt CONTRIB INSTALL NEWS \
+		  README ROADMAP.txt TODO.txt
+
+	if use doc; then
+		dohtml "${DISTDIR}/${P}-manual.html"
+		dodoc "${DISTDIR}/${P}-manual.pdf"
+	fi
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+}
+
+pkg_postinst() {
+	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
+	elog "in your profile files to access exactly this version over ssh."
+	elog "Or you can use 'eselect unison' to set the version."
+	eselect unison update
+}
diff --git a/net-misc/unix2tcp/Manifest b/net-misc/unix2tcp/Manifest
new file mode 100644
index 000000000000..4618457b9935
--- /dev/null
+++ b/net-misc/unix2tcp/Manifest
@@ -0,0 +1,5 @@
+DIST unix2tcp-0.8.2.tar.bz2 29636 SHA256 aff16bf2873862badeef532d829dee5029f6e921138afdc82a8de6024ed042bb SHA512 0f46895b1693065b592915574142c6475d79701c2f2eca70cfb40603849af9bdb6be939119fcca1d50d069ace940da691cf554a33eb2ac357194cf729b2c7a20 WHIRLPOOL 5086491e72a667b6032a8f4937c581f095dbff8a9bec99ab98b30650b26633f0cbc066c5904163d035a796bebc0593910f3c13f8a60703d0cbdbd8f1f678d509
+EBUILD unix2tcp-0.8.2-r1.ebuild 400 SHA256 4a46f99d46ff4072c1c252c62dbd513fb90eed33fa40845232140160c63c3746 SHA512 098d350d8268a73598db18c6c86c348ba1bfc5bff0c94daae0785db71f86b417b0470e530861bd6880cd339c73a792167c4859e8e991de92a9f65983c2d71401 WHIRLPOOL a2fd1e4642bb7f5bc9e23f0add0e49b7a09e6d74e40672fb8866af1544c761c06084dcc1ffe55ffd9a0dd5ff3bec643c4cd563897e07ccdbee0332ef3e800c5d
+MISC ChangeLog 2525 SHA256 e278db2de30ae6cfd0d984ef9797701b8f1040326974c4b74aac30ac717728d5 SHA512 b4e782d6a322ffa1a28b24d6a2d139d8e0d3e5ff46ee6bcee4474c295556a1e181a277300fbbfc41fd36a860db99ecc8c3ca23d67e19d48fa1ca45c88bf00509 WHIRLPOOL 4f918921c6bed40249077532e6e979fc24ad64310ca2962f526b4d2f2a4255d8d57658995da29ab7e078a7eb64a535164823121fab5d139dbfe9af59ed426e97
+MISC ChangeLog-2015 1755 SHA256 c3eb4085e37d5c43d45c565d0bdc90261636a3794d342e80c7748106ae2cb2ca SHA512 614f68c82bbbcffe9cd9bbfdc2c84b7adafdd48abf7f5ab38bb996805d25fa2b74199224e350a56218d42d02bda15b0e2621bcf89ef9ed55662fc6754e8e0971 WHIRLPOOL a93856a9f12641da3c9da8503d6f278e946bf00384879d29c146ed263ddb72a283589a8b099036fe709db6d0727ef8ccd06a48228b122946775e969beef9a250
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/unix2tcp/metadata.xml b/net-misc/unix2tcp/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/unix2tcp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild b/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..07e7bdfb2d2a
--- /dev/null
+++ b/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a connection forwarder that converts Unix sockets into TCP sockets"
+HOMEPAGE="http://gnu.gds.tuwien.ac.at/directory/all/unix2tcp.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ppc s390 x86"
+
+DOCS=( ChangeLog README )
diff --git a/net-misc/urlview/Manifest b/net-misc/urlview/Manifest
new file mode 100644
index 000000000000..5562d08e9d06
--- /dev/null
+++ b/net-misc/urlview/Manifest
@@ -0,0 +1,9 @@
+AUX include-fix.patch 165 SHA256 b6b8525bd8e08ae93ab325b92ec847fc3821e2335aa49ffd2411ba1ae2108cba SHA512 7105a53ffba98beb253bd2ebdb3096875df62561c028c250c8ff172793b54a81ea553223b375aefd4e97a0edf054921f8bab5e8c58d0357cd33c6782e06cf4a8 WHIRLPOOL e6351af7b28bd6fbc10b5cec20e1c5d23de291316139a5677d42652520d4209f6face3e49c9a0350ef6c7617a5c87eb03275316700058697a8098dac8ce765bb
+AUX no-trailing-newline.patch 459 SHA256 a222d3d8f047d798c529685f1ac93748b0bbc246d87a7f1cbee36f9713ff36b5 SHA512 e7591e9ba4d691cf642262603ec78bed053595cc7af5baf91d8258900eaf76046cd41da94d7fb3a65c12a34305f27e6c69d01ef1c2ba55e9abdce8f068a11c46 WHIRLPOOL 0a1f2804f9d547144fbaffacd2a5775578edc4afd27b57cdc6c3136acdb7734644f53f8deac236c2d117bcd643bdfece9a6ab3cb0338181af0ef198af84a1e35
+AUX urlview-0.9-DESTDIR.patch 630 SHA256 9f4c274803262e54ab993c5f7210bd30844edc25f58700bc0a93eb326295dfcf SHA512 9093b720325c3c982281121caece9ea3c59168abadcb7c82213095846378f966e0f9000fa4b4ced6f0eb50633a1fd2c7d13d7dc896a631f2309e8f00d0150c4d WHIRLPOOL 789457fab8038a8c0ff5c9f3a52afa82021f586c6d653122af7cac5f21dfd3733431ccd06a155ac3b0aa082d3acb17489cff53bc495df8b49db466bb7cf93e24
+AUX urlview-0.9-tinfo.patch 642 SHA256 1046bfb6af7ce44c31c9952dca9036a2811583861bdca356a38893f57f48c88d SHA512 600c63d4de91f5d149ff8b0ce9ae4196e9a8a8de0627dce177d9be949dc223cc18d38b3262411380b6ec82b16722c5c85d4e4abe35143993d2d0b5341ae6e71e WHIRLPOOL 357dda69b364e116f2ccf9ad89fce2003c57d8682396669234403a6ad578824e3bbfc0372cf5892c25cd1bc23ecf85f74a09032042b621d1158895e6ff451bab
+DIST urlview-0.9.tar.gz 46685 SHA256 74d18026e84e3cd70a3fdd1a7247a68031b0c1c1c6d761d64b7063ff71091cc3 SHA512 5415c30e34f429c78001b1e87a75a43503d1998b667eaac66dc49298ea491914c6360baba33b5caeeb4ad54e3a4533a46afc05de3b1f135e41069d00fad0936a WHIRLPOOL 1a6311a5ca0675dc937b0875ca4d4955644c7f875e79dfda2db593499fa5bf1ec006db6c118d6f086aae462dcb5f3f3ec114645f5d6d3dd4d42b33625b30a1af
+EBUILD urlview-0.9.ebuild 1052 SHA256 fefccd9e0a5defc10fc00319b114deba43b551805ae1f1c5552a0ed94699edae SHA512 85b370f805bd1d9bf238f185268bd6e198af7cf03c14ff652ffe6b3b63724335182035c31730667b1b5a04b4c1aa98bdf03df562cb858ce2b050c2e292c047fe WHIRLPOOL b4a388f0beb0d568b266c2b8c0e53322b87ea2cdac11519c8553fe2e68ff7aae7faaf9a89995af0bf51ede80c5afc6970909efc74cbef9b4a84a7cc8b6a34ec4
+MISC ChangeLog 2300 SHA256 fa1d61b8947a3221878918f88718021e98cf063585bd81e8852b5f002eef727d SHA512 c968de2296324a1502e5f8295ad074e0025a4c05bc6bab30e412577a7664da6658232fcd4d3d7dda5691d8d202f3d9fd880149472e8421dc48ce33a0b0e7a56f WHIRLPOOL 8ca27db859898e5802f12c73afb5b562af212a24bad383f059c9b4988d6c2f14d0461b5324c005e672e50bc3c9f0aa36340574d8c73c2c5636952bef162aea96
+MISC ChangeLog-2015 2983 SHA256 b382925a00f8b636641c007185e9f32d938095256418a447f5a2eb90e935e608 SHA512 7a799bdc982e284ef7c23243d32f5225d697b8f109ab0bf831b9bc49682ce6492d4bc878170529b7259fa8f1eaa0581512634c3d17d8b3471549ea19eeb97302 WHIRLPOOL 975c550aefde3d3cd3cf9786337e3eb788e85fc1c08658cbc7f883a5bc42b41ad83d83c8ecd33214231382d06984d7c5640458eceff3cd166cfb6441625406cc
+MISC metadata.xml 734 SHA256 145522355ad1825bed35c34bf2403123fe6a682b26ff708043b1f23a0ceb7071 SHA512 d3e459db10e0ca8b736c3850dd4adcdc9289ebed4b6cfea8f9feeb5bab1e4642d6d98e12c03dfd6483192f3827a9c129ae9ca47a87eb330560a81028d8f4ed07 WHIRLPOOL 9f1b4c0f1b2c317acac71e975eee2abc85f98dbafefe3c397287fd1c62700dc22b423e9142e9624a493a704d9fae3b0973c88b45864ae90e7e92c91abfd41229
diff --git a/net-misc/urlview/files/include-fix.patch b/net-misc/urlview/files/include-fix.patch
new file mode 100644
index 000000000000..b9bb6ab46992
--- /dev/null
+++ b/net-misc/urlview/files/include-fix.patch
@@ -0,0 +1,11 @@
+--- a/urlview.c
++++ b/urlview.c
+@@ -40,6 +40,8 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ 
++#include "quote.h"
++
+ #ifdef HAVE_REGEX_H
+ #include <regex.h>
+ #else
diff --git a/net-misc/urlview/files/no-trailing-newline.patch b/net-misc/urlview/files/no-trailing-newline.patch
new file mode 100644
index 000000000000..6d78cd4ed073
--- /dev/null
+++ b/net-misc/urlview/files/no-trailing-newline.patch
@@ -0,0 +1,11 @@
+--- a/urlview.c
++++ b/urlview.no-trailing-newline.c
+@@ -46,7 +46,7 @@
+ #include <rx/rxposix.h>
+ #endif
+ 
+-#define DEFAULT_REGEXP "(((https?|ftp|gopher)://|(mailto|file|news):)[^' \t<>\"]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \t.,;<>\"\\):]"
++#define DEFAULT_REGEXP "(((https?|ftp|gopher)://|(mailto|file|news):)[^' \t<>\"]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \n\t.,;<>\"\\):]"
+ #define DEFAULT_COMMAND "url_handler.sh %s"
+ #define SYSTEM_INITFILE "/etc/urlview.conf"
+ 
diff --git a/net-misc/urlview/files/urlview-0.9-DESTDIR.patch b/net-misc/urlview/files/urlview-0.9-DESTDIR.patch
new file mode 100644
index 000000000000..8c4cfe816b63
--- /dev/null
+++ b/net-misc/urlview/files/urlview-0.9-DESTDIR.patch
@@ -0,0 +1,23 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,6 +11,7 @@
+ CLEANFILES = *~ *.orig *.rej
+ 
+ install-data-local:
+-	$(INSTALL_DATA) urlview.man $(mandir)/man1/urlview.1
++	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
++	$(INSTALL_DATA) urlview.man ${DESTDIR}$(mandir)/man1/urlview.1
+ 
+ # how to create a target for uninstall-data-local???
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -318,7 +318,8 @@
+ 
+ 
+ install-data-local:
+-	$(INSTALL_DATA) urlview.man $(mandir)/man1/urlview.1
++	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
++	$(INSTALL_DATA) urlview.man $(DESTDIR)$(mandir)/man1/urlview.1
+ 
+ # how to create a target for uninstall-data-local???
+ 
diff --git a/net-misc/urlview/files/urlview-0.9-tinfo.patch b/net-misc/urlview/files/urlview-0.9-tinfo.patch
new file mode 100644
index 000000000000..e8f3886a4d0e
--- /dev/null
+++ b/net-misc/urlview/files/urlview-0.9-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/configure.in
++++ b/configure.in
+@@ -3,6 +3,8 @@
+ dnl AM_CONFIG_HEADER(config.h)
+ AM_PROG_CC_STDC
+ CFLAGS="$CFLAGS -DURLVIEW -Dunix"
++
++PKG_CHECK_MODULES(ncurses,ncurses)
+ AC_ARG_WITH(slang, [  --with-slang[=DIR]      use S-Lang instead of curses],
+ 	[AC_DEFINE(USE_SLANG)
+ 	if test $withval = yes -a -d ../slang; then
+@@ -22,8 +24,7 @@
+ 		fi
+ 		LIBS="$LIBS -lslang -lm"
+ 	fi],
+-
+-	[AC_CHECK_LIB(ncurses, initscr, [LIBS="$LIBS -lncurses"], [LIBS="$LIBS -lcurses"])
++	[LIBS="$LIBS $ncurses_LIBS"
+ 	AC_CHECK_FUNCS(curs_set)
+ 	AC_CHECK_HEADERS(ncurses.h)
+ 	AC_CHECK_HEADER(ncurses/curses.h, [CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"])])
diff --git a/net-misc/urlview/metadata.xml b/net-misc/urlview/metadata.xml
new file mode 100644
index 000000000000..24ae812e9c0b
--- /dev/null
+++ b/net-misc/urlview/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>nimiux@gentoo.org</email>
+    <name>Chema Alonso</name>
+  </maintainer>
+  <longdescription lang="en">
+    urlview is a screen oriented program for extracting URLs from text
+    files and displaying a menu from which you may launch a command to view
+    a specific item.
+  </longdescription>
+  <longdescription lang="es">
+    urlview es un programa orientado a terminal para la extracción de URLs
+    desde ficheros de texto. El programa muestra un menú desde el que se
+    puede lanzar una orden para ver un elemento en particular.
+  </longdescription>
+</pkgmetadata>
diff --git a/net-misc/urlview/urlview-0.9.ebuild b/net-misc/urlview/urlview-0.9.ebuild
new file mode 100644
index 000000000000..0303d4e33c6a
--- /dev/null
+++ b/net-misc/urlview/urlview-0.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="extracts urls from text and will send them to another app"
+HOMEPAGE="http://www.mutt.org"
+SRC_URI="ftp://gd.tuwien.ac.at/infosys/mail/mutt/contrib/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/no-trailing-newline.patch \
+		"${FILESDIR}"/include-fix.patch \
+		"${FILESDIR}"/${P}-DESTDIR.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc README INSTALL ChangeLog AUTHORS sample.urlview
+	dobin url_handler.sh
+}
+
+pkg_postinst() {
+	echo
+	einfo "There is a sample.urlview in /usr/share/doc/${P}"
+	einfo "You can also customize /usr/bin/url_handler.sh"
+	echo
+	einfo "If using urlview from mutt, you may need to "set pipe_decode" in"
+	einfo "your ~/.muttrc to prevent garbled URLs."
+	echo
+}
diff --git a/net-misc/usbip/Manifest b/net-misc/usbip/Manifest
new file mode 100644
index 000000000000..9385438dc597
--- /dev/null
+++ b/net-misc/usbip/Manifest
@@ -0,0 +1,5 @@
+DIST linux-3.19.tar.xz 81688872 SHA256 be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c SHA512 d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c WHIRLPOOL 76a17bb3d7c30cee19e135940f3607106efb2984061f946f0da9a2ddd602dc1bfc7e6f8970975cfb113d13f23a75415f39938204af266e2819e7a239b6f46778
+EBUILD usbip-3.19.ebuild 1172 SHA256 dc26724d504beae3c92536ee91da1bf5f8f04207743cc077ffce82b39ca23e2d SHA512 2ae1c607c46d61ec1a85a530ebc3a3631788477d16c5372e8e54e15e5b9255130f6529ebcf42235f413df7a6ac5f844ce711d3332cc39155dfe637f53d6f2515 WHIRLPOOL 7ff42355a146207f91c146ad9235b0924cb5eeccebb234445a40dfc3ea44ff62e5b29e2049f474a52c6f616f827851663874e3d7eab22ca91f532cd435588756
+MISC ChangeLog 2720 SHA256 b0d3076e08ea63cbcce965c8b0a8db17455de678c81a61bd621b17b5fa2f6da3 SHA512 806f20291e90ecebf038bcc43b5fab7b14eae234c23ae944ae0e1b2ed497d61e3bbd2b48beefcc18cb6aeef7f8b3bea837d308d6fd35c5e3beb9473836903475 WHIRLPOOL c1843561863605d9901c8649b3017b5b433b3635e45b1e4fb390c2beb3cae08ede4c0e1e7d6016de93b5f3625fc57c79c48af40423c34c225e04da3ca48808a9
+MISC ChangeLog-2015 1213 SHA256 a3b8f3f43b010e3aafd93ee9ef08ca2d69d2e13ed460bfcf825dfccc386a59e3 SHA512 79b94ebd298d2511add290a452aa08ec6744216cf813cba047d51b5c117de3a03f5efbeaf14f33282992432a1520aef035093f8e0f502a081be2c27e2a8b957c WHIRLPOOL f4ec7c42585ca48549bf2f2b07db6509b6e2f4efdc581c181160f69e6fbd8cf0e67a78a2f11ea4820f776918a2aa5b5f5d6c3d62b943834c37bf888e9af2d11d
+MISC metadata.xml 266 SHA256 76cc9d0b53488ed4cb6c14c37b32f0d5ee6a337e209f13dcdacdfbc0c8750bba SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5 WHIRLPOOL 8361293f9fb11196804aafba7dff1ac177d9a5fe90d232ec69186838edd7796fd30f7ed56091753e04a68ac71b32be6c700b402fc1c7cb0774a71ffb90f349a7
diff --git a/net-misc/usbip/metadata.xml b/net-misc/usbip/metadata.xml
new file mode 100644
index 000000000000..6dde16e5c4b6
--- /dev/null
+++ b/net-misc/usbip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chithanh@gentoo.org</email>
+		<name>Chí-Thanh Christopher Nguyễn</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/usbip/usbip-3.19.ebuild b/net-misc/usbip/usbip-3.19.ebuild
new file mode 100644
index 000000000000..b2df8e2613cf
--- /dev/null
+++ b/net-misc/usbip/usbip-3.19.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ETYPE="sources"
+K_NOUSENAME=1
+inherit autotools eutils kernel-2
+
+DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI="${KERNEL_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs tcpd"
+RESTRICT=""
+
+RDEPEND=">=dev-libs/glib-2.6
+	sys-apps/hwids
+	>=sys-kernel/linux-headers-3.17
+	virtual/libudev
+	tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS README ../../../drivers/usb/usbip/usbip_protocol.txt"
+
+S=${WORKDIR}/linux-${PV}/tools/usb/${PN}
+
+src_prepare() {
+	# remove -Werror from build, bug #545398
+	sed -i 's/-Werror[^ ]* //g' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use tcpd || echo --without-tcp-wrappers) \
+		--with-usbids-dir=/usr/share/misc
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
+	elog "machine's kernel config and USBIP_HOST on the server."
+}
diff --git a/net-misc/utelnetd/Manifest b/net-misc/utelnetd/Manifest
new file mode 100644
index 000000000000..4bc1758ce82f
--- /dev/null
+++ b/net-misc/utelnetd/Manifest
@@ -0,0 +1,6 @@
+AUX utelnetd.initd 349 SHA256 0ae7bc897ab064fc23c6b2d44d5e8366cce6f1965d6fb56c22ebd29815cc0df1 SHA512 543f888cc0016bf374106bdc09504e15ad9eb2db67bc8c98c386ad50564bd24a9e481a977314c9a8734a9c8b43af26c20df36525ff249f8c6f0ef87344afc248 WHIRLPOOL 9d0871573c3023e5fee6af159e8c985c01adfa2679e9c596600221487d0515cc19f462e420689bef892cfc073af1fadac2eb72527668858f740351b7cd8df7e8
+DIST utelnetd-0.1.11.tar.gz 14548 SHA256 f7c8dc19351612d7c49fd2b1bc30cfb33b7fe24f183ba5e5d9bcb468e3757cd8 SHA512 96b34cba5b007ae0114810a1f7ef348b4db0f210b6f6a76b056420d4c7aa2c8f862253924d21add98d9db7736f9acb61a08084ddee7b8bfa1d4012776a0bb2db WHIRLPOOL f319f013fae1734132a0f93e7688e8a77389112104313cd4c9c91b4af9711f61789dc5acddfc8fabeeb3992aff48360ce1ce61c67376570027cacb14833ecfe5
+EBUILD utelnetd-0.1.11-r1.ebuild 694 SHA256 f988be9e7075b0284ff61e4d9b1e3e0e8cff20c3568f5ece2c6d69d07b9bc8aa SHA512 88084e00627f0a225882751f82ec4029c8c60243fae1a2819cd2e5419db1df55f2a1a6f7dec37bd600d7295408ad5b3a2a05c9a35572088774013f3ee0612c93 WHIRLPOOL f998534fbabd87db76178013c2f879c0a23e96312f45023228f2abf607bba6b0faff5d2aa4e249b16b1c73fe0642346c74cf8eeca6f96cd5414996df5a2ff551
+MISC ChangeLog 3301 SHA256 fd685b1466e2d655e9d4c5eaef82ee8996c71c10407a9f8887fe6f7398f3a283 SHA512 209fb8169fe160b3db9bb2d3be468c818740d291adc3d4376824031da54c5e64eb0e1623126fc06e74ce553e197b600aaf16dbdb26dc416be144fd1fdbdd9856 WHIRLPOOL 814877e9cd3b872cedbefe9e6ce7b757ca535ac34d965fcef00ca8125a97a2caef0410f1b205456b39d50b495ee39ddc008da40ef0e0105256fc08371e640a35
+MISC ChangeLog-2015 1534 SHA256 32318920679ecaa6f767257a4859205fb4cc159109f06fbcf3e6bd03400c66fa SHA512 87135f153d5b7d91a6569ec5cbf2843d22414c7835c218afe1852f54787ee9b3a3b735efed3bb47456147aadfa1d2cb7d929094835dd4b4e832bb650a13c94ff WHIRLPOOL 143c071c33b52bf3588a1bb92d369496b98bb08ee069f3318eebca2f8c2eb0847ca7697182def22e189add1cd1358a0363ade635587a942b018dd06e96e15365
+MISC metadata.xml 279 SHA256 a7a4477e5b86d816e92fa83305658842e0b5690dcd8fa6c9a9c564e7c665ec79 SHA512 58476718e664a2bb8b9cd57b1c056fa9dc2513ee3410f406cacc8963693ed032f77b4ab6de5dc4362084220f9df6058575a49d770c86a6d56673d388dc6c0c2e WHIRLPOOL b9cd1830ec69166218d39e4ebbf6f4a2a654a7924d77925c245ec9ef92ab7ba18ad88a5cfc2ac5b7d89c81f2b6b913981f168631cf5488ed00fd1158055b395c
diff --git a/net-misc/utelnetd/files/utelnetd.initd b/net-misc/utelnetd/files/utelnetd.initd
new file mode 100644
index 000000000000..35bea850d64f
--- /dev/null
+++ b/net-misc/utelnetd/files/utelnetd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	ebegin "Starting utelnetd"
+	start-stop-daemon -b --start --quiet --exec /usr/sbin/utelnetd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping utelnetd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/utelnetd
+	eend $?
+}
diff --git a/net-misc/utelnetd/metadata.xml b/net-misc/utelnetd/metadata.xml
new file mode 100644
index 000000000000..8798e9059242
--- /dev/null
+++ b/net-misc/utelnetd/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>This is a small telnet daemon for standalone use, mostly on embedded systems.</longdescription>
+</pkgmetadata>
diff --git a/net-misc/utelnetd/utelnetd-0.1.11-r1.ebuild b/net-misc/utelnetd/utelnetd-0.1.11-r1.ebuild
new file mode 100644
index 000000000000..4d3e7fdfa6f1
--- /dev/null
+++ b/net-misc/utelnetd/utelnetd-0.1.11-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A small Telnet daemon, derived from the Axis tools"
+HOMEPAGE="http://www.pengutronix.de/software/utelnetd/index_en.html"
+SRC_URI="http://www.pengutronix.de/software/utelnetd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/shadow"
+
+src_prepare() {
+	sed -i \
+		-e "/(STRIP)/d" \
+		-e "/^CC/s:=.*:= $(tc-getCC):" \
+		-e "/fomit-frame-pointer/d" \
+		Makefile || die
+
+	default
+}
+
+src_install() {
+	dosbin utelnetd
+	dodoc ChangeLog README
+
+	newinitd "${FILESDIR}"/utelnetd.initd utelnetd
+}
diff --git a/net-misc/valve/Manifest b/net-misc/valve/Manifest
new file mode 100644
index 000000000000..adeb0a743c32
--- /dev/null
+++ b/net-misc/valve/Manifest
@@ -0,0 +1,6 @@
+DIST valve-1.0.tar.gz 272182 SHA256 508ba6854cf3b7b1c1ad9b1a217e7e2a5191953397977e5bcd69c3d953ab6f4a SHA512 116d3c6c400ad523c1c40cf592f56a43e0920ea0b0b2436d8f6185f4664adbc79c30e0cec63ccf922e5998357138a5b50a7e7bb2d9d0b77cbd054d8d1a5ffc12 WHIRLPOOL d42c8f341d39f59de1a7db2c6d370fdec3f688ef4ee0eb0f00839d2a5f241f4a61a18506768c71939cc9bbc42b1e73adbf3a78d12f7509852f21f5637e394845
+EBUILD valve-1.0-r1.ebuild 594 SHA256 d7016b4fc41a59bae8569294df4c7711a1118b2c671275534cf93ae3469a6834 SHA512 7d618e4511a4d2e2f145b415baeb21951a619be1abe10dd0d8b3ebb2a569ab1d65cc577a662d525e3b02489aa226d0857854ee83b4fb6b6de8ef50e66d772a1e WHIRLPOOL 839635e2acbbae9cba2f752654502161096c6bb974e4ff6e83674985bbb414b4e2399bb78eb3f109da959a32cad260a4e22f996f5c3783518ed102d2a208e6f6
+EBUILD valve-1.0.ebuild 647 SHA256 99d2b12aaee57ef11074c567ace3b2cc5c132e389fe7960c38af3ee7ee9787c3 SHA512 0fbc3d6e28a85b13264fcfb81604aebf8953a447bcf9b142083227ee2cfe32b763512f936ce5d67383de09bebb2316eb224112b4e0fa5d73baa1d3a1111ea5f9 WHIRLPOOL 829a85a088f3a1af560a7297e7c0d1f6e5bba959e91e8978d29387c985188b3109fc0b49e76a5385b876daaca558514e0d3ac6dc43281401038a3b4e9f678dd4
+MISC ChangeLog 2166 SHA256 8ff020bc183ec7e67ba46c72ac77ea8222d6096b6d0ee7444492f7f7fd524241 SHA512 6a26630709a3268714b6dce7667deda9743bc3ff3a8da5a2a46af7793e831573ddee39e8ab168d7ab1c9810d98ff9bb8777820851e4bffe7f9a8a01bfdca4fb2 WHIRLPOOL 2d3badca24bd1402de32a4908699008da9312878422171fb4e3440534974e8f2b5e31a355c9a545f5d4c541e825dab116a86192ea4346804a366c1bd3285ca12
+MISC ChangeLog-2015 719 SHA256 1e05e71179d5e74b79280de55285f22ba3a27cedd90189b90e9cc5d6f0e6593a SHA512 e2c0a1354b47075d4e8300fd61242f97de78d88645de326195887e56a2a0c374efc5fb81286c40a4029d4ff210a24942d9d474722b6f7837462f8853e4bb6fc0 WHIRLPOOL b4adb51204914532d2b144c276c46a059a78c08dd3f4679713302f0d4961a2052532b17994d6ada170a6648b5d65fb3ad5bb85d38bebe8579bd677fff94444d1
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
diff --git a/net-misc/valve/metadata.xml b/net-misc/valve/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/net-misc/valve/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 type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/valve/valve-1.0-r1.ebuild b/net-misc/valve/valve-1.0-r1.ebuild
new file mode 100644
index 000000000000..ae6d5a2b21db
--- /dev/null
+++ b/net-misc/valve/valve-1.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Copy data while enforcing a specified maximum transfer rate"
+HOMEPAGE="http://www.fourmilab.ch/webtools/valve"
+SRC_URI="http://www.fourmilab.ch/webtools/valve/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test doc"
+
+DOCS=( README INSTALL valve.pdf )
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	dodir /usr/share/man/man1 /usr/bin
+	emake DESTDIR="${D}" install
+	use doc && local HTML_DOCS=( index.html logo.png )
+	einstalldocs
+}
diff --git a/net-misc/valve/valve-1.0.ebuild b/net-misc/valve/valve-1.0.ebuild
new file mode 100644
index 000000000000..dff76c7f8ad2
--- /dev/null
+++ b/net-misc/valve/valve-1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Copies data while enforcing a specified maximum transfer rate"
+HOMEPAGE="http://www.fourmilab.ch/webtools/valve/"
+SRC_URI="http://www.fourmilab.ch/webtools/valve/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="doc"
+
+DEPEND=""
+
+src_compile() {
+	econf || die
+	emake CTANGLE='' CWEAVE='' || die
+}
+
+src_install() {
+	dobin valve || die
+	doman valve.1 || die
+	dodoc README valve.pdf || die
+	dohtml index.html logo.png || die
+}
+
+src_test() {
+	emake CTANGLE='' CWEAVE='' check || die "check failed"
+}
diff --git a/net-misc/vconfig/Manifest b/net-misc/vconfig/Manifest
new file mode 100644
index 000000000000..3a57aa0eecca
--- /dev/null
+++ b/net-misc/vconfig/Manifest
@@ -0,0 +1,5 @@
+DIST vlan.1.9.tar.gz 176135 SHA256 3b8f0a1bf0d3642764e5f646e1f3bbc8b1eeec474a77392d9aeb4868842b4cca SHA512 7602679c1f1569d1742da37062213fea3a14b875bec9c41fc6b10c28a09a312db80f6eae4a8641a1892946545b2b4ef4699e61fddd8514469970e334a9dab0c5 WHIRLPOOL d2674c64530e42b911cc7d76dfef5a9efceb37e59ebc82bf899cd810b2a31a592e609320b7bbd62181b45e9baeaf410e0b7adb78c16fa094732eba49e392dffa
+EBUILD vconfig-1.9.ebuild 1113 SHA256 0d99cf1854a6f59aa16817eec992a54e20b655b74fe5385bdbee0f111f0254d1 SHA512 8dfb08e7184f8fdb49b994772ed96b5a49e5cff7504215aaa5d504869f26e36267999cc2d92ad3abb205b393e105e67a95a46d8f076f7b4dca7f6609c60e472f WHIRLPOOL 84ff9c212b18c9b8bfbb6126f50c1d2606c59f7dac4dcb1ea86f5c502c0b6ed5198cf14c1d58657eb79db72c9e6fd8175962fbee2d3b0be8af1b4e9496fe04ab
+MISC ChangeLog 2423 SHA256 ce50d3be8a71620d33faa52cea8eae976095f331c66998308cfdc456a1fbcb65 SHA512 a2352b73187ce40ce451ef045f373342862725a133ce8efb4b1f59de2bfe5ec616ef4ca2d9969471d7b2704899cab6843000072fc36477c215e9090b45abdd1a WHIRLPOOL 87aecc8eac80fda0e5852aaba0f06d5da8213a8d4347f1d8c308403b31b1389043770cd2a69ff9fc0cc05cb6ec072bc7c084691233376dedd5030c07ab07d602
+MISC ChangeLog-2015 3982 SHA256 20b41605ce493cb7231b4543d7ec7a8a164100b38d18fcf72113a186d8738682 SHA512 2223d395438bbe840dde231152e54f9d50da05e0361617aaa30b14a79a385f04b2d57ee88db92e54f2b5aebedc5fd1a5300638b7dca066b182dbbd07465dd716 WHIRLPOOL 03cea3aa7019c91bbe9cb0289002c7e7b7c574b055e254a3de8e0b8df4df1fd91056e23aa5bd307fd6c85833f15c7e861eac6c3900c272937d290075da431f9e
+MISC metadata.xml 490 SHA256 c143e9e4c0f0e0787e6de78bc0c2dd55df5d0667a748694ee42675ff45f50b52 SHA512 bfc7141dc32d3992efa44836da7c032ad28829e77d0ca6038ab3d70b540f8b67ea5428c86c138f9f6f5b3bc1e007e17ad3941eb4dc7e65fc6d34d962ae8606b4 WHIRLPOOL 0ea12120221238ea26d4b57992d25a99f0a8fa22ddf0a1cd0b72abbadf52564697d6a83805ecf5e5cae6dc3210b1facf3e7d0d390b957ba3d35709b763a9abba
diff --git a/net-misc/vconfig/metadata.xml b/net-misc/vconfig/metadata.xml
new file mode 100644
index 000000000000..09801c2600ee
--- /dev/null
+++ b/net-misc/vconfig/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>
+		The vconfig program allows you to create and remove vlan-devices on a
+		vlan enabled kernel. Vlan-devices are virtual ethernet devices which
+		represents the virtual lans on the physical lan.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/vconfig/vconfig-1.9.ebuild b/net-misc/vconfig/vconfig-1.9.ebuild
new file mode 100644
index 000000000000..f12905185523
--- /dev/null
+++ b/net-misc/vconfig/vconfig-1.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_PN="vlan"
+S=${WORKDIR}/${MY_PN}
+
+DESCRIPTION="802.1Q vlan control utility"
+HOMEPAGE="http://www.candelatech.com/~greear/vlan.html"
+SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
+IUSE="static"
+
+src_compile() {
+	use static && appened-ldflags -static
+	emake purge
+	emake CC="$(tc-getCC)" CCFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" STRIP="true" vconfig || die
+}
+
+src_install() {
+	into /
+	dosbin vconfig || die "dosbin error"
+
+	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:g" -i vlan_test.pl
+	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:g" -i vlan_test2.pl
+
+	doman vconfig.8 || die "doman error"
+	dohtml howto.html vlan.html || die "dohtml error"
+	dodoc CHANGELOG README vlan_test*.pl || die "dodoc error"
+}
+
+pkg_postinst() {
+	ewarn "MTU problems exist for many ethernet drivers."
+	ewarn "Reduce the MTU on the interface to 1496 to work around them."
+}
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
new file mode 100644
index 000000000000..fd6cee6be0b6
--- /dev/null
+++ b/net-misc/vde/Manifest
@@ -0,0 +1,8 @@
+AUX vde-2.3.2-format-security.patch 547 SHA256 201572eb60e82888b2cb70e20bd4acd6b551d6c7d3d74f58f8451df265c419f1 SHA512 05d4ef0c8e45a30ccdf24ce65e7b1ed268f7e8da095d20d8743193eef1018bc11cf13996bde32231739d153af9e4b1828bd2073d862e06ac21e7e64b6945cbf4 WHIRLPOOL 50a9495c4d888af01c2a343108b81a9eeef7e001f7e53ddcf7324b79c9ad082352835c11084725eeb10246a9a265bdea486dfd0b1de18b2e67b55c9a5a11252d
+AUX vde.conf-r1 341 SHA256 5335c4e6c8ad5314f113b334bf95fb9529b3a73862e8f285b33f32c6da985ef1 SHA512 5aa5a52fb150f54672465b36dd215dc24e45f60015bf7afc4b376e046093089c656db642a4d8c4a98205cd0c453427e38ecc3c36cab79bf5f9d2936c61c914df WHIRLPOOL c9bda2d402c3cf2fa28b29456d06358ec11990fdd6ef4544fd1c82db16eeff9dc7f5e6debb25b7edcfc885231712b4518ea50c490d54bbc89a5f5fc2a6aa23b7
+AUX vde.init-r1 1022 SHA256 b3c0eec9b5f97fbb2dca2c62debe091117861f0bfe94b5a2f2b789cebad6d28b SHA512 599b3560721b6e31cbcc21e764df772bde2a8bbf131b47ebb575bf31855a53237dd1c265d33f31c91e3115d6f8cb9f94493d2dd6792c8bedb011299d1ed6d8e9 WHIRLPOOL 9726deaa47db3aafdc309ab67f55873a6526e9c63a5b3598405be9f3d0a1dbb1d333f0a8f76b603b91355b01ac46589a73a0557f0ec7ec87a6eaae1b71d62925
+DIST vde2-2.3.2.tar.bz2 600527 SHA256 cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6 WHIRLPOOL dde513400eb725fe683c01110628ec9d2c3e415f0907d4f62d9bf09e2ec8ad14c4ad6437e428680a680118eb4297132f938b5cf71123480bf59c8f37eb0fee53
+EBUILD vde-2.3.2-r4.ebuild 1527 SHA256 5e6a226d70b2872b7c5c220a566292489eb4af6493aef4b971c7b5d273cae17a SHA512 4b56134ae9c8c3e586a5d322a98d487f6aca2768cee4120eaaf79951548712408595c9a346b90894fd814216f4bb89257aa2114f705f76db02e931bfa00e32e4 WHIRLPOOL f582ff1acaf528937ee7b7d2641c7d4d80184de37e731a7284aa4825b6857bd463b4c482847ec729583bac9ee2ff32b119ed040943e145242fa410c42e6362bb
+MISC ChangeLog 5025 SHA256 48891d241ae287bc75b5a26e0955330e73e411d1af1dbf58c4a528020180a71c SHA512 82763eb053e1cce5546e890b5a3e7567f0fed110dbe5e9c813424393f3078f4cc05e002e3cf8587ad11f93972674e6f54bcc5602924e3915c87ef40f85f0790d WHIRLPOOL ef10e4a9c8261c2ea9e094450068ff2d556c300a2a11b2bee1fafb4170be6d7a8c5d009d14a53b77d0e037d0bde72ebd7bfb87b9a2b5feda8808a0c06f881152
+MISC ChangeLog-2015 5943 SHA256 656f4d50a1c88ac48d5858dadae8c684574bb409c7be76ce4e438b9689c25904 SHA512 5e556ecf28fd68783408dddd9d964f368109b1b02ca1733cb3932cb016dd8326958d4b168839e2aae55884c058ff1e7823815e7b268af89f13326cfa4a7822bd WHIRLPOOL 066119b375c0aae13475436517d1917e18f3081d4537dfe79a0826751bcfdd1475228f25702b2cef080ccafd72fe761391b7500322a7d411d4d8798f39f516c9
+MISC metadata.xml 955 SHA256 2bb4e9f4be058f5a86b90c50fa43d73dcbfda897b34d6924fc8b3a28408f1d47 SHA512 06ac79d51fd38f77e4f3840995d228c61923d512e023ab74915030d9ee4ec628669c52d99fb040021ed1452fc5e4ba459a7a29e08fb898b44bd99642e1d7a6d6 WHIRLPOOL 2ec46692e1968e4c3970fa50270818f2cba0781f30b446eedd46635632a43e24998aaf89c930f60a6173547716913247d9b07bb74e3d1e7148ab0c1b98cb3549
diff --git a/net-misc/vde/files/vde-2.3.2-format-security.patch b/net-misc/vde/files/vde-2.3.2-format-security.patch
new file mode 100644
index 000000000000..d1cfaa58cb2f
--- /dev/null
+++ b/net-misc/vde/files/vde-2.3.2-format-security.patch
@@ -0,0 +1,18 @@
+--- a/src/common/cmdparse.c	2017-09-20 18:47:31.662856695 -0400
++++ b/src/common/cmdparse.c	2017-09-20 18:48:54.008852141 -0400
+@@ -284,13 +284,13 @@
+ 								int i;
+ 								for (i=0;i<argc;i++) {
+ 									if (i) fprintf(mf," ");
+-									fprintf(mf,argv[i]);
++									fprintf(mf,"%s",argv[i]);
+ 								}
+ 							} else {
+ 								int num=atoi(t);
+ 								while (*t >='0' && *t <= '9') t++;
+ 								if (num < argc) 
+-									fprintf(mf,argv[num]);
++									fprintf(mf,"%s",argv[num]);
+ 							}
+ 						} else
+ 							fprintf(mf,"%c",*t);
diff --git a/net-misc/vde/files/vde.conf-r1 b/net-misc/vde/files/vde.conf-r1
new file mode 100644
index 000000000000..856bde8ea2b0
--- /dev/null
+++ b/net-misc/vde/files/vde.conf-r1
@@ -0,0 +1,15 @@
+# load the tun module
+VDE_MODPROBE_TUN="yes"
+
+# virtual tap networking device to be used for vde
+VDE_TAP="tap0"
+
+# The group that will have access to the VDE control socket.
+VDE_GROUP="qemu"
+
+# VDE socket location (default: /run/${RC_SVCNAME}.ctl)
+VDE_SOCKET=""
+
+# Additional options passed to the vde_switch daemon.
+#VDE_OPTS=""
+VDE_OPTS=""
\ No newline at end of file
diff --git a/net-misc/vde/files/vde.init-r1 b/net-misc/vde/files/vde.init-r1
new file mode 100644
index 000000000000..0934c51f8f48
--- /dev/null
+++ b/net-misc/vde/files/vde.init-r1
@@ -0,0 +1,44 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/vde_switch"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	after net.${VDE_TAP}
+}
+
+start_pre() {
+	[ "${VDE_MODPROBE_TUN}" = "yes" ] || return 0
+	modprobe tun
+}
+
+# We have to use start() because the shortform uses --pidfile for s-s-d --start
+# which causes s-s-d to check the pid file before it exists
+start() {
+	VDE_SOCKET="${VDE_SOCKET:-/run/${RC_SVCNAME}.ctl}"
+
+	ebegin "Starting ${SVC_NAME}"
+
+	start-stop-daemon --start --exec ${command} -- \
+		--pidfile=${pidfile} \
+		--tap=${VDE_TAP} \
+		--group=${VDE_GROUP} \
+		--mode=660 \
+		--dirmode=770 \
+		--sock=${VDE_SOCKET} \
+		--daemon \
+	${VDE_OPTS}
+	ewaitfile 10 "${VDE_SOCKET}"
+
+	eend $? "Failed to start ${RC_SVCNAME}"
+}
+
+stop_post() {
+	[ "${VDE_MODPROBE_TUN}" = "yes" ] && modprobe --quiet --remove tun
+
+	# Don't fail to stop the service if the "tun" module in use
+	# and the above "modprobe -r" command fails.
+	return 0
+}
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
new file mode 100644
index 000000000000..f74a15637a8b
--- /dev/null
+++ b/net-misc/vde/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>NP-Hardass@gentoo.org</email>
+    <name>NP-Hardass</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mlspamcb@noci.work</email>
+    <name>Nico Baggus</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>jmbsvicetto@gentoo.org</email>
+    <name>Jorge Manuel B. S. Vicetto</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="pcap">
+    Enable the pcap-based plugin that allows creating a switch against
+    a real interface.
+  </flag>
+    <flag name="ssl">
+    Enable the cryptcab plugin that allows creating an encrypted
+    virtual cable.
+  </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">vde</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/vde/vde-2.3.2-r4.ebuild b/net-misc/vde/vde-2.3.2-r4.ebuild
new file mode 100644
index 000000000000..fe1cc671c9a6
--- /dev/null
+++ b/net-misc/vde/vde-2.3.2-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ltprune python-single-r1 user
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
+SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
+HOMEPAGE="http://vde.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+IUSE="pcap python selinux ssl libressl static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPS="pcap? ( net-libs/libpcap )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${COMMON_DEPS}"
+RDEPEND="${COMMON_DEPS}
+	selinux? ( sec-policy/selinux-vde )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-format-security.patch" )
+
+pkg_setup() {
+	# default group already used in kqemu
+	enewgroup qemu
+
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		$(use_enable pcap) \
+		$(use_enable python) \
+		$(use_enable ssl cryptcab) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/vde.init-r1 vde
+	newconfd "${FILESDIR}"/vde.conf-r1 vde
+}
+
+pkg_postinst() {
+	einfo "To start vde automatically add it to the default runlevel:"
+	einfo "# rc-update add vde default"
+	einfo "You need to setup tap0 in /etc/conf.d/net"
+	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
+}
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
new file mode 100644
index 000000000000..4c0d61ba00ab
--- /dev/null
+++ b/net-misc/vinagre/Manifest
@@ -0,0 +1,8 @@
+AUX vinagre-3.20.2-freerdp2.patch 1355 SHA256 2b66594f892f568036c1a9aa9798851504c138cdb1de8cc35c84a038079df0ae SHA512 9fbe2c45bdda85226410020154441f25f1010e331c30a6d64eabd302c59408d2097238412f4b75407b0bb65163b3ed7258c280b411f17e4b071c95c27b0b2095 WHIRLPOOL 7a1eb598b1b4ed4eada1e04836fd43c1c6aaa42fc5a19a9583cf5c548ab0b362990d1f576119f37a04a4f087591b4f09a775f7380f01728d6ace42de79c1000d
+AUX vinagre-3.22.0-freerdp2-2.patch 3671 SHA256 67659a4a09ee6ec27d9ad10f101b97cf0990b56a305fbd7221a7bcc9ad46c216 SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312 WHIRLPOOL 3fa7921cbd2ce2ae541f5af82d83f5145e9e7e9f948eae57d57f118503527ff3fc1c8a685a7a11ce540de5564a928aa6eaa4971a3dd0e3b0015e3c63c882da30
+DIST vinagre-3.22.0.tar.xz 1574984 SHA256 cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f WHIRLPOOL 0053c75b5f007d54ac08b446c0f1c1421d10f9cb688b2d14e4d0f0ace9f629ac1da0cb11368645f8b19d8ce40e2feb648198e95fabeadbbf62f95d74b82d39d1
+EBUILD vinagre-3.22.0-r1.ebuild 1587 SHA256 0b94d78a14ad3b19bf094008da7d8f4d8bf222cb88754c992e091de070195074 SHA512 f8e67898179e8fb8401471e48f55ed392f233cf61a0e28461f84e642cc485fb866cc4922babd030013092a1e91cd41e6df7ffcf1ce2200e5ed3ee125e2b6d1df WHIRLPOOL 8e97701dc130b609c380c84ffa56587586db4d7a6de1b203bb224040076435753d42858635402b3b2050b86bb2b5013f3076dd419d8ae98879b5644121087239
+EBUILD vinagre-3.22.0-r2.ebuild 1641 SHA256 c5ee526e9599893bdc625a9ef11237c402ffe495a3ebc74732235616d19a1dfc SHA512 52a07c86d7381d3a99ea46aedd6f2d3671aef04e63fb80fb6adcb4f08c24c073c4ecdea211b18b595e061d3db682c86921a588ff385390e7620ef9628b24b34f WHIRLPOOL 5f09ea856acc3672d0e77f19e9872ec59bfec94755cf7f0158d842ac7208cd1f6ccb262fc6627cca85aef9a747bbf003209ec6533022edbcc9207b790beb84e7
+MISC ChangeLog 5841 SHA256 d5ccc6e9a06b16a48f99723b1fbff0c90a39feb7dd1542038f2ea79792070915 SHA512 d7e9140e0b06dbc50c99cf815fed9fd8e24dd01d28ee6e943947357012da008c1f8d465e1646f78f42046a89f1aa088a1026377518a3ca976aee022804a1307c WHIRLPOOL 62f058e0201b117abb2ba17e6e1bfb415ee3c65f65f69c7d0868ed5a72677c45dda0797ffaa3b2963d572a7cc40e8b1c663090e0200fc7b630b7c6884306d6f6
+MISC ChangeLog-2015 16610 SHA256 5ec67f9adc73d5551d657140cba404069642e14d03bbee7208c5e987be7ca23e SHA512 d49dc214e08e6dd512bb381066d69a9b4d34fc4504f77b3941676b9be400b3ac7e14ca9911323105a34cecb08a5759fb71d179e5f9cba6205aca1d4f20ce0845 WHIRLPOOL 3bb81111f7145e2a85e5027df902e6b86b2c677c33e3c0d616e9115863a793820a91582914aa30e7099b449395220db7dadf7076420ab9054e776d6c52dbfcda
+MISC metadata.xml 550 SHA256 4c16ded8893ddef7315c408c2a37d55bd189d4d1c44c85af942ccaf141c09597 SHA512 3dbf3930996cc2cd2fd0ced60858094f3628eb08688fbec8d0bbf59880727e18f23402de48e04ef086924543d3d0085c9f75e4b070a5b3f6a4877774ade98840 WHIRLPOOL 06f5e3d44d9ab648bcf3e9cf4c111b70519579bf2df66263d8dae9e1c1b7e31450c05b319c84013d676200f76ac277e47e38774355959e026fb520573f3baf97
diff --git a/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch b/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch
new file mode 100644
index 000000000000..4f88ab013e10
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch
@@ -0,0 +1,39 @@
+From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Fri, 22 Apr 2016 14:54:09 -0700
+Subject: [PATCH] handle new freerdp pkgconfig name
+
+freerdp has now changed its pkgconfig name to 'freerdp2' -
+https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming
+we can build against both 1 and 2, we should handle both names.
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 585c016..362951d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
+ 
+ # Whether to enable support for RDP.
+ RDP_DEPS="freerdp x11"
++RDP_2_DEPS="freerdp2 x11"
+ AC_ARG_ENABLE([rdp],
+   [AS_HELP_STRING([--disable-rdp],
+     [Disable Remote Desktop Protocol (RDP) support])])
+@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"],
+     [have_rdp=yes
+      PKG_CHECK_EXISTS(freerdp >= 1.1,
+        [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
+-    [have_rdp=no])],
++    [PKG_CHECK_EXISTS([$RDP_2_DEPS],
++       [have_rdp=yes
++        RDP_DEPS=$RDP_2_DEPS
++        AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])],
+   [have_rdp=no])
+ 
+ AS_IF([test "x$have_rdp" = "xyes"],
+-- 
+2.7.3
+
diff --git a/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch b/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch
new file mode 100644
index 000000000000..6c22b46b2583
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch
@@ -0,0 +1,117 @@
+Fix build issue with freerdp2
+
+Gnome-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=765444
+Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=609474
+
+diff --git c/plugins/rdp/vinagre-rdp-tab.c i/plugins/rdp/vinagre-rdp-tab.c
+index b731f9b20ec910cc..13100de3dc0e07e1 100644
+--- c/plugins/rdp/vinagre-rdp-tab.c
++++ i/plugins/rdp/vinagre-rdp-tab.c
+@@ -476,16 +476,17 @@ frdp_drawing_area_draw (GtkWidget *area,
+   return TRUE;
+ }
+ 
+-static void
++static BOOL
+ frdp_begin_paint (rdpContext *context)
+ {
+   rdpGdi *gdi = context->gdi;
+ 
+   gdi->primary->hdc->hwnd->invalid->null = 1;
+   gdi->primary->hdc->hwnd->ninvalid = 0;
++  return TRUE;
+ }
+ 
+-static void
++static BOOL
+ frdp_end_paint (rdpContext *context)
+ {
+   VinagreRdpTab        *rdp_tab = ((frdpContext *) context)->rdp_tab;
+@@ -495,7 +496,7 @@ frdp_end_paint (rdpContext *context)
+   gint                  x, y, w, h;
+ 
+   if (gdi->primary->hdc->hwnd->invalid->null)
+-    return;
++    return TRUE;
+ 
+   x = gdi->primary->hdc->hwnd->invalid->x;
+   y = gdi->primary->hdc->hwnd->invalid->y;
+@@ -517,6 +518,7 @@ frdp_end_paint (rdpContext *context)
+     {
+       gtk_widget_queue_draw_area (priv->display, x, y, w, h);
+     }
++  return TRUE;
+ }
+ 
+ static BOOL
+@@ -587,15 +589,7 @@ frdp_post_connect (freerdp *instance)
+   rdpGdi               *gdi;
+   int                   stride;
+ 
+-  gdi_init (instance,
+-#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
+-    !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \
+-    FREERDP_VERSION_MINOR >= 2))
+-                    CLRBUF_24BPP,
+-#else
+-                    CLRBUF_32BPP,
+-#endif
+-                    NULL);
++  gdi_init (instance, PIXEL_FORMAT_BGRA32);
+   gdi = instance->context->gdi;
+ 
+   instance->update->BeginPaint = frdp_begin_paint;
+@@ -934,11 +928,13 @@ frdp_authenticate (freerdp  *instance,
+   return TRUE;
+ }
+ 
+-static BOOL
++static DWORD
+ frdp_certificate_verify (freerdp *instance,
+-                         char    *subject,
+-                         char    *issuer,
+-                         char    *fingerprint)
++                         const char *common_name,
++                         const char *subject,
++                         const char *issuer,
++                         const char *fingerprint,
++                         BOOL host_mismatch)
+ {
+   VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
+   GtkBuilder *builder;
+@@ -968,17 +964,20 @@ frdp_certificate_verify (freerdp *instance,
+   gtk_widget_hide (dialog);
+ 
+ 
+-  return response == GTK_RESPONSE_YES;
++  return (response == GTK_RESPONSE_YES) ? 1 : 0;
+ }
+ 
+ 
+ #if HAVE_FREERDP_1_1
+-static BOOL
++static DWORD
+ frdp_changed_certificate_verify (freerdp *instance,
+-                                 char    *subject,
+-                                 char    *issuer,
+-                                 char    *new_fingerprint,
+-                                 char    *old_fingerprint)
++                                 const char *common_name,
++                                 const char *subject,
++                                 const char *issuer,
++                                 const char *new_fingerprint,
++                                 const char *old_subject,
++                                 const char *old_issuer,
++                                 const char *old_fingerprint)
+ {
+   VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
+   GtkBuilder *builder;
+@@ -1023,7 +1022,7 @@ frdp_changed_certificate_verify (freerdp *instance,
+   gtk_widget_hide (dialog);
+ 
+ 
+-  return response == GTK_RESPONSE_YES;
++  return (response == GTK_RESPONSE_YES) ? 1 : 0;
+ }
+ #endif
+ 
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
new file mode 100644
index 000000000000..ff8fb2250832
--- /dev/null
+++ b/net-misc/vinagre/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="ssh">Enable ssh plugin using <pkg>x11-libs/vte</pkg></flag>
+    <flag name="spice">Enable access to SPICE-enabled virtual machines</flag>
+    <flag name="telepathy">Enable access to remote desktop via a
+      <pkg>net-libs/telepathy-glib</pkg> client</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-misc/vinagre/vinagre-3.22.0-r1.ebuild b/net-misc/vinagre/vinagre-3.22.0-r1.ebuild
new file mode 100644
index 000000000000..93f549eee1f5
--- /dev/null
+++ b/net-misc/vinagre/vinagre-3.22.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 linux-info vala
+
+DESCRIPTION="VNC client for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+IUSE="rdp +ssh spice +telepathy zeroconf"
+
+# cairo used in vinagre-tab
+# gdk-pixbuf used all over the place
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=x11-libs/gtk+-3.9.6:3
+	app-crypt/libsecret
+	>=dev-libs/libxml2-2.6.31:2
+	>=net-libs/gtk-vnc-0.4.3[gtk3]
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-themes/hicolor-icon-theme
+
+	rdp? ( >=net-misc/freerdp-1.1:= )
+	ssh? ( >=x11-libs/vte-0.20:2.91 )
+	spice? (
+		app-emulation/spice-protocol
+		>=net-misc/spice-gtk-0.5[gtk3] )
+	telepathy? (
+		dev-libs/dbus-glib
+		>=net-libs/telepathy-glib-0.11.6 )
+	zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+"
+# gnome-base/gnome-common needed for eautoreconf
+pkg_pretend() {
+	# Needed for VNC ssh tunnel, bug #518574
+	CONFIG_CHECK="~IPV6"
+	check_extra_config
+}
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=765444
+	eapply "${FILESDIR}"/${PN}-3.20.2-freerdp2.patch
+	vala_src_prepare
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable rdp) \
+		$(use_enable ssh) \
+		$(use_enable spice) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi)
+}
diff --git a/net-misc/vinagre/vinagre-3.22.0-r2.ebuild b/net-misc/vinagre/vinagre-3.22.0-r2.ebuild
new file mode 100644
index 000000000000..93fecd7376ae
--- /dev/null
+++ b/net-misc/vinagre/vinagre-3.22.0-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 linux-info vala
+
+DESCRIPTION="VNC client for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="rdp +ssh spice +telepathy zeroconf"
+
+# cairo used in vinagre-tab
+# gdk-pixbuf used all over the place
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=x11-libs/gtk+-3.9.6:3
+	app-crypt/libsecret
+	>=dev-libs/libxml2-2.6.31:2
+	>=net-libs/gtk-vnc-0.4.3[gtk3]
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-themes/hicolor-icon-theme
+
+	rdp? ( >=net-misc/freerdp-1.1:= )
+	ssh? ( >=x11-libs/vte-0.20:2.91 )
+	spice? (
+		app-emulation/spice-protocol
+		>=net-misc/spice-gtk-0.5[gtk3] )
+	telepathy? (
+		dev-libs/dbus-glib
+		>=net-libs/telepathy-glib-0.11.6 )
+	zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+"
+# gnome-base/gnome-common needed for eautoreconf
+pkg_pretend() {
+	# Needed for VNC ssh tunnel, bug #518574
+	CONFIG_CHECK="~IPV6"
+	check_extra_config
+}
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=765444
+	eapply "${FILESDIR}"/${PN}-3.20.2-freerdp2.patch
+	eapply "${FILESDIR}"/${PN}-3.22.0-freerdp2-2.patch
+	vala_src_prepare
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable rdp) \
+		$(use_enable ssh) \
+		$(use_enable spice) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi)
+}
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
new file mode 100644
index 000000000000..4e2213822bfd
--- /dev/null
+++ b/net-misc/vino/Manifest
@@ -0,0 +1,5 @@
+DIST vino-3.22.0.tar.xz 768716 SHA256 2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f WHIRLPOOL 63d03bda4ff03d794345a925bc23dc4795c845754da78171a37c0f4340424474b30df478dd5f813fec23c408abf17d99dacb1481c39d1478aae32b67bd88a695
+EBUILD vino-3.22.0.ebuild 1633 SHA256 8fbce7b67f73fab699d6dbc2d8c015f1e77780d59bea3bbf66f1c732e69a7319 SHA512 9134f6315e151bdc72953943faa8182830752e71146ba089c4b0b8c65e64306baf129bed77944f5f4541630e542ce94f2e8b8f0460e40a713ed6b9486a9eddf8 WHIRLPOOL 6bca440cf27a57e9ba349613c73e4312d04e8fa0f39bc8e64ca6d01d32a7baefcf15555c6cdcd5a1e37bfad5ec14d0cb1e0c26d62af925d8eb8e58a7e91eebaa
+MISC ChangeLog 5380 SHA256 99cefb2a9d0dc2d8777f61e3c1fa60b8f0bc17a7f384cd513ffc62d8f7e92d8b SHA512 00fc55b7529050ff7e41cd380f84763c63185e4a00f20583d633d094ab2c7478ebed0f1029e672416e58d944d3be7321fe65429d5169441a09b75e882fde0c39 WHIRLPOOL d1ab0735549fb2338ce0d44b9f6fcff387670f14bef04a2c54de2e167d877cdd6f17f75556fa2dce3f65dd855ed9fbdd7cba3a8d82d3d9ae9e8c8a26a4d16124
+MISC ChangeLog-2015 28007 SHA256 1b1f61b8b3dfe5ad2df14f5648912170e3d987425909def34eed75a0eccaf56b SHA512 6fd1baba9a11dd2280dee0184fcf5eae012774f64781e92b0de8070092727217fbe91b46ae8e3cbae7ff4b0175a521087ecdca1640a702b4d578cbe3de1521e5 WHIRLPOOL a5a754b400ac61b7d480f38992fa82061d3201ea6be69e618b2f2df959b56e08b7f01d2dd4837156a7c20ebdfb342762105f9e971e85e72f39381a211da136a0
+MISC metadata.xml 343 SHA256 2a9d2af41251a94207006c22a3faeea1e18024823735ed8e426bd454379ccea4 SHA512 dc33b648174ba60a62212dd252f1d358ee7a05ddbd41ae2b31dbdf362f4f780207c5183c0b180d68c8df5a613e91c1336231f2d75100076a01517e4d70d8252d WHIRLPOOL c86cb2615c174a5c1aa8c1da3b9ef2bbd2f1ee1bdac3de0059d6ea6614fd21a8d658f8808f21071f80b6c1154a6b638d825dcebce01ccd466c3c8f2c67af4bdf
diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml
new file mode 100644
index 000000000000..1208299aea7a
--- /dev/null
+++ b/net-misc/vino/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="telepathy">Enable desktop sharing through a telepathy client</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/vino/vino-3.22.0.ebuild b/net-misc/vino/vino-3.22.0.ebuild
new file mode 100644
index 000000000000..bf21f64eb59d
--- /dev/null
+++ b/net-misc/vino/vino-3.22.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 systemd
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="crypt debug gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
+# bug #394611; tight encoding requires zlib encoding
+REQUIRED_USE="jpeg? ( zlib )"
+
+# cairo used in vino-fb
+# libSM and libICE used in eggsmclient-xsmp
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libgcrypt-1.1.90:0=
+	>=x11-libs/gtk+-3:3
+
+	x11-libs/cairo:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/pango[X]
+
+	>=x11-libs/libnotify-0.7.0:=
+
+	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	jpeg? ( virtual/jpeg:0= )
+	ssl? ( >=net-libs/gnutls-2.2.0:= )
+	telepathy? (
+		dev-libs/dbus-glib
+		>=net-libs/telepathy-glib-0.18 )
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}
+	app-crypt/libsecret
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+"
+# libsecret is always required at build time per bug 322763
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable ipv6) \
+		$(use_with crypt gcrypt) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_with gnome-keyring secret) \
+		$(use_with jpeg) \
+		$(use_with ssl gnutls) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi) \
+		$(use_with zlib) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/net-misc/vmnet/Manifest b/net-misc/vmnet/Manifest
new file mode 100644
index 000000000000..31ddc8a6b670
--- /dev/null
+++ b/net-misc/vmnet/Manifest
@@ -0,0 +1,6 @@
+DIST vmnet-0.4.tar.gz 11362 SHA256 80c7148200bffa239e3daae79332a18c28409a5ef92ce631d41e2859a9011765 SHA512 b5872caf2d0eadd24323901aff527deb6c57b9286d03362c252b87cd84b7dd8db149b86636fbd4b499810caff41aa948fa7b1f2163159d4b665c2feae279375d WHIRLPOOL fcc59cbb77383496aad9b10b78574a4960b1d0c37036ad35ab81002f797abef4110c64ade3ffaf2f2bbd32300d0040311826434e6f6465619ef7ee64b7641218
+DIST vmnet_0.4-1.diff.gz 5084 SHA256 fb01abcbc384025365ff50b35ca3e7777cc4a9a62f353c04d16f4c867332e453 SHA512 d9518917d0c9ebb75ffe82f002c0c5375b3a932fdd31d2cb4818a9956d586fb0e1bfedc166cdad3ab7a5ead8109afdee2893c68fe69b426c57965648188de4af WHIRLPOOL 6cfdfa05d745a5c203d09a573a7d179ed05f2a80f2e5b7177b00abadd905c04b30274887b8c52aff705b08713123d9afa4f439f4c02eecb62a7c5026f2409c38
+EBUILD vmnet-0.4.ebuild 1075 SHA256 ba11d75440a6a3a6c19ff1966d916175fb8faac43e04ad79a8bb758e71f724bc SHA512 aa83469513e67e6f3e83bf2a3e0668e72e93641f3043e1b495d1f2d560f5cc20aa774907c1ea7467d8b80a26349bc3a2f95c9d1f779c2ed14b073a44cedae85b WHIRLPOOL 84d5634e0c68f64d3cf1a3ec856948a6004f1a17ff5a03cb4fb8210b4b435bbd9878987432bc924ce1f2dcdc76c647fe61231dd82a61494a5f3e0e5aa2be3536
+MISC ChangeLog 2166 SHA256 838ca16e92601ef43aca8cd48484d3383d65c649e83cb35dd2957deb4e8529d1 SHA512 3a58063fc47f29cb623740a65f136acf56dcba1364ab0380bf4947727b5263f80c957737f0f2be27abff3f2dfcb05fc379c084f9c3be0f8653281276dee9f8d7 WHIRLPOOL 2856a8e6dd0a77ec3a5823072fcaf37f579d524fd4976dedd89e4b549d6142e79310aad5801ae6d359d599a0c50088f88f050a246f514829a7c3e8b0802729ff
+MISC ChangeLog-2015 825 SHA256 39941df2b6052af86e589bcd90b323724d308cc750f4e07c5cb88c1fd2b00f31 SHA512 93b266b79337b2a9924ccf3c292fd4a1bf6377bf8b07168f3856bf7b00ca08e035cab3e376481dc2c8abb53b1566868d4adb7ac28ffe9ac86e8ba3206cb19b07 WHIRLPOOL dfd7aaaaa5e68f20898627ab7fc2ed22f449c3a984793c20b4541601c9738fc144ce2c4ddf4e1c4995b01017e000ddd4e408b8b0c4437a088116582f8ac1851c
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
diff --git a/net-misc/vmnet/metadata.xml b/net-misc/vmnet/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/net-misc/vmnet/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 type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/vmnet/vmnet-0.4.ebuild b/net-misc/vmnet/vmnet-0.4.ebuild
new file mode 100644
index 000000000000..78799eb6c516
--- /dev/null
+++ b/net-misc/vmnet/vmnet-0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A simple virtual networking program - SLIP over stdin/out"
+HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/"
+# The main site is often down
+# So this might be better but it's a different filename
+# http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz
+# We use the debian patch anyway
+SRC_URI="ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz
+		mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="sys-apps/net-tools"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	epatch "${DISTDIR}"/${P/-/_}-1.diff.gz
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,now
+	emake || die "Emake failed"
+}
+
+src_install() {
+	dobin ${PN} || die "dobin"
+	fperms 4711 /usr/bin/${PN} || die "fperms"
+
+	doman ${PN}.1
+	dodoc README debian/${PN}.sgml
+
+	insinto /etc
+	doins debian/${PN}.conf
+}
+
+pkg_postinst() {
+	einfo "Don't forgot to ensure SLIP support is in your kernel!"
+}
diff --git a/net-misc/vmpsd/Manifest b/net-misc/vmpsd/Manifest
new file mode 100644
index 000000000000..25df62fe060a
--- /dev/null
+++ b/net-misc/vmpsd/Manifest
@@ -0,0 +1,7 @@
+AUX vmpsd-1.3-64bit.patch 910 SHA256 e6d57def5aff4389c656ef0bb32b10a028a50ede711ea88d5c2edfe125a0533f SHA512 45fc49fe1412760ecb45811c01e86406c4103492c5a29b99d8953dcca388c58ad157b4200a2fb9adaf73488746b8d16b168cad9dc5ae95e1e618de7490fb8b7d WHIRLPOOL d809fc10de9f1bb1ab3822ed6894330da4073e02ae52cd7f8ce9166bf63812d0f0d1caa8fa3165994d4516bafaa5e57c98aba31d2cad40733aac9507cf79eee8
+AUX vmpsd-1.4-snmp-support.patch 2237 SHA256 793afee5e7d6c43dc15bb33c7d9afe2b8c1aabf2f936f8f0c2878d74577e86c8 SHA512 fd3b9327b07d87d04d9b2f407ceb1e6c1ef64fca0ba63ae040c10e1c46739a487423a3e54fdb228a3210573fbe76faf5a0d4c7f3a4e84eeb80fb74543e42c027 WHIRLPOOL 5fd3079d82257d68aeb3ad04f5f0cf08421962d755ecc4a62698f340f1844d1ac73875c502d408cfae5b9965afa2bce8d00467b4a8a040949af8c00837a99708
+DIST vmpsd-1.4.tar.gz 92138 SHA256 f9f0bc2f7b5d81189794179b4706015ec01ce5a2f2c87d2d086538754559da7e SHA512 341a86f8db28f1f7a03b5581ec8f8319a175a2c5dc9c7ff5df880f4416cf048ef9e32afd6600220e48f8713d6c72c4ffae7d1e8d31c73ded466f084711580efd WHIRLPOOL 1ec27dfc0cd6ffc2c9f1fbbd6db716608af04ac8a972518e6a5ff12b01a05443b2665f3a27e7e0835d22df1ef40d0b4eb5490ea0bc2a5f60859df8c83e801837
+EBUILD vmpsd-1.4.ebuild 983 SHA256 85b8a46344dc1af33fe8b7ef2374a657fc074c4207bd11db28d6d2a7a567943d SHA512 8139fa2e06e0d9d24f71dbc1214c93a94e897974377013e4da0ce05e8884530602065ce850f7632edee2344eaa3e32e27e7fb4fc142468d56012d5b0d6103efa WHIRLPOOL 5818357581478a131ea141d44b91bdb9850b6254b32411c515c0671148f9d9697045ec2c50379517731b977516c1e083b1611cfc510f794aaf8e84dd43569912
+MISC ChangeLog 2235 SHA256 cdc4b688d1c5ba5d341c34b2830d516cf84136f498fbf0a1d1f9c659c132490c SHA512 b6e26fc9a775426e82aa6b1dbc6f2d72a7d7d675253cb994d386a38455d0fce7a2ae4cdf015e596bf5664effd2dcaa4c46edeaa8f37017a5465b82513140661c WHIRLPOOL 50942c05ddef61ccbe1fd5e69efa210a5536b241066059ce51feee1139f81c0ecc872bea1afe41b26aacd9a0e9f94c32689be3ece5364c51ec1a8126fa31e0af
+MISC ChangeLog-2015 2398 SHA256 7870bc253d508a202f90719d5f24d8540a47805223a0b82e1050e834bcfa940c SHA512 7fb03199a47600c551537468594c743b0f05eb61efe0d0e8b0c043f1ee66612fcf61a229d5d504d1073a63b82e1ac7571a346a3b43887ab4f7e7b2faf34ffe2a WHIRLPOOL b7fac8e8b1291a82ae8264e9e7c9ff629d97e74a780e8d0b87d047ffbd0e50aa7d41d3f632fed8ab2f8c9467b2fd64bf9e7a6ac97941c135a86ab6216ca3ecf7
+MISC metadata.xml 300 SHA256 9415e292b3d4b2940966ebe7d14bfb1a6faf636a83c56bb6ff9a1cbb3f4e5a31 SHA512 02b5627182dd5c4adfa3dbcce0c19c4a5d1dce64061cdb2843e133c168c4e8203c8a37a8da80fb04a0c9fb5a3b6b80be2cb6e8453839db39dc5cf3bd0fe51e03 WHIRLPOOL b67826d6665609a643c5dbff740645ffa6503b864593911fac069a402c3cbf9256be966ab56a1bbdc6f547c6f1bbb4aab60ce2dcf1775f671842acd8ff61ba5c
diff --git a/net-misc/vmpsd/files/vmpsd-1.3-64bit.patch b/net-misc/vmpsd/files/vmpsd-1.3-64bit.patch
new file mode 100644
index 000000000000..c2825d4a6b76
--- /dev/null
+++ b/net-misc/vmpsd/files/vmpsd-1.3-64bit.patch
@@ -0,0 +1,38 @@
+*** vmpsd/vqp.c.orig	Tue Aug  3 05:54:04 2004
+--- vmpsd/vqp.c	Tue Mar 20 06:48:33 2007
+***************
+*** 127,134 ****
+  	VQP_HEADER	h;
+  	u_char		buf[MAX_PACKET_SIZE];
+  	u_char		*p;
+! 	unsigned long int	data_type;
+! 	unsigned short int	data_len;
+  	unsigned int		n = 0;
+  
+  	h.unkn1		= 0x01;
+--- 127,134 ----
+  	VQP_HEADER	h;
+  	u_char		buf[MAX_PACKET_SIZE];
+  	u_char		*p;
+! 	uint32_t	 data_type;
+! 	uint16_t	data_len;
+  	unsigned int		n = 0;
+  
+  	h.unkn1		= 0x01;
+***************
+*** 310,316 ****
+  				MAC_ENTRY *m;
+  
+  				m = find_mac(r->mac);
+! 				if ( (m->speed != 0) || (m->duplex != 0) ) 
+  					set_port_speed( inet_ntoa(r->client_ip),
+  							community,
+  							r->port,
+--- 310,316 ----
+  				MAC_ENTRY *m;
+  
+  				m = find_mac(r->mac);
+! 				if ( m != NULL && ((m->speed != 0) || (m->duplex != 0)) ) 
+  					set_port_speed( inet_ntoa(r->client_ip),
+  							community,
+  							r->port,
diff --git a/net-misc/vmpsd/files/vmpsd-1.4-snmp-support.patch b/net-misc/vmpsd/files/vmpsd-1.4-snmp-support.patch
new file mode 100644
index 000000000000..66890af3a731
--- /dev/null
+++ b/net-misc/vmpsd/files/vmpsd-1.4-snmp-support.patch
@@ -0,0 +1,56 @@
+diff -Nuar vmpsd.orig/Makefile.am vmpsd/Makefile.am
+--- vmpsd.orig/Makefile.am	2004-10-31 00:59:51.000000000 +0000
++++ vmpsd/Makefile.am	2012-02-21 09:11:30.120856909 +0000
+@@ -1,5 +1,6 @@
+ bin_PROGRAMS = vmpsd
+-vmpsd_SOURCES = vmpsd.c daemon.c data.c log.c parser.c vqp.c data.h log.h vqp.h external.c external.h
++vmpsd_SOURCES = vmpsd.c daemon.c data.c log.c parser.c vqp.c snmp.c data.h log.h vqp.h external.c external.h
+ vmpsd_CFLAGS = -DSYSCONFDIR="\"${sysconfdir}\""
++vmpsd_LDADD = $(SNMP_LIB)
+ man_MANS = vmpsd.1
+ sysconf_DATA = vlan.db
+diff -Nuar vmpsd.orig/Makefile.in vmpsd/Makefile.in
+--- vmpsd.orig/Makefile.in	2006-05-15 13:33:57.000000000 +0000
++++ vmpsd/Makefile.in	2012-02-21 09:08:54.807227002 +0000
+@@ -59,7 +59,7 @@
+ am_vmpsd_OBJECTS = vmpsd-vmpsd.$(OBJEXT) vmpsd-daemon.$(OBJEXT) \
+ 	vmpsd-data.$(OBJEXT) vmpsd-log.$(OBJEXT) \
+ 	vmpsd-parser.$(OBJEXT) vmpsd-vqp.$(OBJEXT) \
+-	vmpsd-external.$(OBJEXT)
++	vmpsd-external.$(OBJEXT) $(SNMP_OBJECTS)
+ vmpsd_OBJECTS = $(am_vmpsd_OBJECTS)
+ vmpsd_LDADD = $(LDADD)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+diff -Nuar vmpsd.orig/snmp.c vmpsd/snmp.c
+--- vmpsd.orig/snmp.c	2004-07-08 09:34:29.000000000 +0000
++++ vmpsd/snmp.c	2012-02-21 09:11:51.817566865 +0000
+@@ -8,6 +8,8 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
++#define UCD_COMPATIBLE 1
++#include <net-snmp/net-snmp-config.h>
+ #include <ucd-snmp/ucd-snmp-includes.h>
+  
+ #include "log.h"
+diff -Nuar vmpsd.orig/vmpsd.c vmpsd/vmpsd.c
+--- vmpsd.orig/vmpsd.c	2006-05-15 13:33:57.000000000 +0000
++++ vmpsd/vmpsd.c	2012-02-21 09:12:28.987640940 +0000
+@@ -18,7 +18,7 @@
+ 
+ int parse_options(int argc, char **argv)
+ {
+-	char	opt;
++	signed char	opt;
+ 	char	*options = "a:cde:f:l:p:";
+ 
+ 	opterr = 0;
+@@ -80,7 +80,7 @@
+ 	printf("\t-d         do not detach, log to stderr also\n");
+ 	printf("\t-e path    use external program for mac to vlan assignment\n");
+ 	printf("\t           when/if used with -f, -f is disregarded\n");
+-	printf("\t-f file    read VMPS database from file (/etc/vmps.db)\n");
++	printf("\t-f file    read VMPS database from file ("SYSCONFDIR"/vmps.db)\n");
+ 	printf("\t-l level   set logging level:\n");
+ 	printf("\t                 0x0100 - fatal,\n");
+ 	printf("\t                 0x0200 - info,\n");
diff --git a/net-misc/vmpsd/metadata.xml b/net-misc/vmpsd/metadata.xml
new file mode 100644
index 000000000000..d48f3a594fa3
--- /dev/null
+++ b/net-misc/vmpsd/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 type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">vmps</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/vmpsd/vmpsd-1.4.ebuild b/net-misc/vmpsd/vmpsd-1.4.ebuild
new file mode 100644
index 000000000000..3921400cd694
--- /dev/null
+++ b/net-misc/vmpsd/vmpsd-1.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An open-source VLAN management system"
+HOMEPAGE="http://vmps.sourceforge.net"
+SRC_URI="mirror://sourceforge/vmps/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND="net-analyzer/net-snmp[ucd-compat(+)]
+	dev-libs/openssl"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4-snmp-support.patch
+	epatch "${FILESDIR}"/${PN}-1.3-64bit.patch
+	# Merged upstream
+	#EPATCH_OPTS="-d${S}" \
+	#epatch "${FILESDIR}"/${PN}-1.3-format-sec.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/vmpsd \
+		--enable-snmp \
+		LIBS="-lssl" \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README INSTALL AUTHORS doc/*txt
+	newdoc external/README README.external
+	newdoc tools/README README.tools
+	dodoc external/simple tools/vqpcli.pl
+}
diff --git a/net-misc/vncrec/Manifest b/net-misc/vncrec/Manifest
new file mode 100644
index 000000000000..e2ed2e3b183c
--- /dev/null
+++ b/net-misc/vncrec/Manifest
@@ -0,0 +1,6 @@
+AUX vncrec-0.2-includes.patch 565 SHA256 591481a0e62fa3cbe331b37954c33d4f94586bedec35df7fd0f13c8cf5835cfb SHA512 256bad5e63e2e744ec7a1f1ca2002bb8caf7d9cff8a787c426a7950c0acf1ee4af27342e68f5f6440a292c35d31cebf98b7f085e8feddfa92d4cd7f64d04b651 WHIRLPOOL 037555f305f233b09af0fc3b79cbdc879c1835cce20455b972c5ca7880cb4c299baea34fbf02cdf8ad51c5e503e6a530e3c4b0a0239d22488f8e17b83f909a5d
+DIST vncrec-0.2.tar.gz 65768 SHA256 fd4abed79892c68c078d74ec9cd7599d782325f5f59b71f356aec0120c21295b SHA512 dd2eb979311e1d04d45aa44362bb7d747719547d3c45ebf18174e7fbcc5bd5be039d53c39077411b636564ea14c0287317f11b16633fa64da314c983250c3ef4 WHIRLPOOL bbb5f17cf4fbb23cebcd1dbe7e958580328fea31cbb2b799f059df0761404e2dff1e36a74a67e1d43a606f9aa6e5eccd0328d829410b3fa8f4ec852e7fe4923a
+EBUILD vncrec-0.2-r1.ebuild 910 SHA256 007eee31764dd913e8cd9f6d9a0f92539ff05cab824d305cbdb4f87836c39dd8 SHA512 0e8e7c1b8a229fc328864b52c6a04ee5e0b3687fc79aab793892c515f4efffafcdb9881037a48ce08b72190c726b358703bdbbcf0655d2882436df99cbb3d733 WHIRLPOOL b0921de56267f5b5362c706fcdae4944544fb45be153b7d4ea55bd4e9a5f19427995d58f883e52b5e9c7f4f21c625eccef2fc6d18e3cd556e47a099b987dc5b5
+MISC ChangeLog 2555 SHA256 08cba4c5588b5545e465eab44115ef1d5ae27274bba5eec1d5fda3a144ddfd52 SHA512 60b618ece2c1fee69b89e08ec6bcec2f15f31b6c4dba6397cc28f84fbd3bc93b442424b042f638b19b53b987ce91735f294646d136e8e2fa87363f22f303e73b WHIRLPOOL 5626e728dde3c32017d97c2fc95b0dbeb18c3c16ff22d30cb3e1cbf1807b8194776ae1e342399a34b9cc61c3d89a4e0feb25c3dd97bdf037cadf9018a9631780
+MISC ChangeLog-2015 1363 SHA256 850d2b6dd8aa973da4359c4c2b27c486956aa1792278a09ee48b3f6595427bde SHA512 9f0bcf03e4986d6c7d581e81a27be185cc4ce1675ce9265e97a508ea53126fd5a453c57d60af0bc6485104d1459b53a571422185cf35a169ab29a1f9ccc222f3 WHIRLPOOL 8aaf1d1efeaa266687c1d9bec480188e7b34888c8bc7073568f9bc1a4b61bc4cd438aefb7f97e9601e45f59e01dccd796e1be92c24cbad05af0bf55fd8ebeadc
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/vncrec/files/vncrec-0.2-includes.patch b/net-misc/vncrec/files/vncrec-0.2-includes.patch
new file mode 100644
index 000000000000..174a42738ab7
--- /dev/null
+++ b/net-misc/vncrec/files/vncrec-0.2-includes.patch
@@ -0,0 +1,21 @@
+--- a/vncconnect/vncconnect.c	2001-06-09 05:41:45.000000000 +0200
++++ b/vncconnect/vncconnect.c	2010-09-28 20:19:03.000000000 +0200
+@@ -5,6 +5,8 @@
+ #include <stdio.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
++#include <stdlib.h> /* exit() */
++#include <string.h> /* strlen() */
+ 
+ static char *programName;
+ 
+--- a/libvncauth/vncauth.c	2001-06-09 05:41:45.000000000 +0200
++++ b/libvncauth/vncauth.c	2010-09-28 20:19:44.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <sys/stat.h>
+ #include <vncauth.h>
+ #include <d3des.h>
++#include <time.h> /* time() */
+ 
+ 
+ /*
diff --git a/net-misc/vncrec/metadata.xml b/net-misc/vncrec/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/vncrec/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/vncrec/vncrec-0.2-r1.ebuild b/net-misc/vncrec/vncrec-0.2-r1.ebuild
new file mode 100644
index 000000000000..ef08f35b48b7
--- /dev/null
+++ b/net-misc/vncrec/vncrec-0.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="VNC session recorder and player"
+HOMEPAGE="http://www.sodan.org/~penny/vncrec/"
+SRC_URI="http://www.sodan.org/~penny/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/xextproto"
+
+DOCS=( README README.vnc )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-includes.patch
+	touch vncrec/vncrec.man || die
+	sed -i Imakefile \
+		-e '/make Makefiles/d' \
+		|| die "sed Imakefile"
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CCOPTIONS="${CXXFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		World
+}
diff --git a/net-misc/vncsnapshot/Manifest b/net-misc/vncsnapshot/Manifest
new file mode 100644
index 000000000000..d76e71180813
--- /dev/null
+++ b/net-misc/vncsnapshot/Manifest
@@ -0,0 +1,6 @@
+AUX vncsnapshot-1.2a-amd64grey.patch 408 SHA256 04f97cc37e33d0925521ab9b3551db06a1cd7e0eff71c5b2eeaa7528658e6318 SHA512 b5a90a5917c71f5d30608bfa8316ac052b377e024d871754fefc7f1fa13e29eb49be587b5c99d65e9058c65a914120c646194bb25ad114220a439642f3e24ea9 WHIRLPOOL 2b2c70b5ecd383abd362de0441173ad40fa60ef3e33d3e47c7995087971996a8cda41bd4630cf4aac3ce7ec817eedaa8aad1b8b5372e465230ccbee15c22c0b2
+DIST vncsnapshot-1.2a-src.tar.bz2 70121 SHA256 ac490c4b3810d419c65cdfb48d742ca382218c3c0f04e7868520ff9a06149ca6 SHA512 2ae53a043c11d02bbb7ff6afc000eef268448643ba1db7b6c5a55fe3e25e65e1b22e64e855d33dfe55b1df04dc57f592e48c44918943642da19f7d06df77027c WHIRLPOOL 7cb9080b70ba5b96ed1e1288a4f6b5d739fd84aa513f8b33e3485eb6dd043b967cbe11f53b87ed728451a2f4d2b159fdfaae5a1acb902cfc9541d3d04d91304a
+EBUILD vncsnapshot-1.2a.ebuild 988 SHA256 fedfef2bbd9d7d5531627c41fcae4ea735edb8c5824ec966ed3cfbd7b35805b3 SHA512 d6c54dcc970320faa1535d2c93be4c12c50b3f66cb8f18eaf83912fb4ed2c0a44d2b50e5e70517257e81ec45b1ebf0c6cf0790c9397dab07798d3d3bdb4b239d WHIRLPOOL 6bf4fd38d42a45b47ac1cddda12d4792dfbb0223e7cac8fb2bfa1749bc129f95751bbc844ba02f172edfe8e1e53af4c9edac9de0cb79ccdbe487a13191b10acd
+MISC ChangeLog 2575 SHA256 d770a407933e401b01ddc2e61321f1f366fbccc62f8279fb1cfff984c7dda113 SHA512 5a435dc5abe53ed5b8713e646ab0ae8caaf2823fae6d6ea061ae81ee2a7fc8c13bf77617b3ea4c49daf1bec79279bead5a79eca154dfef2ea93177ad1a1ce824 WHIRLPOOL ca196c0fbbe959a5bcdd1782c1c5c75027f98e70d1c4f87482b8191f1bfec3f29d0be6f105a447f588ce11f210e48bf9cbdd3350e98196e01772e97226e31004
+MISC ChangeLog-2015 2008 SHA256 4f8435ce8c5b5675fbd1287b90927b670c37ae74e9c73e067c8b29e17530f66a SHA512 c27ab37942be94d460d7f09d75c4f85f17b50c64eb6946a56385fb1389c69595f7326f52d9493e6fb1080d98f4861f55c8aeab71d506ec554060fbf0117b7e46 WHIRLPOOL 1dde9765ecad71d9eb5d79427fa69ceff752d47c23e777d8ee2da984566e21064bc99619f6e540597b09e4328f1fbe9d0dfb6710150c57882fdc035d4d911281
+MISC metadata.xml 248 SHA256 347fef883b40150a9b52c13d40145c467bdee577a461d90af55c5e173249fe84 SHA512 bbd64700d2397ca9fd98cd273404e7a3d744d7aea1e2c7237e5d157786966841c7156d716b47da9cb46dbc248c25e2aa9dcf1be44f0583e50cdc9c1b253de799 WHIRLPOOL 13afd435710f07e422f185dfac8a1248ea879ffd88a6a8d59ea18bc68fdf039e0ef521d40217b250aa051c682e1312e48e9f46454de834f9271f110d3c26ffbb
diff --git a/net-misc/vncsnapshot/files/vncsnapshot-1.2a-amd64grey.patch b/net-misc/vncsnapshot/files/vncsnapshot-1.2a-amd64grey.patch
new file mode 100644
index 000000000000..ee5807b58af9
--- /dev/null
+++ b/net-misc/vncsnapshot/files/vncsnapshot-1.2a-amd64grey.patch
@@ -0,0 +1,12 @@
+diff -aur vncsnapshot-1.2a-orig/rfb.h vncsnapshot-1.2a/rfb.h
+--- vncsnapshot-1.2a-orig/rfb.h	2002-02-09 16:00:42.000000000 -0500
++++ vncsnapshot-1.2a/rfb.h	2008-09-24 16:57:13.000000000 -0400
+@@ -34,7 +34,7 @@
+ 
+ // Define the CARD* types as used in X11/Xmd.h
+ 
+-typedef unsigned long CARD32;
++typedef unsigned int CARD32;
+ typedef unsigned short CARD16;
+ typedef short INT16;
+ typedef unsigned char  CARD8;
diff --git a/net-misc/vncsnapshot/metadata.xml b/net-misc/vncsnapshot/metadata.xml
new file mode 100644
index 000000000000..c7ec75ece6f7
--- /dev/null
+++ b/net-misc/vncsnapshot/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">vncsnapshot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
new file mode 100644
index 000000000000..11ea46fa1db4
--- /dev/null
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers"
+HOMEPAGE="http://vncsnapshot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+DEPEND="
+	virtual/jpeg
+	>=sys-libs/zlib-1.1.4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-amd64grey.patch"
+	sed \
+		-e 's:-I/usr/local/include::g' \
+		-e 's:-L/usr/local/lib::g' \
+		-e '/^all:/s|$(SUBDIRS:.dir=.all)||g' \
+		-e '/^vnc/s|$| $(SUBDIRS:.dir=.all)|g' \
+		-i Makefile || die
+}
+
+src_compile() {
+	#note: We override CDEBUGFLAGS instead of CFLAGS because otherwise
+	#      we lost the INCLUDES in the makefile.
+	# bug #295741
+	emake CDEBUGFLAGS="${CXXFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	dobin vncsnapshot
+	cp vncsnapshot.man1 vncsnapshot.1
+	doman vncsnapshot.1
+}
diff --git a/net-misc/vrrpd/Manifest b/net-misc/vrrpd/Manifest
new file mode 100644
index 000000000000..d77e4edafca2
--- /dev/null
+++ b/net-misc/vrrpd/Manifest
@@ -0,0 +1,8 @@
+AUX vrrpd-1.9-rollup.patch 820 SHA256 0fb9cbb55f72a738d77a443413a875014712e333ab59b9ab169fee661b22a1e0 SHA512 20dd64876125707cb0cca6c45363a4db05a9472a0bec7bded2665229ee9db44a8429703294cf39b53a703fa9c66b6644e89edf98d1e87c090d763da2a3b07b7a WHIRLPOOL 0eb6c9a134c2d16f99b5c5d990ce6875e88e34ae004793f5fde21e5677a738aca447bd9e4a3b582c21001466e74cd1c4c0b5c65457f4e9a03269163691023b4c
+DIST vrrpd-1.0.tar.gz 68819 SHA256 5d49eee9ecb3ceba3a35182930d3d740f771c8f7950b2327502a79c66bca2fd6 SHA512 bf855d4d196fe7ee2d6fb8db02d86941ce6e0ddac59896c649df99eb20002d23a42a60dc11ddb1a35da6bb6b20099df81e2e6114915e71d06cbc82d93a0ff82f WHIRLPOOL 34028a5bcb28645840cee636c22e647972b9f4c2ac71369168131a5ea191c39d23d0ac49850c095091542e885649da93d7c1c2bd35e8d0575717cecca892360e
+DIST vrrpd-1.9.tar.gz 542249 SHA256 b505adad5c4c8972ad2a0d8012d8193292a4ddfcb9cfa854a416f1da64c95e03 SHA512 8c719cabbd6a799e4e439dbb698af9d6e24cf2635cfbd71a204b46bd2b65c1384e53f130b663d0fcfc903d89080ff25d9c97ae4cd9f6b2434d5462cf678a306b WHIRLPOOL 38b3c21df58096473ed71e7b8ef8241ef72948758273313f39eb5052d7304cb311c4b94d81dbf3988b54ac077c929e4788b9bf73a2e2210dee728104a2589ebf
+EBUILD vrrpd-1.0.ebuild 642 SHA256 4cc08385679ef502ee924e1c9a82a5e97c8f80fd4ef5058b7e2a1b83e252e437 SHA512 9b9a974fe653ba8ed7ae23ce405ba4c88a9f2964386d1577c1bacd68d49fece26d5380c39e9a828b3ceff5432a6d38fde9fa1a67cfd00e4e113a5bd75901d227 WHIRLPOOL 1eae25b0d20709e123982c6a2f92f1a9ddf09df0f3cb70622d4db424c309a5fbfdc95d4ed75c9748be07da3d15da9ca8a6b72b28a6917d69cf0cff083399e2ae
+EBUILD vrrpd-1.9.ebuild 862 SHA256 7237e640ca867da4e626a886ee65b4f17d3cd1b93205c8b387956daf87f356f4 SHA512 433bdb266ed1788f28cc38555a00208fe896a1ed301f8eac82d2a07d5006fec4b01767e2c5bde2f3587f147c72b5a5511349e599342296978c9a61d86e35334c WHIRLPOOL 6f4ccf4b6b59f6d7f5dc9e47716c6a02f9dabf7ec90f6aacec44035c7880c97139ee771ea7e001bff5d7f9d728f8a9f95f60ce0f15d26dc3dc7fe471a6fc3786
+MISC ChangeLog 2789 SHA256 3b73273fc183a6f0e5b900ec6ad80ca30081d02c8c2843bc0ed69767df5b7859 SHA512 6ee804592c540d074b9c194f73c2d28b56700debd42fef6980a79fda7e42a6f1f52d3cd9b83fb65c4e9a5d1266b314ddd91f0a5a29c1267211689650c82d04eb WHIRLPOOL 9f7318b651b3f34382bcb7ce925ca098ecd196805909807e1bce4c4eebda84eea120fe56154c99ee177046e904e37d41143dc4166857327e4670244899d468b7
+MISC ChangeLog-2015 581 SHA256 cbd8b81de4af63375956949419607e09e245bb9463d86a2f72c8a8902fa0202d SHA512 62f4003f95e01d44e6b15b7bacda838b5694c2ad7de59b8269b29cf1238167f24d604903611840c8ec6730948831a387ebd2694256c385a4053cbfbdffdc540f WHIRLPOOL d222a7d67f6a7f568a82ac21c05b9bfbaeff00fcbbdb91d5a452341d7b6bf540a8e7e0db2d7a7bdccb7ed9f496b72deb23e2a425aeb86da40c8cfd9cf642bc62
+MISC metadata.xml 392 SHA256 9f57641ccb68a3211a8a6185a10dce00e57b0a07a33688f6cabbd4ba42f291a6 SHA512 1e3efb18e8680a55af393d09389ce819d187cf18e8c196be5acf9bd831afb1440d23d490c3b1137a4f7faadd734a8858c671a59ed0451430e0dcd928ee75b338 WHIRLPOOL 9435268a8175313998403c0151370676c23f940dbc22b9cd9b7934f53262d86272fe31a6510100458ae21cd3bacfa365be4e460a49e270241a436c0fe58dee29
diff --git a/net-misc/vrrpd/files/vrrpd-1.9-rollup.patch b/net-misc/vrrpd/files/vrrpd-1.9-rollup.patch
new file mode 100644
index 000000000000..72c5f3ad47f3
--- /dev/null
+++ b/net-misc/vrrpd/files/vrrpd-1.9-rollup.patch
@@ -0,0 +1,37 @@
+This is a partial rollup of patches submitted to upstream to clean up the
+packaging.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff --git a/Makefile b/Makefile
+old mode 100755
+new mode 100644
+index d7f3309..869d06d
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,8 @@
+ PROJECT=vrrpd
+ 
+-ALL_EXE=vrrpd
++ALL_EXE=vrrpd atropos
+ 
++ATROPOS_OBJS = atropos.o
+ VRRPD_OBJS = vrrpd.o libnetlink.o ipaddr.o
+ 
+ MAIN_OPT=
+@@ -18,9 +19,13 @@ COMMON_CFLAGS= $(MAIN_OPT) $(INCLUDEOPT) $(PROF_OPT) $(DBG_OPT) $(MACHINEOPT)
+ CC=gcc
+ CFLAGS= $(COMMON_CFLAGS) -Wall
+ 
++all: $(ALL_EXE)
++
++atropos: $(ATROPOS_OBJS)
++	$(CC) $(PROF_OPT) -o $@ $^
++
+ vrrpd : $(VRRPD_OBJS)
+-	$(CC) $(PROF_OPT) -o $@ $(VRRPD_OBJS) $(LINKLIB)
+-	$(CC) atropos.c -o atropos
++	$(CC) $(PROF_OPT) -o $@ $^ $(LINKLIB)
+ 
+ vrrpd.o: vrrpd.h
+ libnetlink.o: libnetlink.h
diff --git a/net-misc/vrrpd/metadata.xml b/net-misc/vrrpd/metadata.xml
new file mode 100644
index 000000000000..131b5e980ee7
--- /dev/null
+++ b/net-misc/vrrpd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fredbcode/Vrrpd</remote-id>
+    <remote-id type="sourceforge">vrrpd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/vrrpd/vrrpd-1.0.ebuild b/net-misc/vrrpd/vrrpd-1.0.ebuild
new file mode 100644
index 000000000000..fe78feecdfe2
--- /dev/null
+++ b/net-misc/vrrpd/vrrpd-1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Virtual Router Redundancy Protocol Daemon"
+HOMEPAGE="http://www.sourceforge.net/projects/vrrpd"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/1.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DEPEND="sys-devel/gcc"
+RDEPEND=""
+
+src_compile() {
+	emake DBG_OPT="" MACHINEOPT="${CFLAGS}" PROF_OPT="${LDFLAGS}"
+}
+
+src_install() {
+	dosbin vrrpd
+	doman vrrpd.8
+	dodoc FAQ Changes TODO scott_example doc/draft-ietf-vrrp-spec-v2-05.txt doc/rfc2338.txt.vrrp doc/draft-jou-duplicate-ip-address-02.txt
+}
diff --git a/net-misc/vrrpd/vrrpd-1.9.ebuild b/net-misc/vrrpd/vrrpd-1.9.ebuild
new file mode 100644
index 000000000000..79f102e990c4
--- /dev/null
+++ b/net-misc/vrrpd/vrrpd-1.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Virtual Router Redundancy Protocol Daemon"
+HOMEPAGE="http://numsys.eu/vrrp_art.php"
+SRC_URI="https://github.com/fredbcode/Vrrpd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DEPEND="sys-devel/gcc"
+RDEPEND=""
+S="${WORKDIR}/Vrrpd-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/vrrpd-1.9-rollup.patch || die
+	emake mrproper
+	#rm -f atropos
+}
+
+src_compile() {
+	emake DBG_OPT="" MACHINEOPT="${CFLAGS}" PROF_OPT="${LDFLAGS}"
+}
+
+src_install() {
+	dosbin vrrpd atropos
+	doman vrrpd.8
+	dodoc FAQ Changes TODO scott_example doc/draft-ietf-vrrp-spec-v2-05.txt doc/rfc2338.txt.vrrp doc/draft-jou-duplicate-ip-address-02.txt doc/principe-Vrrp1.jpg doc/principe-Vrrp2.jpg README.md
+}
diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
new file mode 100644
index 000000000000..841602319f3b
--- /dev/null
+++ b/net-misc/wakeonlan/Manifest
@@ -0,0 +1,6 @@
+AUX wakeonlan-0.41-ethers-lookup.patch 2284 SHA256 091cf1f456e66cf264657ade127cf524b26d1111bc6c0b5c9375cb662d49f20e SHA512 39cdee0f2732f4d09822cbb82e4674e966b1648fbdd84b4a8adaf3b734ea2e8e4b5f0d535f7d70dbf3608c23ddc0761de9c5892a5c6c73613f322dc4e71db3d2 WHIRLPOOL 19c4a260e8eea106aadadd686f75358a91ade956397226bd324dddc538772bec8c999375d7b58d55659ebfbbc34e9153733b5c1dc008e7aa3039b0d37e078400
+DIST wakeonlan-0.41.tar.gz 6028 SHA256 581b1b27a7e810ab72668cce4bd9aa9b3e0cea34b2db24dd1a44c09d63ddda98 SHA512 192ed2ad157e3f5af01632b8f2b727e232448e5a9bff6aec25298fa9913ec38f1036b665b141b5299994c88b1941d9896b6eaa92cfdb44d65db3628f50e3824f WHIRLPOOL ac27332a74a2327dc33914c7e4adaffefcc064a5667baa95ac8e43fffc59b4d2917916c073e93bfcfeb23e5141047b032d3f87b8800e9fba81d956e6f40eef46
+EBUILD wakeonlan-0.41-r2.ebuild 620 SHA256 7e3fee09ac0e999c8e5f6371bec520814e896f6dbca995c55080c370f6b1264f SHA512 44fc89c20ab63a6cde8881b40d8c69a9f744c03fdc877afeda97c68810d3adc3a73e85d338f59ef0da363f70baac896cecce4d7e281d6bb961afc5e5a423870d WHIRLPOOL 10a1c7edc08954c2c47b9666733fdcbdbd4c3bf8e6d1cf66831bc5ad6a8e9de4fe03dc34345767939a6957823203343ec2c51a83f7b48e933070846f0632cbef
+MISC ChangeLog 2231 SHA256 a155e115f6aaeef1394d5f3bcccc23109d3eb94294e80a8a281ea7f3e2c0c0c1 SHA512 d62ae9919ee5c96a5893ba3103e03ec531ec1286be503c9d9e430d8d164b317e0fa74b6a2f17922b266e187be262d8aea00422bbe24b2dd675bf27ff2d32ac13 WHIRLPOOL cb05e75dbc9f61ad9db757ab1d4944e55782d46ec6fc1ee1d3736c6af787338bc62c47ed69a79fbc618978f8231f5909cb12f6c2ad02de561248201e99843ccc
+MISC ChangeLog-2015 3738 SHA256 aa9ea1574923b21279a07114775461f9bbb42dd2800cb864ef59cfe116f745b9 SHA512 f62c4bd55704b32c44dc5d34fa69100d2e85bfb504567dc301d60795ebba1dff16392f1966bd56efbe0748eec238e2789362de9b6579d42e5ea34a8bae294144 WHIRLPOOL 8aa0e366885905b6bdc1fb1af31b923ada51a889632bda52e96efc55085d3e109ece5b0f7f78f3d106c529d0c0bcb0971b6c7b4240261a0d8a97b2b229c74120
+MISC metadata.xml 302 SHA256 8110ab3b5edc3ffc2f0a138ea8aa64a1e18192a76605dcdc5750a7f2fb4f5d84 SHA512 bc8b86a8e7af1b7c3fc543f267642dfd37f7d8e0f17b99e1eba9a508551c4248b6a072da9d9f74f04d68d51d4b815f3ad2cab2717eb0cbb23f3d224dabe98482 WHIRLPOOL c948993e8620a1aa27f1120f54381313b98d6018ea17e30c564f152ba2736f568a0cc524a685bdeb9de676a802aad280bcb8cd9106a3b214f4527bef164191c7
diff --git a/net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup.patch b/net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup.patch
new file mode 100644
index 000000000000..6cbc355e2854
--- /dev/null
+++ b/net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup.patch
@@ -0,0 +1,90 @@
+--- wakeonlan-0.41.orig/wakeonlan
++++ wakeonlan-0.41/wakeonlan
+@@ -5,6 +5,7 @@
+ #########################################################################       
+ 
+ use strict;
++use Net::hostent;
+ use Socket;
+ use Getopt::Std;
+ use vars qw($VERSION $opt_v $opt_h $opt_i $opt_p $opt_f);
+@@ -44,19 +45,64 @@
+ 
+ sub wake
+ {
+-	my $hwaddr  = shift;
++	my $host    = shift;
+ 	my $ipaddr  = shift || $DEFAULT_IP;
+ 	my $port    = shift || $DEFAULT_PORT;
+ 
+ 	my ($raddr, $them, $proto);
+-	my ($hwaddr_re, $pkt);
++	my ($hwaddr, $hwaddr_re, $pkt);
+ 	
+-	# Validate hardware address (ethernet address)
++	# get the hardware address (ethernet address)
+ 
+ 	$hwaddr_re = join(':', ('[0-9A-Fa-f]{1,2}') x 6);
+-	if ($hwaddr !~ m/^$hwaddr_re$/) {
+-		warn "Invalid hardware address: $hwaddr\n";
+-		return undef;
++	if ($host =~ m/^$hwaddr_re$/) {
++		$hwaddr = $host;
++	} else {
++		# $host is not a hardware address, try to resolve it
++		my $ip_re = join('\.', ('([0-9]|[1-9][0-9]|1[0-9]{2}|2([0-4][0-9]|5[0-5]))') x 4);
++		my $ip_addr;
++		if ($host =~ m/^$ip_re$/) {
++			$ip_addr = $host;
++		} else {
++			my $h;
++			unless ($h = gethost($host)) {
++				warn "$host is not a hardware address and I could not resolve it as to an IP address.\n";
++				return undef;
++			}
++			$ip_addr = inet_ntoa($h->addr);
++		}
++		# look up ip in /etc/ethers
++		unless (open (ETHERS, '<', '/etc/ethers')) {
++			warn "$host is not a hardware address and I could not open /etc/ethers.\n";
++			return undef;
++		}
++		while (<ETHERS>) {
++			if (($_ !~ m/^$/) && ($_ !~ m/^#/)) { # ignore comments
++				my ($mac, $ip);
++				($mac, $ip) = split(' ', $_, 3);
++				if ($ip =~ m/^$ip$/) {
++					if ($ip eq $ip_addr) {
++						$hwaddr = $mac;
++						last;
++					}
++					next;
++				} else {
++					my $h2;
++					unless ($h2 = gethost($ip)) {
++						next;
++					}
++					if (inet_ntoa($h2->addr) eq $ip_addr) {
++						$hwaddr = $mac;
++						last;
++					}
++				}
++			}
++		}
++		close (ETHERS);
++		unless (defined($hwaddr)) {
++			warn "Could not find $host in /etc/ethers\n";
++			return undef;
++		}
+ 	}
+ 
+ 	# Generate magic sequence
+@@ -68,7 +114,7 @@
+ 
+ 	# Allocate socket and send packet
+ 
+-	$raddr = gethostbyname($ipaddr);
++	$raddr = gethostbyname($ipaddr)->addr;
+ 	$them = pack_sockaddr_in($port, $raddr);
+ 	$proto = getprotobyname('udp');
+ 
diff --git a/net-misc/wakeonlan/metadata.xml b/net-misc/wakeonlan/metadata.xml
new file mode 100644
index 000000000000..051b645b0f12
--- /dev/null
+++ b/net-misc/wakeonlan/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>axs@gentoo.org</email>
+    <name>Ian Stakenvicius</name>
+    <description>Primary maintainer</description>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
new file mode 100644
index 000000000000..62de72536991
--- /dev/null
+++ b/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils perl-app
+
+DESCRIPTION="Client for Wake-On-LAN"
+HOMEPAGE="http://gsd.di.uminho.pt/jpo/software/wakeonlan/"
+SRC_URI="http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/${P}.tar.gz"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${P}"-ethers-lookup.patch
+}
+
+src_install() {
+	perl-module_src_install
+	dodoc examples/lab001.wol
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
new file mode 100644
index 000000000000..4775ef27454f
--- /dev/null
+++ b/net-misc/wget/Manifest
@@ -0,0 +1,6 @@
+AUX wget-1.19.1-CRLF_injection.patch 1051 SHA256 4eb2932d33f79b59af345b6ad075893f0a146547d8a7266edfea0d3e7c612093 SHA512 fd36c9225c567e9958f030449f40cb747c0a23b7023fd4eee4e982c867d96be1562377a2d9b80150d9dc714bdbdc2bd509a8a244c4969c731002bdf6434d9cf8 WHIRLPOOL 90cf4613f9e65fabc6d228d361e8ef31a72dc00f5a165ce922fd4ee34568ccabf43954f900a94f13ab51b0d81d1a7272c10c646472066e373ceadd3e4bc4efe1
+DIST wget-1.19.1.tar.xz 2111756 SHA256 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5 WHIRLPOOL 2a4bd80f1e7134637227609f532ee3385472a6895ff22efeface42d082072a09abaa5dd2d8653bfdab015de801d31426b01d73ab5dd1a6864b84c29dc8e72462
+EBUILD wget-1.19.1-r1.ebuild 3197 SHA256 29fc6002b0afa09b6b8718ba1e1a77e1329d4b8b58cd9d95644d7f2c09e968f2 SHA512 bf0b1c2275c6252f8f17c630aa9bb89e9276097f1fa74cf9d56d67c3ea099851ae64cd08996653493dadc39e31737fbeed88f5fc8cc0cbf1313b0b23e824befc WHIRLPOOL 4a989f7804950fa9b4bf1890f717e46a3dd64591df82b9627349b8a4bab9dbba4c9b83ade854effd5e8fd445a5f4223aa807dd3134583e831fde890f71e36926
+MISC ChangeLog 11759 SHA256 b0200db8aa9205aa6cf590936f1758619e1b56fdb17c76314175d6031c287ccf SHA512 eb9e6c7b1d5cb9f3e550b3c7d89493da0026492b629d3b76c5f096b9ef7de499addb31fcf43dd4cfd01eaf73253ddd10ceef5937a9a1a8d18142f9e5c22b764b WHIRLPOOL 679e53afbcbdadd297e78cfbbbbbb4406d23f993f44d38388c0f55b74ec888ea1f81b29be95e36b19dcc92fe6f350861d59549b28a77eb884eba6bee3d0844a2
+MISC ChangeLog-2015 29939 SHA256 902a2f6576d8c8dd01ee76cad7a689cb260d153139adc04b8d76abe91860d86d SHA512 55c752f56737ab6116057f3c158fcd4ba9b0405d43796e4114076c6fe849f7bdf3f771606c69551d5a1bd8a408ff5099158d461b26c840c6a4fe05824d8ae11e WHIRLPOOL 4b1c46b1c0c25428559442be8e2aef443686e00fd1889c908bf7d28291a5064e2dbe9879f0bd2025a8e0f49e42ed89334198f5dc9ee1122c91e1ba7c317678c7
+MISC metadata.xml 570 SHA256 82fb121ee11ecf4d5b5a20e885a9773b301061d7a2b19755c01322aef615e1ae SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c WHIRLPOOL 08ddfe93af78d6f213e2a08f2414e2ae7e1442ec0eddf34ea29e1383a694f342c1dc72df8370b61828e7ef7914f2863519afc83e83a3cbd783a1be015703bcfb
diff --git a/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch b/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch
new file mode 100644
index 000000000000..aa4e978cfda9
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch
@@ -0,0 +1,37 @@
+From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Mon, 6 Mar 2017 10:04:22 +0100
+Subject: Fix CRLF injection in Wget host part
+
+* src/url.c (url_parse): Reject control characters in host part of URL
+
+Reported-by: Orange Tsai
+---
+ src/url.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/url.c b/src/url.c
+index 8f8ff0b..7d36b27 100644
+--- a/src/url.c
++++ b/src/url.c
+@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode)
+       url_unescape (u->host);
+       host_modified = true;
+ 
++      /* check for invalid control characters in host name */
++      for (p = u->host; *p; p++)
++        {
++          if (c_iscntrl(*p))
++            {
++              url_free(u);
++              error_code = PE_INVALID_HOST_NAME;
++              goto error;
++            }
++        }
++
+       /* Apply IDNA regardless of iri->utf8_encode status */
+       if (opt.enable_iri && iri)
+         {
+-- 
+cgit v1.0-41-gc330
+
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
new file mode 100644
index 000000000000..85b6f1cfa8ce
--- /dev/null
+++ b/net-misc/wget/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+<use>
+ <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
+ <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
+</use>
+<upstream>
+ <remote-id type="cpe">cpe:/a:gnu:wget</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/net-misc/wget/wget-1.19.1-r1.ebuild b/net-misc/wget/wget-1.19.1-r1.ebuild
new file mode 100644
index 000000000000..edbca55d9110
--- /dev/null
+++ b/net-misc/wget/wget-1.19.1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs eutils
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CRLF_injection.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	ac_cv_libunistring=no \
+	econf \
+		--disable-assert \
+		--disable-rpath \
+		--without-included-libunistring \
+		--without-libunistring-prefix \
+		$(use_enable debug) \
+		$(use_enable idn iri) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable pcre) \
+		$(use_enable ssl digest) \
+		$(use_enable ssl opie) \
+		$(use_with idn libidn) \
+		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
+		$(use_with uuid libuuid) \
+		$(use_with zlib)
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info
+}
diff --git a/net-misc/whatmask/Manifest b/net-misc/whatmask/Manifest
new file mode 100644
index 000000000000..0361ed0e219c
--- /dev/null
+++ b/net-misc/whatmask/Manifest
@@ -0,0 +1,5 @@
+DIST whatmask-1.2.tar.gz 170183 SHA256 7dca0389e22e90ec1b1c199a29838803a1ae9ab34c086a926379b79edb069d89 SHA512 7e32eedf4a58d7f0396099ed07d6d8fed14dd12fa166316bfe8d3246643c50158c19a192272f555e9fbbb99f009552ba294c9e27b6dbb373f28067ce9ff5cd17 WHIRLPOOL 24defc056d9945119398d5bfacc6260844d2e14f99ad4743f45031b806c739a5332a026f509bbdbcdac19fb153b96f5a9a846ee3a4abd16fd7264ab8e5137b81
+EBUILD whatmask-1.2-r1.ebuild 505 SHA256 1aec22bdee3aa671b9496faea824b18445859375c913c97485d9209104f9e7ea SHA512 593010d8e0b4322cfc9ed04682b91a87347881d31d4a3fe3aa3b8e02c69d190e66c54d73fbc27fa1cfe92ab257c1afa38bcefadced68e13fa30a5864b771ef87 WHIRLPOOL 97459641fe8571dd336cc2436d3e6a1c0902d985859b60e171c8f20e8331d3d6a7e4982c9dcc5bdf85e62c1c30cc6275ee8ee7398aa86e22f6ccf1ec72ff128c
+MISC ChangeLog 2181 SHA256 dcefaf1f806464f86aa13d8779001bad64012bf40ce6e114d554f11b8ee54c5c SHA512 a2639004602bd96d2dfbdce660df8a9de43b308fe12260cda8d55a73348796bcab948fd5569914f406324a2b5e36cf682cd14d7676c6a037c014ce87e44cc806 WHIRLPOOL bce4f1b246112171b411f75efe7d441ac78ec71fffba57a4bdf2178af44d885a3133ed185eca8c85dd087aa31dafb987cb023ae4a2176f170ab57e896f4f53c2
+MISC ChangeLog-2015 3299 SHA256 33eecc9d5a8a97309aac513acb3393af4cfec15e64172c4d3739f01a0aa43bf3 SHA512 cb8dcad121bce99e5ed0d4b8312a6357f62f8a762268d83540367c7644b92ce329170eadde2bf676be60361c5baf5dd7d3cb279234ba09c011ad2769d39b694c WHIRLPOOL 6ebc866ba61923b145614c74fd3b4f296879edef242beb44355e5d1f189fac0ff4f98fc174016d36d83e1fc21d17790882d42e352609a26ab723686ae1d05b25
+MISC metadata.xml 244 SHA256 a65bfec176330796e1eeb3bb589b78ff60a123b947537decd4705ea71ca4e906 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db WHIRLPOOL 1164de6a99d8931ca3ae60cbb397be80b802eb473943ef777dbe8473d8d665a5f93d8b99175709bf09d8af856b3ea7aaf7c95a87aad37e48b85c06e618431a1f
diff --git a/net-misc/whatmask/metadata.xml b/net-misc/whatmask/metadata.xml
new file mode 100644
index 000000000000..f8bd6f3f34f9
--- /dev/null
+++ b/net-misc/whatmask/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/whatmask/whatmask-1.2-r1.ebuild b/net-misc/whatmask/whatmask-1.2-r1.ebuild
new file mode 100644
index 000000000000..4dbd6756dbc5
--- /dev/null
+++ b/net-misc/whatmask/whatmask-1.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="little C program to compute different subnet mask notations"
+HOMEPAGE="http://www.laffeycomputer.com/whatmask.html"
+SRC_URI="http://downloads.laffeycomputer.com/current_builds/whatmask/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc sparc x86"
+IUSE=""
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README )
+
+src_prepare() {
+	tc-export CC
+}
diff --git a/net-misc/whatportis/Manifest b/net-misc/whatportis/Manifest
new file mode 100644
index 000000000000..6da1096dcfb6
--- /dev/null
+++ b/net-misc/whatportis/Manifest
@@ -0,0 +1,4 @@
+DIST whatportis-0.6.tar.gz 218447 SHA256 d037a5b36629b0775527dea71a95feb99a5e619cca7626abe52edf6590c13602 SHA512 f9a46974618b0c70164de29aa9c57c7d0cb3c0a09626ec3d7d514fe0b88ce50b2acca1f9e949449508a2b170311e470fe9c7f3ed66f0af4ef01fd63dd815b8a2 WHIRLPOOL d02cfa19af5e7cd759bab614b6b10facc17c6f71e2588369ae2864da6706a2c2b2b1c2695eab312023533aa9751e82f5e9f82e99aea1cacde0df29e7339a98af
+EBUILD whatportis-0.6.ebuild 851 SHA256 95b727a4ac48c1a7b0973399e7d3b60ecd9571ff63cab87936691cbb30677b66 SHA512 fb4c3f4b52ca3abc67d42a98d2bfa717f93dd35105d9d15f3703737429868e85fb00bf5c3a5b3324e0985a71e2d3f72572968fdea8a809fbeb96826ac9a980f3 WHIRLPOOL 2bd33362ecc79bb5f01848622bde263db6320618c24d6b04c8811b231d34307369e5f0d6103a8828c2b6374c867ff00a171d6fbd3f0d270c8120703064c585f1
+MISC ChangeLog 2759 SHA256 abd94eb40d3b38478f3ac6b8f2b1903d1547ed56938b536d0f96cae810732fdb SHA512 77da2fd08565d02a88a70a8ed28dfeeebd2e2f67e77e880ab732d7809d99f9fcf317d6de6a81a9d15da61d015aabe6d8b5ca1bcfb75c346a6b6c1d7b5e3e8f9e WHIRLPOOL b323793aa7578d642bef7b9928af4acda83d70382c762d2aa69f506509f7aad909a70cb3868a8d7edcc4f284593a09e702923c6e8515ca15f87768afb6533dc8
+MISC metadata.xml 433 SHA256 07ebcb9e94bd5c726487a44245698ce42d796e40045d939e12fa6e8f9a504946 SHA512 07dcab4d60662404545f0a48a9a70cbda5791adff2bfad29a8877fcaa78a91b117edd750d11779ccfb04ba5332b0cc8b97482d368976b2e926e0076bd1fe783d WHIRLPOOL 685464f6691b682d924126ae20e5cfbfcb87ad3422b984d8d9c50608a0a536b950db5041e37e5f9f5e0182bb89e8e96dd35e6c9a3842bd2ae5fb00ff24c0a846
diff --git a/net-misc/whatportis/metadata.xml b/net-misc/whatportis/metadata.xml
new file mode 100644
index 000000000000..497425e26622
--- /dev/null
+++ b/net-misc/whatportis/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-needed -->
+  <upstream>
+    <remote-id type="pypi">whatportis</remote-id>
+    <maintainer status="unknown">
+      <email>ncrocfer@gmail.com</email>
+      <name>Nicolas Crocfer</name>
+    </maintainer>
+    <remote-id type="github">ncrocfer/whatportis</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/whatportis/whatportis-0.6.ebuild b/net-misc/whatportis/whatportis-0.6.ebuild
new file mode 100644
index 000000000000..97cd47b75bf4
--- /dev/null
+++ b/net-misc/whatportis/whatportis-0.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A command to search port names and numbers"
+HOMEPAGE="https://github.com/ncrocfer/whatportis http://pypi.python.org/pypi/whatportis"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/click-6.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/tinydb-3.1.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.8.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" test_${PN}.py || die
+}
+
+pkg_postinst() {
+	optfeature "Run ${PN} as a Server" dev-python/flask
+}
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
new file mode 100644
index 000000000000..5005091613fc
--- /dev/null
+++ b/net-misc/whois/Manifest
@@ -0,0 +1,10 @@
+AUX whois-4.7.2-config-file.patch 202 SHA256 4f7d1de6d0ba34f6cb03c4424b62d5b703a5d7ef286f1d04e09fdd73f31561fd SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65 WHIRLPOOL 2ab0e6620a68c3177b1e4b6993978466cc7569ef378423ac5a131f2cf38978b64dd4fc5257a218a698ccc455f93f2a4e18ab9cf50e9adcdf541fbde2331e1211
+DIST whois_5.2.12.tar.xz 80428 SHA256 b26d4027b8987d9911466aa06ce2c167a50017cd59a622a429bd506222f6cdf1 SHA512 df40e2e7cbd11d00984f865e122ad4ece882a6a45e2f75ad5ea24ce937b7e9452b01fd886f43bae55fd065a6556cfc4577e7126151b5fd43fa806c4b0c886ced WHIRLPOOL a2c5a3e9f01dd0cbb127269632c60e6c71c981df4d4e53fdf37e2c1932252f3ae2b13961a1c8606b542fd9997bf9fcb62a6cef592a01dbd04ff18c75e3f9b3ec
+DIST whois_5.2.17.tar.xz 82360 SHA256 257585678f571e18964667b41dc6543fe9da6123ac95743660c9c3ae1eba9664 SHA512 b65de384ac935518bde0cee42f46f4bf99dc94e94e411b103df8eb73291c317409837adba2a358dfebdae6e1c46d85ccfe8debf86233be64eb91ebfe86a29152 WHIRLPOOL 4ed1eca099fd1c4337e555564b37e604b4115ca520b751531470c5e70ab9013a3e43a3db3318307e04b10d357743bd2495cdf2051c159a3a661c36d29f919af2
+DIST whois_5.2.18.tar.xz 82368 SHA256 c35d0d26aff37107c244a8ad54fd42e497ec0b90f76309e9beb7078b827c97d5 SHA512 dcbfbab0da3b9b5876c7c51bc411ac371a5c33012bf1286a3e6ccfb59fb4fba89eab1c4b812766d2f101a93ca3424ef636214c05add59549b9809621dfb03d73 WHIRLPOOL 780401ba9d6494589eea4273041a9ba6cbb6779cc11be2cdf96b39ea338afd60a5f62b185da78f4bc5da29562601b197bb6d39a71fdb69c1e49a416a34de8606
+EBUILD whois-5.2.12.ebuild 1494 SHA256 d21b36d1f3ec9d99befbb2b8559efc7ebc07bf93470c0bdbf7bde209af97a803 SHA512 ca9371338ccbba81f3a60a611e82b6702c4a43166d57c02cb029d1303fc2cee92cf2173f9381d888a48785191dd05719f66d3eb687bf90e4d987377d092700ff WHIRLPOOL a905fd12119c76f171be9e3b2ed7d45f3366d16d6b6d4e33618a8a2d7fcec2fd1e137d7efa4c071cee36951e574daf2437a91f683f8eb4d69d7ca4f31c8e7526
+EBUILD whois-5.2.17.ebuild 1514 SHA256 5850cf7d8e2ab82d35211b101f343acd37349d23db7db3a26df7827198ce3db1 SHA512 1c8d4b22ce6b4d96e11e0c96d06adf246466ecd730fc535ce4b69a53d00d4be28f987957b54b4ce652e17c3e9feba639434d0feb14b015bd10f0b81290389dec WHIRLPOOL a9514484d528e67078a4b788e4ec4d2d1b753209d710e0e7889f4d8738923c3cee5968ab2a51cd534343989de2e52accdd73f44c65abd8fef4eacc5ccd699438
+EBUILD whois-5.2.18.ebuild 1514 SHA256 5850cf7d8e2ab82d35211b101f343acd37349d23db7db3a26df7827198ce3db1 SHA512 1c8d4b22ce6b4d96e11e0c96d06adf246466ecd730fc535ce4b69a53d00d4be28f987957b54b4ce652e17c3e9feba639434d0feb14b015bd10f0b81290389dec WHIRLPOOL a9514484d528e67078a4b788e4ec4d2d1b753209d710e0e7889f4d8738923c3cee5968ab2a51cd534343989de2e52accdd73f44c65abd8fef4eacc5ccd699438
+MISC ChangeLog 4684 SHA256 09aa77a369c9a3a38a054b05ee4027da63e30bf22860344b32572cb74ea98ba4 SHA512 8eede489ca3d68856fd91486e256cdb782b33682cfe4c08f4f85ea2c63c2752e47d47c7463844aa4f1f180078734f2128238addcb1236b66359752a09e22c761 WHIRLPOOL 0925454c25dcb48c4f5a8d1f6cbdba024734b4375a3237a576d897334ea68a7344b0badb6448eb7fd6436792d9dd62ad53bd60cb04fc7f7883354961c9e442c1
+MISC ChangeLog-2015 27688 SHA256 9fae1217e514122384e797d575b6c7769d7ebe7b4ec6885be6b921c6f7a6e44e SHA512 a892cbb5db4af5ebd5d03bbcc660ea5159e3edadbbdb552e2ee99f2dd9e907555dcf5e3218ae48d504feba74d9b2c69d4aafb2f453f59a433bd45e0d21f6707f WHIRLPOOL ab11384acce69d4388514f5c34a676717b5549cdceea3372bfc61a3b6169757655a7e16434400d6b47fcd4513ddde028269f1e3cfc9f2fbf0767765163153a11
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/net-misc/whois/files/whois-4.7.2-config-file.patch b/net-misc/whois/files/whois-4.7.2-config-file.patch
new file mode 100644
index 000000000000..da91d5a71337
--- /dev/null
+++ b/net-misc/whois/files/whois-4.7.2-config-file.patch
@@ -0,0 +1,12 @@
+Enable /etc/whois.conf support.
+
+http://bugs.gentoo.org/show_bug.cgi?id=89417
+
+--- a/config.h
++++ b/config.h
+@@ -13,5 +13,3 @@
+ /* Configuration file */
+-/*
+ #define CONFIG_FILE "/etc/whois.conf"
+-*/
+ 
diff --git a/net-misc/whois/metadata.xml b/net-misc/whois/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/net-misc/whois/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/whois/whois-5.2.12.ebuild b/net-misc/whois/whois-5.2.12.ebuild
new file mode 100644
index 000000000000..b29486572d8b
--- /dev/null
+++ b/net-misc/whois/whois-5.2.12.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://www.linux.it/~md/software/"
+SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="iconv idn nls"
+RESTRICT="test" #59327
+
+RDEPEND="iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
+
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :;} # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-misc/whois/whois-5.2.17.ebuild b/net-misc/whois/whois-5.2.17.ebuild
new file mode 100644
index 000000000000..b9d8673f4dc0
--- /dev/null
+++ b/net-misc/whois/whois-5.2.17.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://www.linux.it/~md/software/"
+SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="iconv idn nls"
+RESTRICT="test" #59327
+
+RDEPEND="iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+)
+
+src_prepare() {
+	default
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :;} # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-misc/whois/whois-5.2.18.ebuild b/net-misc/whois/whois-5.2.18.ebuild
new file mode 100644
index 000000000000..b9d8673f4dc0
--- /dev/null
+++ b/net-misc/whois/whois-5.2.18.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://www.linux.it/~md/software/"
+SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="iconv idn nls"
+RESTRICT="test" #59327
+
+RDEPEND="iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+)
+
+src_prepare() {
+	default
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :;} # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
new file mode 100644
index 000000000000..7be8165d0bf5
--- /dev/null
+++ b/net-misc/wicd/Manifest
@@ -0,0 +1,13 @@
+AUX wicd-1.7.2.4-fix-desktop-categories.patch 879 SHA256 11da20e35ac224f5a4ddd50d3c700eb2d139eb004956dffe8600e36fab241b6d SHA512 f67dd4bbe84dd145e25718185b6c50e5b2a99e77787ca536d1cc1844b0ed70d1d3acff3f660d94299479bc4d4ce685ebb43f7afd7565682b05d99e14d657ed9e WHIRLPOOL f8c1b07c3aeac7306e238c7e9db53e2242455fae6e756b2e4873d22cac25e358412aa7159e7386869f9378efe78f13dfac25397dea79f0754614299ab957a9ca
+AUX wicd-1.7.3-add-missing-gnome-shell-extension.patch 1695 SHA256 9e94c652e2a85d8a2bdff41b9a2d7c28dd9f552fb0bdc88cff61e2b9b4336deb SHA512 4a08360d192f040983e782a81f8a57b8407726531551f512f5ea8537c18c3abf8934a1c597e73945637e15c96ba0f26cfc63525d00981a7ab6897ef0ab4ed2e5 WHIRLPOOL 6fa2c1bd6d7397dfc28e354019eba31ff77a6f1716c0b4a0f9490528dd85ce673c32dfd2c94c157384298716bf3839af4b7505339cfd0586e8f3668d25829eea
+AUX wicd-1.7.3-bitrate-property.patch 775 SHA256 06c38a1ac8c7f150473c33da4053badd19ae5b6cbae740b3511be012e63139a1 SHA512 02a4e219b62b5ba36371aac75c89adf0e2c05d57d472ab39f7bca0f500140ff78cab94db292f793dc2398933d26c2e18e1c806940b339e120afbd617d83e67a8 WHIRLPOOL 11509d9649462360af035547af99bde11438a278b8479e1f2b3f2a1a6fe1d703cd0b82b5562c20a2c8ed426127c3c1acdad03569c447d697699c413948411468
+AUX wicd-1.7.3-undefined-LANG.patch 946 SHA256 747f5a0b87460148af67c37cb63c563dd0ec68b362a1853836515f4ccfed182e SHA512 c2d197d41a84975bb3caf44de9b05b741b6702c38079ecc917632f9eedcf2be71373416154013690620511f2e9e99fb0d88cee0b22292fe007795cde664e63e5 WHIRLPOOL 0b36b1d1cf4de2ec375f70e8bfbf7d453eb5104bd3aa1b0e4e2ade6b9e211f1d0759cdd7b78a356ce5ef2d8a4cf5017a2529e8f274b41408597d45315e171085
+AUX wicd-1.7.3-urwid-1.3.0.patch 477 SHA256 eed37078a474fa64da0290c34c9107f2562a76ddc3f73796e00124061862dc6b SHA512 f5904e9fd082fb77d6b930285d6f1662d603d11c348068ec29820683aee319adf4ff0ddd28f7da80dc3c5b5834d9f9a0649d4077aed09d6c8ce8e24d8791d5c6 WHIRLPOOL 0d5277e87841f20eeca9ace601cfa682c995549eda60cf570efbd862f5c3355e188139368303710dc16c5f07919b1c4c4b9735a7d5ca481113ba7910f0d17c95
+AUX wicd-init-sve-start.patch 317 SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db SHA512 d62db40a156aa9e7b97b23b3ebceded77bcae18ae513c39b8e4ef8733c30429059a83f932c83b3cf0b90fd0aeeeadc6249a71498c569630df057037acf43f3fc WHIRLPOOL 7df520e4e3291e032d031763f43596e97b66bdcf8418f0a328b885e3ee7051807b7023fa0663e2f42010bc3b71e4d7852e954a5b8e00e2805f4487f409a0da31
+DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 WHIRLPOOL 336f363092c9bac7523047b6052a856a699820147967820418c6ac1ca528c472d371c6c211c505c325b5eb001812042c01425b05e1dfdf2d4a528f96686c530a
+DIST wicd-1.7.4.tar.gz 547393 SHA256 67989614004773db349791c37675efb914d084bdb221356a05e4369c35e7eb62 SHA512 1e99a45daa858eba634e60e50c22aa2fab3fc4d643979a6741b6164bf500bd6db285d11c12ccd164ab6cf0792284e319e3c3447804088e74b4fc67bb6f431959 WHIRLPOOL 680c79380ea645a286889c737c7b478a933e4243ad20c5c0f8cf53d37747a1d98780e21a4aeb98bed6da37f93f61d5dd4a42b22466f2feceae08e87d853b80fd
+DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011 SHA512 98ed3f92ec361aa8651c64efdb5128b8f73068f1cf2423640dafc4b46889ae32c1d1f56f509ad609b2bf98f634f8ada4c501f2294e3a64affd1befd4400498a8 WHIRLPOOL 84c097432ebb6ca66c0fa48d4226c8da5f6342b6fdeeb9546c98952b8f6e52a1f87d0ba23c1b409f3008432e5c6346bf65949dad99070804b1dcc2c1055eb9ea
+EBUILD wicd-1.7.4-r2.ebuild 5090 SHA256 655787b6e96bcfbe6d65262917855c966b642006cd664e7e00ba1a4a8a8bd123 SHA512 70de74c229f32ef67472b5e4bb90e11aa6db3c964cb2e584128c73217ede9e7b01d307e5d488ae7808fd33c8d2eea753e7e7938c70012d1fce5f861454da5248 WHIRLPOOL b201cb9f889760a5fbe5430be55cc014881762310215a4ff580ec161ca407c89d522032c8dc85dedf665ddefbac7c7131930f100e1827d64c5a6a4f1888c780e
+MISC ChangeLog 6589 SHA256 40c4d124de33cac3e06ca57c7739fd18fdfbd7b3404920e2b112171732227043 SHA512 52583ce554757db55effec9b9282ef15886034edb85e009ebd838c71f14fee3975706dec7352211ae3b47ab9fa1d91f47d042f3fc1f254e128415d4f41ce5b4a WHIRLPOOL de6f7117fc6178cf45c8994eb8a04ef472fb5332acf03493fe05b9212dfc57dfa20b3494473365650cf5f901b55f64779726334ddf5001e179b698f5bba6b6e0
+MISC ChangeLog-2015 26387 SHA256 a7f737451ae142fbf394d86d0ea0b45aa0569a783ab741b0fb625949d82dd6a8 SHA512 9116e57c3808bf057848c154f8d7db97c2d4d8a5cb550755b7c153cddcf00172624cb2144dd97507d8477634b60593b9888e50457c5c5d9b2d7e8be1ea440b80 WHIRLPOOL 665ea3e24b5e4ff25340bde9e96babea90437a320cb9d593bb7996b0b8796556c4c55ca087a297b16815d387f22d41cc0685b4acf8a93a777184cc17750244bc
+MISC metadata.xml 913 SHA256 093b6929d3794e81c15c1ceb1c2460d998f3a4c32e78e8459c1255d982c57054 SHA512 2cc53e7e0f14169b88d26324b071b2078012cc57bd9ddae0b14f18efbe2d1bc1ef0b66122c178b0e3019a48bec2ba87fc09186b4d8a96e8e7d8e51a997c09d69 WHIRLPOOL ec17032c4cfb7e9046a4ea13cb5fd7763c2ec4534e3d58c4c2ae846e108acadf72ad7c2a6b90132d94a17a56a98c866415af54fdbf144e9f534e5d4a07da8d60
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch b/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch
new file mode 100644
index 000000000000..0ccbd7833b23
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch
@@ -0,0 +1,20 @@
+diff -U 3 -dHrN wicd-1.7.2.4.orig/other/wicd.desktop wicd-1.7.2.4/other/wicd.desktop
+--- wicd-1.7.2.4.orig/other/wicd.desktop	2013-06-24 22:18:00.715578998 +0200
++++ wicd-1.7.2.4/other/wicd.desktop	2013-06-24 22:18:57.672595363 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Categories=Application;Network;
++Categories=Network;Settings;Utility;X-GNOME-NetworkSettings;
+ Exec=wicd-gtk --no-tray
+ GenericName=Network Manager
+ Icon=wicd-gtk
+diff -U 3 -dHrN wicd-1.7.2.4.orig/other/wicd-tray.desktop wicd-1.7.2.4/other/wicd-tray.desktop
+--- wicd-1.7.2.4.orig/other/wicd-tray.desktop	2013-06-24 22:18:00.715578998 +0200
++++ wicd-1.7.2.4/other/wicd-tray.desktop	2013-06-24 22:18:59.864595996 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Categories=Application;Network;
++Categories=Network;Settings;Utility;X-GNOME-NetworkSettings;
+ Exec=wicd-gtk --tray
+ GenericName=Network Manager
+ Icon=wicd-gtk
diff --git a/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch b/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch
new file mode 100644
index 000000000000..9ea419eb4e71
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch
@@ -0,0 +1,39 @@
+diff -U 3 -dHrN wicd-1.7.3.orig/gnome-shell/extension.js wicd-1.7.3/gnome-shell/extension.js
+--- wicd-1.7.3.orig/gnome-shell/extension.js	1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.3/gnome-shell/extension.js	2015-01-19 14:12:12.962333228 +0100
+@@ -0,0 +1,29 @@
++/*
++ * Copyright © 2012, David Paleino <d.paleino@gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License Version 2 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++const StatusIconDispatcher = imports.ui.statusIconDispatcher;
++
++function init(metadata) {
++}
++
++function enable() {
++    StatusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS['wicd-client.py'] = 'wicd-gtk';
++}
++
++function disable() {
++    StatusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS['wicd-client.py'] = '';
++}
+diff -U 3 -dHrN wicd-1.7.3.orig/gnome-shell/metadata.json wicd-1.7.3/gnome-shell/metadata.json
+--- wicd-1.7.3.orig/gnome-shell/metadata.json	1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.3/gnome-shell/metadata.json	2015-01-19 14:12:12.962333228 +0100
+@@ -0,0 +1 @@
++{"shell-version": ["3.4.2"], "uuid": "wicd@code.hanskalabs.net", "name": "WICD Network Manager", "description": "Show status of WICD"}
+\ No newline at end of file
diff --git a/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch b/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
new file mode 100644
index 000000000000..855a2939b5de
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
@@ -0,0 +1,19 @@
+--- a/curses/netentry_curses.py
++++ b/curses/netentry_curses.py
+@@ -538,11 +538,12 @@
+         self.bitrates = wireless.GetAvailableBitrates()
+         self.bitrates.append('auto')
+         self.bitrate_combo.set_list(self.bitrates)
+-        self.bitrate_combo.set_focus(
+-            self.bitrates.index(
+-                wireless.GetWirelessProperty(networkID, 'bitrate')
++        if wireless.GetWirelessProperty(networkID, 'bitrate'):
++            self.bitrate_combo.set_focus(
++                self.bitrates.index(
++                    wireless.GetWirelessProperty(networkID, 'bitrate')
++                )
+             )
+-        )
+         self.allow_lower_bitrates_chkbox.set_state(
+             to_bool(self.format_entry(networkID, 'allow_lower_bitrates'))
+         )
diff --git a/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch b/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch
new file mode 100644
index 000000000000..b854607d9583
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch
@@ -0,0 +1,24 @@
+Fixes compilation errors when os.environ['LANG'] is undefiend
+--- ./setup.py
++++ ./setup.py
+@@ -621,7 +621,7 @@ class compile_translations(Command):
+                 shutil.rmtree('translations/')
+             os.makedirs('translations')
+ 
+-            oldlang = os.environ['LANG']
++            oldlang = os.environ.get('LANG', None)
+             os.environ['LANG'] = 'C'
+ 
+             for pofile in sorted(glob('po/*.po')):
+@@ -656,7 +656,10 @@ class compile_translations(Command):
+                     os.makedirs('translations/' + lang + '/LC_MESSAGES/')
+                     os.system('pybabel compile -D wicd -i %s -l %s -d translations/' % (pofile, lang))
+ 
+-            os.environ['LANG'] = oldlang
++            if oldlang is not None:
++                os.environ['LANG'] = oldlang
++            else:
++                del os.environ['LANG']
+ 
+ class uninstall(Command):
+     description = "remove Wicd using uninstall.sh and install.log"
diff --git a/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch b/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch
new file mode 100644
index 000000000000..d7f73dca8d59
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch
@@ -0,0 +1,15 @@
+--- a/curses/wicd-curses.py
++++ b/curses/wicd-curses.py
+@@ -1153,9 +1153,10 @@
+         if not ui._started:
+             return False
+ 
+-        input_data = ui.get_input_nonblocking()
++        ui.set_input_timeouts(max_wait=0)
++        input_data = ui.get_input()
+         # Resolve any "alarms" in the waiting
+-        self.handle_keys(input_data[1])
++        self.handle_keys(input_data)
+ 
+         # Update the screen
+         canvas = self.frame.render((self.size), True)
diff --git a/net-misc/wicd/files/wicd-init-sve-start.patch b/net-misc/wicd/files/wicd-init-sve-start.patch
new file mode 100644
index 000000000000..c6314920d74a
--- /dev/null
+++ b/net-misc/wicd/files/wicd-init-sve-start.patch
@@ -0,0 +1,10 @@
+diff -U 3 -dHrN wicd-1.7.1b2.old/in/init=gentoo=wicd.in wicd-1.7.1b2/in/init=gentoo=wicd.in
+--- wicd-1.7.1b2.old/in/init=gentoo=wicd.in	2011-05-07 20:52:13.000000000 +0200
++++ wicd-1.7.1b2/in/init=gentoo=wicd.in	2011-05-07 20:52:43.000000000 +0200
+@@ -35,5 +35,5 @@
+ 
+ restart() {
+ 	force_kill
+-	start
++	sve_start
+ }
diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
new file mode 100644
index 000000000000..8fa97712dc59
--- /dev/null
+++ b/net-misc/wicd/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="ambiance">Install icons from Ubuntu's ambiance theme</flag>
+		<flag name="gtk">Installs a gtk UI. This is enabled by default because it is
+		intended behavior. Requires <pkg>dev-python/pygtk</pkg></flag>
+		<flag name="ioctl">Installs additional python libraries to use as a backend.
+	This will improve speed but is experimental.</flag>
+		<flag name="mac4lin">Change default icons to mac4lin icon set</flag>
+		<flag name="ncurses">Installs a ncurses UI</flag>
+		<flag name="pm-utils">Installs the pm-utils hooks for suspend/resume and
+	requires <pkg>sys-power/pm-utils</pkg></flag>
+		<flag name="gnome-shell">Install gnome-shell extension</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">wicd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/wicd/wicd-1.7.4-r2.ebuild b/net-misc/wicd/wicd-1.7.4-r2.ebuild
new file mode 100644
index 000000000000..c06f9fd6f0ff
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.4-r2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?,xml"
+
+inherit eutils distutils-r1 linux-info readme.gentoo-r1 systemd
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="https://launchpad.net/wicd"
+SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
+	mac4lin? ( https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )
+	ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
+IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell"
+
+DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	X? (
+		gtk? ( dev-python/pygtk[${PYTHON_USEDEP}] )
+		|| (
+			x11-misc/ktsuss
+			kde-plasma/kde-cli-tools[kdesu]
+			kde-frameworks/kdesu
+		)
+	)
+	|| (
+		net-misc/dhcpcd
+		net-misc/dhcp
+		net-misc/pump
+	)
+	net-wireless/wireless-tools
+	net-wireless/wpa_supplicant
+	|| (
+		sys-apps/net-tools
+		sys-apps/ethtool
+	)
+	!gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
+	ioctl? ( dev-python/python-iwscan[${PYTHON_USEDEP}]
+			 dev-python/python-wpactrl[${PYTHON_USEDEP}] )
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	ncurses? (
+		dev-python/urwid[${PYTHON_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+	)
+	pm-utils? ( sys-power/pm-utils )
+	gnome-shell? ( gnome-base/gnome-shell )
+	|| (
+		>=sys-apps/util-linux-2.31_rc1
+		net-wireless/rfkill
+	)
+	"
+PATCHES=(
+	"${FILESDIR}"/${PN}-init-sve-start.patch
+	# The Categories entry in the .desktop files is outdated
+	"${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch
+	# Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413
+	# Creates files -> give -p
+	"${FILESDIR}"/${PN}-1.7.3-add-missing-gnome-shell-extension.patch
+	# If LANG is undefined, build can fail (bug 537202)
+	"${FILESDIR}"/${PN}-1.7.3-undefined-LANG.patch
+	# Fix urwid compat again
+	"${FILESDIR}"/${PN}-1.7.3-urwid-1.3.0.patch
+	# Another compatibility patch from launchpad bug 1075399
+	"${FILESDIR}"/${PN}-1.7.3-bitrate-property.patch
+)
+
+src_prepare() {
+	CONFIG_CHECK="~CFG80211_WEXT"
+	local WARNING_CFG80211_WEXT="Wireless extensions have not been \
+	configured in your kernel.  Wicd will not work unless CFG80211_WEXT is set."
+	check_extra_config
+
+	default
+
+	# get rid of opts variable to fix bug 381885
+	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
+	# Need to ensure that generated scripts use Python 2 at run time.
+	sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
+	  -i setup.py || die "sed failed"
+	# Fix misc helper scripts:
+	sed -e "s:/usr/bin/env python:/usr/bin/env python2:" \
+		-i wicd/suspend.py wicd/autoconnect.py wicd/monitor.py || die
+	# fix shebang for openrc init script (bug #573846)
+	sed 's@/sbin/runscript@/sbin/openrc-run@' \
+		-i in/init=gentoo=wicd.in || die
+	if use nls; then
+	  # Asturian is faulty with PyBabel
+	  # (https://bugs.launchpad.net/wicd/+bug/928589)
+	  rm po/ast.po
+	  # zh_CN fails with newer PyBabel (Aug 2013)
+	  rm po/zh_CN.po
+	else
+	  # nuke translations
+	  rm po/*.po
+	fi
+
+	DOC_CONTENTS="To start wicd at boot with openRC, add
+		/etc/init.d/wicd to a runlevel and: (1) Remove all net.*
+		initscripts (except for net.lo) from all runlevels (2) Add these
+		scripts to the RC_PLUG_SERVICES line in /etc/rc.conf (For
+		example, rc_hotplug=\"!net.eth* !net.wlan*\")"
+}
+
+src_configure() {
+	local myconf
+	use gtk || myconf="${myconf} --no-install-gtk"
+	use libnotify || myconf="${myconf} --no-use-notifications"
+	use ncurses || myconf="${myconf} --no-install-ncurses"
+	use pm-utils || myconf="${myconf} --no-install-pmutils"
+	use gnome-shell || myconf="${myconf} --no-install-gnome-shell-extensions"
+	python_setup
+	"${EPYTHON}" ./setup.py configure --no-install-docs \
+		--resume=/usr/share/wicd/scripts/ \
+		--suspend=/usr/share/wicd/scripts/ \
+		--verbose ${myconf}
+}
+
+src_install() {
+	distutils-r1_src_install
+	keepdir /var/lib/wicd/configurations
+	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect}
+	keepdir /var/log/wicd
+	use nls || rm -rv "${D}"/usr/share/locale
+	systemd_dounit "${S}/other/wicd.service"
+
+	if use mac4lin; then
+		rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icons"
+		mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/ || die
+	fi
+	if use ambiance; then
+		# Overwrite tray icons with ambiance icon
+		rm "${WORKDIR}/Icone Wicd Lucid"/signal* || die
+		cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	# Maintainer's note: the consolekit use flag short circuits a dbus rule and
+	# allows the connection. Else, you need to be in the group.
+	if ! has_version sys-auth/consolekit; then
+		ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
+		ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
new file mode 100644
index 000000000000..e1956cfcff97
--- /dev/null
+++ b/net-misc/wol/Manifest
@@ -0,0 +1,5 @@
+DIST wol-0.7.1.tar.gz 445648 SHA256 e0086c9b9811df2bdf763ec9016dfb1bcb7dba9fa6d7858725b0929069a12622 SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3 WHIRLPOOL 36f9e9fdfe76846e9f65a2c7e83530532dc24c8dff6fe6f5e30c53659d59be926aaef13e028f23f325564a4d7b43dfbc9759b5ca9d354fb61edcf5ca46cbf7b3
+EBUILD wol-0.7.1-r1.ebuild 401 SHA256 dc15a02b75d24413a13d5f6029ee1cfe2096e55d2dac1e109abe7834699640f7 SHA512 cb1396eb681e2bd3b09ea4b3c5327995c12e58f608e8685de7507a393feba86011ab31b2564e8a660c60834691720e54d7293810a4b14703a8cfbab57e18e78c WHIRLPOOL 910ce9a07c98e54e6fe5238c8fc922a736f3a7b90c340d478c658a6d324d0317ea071fe0813875dcae3389186c202af314c2640f7fbe5307fe7c45ed9eaa4a8e
+MISC ChangeLog 2170 SHA256 8af4bdf61670162dc452882a2bb62d22cc2c658233eb20796bfc0efe6bce71cc SHA512 e15836ce444ab47840c921984f612729b279c1a473e0c41ac6721f10ae809a792ea04db9118285c93109e6695597fb8966ebe3fafb4e6edd819cba3da31cc9f5 WHIRLPOOL 51c9d7a93df27689ee078077a6e1a4658189e7aaa68c32d6d18abd25a114f5fcdfdfdb09dfa3caead496cd3dbb2abff562c952134816a4e7229a63274ddffe7b
+MISC ChangeLog-2015 2396 SHA256 64d2021e7d14f999426a4814d6396d1a109a6708e93f8e6fd2751203a2eabee2 SHA512 63c3bb732ba30c9945468ca4caf75742ca298c0c8c9ee213991bbe46bcd2f4c2c44a253766bf54dae5a413b61543ee73e2b357b7e37162b94d545fae03c3d31b WHIRLPOOL 8c7e8f87bcc5a241fa51ebf7cac2ab97a8ad3d86d184378cd830c7cf7c6069d4589984bec391ef6922b11c50e7d19b252c76235e0c117e27caad7815b94d3de1
+MISC metadata.xml 649 SHA256 3d6e3387f633ebdbc26d90af552204ff9be4ebf7072048aa24ce3d4e772acff5 SHA512 b47517a4899bce138c8982dfce164496844d1a534a77f15c128b5321cd6ce41fa6ffed9e5267233ae7e8871a1c36b5861389fc5143c7ccae4badf73bbd21b388 WHIRLPOOL a02af95e7a31d37f0259ab2a790628082d1293343f6a160ffb90987f9b66493bad2f9c1671ecf069e49f0d47bdb9e81ce5b85a8734c4705cecc9bfa2f3befa8f
diff --git a/net-misc/wol/metadata.xml b/net-misc/wol/metadata.xml
new file mode 100644
index 000000000000..efb8e8ab0cb2
--- /dev/null
+++ b/net-misc/wol/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
+  </maintainer>
+  <longdescription>
+wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant.
+Consider you have a sleeping or turned-off computer and you want to remotely wake him up. Just type
+"wol MAC-ADDRESS" and the host wakes up (OK, it will boot ;-).
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">ahh</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/wol/wol-0.7.1-r1.ebuild b/net-misc/wol/wol-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..7b4fd2794d93
--- /dev/null
+++ b/net-misc/wol/wol-0.7.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Wake up hardware that is Magic Packet compliant"
+HOMEPAGE="http://ahh.sourceforge.net/wol/"
+SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ~ppc64 x86 ~x86-fbsd"
+IUSE="nls"
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
new file mode 100644
index 000000000000..5404de7ef323
--- /dev/null
+++ b/net-misc/wput/Manifest
@@ -0,0 +1,8 @@
+AUX wput-0.6-gentoo.diff 641 SHA256 e72d178f76b6f877ae4379f6c729fdb95267f28e9efd887c29abe862957c9c40 SHA512 7fdf3cd385753dac4fa219aaebde585427f9b4b208252f36f48132b850f28cf58934d4972cefcaf4a1f8b97eb02f32ca1b60eec2ca68f2fc3f1a623f6bf4817a WHIRLPOOL a3114f8d6b5af69e5f4024041b7e4f753655557e584c931728f67898a68c1db8e0ffae5d82e092ef541da90be10229e550d6c38a261d10c59cade2ada54a06f9
+AUX wput-0.6-respectldflags.patch 391 SHA256 27ca4093b3abeb4ba4bf9c201f5a0588bab5af991d1dc7146b0431fb8fb43b59 SHA512 3ae0d882e94b23a84b40b3c79a793dd21c7a070019fe3003f6aa213e269eef455826830e316483328507c359b0c27e5723f919d383af0a73eb0d8559954db146 WHIRLPOOL 13aebcb28c3d0d97a49deaab7d7aa60b7555c8f022ce14bab2650c3025a6cd5c0f16d06513aa74cc1f3f5fb4a5bb7f23934616b94b8d057d9a065a6df087d71e
+DIST wput-0.6.1.tgz 312342 SHA256 67125acab1d520e5d2a0429cd9cf7fc379987f30d5bbed0b0e97b92b554fcc13 SHA512 f5eb5e343c77cec0f3370e8d73679e3c720a848a963c2cdc64e6c52f30b47d76e0de9ccde965da9af97d2e5f23f45dd894f26371f56ead498d28fadffe65fc4b WHIRLPOOL 54434fdc5bdf0975e01f47550eb2c3422f892dfb80d5ed49cc7479dbee9b9b6f332654f00cff2b62423d08c2656d532872140801b5c1d85b09c7452eae987f1e
+EBUILD wput-0.6.1-r1.ebuild 774 SHA256 a72066f85b35973bad0d98b994ecb542717cf8da3fcbbd3f21972846c9eca645 SHA512 9cd3e7ee0a20dcef19a2e8296688b6aca9f2521816560f2d10eec3ccca4010450d56b8d387ef2c2f05d299eba64a8f90c326fb2ae5f97554cb542bd1b73ea9d8 WHIRLPOOL abcecd8f785c392ff9cf30668b20b54f31b4a13bd648b7bbda3c357b27019d61c85745114376b70d0fe551ce822d31ffb64980fa0ed961699455d5c2a7c5941f
+EBUILD wput-0.6.1.ebuild 937 SHA256 9cdd3eeec33a4a4c1b4a96c843969c1c46879cfaffcf416c8469969401602277 SHA512 09ff86266767d47be0269d2d35d0d6e5d79669a7e587075622f5248cb1be597234e84314080fe01117ad58e1858841ec0adf5009df336488571897fafffcec68 WHIRLPOOL e6619a661212f9618470da17e8f6542f40e2db74ee5b7df4cfea1c6714634f81a377edbee3aa3fa309f168416ecdb42f78f2612264f713074901e595e7c873c3
+MISC ChangeLog 2357 SHA256 471478f8ddea805ebd740c9758dc965667602e8e57dfc51f3c8c68c7bcdb7904 SHA512 efd584c6af433f9bb3828cef5e72bfdc4a81e839792109ca6a695b2b75ab60f2cd27c1d924ed2971188e708ade6620f28b2bc74e9387d443882e51024dd6b3ee WHIRLPOOL 38949b3ac0357bffa9d06142518b815c91cfcf97faf50ab0ee4c05e8aa34ee49c39df4a4c12c005c8a9b194e2ec7a94453d261771cbf585323e5aa77612d6475
+MISC ChangeLog-2015 3101 SHA256 d6256dadbae1e382f1b750b16d616db139351d55d2675988351c2376cc3b385a SHA512 a58822aa1fdab542d4c3115bfe4f86845f3b5ae3233e5bbb79b615581506c1022b4bb2a9a5bbe99c4a5c74d7e837aa2582d95eeabbe29f24c2064ad0332e1eb4 WHIRLPOOL b85073996491b418250555955ddfbcecfb3611294cfa1f41d420721e81f8b274426106e757528387bd3fe07d21dee3394e5ea2c77230bb5e194a71301635fa68
+MISC metadata.xml 213 SHA256 5f35a9ab0bd5cb34de281cd7235e414075f945813049dcb95ebdd22985db348a SHA512 6aa0dd15c8b17b8007764f93049ca69537377c25282ff538d14b792fda16dd1eb4d847b2354d140e1ff68c2df28b4280d6e93b2ca0c90f862c4a6748d916ae4c WHIRLPOOL c885bfb10c30762c0eaae23af9dbc609fe16bc4abbcf4ba158e5a18fee2a3ba000bc50ea6a4c874429ad0b53b1787ea1a0de7e79cfdcd404b355f1a6a3617f8d
diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff
new file mode 100644
index 000000000000..312172348d02
--- /dev/null
+++ b/net-misc/wput/files/wput-0.6-gentoo.diff
@@ -0,0 +1,18 @@
+diff -urN wput/Makefile.in wput/Makefile.in
+--- wput/Makefile.in	2006-04-04 18:16:52.000000000 +0100
++++ wput/Makefile.in	2006-11-07 17:31:10.000000000 +0000
+@@ -15,8 +15,12 @@
+ 
+ install: all
+ 	cd po && $(MAKE) $(MAKEDEFS) $@
+-	install -m0755 wput $(bindir)
+-	install -m0644 doc/wput.1.gz $(mandir)
++
++	install -d $(DESTDIR)/$(bindir)
++	install -m0755 wput $(DESTDIR)/$(bindir)
++	install -d $(DESTDIR)/$(mandir)
++	install -m0644 doc/wput.1.gz $(DESTDIR)/$(mandir)
++	
+ 	@echo "----------------"
+ 	@echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
+ 	@echo "Further documentation is located in the doc/USAGE.* files."
diff --git a/net-misc/wput/files/wput-0.6-respectldflags.patch b/net-misc/wput/files/wput-0.6-respectldflags.patch
new file mode 100644
index 000000000000..d2b460b339b3
--- /dev/null
+++ b/net-misc/wput/files/wput-0.6-respectldflags.patch
@@ -0,0 +1,13 @@
+Index: wput/src/Makefile.in
+===================================================================
+--- wput.orig/src/Makefile.in
++++ wput/src/Makefile.in
+@@ -23,7 +23,7 @@ ftplib.o: socketlib.h ftplib.h
+ ftp-ls.o: ftp.h wget.h url.h
+ 
+ wput:   $(OBJ)
+-	$(CC) -o $(EXE) $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) -o $(EXE) $(OBJ) $(LIBS)
+ clean:
+ 	rm -f *.o *~ *.bak ../wput getopt/*.o
+ win-clean: clean
diff --git a/net-misc/wput/metadata.xml b/net-misc/wput/metadata.xml
new file mode 100644
index 000000000000..2d3a29a13dc8
--- /dev/null
+++ b/net-misc/wput/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="sourceforge">wput</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/wput/wput-0.6.1-r1.ebuild b/net-misc/wput/wput-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..354b883b95e3
--- /dev/null
+++ b/net-misc/wput/wput-0.6.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
+HOMEPAGE="http://wput.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug nls ssl"
+
+RDEPEND="ssl? ( net-libs/gnutls )"
+
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6-gentoo.diff"
+	"${FILESDIR}/${PN}-0.6-respectldflags.patch"
+)
+
+DOCS=( ChangeLog INSTALL TODO )
+
+src_configure() {
+	local myconf="--enable-g-switch=no"
+	use debug && myconf="--enable-memdbg=yes"
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl) \
+		"${myconf}"
+}
+
+src_install() {
+	default
+}
diff --git a/net-misc/wput/wput-0.6.1.ebuild b/net-misc/wput/wput-0.6.1.ebuild
new file mode 100644
index 000000000000..1d495ab77a2c
--- /dev/null
+++ b/net-misc/wput/wput-0.6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
+HOMEPAGE="http://wput.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="debug nls ssl"
+
+RDEPEND="ssl? ( net-libs/gnutls )"
+DEPEND="${RDEPEND}
+		nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.6-gentoo.diff"
+	# Fix bug 126828
+	epatch "${FILESDIR}/wput-0.6-respectldflags.patch"
+}
+
+src_compile() {
+	local myconf
+	use debug && myconf="--enable-memdbg=yes" || myconf="--enable-g-switch=no"
+	econf ${myconf} \
+		$(use_enable nls) \
+		$(use_with ssl) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog INSTALL TODO
+}
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
new file mode 100644
index 000000000000..1ae487556534
--- /dev/null
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -0,0 +1,5 @@
+DIST x11-ssh-askpass-1.2.4.1.tar.gz 29229 SHA256 620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88 SHA512 879887cc1d6eb26662494e3a6b59b79a8d153b354abf86e8e8667940545c8e07d0aa051491f5ba6ca5273e3a7fcc367edb4cc79bb2e4bf1bdbd0e234690ad6b9 WHIRLPOOL 0f305023d4d7f4a086122c8c0d5a0a8ecda463b71bed5960365660d293b3670f377d3e0177e743d86413425f6ff48119295dd98d6fc077ba7d759154342dd4de
+EBUILD x11-ssh-askpass-1.2.4.1-r1.ebuild 915 SHA256 3100b57d0e9f31952c9642d83d36477467df4325d85eb20758b6d7ce4987c68c SHA512 6e8a43e6d2374e00905e28c7b8a2ea1bccdcb616a7c7e2ce48c4ee4f57f241020e8ecaef9b95882e5aa8d0f1abe6825975a5875cb36336a9187e560a36ee873a WHIRLPOOL f54fad4e86ae98b5ec443667102696ad7bf675d6ec5935199793779ab630d7ed3ca7139581ccd3b195ac3f0c940f1880f8924c27df276858150c30ddd75d9f20
+MISC ChangeLog 2597 SHA256 a6fba4651e111e0aaf3675184451ba823e776800eec634e17ba6f38d6bf1dffe SHA512 cfcaea304910ebfe2a107677c9631dd104eff2f52dff08f6898e6813d47344265b089f65d4f4b41be1fa4045e3b7916dac5cd292219919f7b7e4946de3465c28 WHIRLPOOL 0759f9e2772af03ce21a72990c9a1cb9edb667513f86c3106cd282cbd6453f6859a1af30c89d66246ad66640272bb80e41766fcf09976bf9eb0296848dca9a04
+MISC ChangeLog-2015 4096 SHA256 dcc2902a53f8eec946d748cf6698de9cad8814a79bed30385f728cf20089946c SHA512 c90876b41694f89047a99d90fdc51b3b0ffc5ce800816adc959f591ef9af8841e058f513f630067ea68d861627119ec98e17faf6c0440486716acaacf34023d6 WHIRLPOOL e43c92ae2c5db4505a1f52642b8ba93714634509fc066bfe5b15311966fa06501b86691ad0b6ac67f6355c8491fa91a019be9f5ac65f52d2a5f70ffa74b2b350
+MISC metadata.xml 291 SHA256 f0ac6758e2f82f5c129782b8154bcd2d8e57d35d99f8d54ef3a268131c3a3ae7 SHA512 ff2abca93c49335572d3b78875cb835aad5d469d01c36f93a0e713962616cc1cc4fcb5e5a6c358616c47ee16d461b0db767dbdf64caadc3f7595e69b822fc989 WHIRLPOOL a9b348f109f7d691f27160b3f40618e1007e6c4a32c5646de351cc09d676770d79d6ebcb99319e9757e75c3cc7f658b577ba0d6fcc58cf441e27215643c55174
diff --git a/net-misc/x11-ssh-askpass/metadata.xml b/net-misc/x11-ssh-askpass/metadata.xml
new file mode 100644
index 000000000000..0c1e85ee38ec
--- /dev/null
+++ b/net-misc/x11-ssh-askpass/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>cardoe@gentoo.org</email>
+  <description>I guess I'll maintain it since I fixed it last</description>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
new file mode 100644
index 000000000000..bf94c5b1170b
--- /dev/null
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils multilib
+
+DESCRIPTION="X11-based passphrase dialog for use with OpenSSH"
+HOMEPAGE="http://www.liquidmeme.net/software/x11-ssh-askpass/"
+SRC_URI="http://www.liquidmeme.net/software/x11-ssh-askpass/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="virtual/ssh
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE"
+
+DEPEND="${RDEPEND}
+	>=x11-misc/imake-1.0.7
+	app-text/rman"
+
+src_compile() {
+	econf --libexecdir=/usr/$(get_libdir)/misc || die
+	xmkmf || die
+	make includes || die
+	make "CDEBUGFLAGS=${CFLAGS}" || die
+}
+
+src_install() {
+	newman x11-ssh-askpass.man x11-ssh-askpass.1
+	dobin x11-ssh-askpass
+	dodir /usr/$(get_libdir)/misc
+	dosym /usr/bin/x11-ssh-askpass /usr/$(get_libdir)/misc/ssh-askpass
+	dodoc ChangeLog README TODO
+}
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
new file mode 100644
index 000000000000..dda31b8337d9
--- /dev/null
+++ b/net-misc/x2goclient/Manifest
@@ -0,0 +1,10 @@
+DIST x2goclient-4.0.3.2.tar.gz 1560536 SHA256 f65a70463eae3d6d9fe6e4379f4ffacda50080a11f196d2792742f5b67fa0c6f SHA512 e390948360cb93db553b157b8146c0222f10a070a7b3f699a0e3be94bba0498b6fc6c0e064b6ecf753afc25a7447e5162f44305688fc2e68423a5530d73f0431 WHIRLPOOL 3d0b6aec77a8096541e810bf0a70d73caf63f34121d6931f5d3c2a721c4cd8b70e0eef1c902decc6733feb9a1cb09d3146baf4429532a60a013d0c36727059f7
+DIST x2goclient-4.1.0.0.tar.gz 1889861 SHA256 4b5915bc3666228910342810a34f7a03fb6967c6b9c796633d9cdf8b89cc2b6a SHA512 cb7023b0b9de6d83ee8206bc0a36be0306cea19a3a8fc081ffe704691ae8744848bc3c329b3bf475e838b93c2ee4b9c96af20fae34e6d4822fcf7feb9c3cf6d0 WHIRLPOOL c2f3de5f164ae6794f439c8b59e72782f54ca802ee7ce5f3f52e0cd79625b372d61e8f5d8a6b2127fa3520545922150fc761a1874640ad1e3fbf7b5066ce3ade
+DIST x2goclient-4.1.0.1.tar.gz 1891484 SHA256 0681b8a11b02652643cf1451a75d812c3ce9f3ee33c348b34178c130dcf77484 SHA512 6cbfb70fb7f522f0a5557ab36b6e15b6cae9ad184bd1d51b6c2f2acfa7b22d8fd9344bbfee141f2d5bd71f5adf9d3bd6d2c7db7b774cd8f8af5bcd25144de98d WHIRLPOOL cb4510229b20fcb5574ba8cdaf7e313ab9d37db99fb39a16d6088f545f39c7587f844f890c02c941674f8021fd5f5425d51aaaee34704f7c66c0addad98cf4ea
+EBUILD x2goclient-4.0.3.2.ebuild 1533 SHA256 70e9d824501daf0e092ac668d03c7378d0beae26de39ecd46857295f40a5d7f0 SHA512 e33ee793ed8d269fad7b98328096cc713224635d6218122cbf9303e7a4aa0463cd0baf725089d0b17bfb08deb4c96a3610c3a6a3175c5d09fcb52ff5f2a029e7 WHIRLPOOL f2bdc8c30e94fd12a522c1a94a178a30a8d6ec5e49847f186c059b9e184a6cd649edd577f2f5975493a6fb2946a43a9784f1756d6638654c799c7e4db3efe51a
+EBUILD x2goclient-4.1.0.0-r1.ebuild 2011 SHA256 d22f1389bf9c766ff7bb5864cc6c42425c878e6873c577cb05db01a3106b8df6 SHA512 d21c351bc31138aea429131051428b574ebd3aa79558f3fd432f71f35d41196d5a172bd7579cdbba84a6d3edb956c9a3e1397d9afb09a37cf26c586e253d9cf9 WHIRLPOOL b6e20db4750c32ee9e121cf377fbf0aaf3114e0e59b72c256af6760728474f846ea74d723b2c8d46f454e617edad0aaeb61af3eaf4642d65b9775e46006c7d7b
+EBUILD x2goclient-4.1.0.1-r1.ebuild 1212 SHA256 0775c1aefddd9271478abcc772754d3bd12cb60b315be869f4fd35a1bd61625c SHA512 6828dde23894609af104231e8e3f86e473bb9491caafe9016ffa2da2415813f785525169b288a23439d26926528bb8a2b26a1e77bf0fbd46ccc803c09527cef3 WHIRLPOOL 3eb1b7454e853c2abd4845cabc95a8073d93a126743df1715d9204b91f806475b33a0c2ea01fc3261644833efa17789e1adefdac2f722d30ec91ea19893321e4
+EBUILD x2goclient-4.1.0.1.ebuild 2011 SHA256 d22f1389bf9c766ff7bb5864cc6c42425c878e6873c577cb05db01a3106b8df6 SHA512 d21c351bc31138aea429131051428b574ebd3aa79558f3fd432f71f35d41196d5a172bd7579cdbba84a6d3edb956c9a3e1397d9afb09a37cf26c586e253d9cf9 WHIRLPOOL b6e20db4750c32ee9e121cf377fbf0aaf3114e0e59b72c256af6760728474f846ea74d723b2c8d46f454e617edad0aaeb61af3eaf4642d65b9775e46006c7d7b
+MISC ChangeLog 4293 SHA256 ef5abb9965123178b0268a9bbd672ae0dfc491060e04df60cf11814fda3fc811 SHA512 57fbd4efda2682b9a9b8b95eed298d99ade59cc24134c0e15170c469c9eb25fcd08f8fd15274b36c4cdefe75aea0f383d60f2decd3c381a2538c7001c7318682 WHIRLPOOL 3bc0cd004550fb82aae2fa0ed12b5191191538418d6eed4e94a94cf626080e95bc0128f0fb959bbee806e436e41446b9e36c4dad76eafd0473296ae41e40a50c
+MISC ChangeLog-2015 7549 SHA256 2c0f55367827416d6228bcea7318b02453a36e4c51dcfffb1c47bc20a5010a31 SHA512 82d554ee16e5ac2b7735054c314e8b30d79a3030560d785bd4df1ba9f36f023a0032764a7f96d77a661ab410012f8c7bda6d3aeeb897d8f44fb628f083cbed67 WHIRLPOOL 09087052fbca653f2f1a9559f534e6b5657de8ca5d405565f2e6ec3a0ccbed7221d76d6544f1ea3653f551c66628abc25d651a7e9d774cf30556db76a8dc3adc
+MISC metadata.xml 307 SHA256 6082d8500c2e02363ceac4a82bcffd022f184c3d94357e169baecf44784f5935 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721 WHIRLPOOL 8761d18df755fe55b762a9297b74e4a2995e3c35bbb84a5fa9567710ed1c7a5ce2843b11f8f6a9d7ff7727103d0762ccc5cf54df843daef2ccd4be30bcd40f8d
diff --git a/net-misc/x2goclient/metadata.xml b/net-misc/x2goclient/metadata.xml
new file mode 100644
index 000000000000..fc4554de3274
--- /dev/null
+++ b/net-misc/x2goclient/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>The X2Go Qt client</longdescription>
+</pkgmetadata>
diff --git a/net-misc/x2goclient/x2goclient-4.0.3.2.ebuild b/net-misc/x2goclient/x2goclient-4.0.3.2.ebuild
new file mode 100644
index 000000000000..1e5d91456c7d
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.0.3.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils nsplugins qt4-r2
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ldap nsplugin"
+
+DEPEND=">=net-libs/libssh-0.6.0_rc1
+	net-print/cups
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	x11-libs/libXpm
+	ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}
+	net-misc/nx"
+
+CLIENT_BUILD=${WORKDIR}/${P}.client_build
+PLUGIN_BUILD=${WORKDIR}/${P}.plugin_build
+
+src_prepare() {
+	if ! use ldap; then
+		sed -e "s/-lldap//" -i x2goclient.pro || die
+		sed -e "s/#define USELDAP//" -i x2goclientconfig.h || die
+	fi
+
+	mkdir -p "${CLIENT_BUILD}"
+	use nsplugin && mkdir -p "${PLUGIN_BUILD}"
+}
+
+src_configure() {
+	cd "${CLIENT_BUILD}"
+	eqmake4 "${S}"/x2goclient.pro
+
+	if use nsplugin;
+	then
+		cd "${PLUGIN_BUILD}"
+		X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
+	fi
+}
+
+src_compile() {
+	cd "${CLIENT_BUILD}"
+	qt4-r2_src_compile
+
+	if use nsplugin;
+	then
+		cd "${PLUGIN_BUILD}"
+		qt4-r2_src_compile
+	fi
+}
+
+src_install() {
+	dobin "${CLIENT_BUILD}"/${PN}
+
+	insinto /usr/share/pixmaps/x2goclient
+	doins -r icons/*
+
+	domenu desktop/${PN}.desktop
+	doman man/man?/*
+
+	if use nsplugin;
+	then
+		# PLUGINS_DIR comes from nsplugins.eclass
+		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+		doexe "${PLUGIN_BUILD}"/libx2goplugin.so
+	fi
+
+	emake DESTDIR="${D}" PREFIX=/usr install_pluginprovider
+}
diff --git a/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
new file mode 100644
index 000000000000..4774046e76f9
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit nsplugins qmake-utils
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap nsplugin qt5"
+
+REQUIRED_USE="nsplugin? ( !qt5 )"
+
+DEPEND=">=net-libs/libssh-0.6.0_rc1
+	net-print/cups
+	x11-libs/libXpm
+	ldap? ( net-nds/openldap )
+	!qt5? (
+		dev-qt/qtcore:4[ssl]
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+"
+RDEPEND="${DEPEND}
+	net-misc/nx"
+
+CLIENT_BUILD="${WORKDIR}"/${P}.client_build
+PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+
+src_prepare() {
+	default
+
+	if ! use ldap; then
+		sed -e "s/-lldap//" -i x2goclient.pro || die
+		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
+	fi
+
+	mkdir -p "${CLIENT_BUILD}" || die
+	if use nsplugin; then
+		mkdir -p "${PLUGIN_BUILD}" || die
+	fi
+}
+
+src_configure() {
+	cd "${CLIENT_BUILD}" || die
+
+	if use qt5; then
+		eqmake5 "${S}"/x2goclient.pro
+	else
+		eqmake4 "${S}"/x2goclient.pro
+	fi
+
+	if use nsplugin; then
+		cd "${PLUGIN_BUILD}" || die
+		X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
+	fi
+}
+
+src_compile() {
+	cd "${CLIENT_BUILD}" || die
+	emake
+
+	if use nsplugin; then
+		cd "${PLUGIN_BUILD}" || die
+		emake
+	fi
+}
+
+src_install() {
+	dobin "${CLIENT_BUILD}"/${PN}
+
+	local size
+	for size in 16 32 48 64 128 ; do
+		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
+	done
+	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
+
+	insinto /usr/share/pixmaps
+	doins res/img/icons/${PN}.xpm
+
+	domenu desktop/${PN}.desktop
+	doman man/man?/*
+
+	if use nsplugin; then
+		# PLUGINS_DIR comes from nsplugins.eclass
+		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+		doexe "${PLUGIN_BUILD}"/libx2goplugin.so
+	fi
+
+	emake DESTDIR="${D}" PREFIX=/usr install_pluginprovider
+}
diff --git a/net-misc/x2goclient/x2goclient-4.1.0.1-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.0.1-r1.ebuild
new file mode 100644
index 000000000000..5538f8dc50ec
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.1.0.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=net-libs/libssh-0.6.0_rc1
+	net-print/cups
+	x11-libs/libXpm
+	ldap? ( net-nds/openldap )
+"
+RDEPEND="${DEPEND}
+	net-misc/nx"
+
+CLIENT_BUILD="${WORKDIR}"/${P}.client_build
+PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+
+src_prepare() {
+	default
+
+	if ! use ldap; then
+		sed -e "s/-lldap//" -i x2goclient.pro || die
+		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
+	fi
+}
+
+src_configure() {
+	eqmake5 "${S}"/x2goclient.pro
+}
+
+src_install() {
+	dobin ${PN}
+
+	local size
+	for size in 16 32 48 64 128 ; do
+		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
+	done
+	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
+
+	insinto /usr/share/pixmaps
+	doins res/img/icons/${PN}.xpm
+
+	domenu desktop/${PN}.desktop
+	doman man/man?/*
+}
diff --git a/net-misc/x2goclient/x2goclient-4.1.0.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.0.1.ebuild
new file mode 100644
index 000000000000..4774046e76f9
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.1.0.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit nsplugins qmake-utils
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap nsplugin qt5"
+
+REQUIRED_USE="nsplugin? ( !qt5 )"
+
+DEPEND=">=net-libs/libssh-0.6.0_rc1
+	net-print/cups
+	x11-libs/libXpm
+	ldap? ( net-nds/openldap )
+	!qt5? (
+		dev-qt/qtcore:4[ssl]
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+"
+RDEPEND="${DEPEND}
+	net-misc/nx"
+
+CLIENT_BUILD="${WORKDIR}"/${P}.client_build
+PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+
+src_prepare() {
+	default
+
+	if ! use ldap; then
+		sed -e "s/-lldap//" -i x2goclient.pro || die
+		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
+	fi
+
+	mkdir -p "${CLIENT_BUILD}" || die
+	if use nsplugin; then
+		mkdir -p "${PLUGIN_BUILD}" || die
+	fi
+}
+
+src_configure() {
+	cd "${CLIENT_BUILD}" || die
+
+	if use qt5; then
+		eqmake5 "${S}"/x2goclient.pro
+	else
+		eqmake4 "${S}"/x2goclient.pro
+	fi
+
+	if use nsplugin; then
+		cd "${PLUGIN_BUILD}" || die
+		X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
+	fi
+}
+
+src_compile() {
+	cd "${CLIENT_BUILD}" || die
+	emake
+
+	if use nsplugin; then
+		cd "${PLUGIN_BUILD}" || die
+		emake
+	fi
+}
+
+src_install() {
+	dobin "${CLIENT_BUILD}"/${PN}
+
+	local size
+	for size in 16 32 48 64 128 ; do
+		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
+	done
+	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
+
+	insinto /usr/share/pixmaps
+	doins res/img/icons/${PN}.xpm
+
+	domenu desktop/${PN}.desktop
+	doman man/man?/*
+
+	if use nsplugin; then
+		# PLUGINS_DIR comes from nsplugins.eclass
+		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+		doexe "${PLUGIN_BUILD}"/libx2goplugin.so
+	fi
+
+	emake DESTDIR="${D}" PREFIX=/usr install_pluginprovider
+}
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
new file mode 100644
index 000000000000..388cac47c61d
--- /dev/null
+++ b/net-misc/x2goserver/Manifest
@@ -0,0 +1,13 @@
+AUX x2gocleansessions.service 198 SHA256 e06420fa5fe526c9ff616af1976840136ef174b94e8876fa6a2d32ee1d111ab8 SHA512 45f29bdaa70a91ccdd129158511f78f85b01aeb1ef874b087e3eb96000fbfc104b1c427a5ad5dab65e66624151988bb2fd75c63d4f5033b76bd19849b0986bd5 WHIRLPOOL c9485457a052188ef83aa7b15d4df69c2584ddc023248b7b7557b2d61a310f23cbae60a265e1e74c8be4a6d3a3cb54212452ff6c3905bb07e9e93389057cda71
+AUX x2goserver-4.0.1.19-remove_sshfs_cipher.patch 1896 SHA256 e6ed47ac8b2c495a7b131e83d24c0ae0bdb0a848c44e38d5c4e250b9a9e26cc9 SHA512 db40255cd804ce7c0331af278319c75e2cb116492cccd55e9999c0318248a15a2fead00af967790ce9ffab53bb7eb555fc9860fed68e11b7d1660cf8bef6cc9f WHIRLPOOL 028467fce59ac910efbdeb0ff4bbbb71a87d9a3feebdc166f26be06a53030070b8100fc7683f760c34d925abac49fe7403fa5d48c5f3afc91c44f32cdf3c21df
+AUX x2goserver-4.0.1.19-use_bash_in_Xsession.patch 1470 SHA256 3ca94c74645c3032b1ecf0fd870ddee6f50820dcfe4292b3cbb27c2f21431b67 SHA512 d8d57fa3064d8bc1d52ff1327e14155efa9baa9f430b8e11c084972c3c5402429a737aeb07ed5f3f9fee30d03d27dc7bed9fd37ce43d7d6f700a94099592d75a WHIRLPOOL 973c22d53d8670bb29feefe9cd7528c37435cf520f58b5b1a814ef4a004bae0ee5735f8f24b2c7b112549f65cff8ec78cffd10f6b7955ab50a633e47e2fad9be
+AUX x2goserver.init 442 SHA256 d85e7ed5e548a23c2e808279eabad976bab4da1bf32ae755ad799781c5a78e10 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c WHIRLPOOL b5e2812fad2220e05c941457dd0357c54456bb49ece6db7ac6efa8a2938f085dfb910c6b2f5e11163b75f9832bdee26db39c9abd7d9158aa7d66916e3cc559e1
+DIST x2goserver-4.0.1.19.tar.gz 89434 SHA256 3dd5c1464a7992a38760fd6b08f5f8d37646f939f4f7834a7cd96bf4950623cc SHA512 dbd054a6bf781d843a48fcea3449037b991aaa38a52705d48dd5fa8d7fe85c56d4ff31b9a10189a9043a3e5cc0c69475947aea5a5fb78e3c076c0e56079b747d WHIRLPOOL f44fadfda6e1ff165ff989f0c10116c8318f5915764b9bfc663e4658190934eb5155e17e072f131842a98cc02908366b0f91c7b0b9b9e73d4e2a729f00ba0d31
+DIST x2goserver-4.0.1.20.tar.gz 96412 SHA256 f8bf48e1c8995bd5a7cde6de1c006fdb77f2bae6c4b82e6b7b985a8f00a3dad9 SHA512 21f3a415c50bf78e4c044c5b77f8478a307e4b3cef990edd415d9e7479f48fbc1c051e9f7c16a5d1f30726f4f2a812fb367eecb0a073bfba1ea2c6173c71fe54 WHIRLPOOL f3ed9160cfbde7ccfa1e367d8ca19afef2e0673103e183e517fb845cf8bf93b487e40ad34a16b85d127446b38bcb10cf9a5a2d467f6fa38b937cb0d30545905d
+EBUILD x2goserver-4.0.1.19-r2.ebuild 2589 SHA256 a39bbbf33fe3476890ad3f0aa631202b587455e7b8f54a3ea63a802514022bd1 SHA512 48b8e813b688ae3195bb16bcbacc7f025ca6fb83574300854be69e443c98663835b8854534d4f5295dc8dacfb60727aea78409d362617c4ded76204e77c4affe WHIRLPOOL 001e9d6ea95f3cb167e049c5dee1068dad77114247e0e9bce751100d30c03aaa385e482807c42b5eefccf2dee555a7a9e1a0ccc8185e47917266bc86c85fad9d
+EBUILD x2goserver-4.0.1.19-r3.ebuild 2638 SHA256 721107c845f2f5177ae2348a9fbe4a6c7037267e5a2fc0e611b93398be1918e3 SHA512 f911bb6de40573af208611ef5fada2b29b6e3e92120e228500a27144f6c8309a104cbaf0a972f53b9d5421c55f8a4f8c97458d7fe9802eb11cf9b0b25f7bca58 WHIRLPOOL 407251c7774ca0bd81ee3bda3b1fec4e636c6b0762eafd9979abf79a6442f972b974ad505f724f11202d8e111dde6ecb9b13a8ed76be57eea5f9a8b0056e4a71
+EBUILD x2goserver-4.0.1.19.ebuild 2499 SHA256 82523c984842bc75e1c012083299d49e2adb4eb98b14f6990456d6dec076fb53 SHA512 f6883747893843fd472344c1bbd578982e878866f60e3fb5fdd4a313a9009bca2498d7ac286dfe96fc16c5002240d4fae3c2972393c248f3d6d034d59b2d3b65 WHIRLPOOL 4e6eea122b607a8b09838eff5d21e8d640fdad341c8394773d0dac919c030bd3b8df7c0aae92cd47614744cf5a6bb28d0a88a8761bf51131a07b5c59bd7e1336
+EBUILD x2goserver-4.0.1.20.ebuild 2545 SHA256 53bd88ef5f0ac8b0a4fa5adcc022558829c23094193292f9d9cbc81863af9726 SHA512 f84fdbaadafaeadc058f573d394f2dd7e60fd965c7970bdcb3ad43e6a6e3fbd3d9fc374cd364fa9761079145c3aedcfc2ea1730c7b8e7b7546ec4570da607533 WHIRLPOOL 638b473e6a0a7e5f864883fbd01b25685fb9d3c411a9f49c950a2b50c8ba4ce66bb68b5bc279e3d6442913294b27ecee376c84c290e6e2ffe4f55f7ced382a9f
+MISC ChangeLog 6358 SHA256 7198ac7c75a68c2db074471238263afed1f53cfceb1e3807a524ec685cd2d228 SHA512 cea547af5c82dc689ea3b820fc1177d4ea66a5f3fe31d125a5968409e905fa6507b0dfb27b0bef7d6472937ba961c625b87eb74903c65cc2d136232961b5d2d8 WHIRLPOOL c90284259476f7e92da3f318ee8c34eef6108522d5a234f6d144f1cae2d381e4e7f0cb5f53bf2ec6bc67240f51fd26d11fe712836ac706b3f1bfb8fa4d723a9a
+MISC ChangeLog-2015 10694 SHA256 280d067f8ea15916b3cdc56ab84c2661fd563272720a933bc10c0250c5378479 SHA512 2588cebd5262b439ab73f00ed6dbaa34d025766b89d47e6e8129401dc56016fb90a100ed1893b185c77a0f197c7e1445ff484c1d617084b7564b02aa8e7a0ec9 WHIRLPOOL de650169bdee0fc545d93e0462ef94e163cde7d4c47f0b4170360b68d3d5452b7e8912acd5be11a73ef1419b10f99b8416db834566311daed5c713963f5d9f9b
+MISC metadata.xml 398 SHA256 232f483c766fd0dac22180147361f9fcbbd69b6ba3d3e2ea4b660ad99787266f SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f WHIRLPOOL 6db594132a762989765659193a778362327e9b467d8a9973dbb3e3fe77810798e306901ba5a603bef4c71ee2e90458d500174879fe295c44278caa45d66afbdd
diff --git a/net-misc/x2goserver/files/x2gocleansessions.service b/net-misc/x2goserver/files/x2gocleansessions.service
new file mode 100644
index 000000000000..393d841c5acd
--- /dev/null
+++ b/net-misc/x2goserver/files/x2gocleansessions.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=x2go - remote desktop server
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/x2gocleansessions
+PIDFile=/run/x2goserver.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch
new file mode 100644
index 000000000000..b29336349f09
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch
@@ -0,0 +1,21 @@
+X-Git-Url: http://code.x2go.org/gitweb?p=x2goserver.git;a=blobdiff_plain;f=x2goserver%2Fbin%2Fx2gomountdirs;h=f39d19975c6806ea115921aa0e1949e3dfa44c7d;hp=f0b497edd252481792ebc6e5e73d79158bc4a14c;hb=86a0e421c3da850045459af855a33f646828dd68;hpb=7ae2669b596d3b84f0ba09552d5a8c0e653ce86d
+
+diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
+index f0b497e..f39d199 100755
+--- a/x2goserver/bin/x2gomountdirs
++++ b/x2goserver/bin/x2gomountdirs
+@@ -304,12 +304,12 @@ for (my $i=0;$i<@dirs;$i++)
+ 		{
+ 			syslog('debug', "SSH host key has arrived: $key.ident");
+ 		}
+-		$msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port";
++		$msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port";
+ 		syslog('debug', "executing: $msg");
+ 		print "inserted, $msg\n";
+ 
+ 		# FIXME: this system call should be converted to a multi-argument system call while pertaining the redirect of stderr to the mounts.log file
+-		if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0)
++		if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0)
+ 		{
+ 			print "mount @dirs[$i] ok\n";
+ 			syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath");
diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch
new file mode 100644
index 000000000000..0eab0d391b69
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch
@@ -0,0 +1,26 @@
+X-Git-Url: http://code.x2go.org/gitweb?p=x2goserver.git;a=blobdiff_plain;f=x2goserver-xsession%2Fetc%2FXsession;h=7ad477ffc439ef0f7f0ccbbee40f55504a8f2dd6;hp=ab32a1062cdbec6b3ccbea29682d240f06046394;hb=7ae2669b596d3b84f0ba09552d5a8c0e653ce86d;hpb=1cc93d59f6bb2559b1c42daba26cf3b9b50f3e69
+
+diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
+index ab32a10..7ad477f 100755
+--- a/x2goserver-xsession/etc/Xsession
++++ b/x2goserver-xsession/etc/Xsession
+@@ -208,16 +208,16 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-
+ 
+ 	# XCLIENTS_D=/etc/x2go/Xclients.d
+ 	#if [ -d "$XCLIENTS_D" -a -x "$XCLIENTS_D/Xclients.${XSESSION_EXEC}.sh" ]; then
+-	#	exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
++	#	exec /bin/bash -c "exec -l \"$SHELL\" -c \"$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh\""
+ 	#fi
+ 
+ 	# switchdesk support is also totally deprecated in RHEL, but we leave it here
+ 	# as a reminder, as well, in case we need it in the future for special setups...
+ 	#if [ -x "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}" ]; then
+-	#	exec -l "$SHELL" -c "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}";
++	#	exec /bin/bash -c "exec -l \"$SHELL\" -c \"$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}\""
+ 	#fi
+ 
+-	exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$STARTUP\""
++	exec $CK_XINIT_SESSION $SSH_AGENT /bin/bash -c "exec -l \"$SHELL\" -c \"$STARTUP\""
+ fi
+ 
+ exit 0
diff --git a/net-misc/x2goserver/files/x2goserver.init b/net-misc/x2goserver/files/x2goserver.init
new file mode 100644
index 000000000000..29da1c81e96f
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver.init
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/x2gocleansessions
+PIDFILE=/run/x2goserver.pid
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
+		--exec ${DAEMON} -- $DAEMON_OPTS
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-misc/x2goserver/metadata.xml b/net-misc/x2goserver/metadata.xml
new file mode 100644
index 000000000000..95685e7bf243
--- /dev/null
+++ b/net-misc/x2goserver/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>The X2Go server</longdescription>
+	<use>
+		<flag name="fuse">Use <pkg>net-fs/sshfs</pkg> to allow shared folders</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild
new file mode 100644
index 000000000000..df3cd66109cd
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib systemd toolchain-funcs user
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-perl/Capture-Tiny
+	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
+	dev-perl/File-ReadBackwards
+	dev-perl/File-Which
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc[nls]
+	>=net-misc/nx-3.5.0.25
+	net-misc/openssh
+	>=sys-apps/iproute2-4.3.0
+	x11-apps/xauth
+	x11-apps/xhost
+	x11-apps/xwininfo
+	fuse? ( net-fs/sshfs )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+pkg_setup() {
+	# Force the group creation, #479650
+	enewgroup x2gouser
+	enewgroup x2goprint
+	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
+	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
+}
+
+src_prepare() {
+	# Do not install Xresources symlink (#521126)
+	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# Skip man2html build
+	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
+	# Use nxagent directly
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+
+	eapply "${FILESDIR}"/${P}-use_bash_in_Xsession.patch
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+	fperms 0750 /etc/sudoers.d
+	fperms 0440 /etc/sudoers.d/x2goserver
+	dosym /usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
+}
+
+pkg_postinst() {
+	if use sqlite ; then
+		elog "To use sqlite and create the initial database, run:"
+		elog " # x2godbadmin --createdb"
+	fi
+	if use postgres ; then
+		elog "To use a PostgreSQL database, more information is availabe here:"
+		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
+	fi
+
+	elog "For password authentication, you need to enable PasswordAuthentication"
+	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+	elog "An init script was installed for x2gocleansessions"
+}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild
new file mode 100644
index 000000000000..c948c742fc63
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib systemd toolchain-funcs user
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-perl/Capture-Tiny
+	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
+	dev-perl/File-ReadBackwards
+	dev-perl/File-Which
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc[nls]
+	>=net-misc/nx-3.5.0.25
+	net-misc/openssh
+	>=sys-apps/iproute2-4.3.0
+	x11-apps/xauth
+	x11-apps/xhost
+	x11-apps/xwininfo
+	fuse? ( net-fs/sshfs )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-use_bash_in_Xsession.patch
+	"${FILESDIR}"/${P}-remove_sshfs_cipher.patch
+	)
+
+pkg_setup() {
+	# Force the group creation, #479650
+	enewgroup x2gouser
+	enewgroup x2goprint
+	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
+	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
+}
+
+src_prepare() {
+	# Do not install Xresources symlink (#521126)
+	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# Skip man2html build
+	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
+	# Use nxagent directly
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+	fperms 0750 /etc/sudoers.d
+	fperms 0440 /etc/sudoers.d/x2goserver
+	dosym /usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
+}
+
+pkg_postinst() {
+	if use sqlite ; then
+		elog "To use sqlite and create the initial database, run:"
+		elog " # x2godbadmin --createdb"
+	fi
+	if use postgres ; then
+		elog "To use a PostgreSQL database, more information is availabe here:"
+		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
+	fi
+
+	elog "For password authentication, you need to enable PasswordAuthentication"
+	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+	elog "An init script was installed for x2gocleansessions"
+}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
new file mode 100644
index 000000000000..7e553376e433
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils multilib systemd toolchain-funcs user
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-perl/Capture-Tiny
+	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
+	dev-perl/File-ReadBackwards
+	dev-perl/File-Which
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc[nls]
+	>=net-misc/nx-3.5.0.25
+	net-misc/openssh
+	x11-apps/xauth
+	x11-apps/xhost
+	x11-apps/xwininfo
+	fuse? ( net-fs/sshfs )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+pkg_setup() {
+	# Force the group creation, #479650
+	enewgroup x2gouser
+	enewgroup x2goprint
+	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
+	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
+}
+
+src_prepare() {
+	# Do not install Xresources symlink (#521126)
+	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# Skip man2html build
+	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
+	# Use nxagent directly
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+	fperms 0750 /etc/sudoers.d
+	fperms 0440 /etc/sudoers.d/x2goserver
+	dosym /usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
+}
+
+pkg_postinst() {
+	if use sqlite ; then
+		elog "To use sqlite and create the initial database, run:"
+		elog " # x2godbadmin --createdb"
+	fi
+	if use postgres ; then
+		elog "To use a PostgreSQL database, more information is availabe here:"
+		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
+	fi
+
+	elog "For password authentication, you need to enable PasswordAuthentication"
+	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+	elog "An init script was installed for x2gocleansessions"
+}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
new file mode 100644
index 000000000000..edd8b54c43bc
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib systemd toolchain-funcs user
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-perl/Capture-Tiny
+	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
+	dev-perl/File-ReadBackwards
+	dev-perl/File-Which
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc[nls]
+	>=net-misc/nx-3.5.0.25
+	net-misc/openssh
+	>=sys-apps/iproute2-4.3.0
+	x11-apps/xauth
+	x11-apps/xhost
+	x11-apps/xwininfo
+	fuse? ( net-fs/sshfs )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+PATCHES=(
+	)
+
+pkg_setup() {
+	# Force the group creation, #479650
+	enewgroup x2gouser
+	enewgroup x2goprint
+	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
+	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
+}
+
+src_prepare() {
+	# Do not install Xresources symlink (#521126)
+	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# Skip man2html build
+	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
+	# Use nxagent directly
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+	fperms 0750 /etc/sudoers.d
+	fperms 0440 /etc/sudoers.d/x2goserver
+	dosym /usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
+}
+
+pkg_postinst() {
+	if use sqlite ; then
+		elog "To use sqlite and create the initial database, run:"
+		elog " # x2godbadmin --createdb"
+	fi
+	if use postgres ; then
+		elog "To use a PostgreSQL database, more information is availabe here:"
+		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
+	fi
+
+	elog "For password authentication, you need to enable PasswordAuthentication"
+	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+	elog "An init script was installed for x2gocleansessions"
+}
diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest
new file mode 100644
index 000000000000..6f384d6a5e38
--- /dev/null
+++ b/net-misc/yandex-disk/Manifest
@@ -0,0 +1,9 @@
+DIST yandex-disk-0.1.5.940-1.fedora.i386.rpm 4551033 SHA256 215d14af442651d2268b64abd9f5593c033f3af7a301f6c1f2c693149c626007 SHA512 40438b9b079c3f1fc9c23794abd320b552f9f77c0f7aa4972fd2de94f60b607bc067a56e00bb35597a505e087ecc6ec7089b90d87695320c685abbf4af735db4 WHIRLPOOL fdb9bd864a213a8b299352e465c6f8676f97da996bf9dcae51c08d5a7902172009fa94d4ab36cff28498fd1b2df335ea0d30f661f18a60c56dc612aa69fa9631
+DIST yandex-disk-0.1.5.940-1.fedora.x86_64.rpm 4349853 SHA256 58f8beae3715893b2f982391107b819492ce6e7536c373c894e5bd0fbe3929b7 SHA512 0e52eb6275a349191b56d89a1e288c7112a8f93c31d4017787ede0a1fd7b69666f8425abb0309500361cbdd56e850e2380f74730d5ace97f1b3e4dd2c5eed6fb WHIRLPOOL 87f84e459bb9a02aa9a4e7cf745591db0bf97c29d1075bf64186e4fd49c00dd150dc03236c65d905f23f365438dd92650352ece435009561d8ea98bd711a520e
+DIST yandex-disk-0.1.5.978-1.fedora.i386.rpm 4353188 SHA256 9dc940ae22998d973412a22ffa08610bbb61b6b2903719509c44b434470c0726 SHA512 59008f42463185fab2aed221b44283e57c279ef7fd0966732dc3b6a3f474104f2ca676d77e7d958f53bff38aac9c0f7ea82b25202fd9da5f0de62bb56a983319 WHIRLPOOL 4f731acc26f4f4ab9f819968ad4210719e86b24c36bff7c60bfb3332b40fc1f993e548ee366fe96c366fbda7f104194274648326f174a6630da0725e5f257b19
+DIST yandex-disk-0.1.5.978-1.fedora.x86_64.rpm 4534132 SHA256 66ee16250f1c0a8dcc56b29283f7d3508dcf31a5822e2b8702802fc972fd6bea SHA512 d4f22bf008767289abf95237aa86ae27b33b99c62ba89381c4ed73a510d8096c169c1c215274133cc7fdf885fb7d629e758cea5925f4afc5acf7b6d688bf0078 WHIRLPOOL 151be29a5739b8fb225c02c835b7ad321a917cd418f062ce0482b7896373550ef2c50feb3875d1bf949fcb64d690f2c4747e887677d718dd3c705e39c5c85128
+EBUILD yandex-disk-0.1.5.940_p1.ebuild 1026 SHA256 333ff03e2935bf260b11f7a81cfaf22df552b6a1a3a34f7e0692fca7631b3d5a SHA512 1f702cc6ed8d661dab0b66ba974675dd1fd0dda55d69161ce4e1f9a99348e23a2312c0cadcb82b2d3e3439d000949d0717720bff236673950f8046f410431384 WHIRLPOOL 9b6c34fc91f410ade2a5fab8776ac544b5fd390f343bee8d8d7b3c57872c4e82c1269480226de8479ac3e850041f713e7bfa5b5dc427b3e3c7e67d05f137c018
+EBUILD yandex-disk-0.1.5.978_p1.ebuild 1028 SHA256 d67cd9912e032d215d08f92c37bfa394289f8ce0a84f5a6f5bd7d135d51a3585 SHA512 d8523494f36813060e2cf2db4259d42baafe742876d9c2ae4cf9399eeb1a542930c38558efb23089c21444002fc5cc5a3b5e84b1d908a73723fc6ee9baf9b06f WHIRLPOOL 1c6ddd315aa86b39c9f7a222da244c2b24615b2ba8d9643d34a4c1736ad4997e4d480dd819da9ff19e658672619aec9c7e18d4e267b67a66bcd46f4b9b976047
+MISC ChangeLog 3204 SHA256 da42b218818093ffcb1f8a8324dd1d19fea0f993bfa5ed21c93645a9a589538f SHA512 90e770fe6074835a98e2707621f373b5f4dede2914487dc754c352441a69741fd6e1bdb0afe6346e67fbca49191fb787b93db8c637da944b313a9086d34c3a27 WHIRLPOOL 2521284045911dad491d509df13b6fce646c4d7f9c2b3a1737c607e467e5f33a65c22580696348a38c22bbf4fa5390c17560fd23cd42f0110425eea9e4d84368
+MISC ChangeLog-2015 1060 SHA256 feb0c7bb79d51bd6d22f511926f6be4397ded330a470d9cc198f81a2222553ab SHA512 1c80c4b7c4ae2c828bd42d1528847ad137c1c456cdcf51e4b83117036575fdc968d0f60c4df51437abb9ebd4430d1675a0dc26921d81c4ebd753f6f81d907ebe WHIRLPOOL cac49087a00b09854ed1c6efd273cd68a74f1fd764c0b0e5d28b3e0ed98d3ac95668ed55724c3799358be17a3683272f68cb031e4b21189b072fb984e4fdea38
+MISC metadata.xml 419 SHA256 33cf98487c85290d6102261672a37302fde54888b8ca1fc1fbfd1e02a6d0e434 SHA512 4d1163cc9c59449dd3f7ff9812e54389032f8edd697255e2b23b32487e242f2e78d3856ac4462d55064884e0c1c9b409679c00a6d81e0ec5b5f9ff0df1009fd6 WHIRLPOOL 7f03fd57b416ff89f86de163f791aa3bc3cbac0eb76f2f88ef3ca31bcecf1479409b05a1215ed30ba1eecd992184edb57341255fb5ec4075b2f665262cb49379
diff --git a/net-misc/yandex-disk/metadata.xml b/net-misc/yandex-disk/metadata.xml
new file mode 100644
index 000000000000..6a5938f617c2
--- /dev/null
+++ b/net-misc/yandex-disk/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueboar@gentoo.org</email>
+		<name>Vladimir Romanov</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild
new file mode 100644
index 000000000000..0ba7ec85dfa9
--- /dev/null
+++ b/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 eutils rpm
+
+MY_P="${PN}-${PV/_p/-}"
+
+DESCRIPTION="CLI to access Yandex Disk file storage service"
+HOMEPAGE="https://disk.yandex.ru"
+SRC_URI="
+	amd64? ( http://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/${MY_P}.fedora.x86_64.rpm )
+	x86? ( http://repo.yandex.ru/yandex-disk/rpm/stable/i386/${MY_P}.fedora.i386.rpm )
+"
+
+LICENSE="YDSLA"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+
+DEPEND=""
+RDEPEND="sys-libs/zlib"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/bin/yandex-disk"
+
+src_prepare() {
+	# bug #526312
+	sed -i \
+		-e '/have /d' \
+		-e 's/+o nospace/-o nospace/' \
+		-e '/^complete/s/-X //' \
+		etc/bash_completion.d/yandex-disk-completion.bash || die
+
+	eapply_user
+}
+
+src_install() {
+	exeinto /opt/bin
+	doexe usr/bin/yandex-disk
+	newbashcomp etc/bash_completion.d/yandex-disk-completion.bash "${PN}"
+	insinto /usr/share/man
+	doins -r usr/share/man/*
+	insinto /usr/share
+	doins -r usr/share/locale
+}
diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild
new file mode 100644
index 000000000000..7f1a75788731
--- /dev/null
+++ b/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 eutils rpm
+
+MY_P="${PN}-${PV/_p/-}"
+
+DESCRIPTION="CLI to access Yandex Disk file storage service"
+HOMEPAGE="https://disk.yandex.ru"
+SRC_URI="
+	amd64? ( http://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/${MY_P}.fedora.x86_64.rpm )
+	x86? ( http://repo.yandex.ru/yandex-disk/rpm/stable/i386/${MY_P}.fedora.i386.rpm )
+"
+
+LICENSE="YDSLA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="sys-libs/zlib"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/bin/yandex-disk"
+
+src_prepare() {
+	# bug #526312
+	sed -i \
+		-e '/have /d' \
+		-e 's/+o nospace/-o nospace/' \
+		-e '/^complete/s/-X //' \
+		etc/bash_completion.d/yandex-disk-completion.bash || die
+
+	eapply_user
+}
+
+src_install() {
+	exeinto /opt/bin
+	doexe usr/bin/yandex-disk
+	newbashcomp etc/bash_completion.d/yandex-disk-completion.bash "${PN}"
+	insinto /usr/share/man
+	doins -r usr/share/man/*
+	insinto /usr/share
+	doins -r usr/share/locale
+}
diff --git a/net-misc/yangcli-pro/Manifest b/net-misc/yangcli-pro/Manifest
new file mode 100644
index 000000000000..8aa6c4ddee80
--- /dev/null
+++ b/net-misc/yangcli-pro/Manifest
@@ -0,0 +1,3 @@
+DIST yangcli-pro-16.10-8.deb8.amd64.deb 1406108 SHA256 4c69d5fd9c99272a8bb1074cdf3bc9de616866bb078546c214df86eefaa8bc10 SHA512 23db68a22d83a95638f1c155126118290fba38fd1bca524d29c75f227a14b15f20982c47b598c235b4e78e905090c17b242a27d59350cbcd9b4179da070d74c6 WHIRLPOOL a941936193e07f450a866692c5c153f9d67e309728fdf4a47bb27f2ce0a67d5069facb286e2af99700ff5920861aa3275a2b8ccbbf9b812b3e424ea41317b037
+EBUILD yangcli-pro-16.10_p8.ebuild 1081 SHA256 8877dae706060f37ff1b61010c542c1b94db44a4fa4bdd4b4206c0c119bec11e SHA512 964b064f542b89997987460e9f6aadd1c5957debec88a3f050eb14c86af245406e224b71d7fad40520dd6ac766ebc5592b08efd956c037f2aa48ec9136812932 WHIRLPOOL 905dbdce11f3bcf9d9d4e401c98fe652d4e16c68029011064affb018069393dc2f25e2d7f7df0037f2b87e96b2b4d938b44e73c97abb999af10c16aad751b976
+MISC metadata.xml 251 SHA256 f6ff468128d9aa804b47d9a184c761b4123b908d302eec0953226acd00fc80df SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd WHIRLPOOL 1610f6ab9cfa21736bbc4643fec692b621f8889a5888b4189847af4aa6f5719829cfaba363c480483fe7e8fb2c40d417e986964b52cb21d564940c4b51f8554d
diff --git a/net-misc/yangcli-pro/metadata.xml b/net-misc/yangcli-pro/metadata.xml
new file mode 100644
index 000000000000..5087760546f6
--- /dev/null
+++ b/net-misc/yangcli-pro/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild b/net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild
new file mode 100644
index 000000000000..e4181608fce5
--- /dev/null
+++ b/net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit unpacker
+
+RESTRICT="bindist mirror strip"
+MY_PV=${PV/_p/-}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}
+
+DESCRIPTION="Network manager client that lets you test and manage NETCONF servers"
+HOMEPAGE="https://www.yumaworks.com/yangcli-pro/"
+SRC_URI="amd64? ( https://www.yumaworks.com/pub/${PN}/${MY_PV}/deb8/${MY_P}.deb8.amd64.deb )"
+
+LICENSE="yangcli-pro"
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE=""
+
+RDEPEND="net-libs/libssh2
+	 sys-libs/ncurses:5/5[tinfo]"
+
+src_install() {
+	dodoc usr/share/doc/yangcli-pro/changelog.gz
+	dodoc usr/share/doc/yumapro/*.pdf
+	dodoc usr/share/doc/yumapro/README
+	dobin usr/bin/yangcli-pro
+	dolib usr/lib/libyumapro_{ncx,mgr,ycli}.so{,.16.10}
+	doman usr/share/man/man1/yangcli-pro.1.gz
+	local my_module
+	for my_module in ietf/{RFC,DRAFT} netconfcentral yumaworks ; do
+		insinto /usr/share/yumapro/modules/${my_module}
+		doins usr/share/yumapro/modules/${my_module}/*.yang
+	done
+	insinto /etc/yumapro
+	doins etc/yumapro/yangcli-pro-sample.conf
+}
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
new file mode 100644
index 000000000000..cdf28203109e
--- /dev/null
+++ b/net-misc/you-get/Manifest
@@ -0,0 +1,4 @@
+DIST you-get-0.4.536.tar.gz 104745 SHA256 9af4fc4eac8c6307562e52c914ebee1c882fc0b8233c6463028443b170fe3df8 SHA512 13d280dd5f0e6b6b5033de6eb94a251007bfc21bd99a9c0af86a5ed7b1c9b267d742c278dd80ec0a13445e09f2e22aea23bc77a5da12557be33f97731258abc6 WHIRLPOOL ee2b186cb15ec07e0e073b0eb5f6561c5726344f9ef8c2cd0c405ec1bdaff784c843087d0376677de5534532f95e9814a64e8e8cfe33920d3e829d1d1439b89a
+EBUILD you-get-0.4.536.ebuild 488 SHA256 2e7d9813f6d1055a7dfe6d848091301b0f0b13644270d5f39ae0235b192db423 SHA512 61de20ee26f4e60d33aeab9355468d34bfea5bd4686846464ab685427718bea5a71d5588568a9c49767619bd72f111af61c307d8516019f554ea886ffb6a4499 WHIRLPOOL 9d7fcc32bb0f53c236b19d89975abcf2364dc9c4ed85a5a4268a11263cedaa6fbd0cdfde76e959e56a0a7811d23a676f144bdd15ad0fdccea6ea4804783af655
+MISC ChangeLog 620 SHA256 200bed69037e6e5ccd278b2e5456e992ff7e068bb504f0e00b51141ae6119c6d SHA512 7ed4ed0bc3e8ff10563a97a528ffbc383aee0cced711ff87118d31a52a538871839771c2fdeaf9ce86f7a937dd1c74b37e7102ec6f834ac41f40a9ece63f7144 WHIRLPOOL 5bea3f412bcf14e539d90dc602a0483c9efe1640450af62e558d6395622c1971c2175956e04e611fcd3d96ebccc2d0f73b04d36161215b6de62c74d7365d9c2d
+MISC metadata.xml 330 SHA256 068aa735db732fb57a097f370e68dd229f890a85d7e4997b97772d240aaa60d8 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6 WHIRLPOOL e4733f6c4e28b30359bbb35e09878bb64296ffbc3ce5ecf3b3bb78e616698a652ffbae2c4d70d697c9186d3a9bc63398346e8bf72013a94fdd81fe63195050f2
diff --git a/net-misc/you-get/metadata.xml b/net-misc/you-get/metadata.xml
new file mode 100644
index 000000000000..e537d4c521df
--- /dev/null
+++ b/net-misc/you-get/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">soimort/you-get</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/you-get/you-get-0.4.536.ebuild b/net-misc/you-get/you-get-0.4.536.ebuild
new file mode 100644
index 000000000000..0f407f5c8a1b
--- /dev/null
+++ b/net-misc/you-get/you-get-0.4.536.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python{3_4,3_5})
+
+inherit eutils distutils-r1
+
+DESCRIPTION="utility to download media contents from the web"
+HOMEPAGE="http://www.soimort.org/you-get"
+SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	virtual/ffmpeg
+"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
new file mode 100644
index 000000000000..9b24d200fa96
--- /dev/null
+++ b/net-misc/youtube-dl/Manifest
@@ -0,0 +1,10 @@
+DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
+DIST youtube-dl-2017.09.24.tar.gz 2810181 SHA256 7d7140ce63377e84a2072b4922809c7a2e90e3916cde2f4f1cc8860664395548 SHA512 de96406aeabb993a39941f5c67947fd1b77ec003be36b215cb3df1e5c90d63c7c570a5ca7627f5b2faae6a15ee07d45cf339cac6b511890acf49c5c38e6c5672 WHIRLPOOL e248990cce1bcbe50ae9e0ac6a95d760948809ec371b93126011d71599e721f1e9b0784690b832d3c5c04fb55c048b08c091193f821b18e1211f4c393ab2d017
+DIST youtube-dl-2017.10.01.tar.gz 2813364 SHA256 0b4f0e12b099c46ad47597764b10f45ceae3935834abf99d49ccd8cfb48dff10 SHA512 f1eafecb2418276df7e7bdb73402779521197f551be3431eda9727390884d42c50a73895d0c58fc3783ab04712e4bf5aa072dad6d3241724e19e6c4c80c0080d WHIRLPOOL 281b7cdb288c1890e785d15cf1aa7c1f8e33976c521559551924b0f18b26981fb33a0b60ff86df796613ef34d273a13b3ada3c5f3e851534dad4bf124260f509
+EBUILD youtube-dl-2017.03.16.ebuild 2381 SHA256 9503230e2716a18498b74f5047095216fa36cdf4801cc6446e6f2075fa5cde50 SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862 WHIRLPOOL ded7fa74a8649db1cc5c16eb98ab557853d264bcc458429374b0bbb29773f993a8621285bcfcbe243cf3892d982f91ff5278c45cb0e50b824b156a0a57786911
+EBUILD youtube-dl-2017.09.24.ebuild 2383 SHA256 e959a1068b24172b3b4ef9a21277befd8161fe9d514ed6924e79f194e011d39b SHA512 212115024819c4ace4aa20c649202883bfa78488e1cc903b49d05e6abc704cbb6051ec12c0f7942c1e7cef8c40925a9e5c984058be9183a367b8b91d20226174 WHIRLPOOL 0313b71a631fac8a921e718d7de6d9ef8e8803e6c18c05dccd80caa22aec292e5566f98fde2a12473feaa6ac0e174bcd49cca8920f5860503d034c91b40cea76
+EBUILD youtube-dl-2017.10.01.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
+EBUILD youtube-dl-99999999.ebuild 2089 SHA256 a46031a2c229d820634b16d31efc904c44bafe1d04c3367b9e40e5e0c8b1c953 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11 WHIRLPOOL a358657c660c533e1b506339c615e781998aa5465408629c51722f6999fc3e5d3fd11b617b89314ada35df0d93aeaa514837ac1a2e3b7573c43657394f6ef4ae
+MISC ChangeLog 32089 SHA256 377c688fd528de367a40230423162256199da2c475ef85d3dc986b622e322fd6 SHA512 955715fa5304b1ee5ab4436e232b4ac5c882e28f4755d2edcd23cc4c760575518dc8c349c20b2e1b41145ca55bbd8df292d12a1b34768acf55ae1d6b80e2f2ca WHIRLPOOL a925103ccb1de53ada47dd94f927a42eff5f97e14b47c607ddfaeda4e719a2eb8be78be8e008e4b3036ab48acb946e283876d646388745288ad5b992e2574104
+MISC ChangeLog-2015 75434 SHA256 71ef7accb3e09eadb601b4541ead4ed3019cbd1e86b56df23130cc0e49572dd5 SHA512 3517da9014199375d7bb8d4841b52ad12eb3a25ca7a225e767dd9b60f8b81848cf7f6763066fb7c7bb7826602711e22f56d710fa319cb8172843a31eb69228e6 WHIRLPOOL 32aee6516cd3e7848eeb08ccd47cb60bc04da646b2e448970ce40fa5d0e8dc591ae5d7c8e1dfe99229b6ee70805e070d8dee2353a41515377083bd7d2f02b073
+MISC metadata.xml 218 SHA256 0fb97418a12b81d9b71e811d3f5f30fce503b6493ecafb187eff32c9a744c3a1 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27 WHIRLPOOL c921419ddb878fc8d4208c8f7c87c3955c0237cb65f2f028b0d37404a45fd8f86f2cd305058e7fff60c42f973b28809bfc27ec9c99254949e48a6f5bc6a69ebf
diff --git a/net-misc/youtube-dl/metadata.xml b/net-misc/youtube-dl/metadata.xml
new file mode 100644
index 000000000000..6a4728cab751
--- /dev/null
+++ b/net-misc/youtube-dl/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 type="person">
+    <email>jer@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/youtube-dl/youtube-dl-2017.03.16.ebuild b/net-misc/youtube-dl/youtube-dl-2017.03.16.ebuild
new file mode 100644
index 000000000000..5a1ccb3c72e9
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2017.03.16.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube fourtube foxgay goshgay hellporno
+			hentaistigma hornbunny keezmovies lovehomeporn mofosex motherless
+			myvidster porn91 pornflip porncom pornhd pornotube pornovoisines
+			pornoxo ruleporn sexu slutload spankbang spankwire sunporno thisav
+			tube8 vporn watchindianporn xbef xnxx xtube xvideos xxxymovies
+			youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber pornhub redtube xhamster tnaflix
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	epatch_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/completions
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild b/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild
new file mode 100644
index 000000000000..fa2e8cbf808f
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex motherless myvidster
+			porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
+			ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
+			vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
+			youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube pornhub redtube tnaflix xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/completions
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild b/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild
new file mode 100644
index 000000000000..975ce26c347e
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex motherless myvidster
+			porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
+			ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
+			vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
+			youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube pornhub redtube tnaflix xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/completions
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
new file mode 100644
index 000000000000..683bc08f1a19
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 git-r3
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+EGIT_REPO_URI="https://github.com/rg3/youtube-dl.git"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS=""
+IUSE="offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube fourtube foxgay goshgay hellporno
+			hentaistigma hornbunny keezmovies lovehomeporn mofosex motherless
+			myvidster porn91 porncom pornflip pornhd pornotube pornovoisines
+			pornoxo ruleporn sexu slutload spankbang spankwire sunporno thisav
+			tube8 vporn watchindianporn xbef xnxx xtube xvideos xxxymovies
+			youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber pornhub redtube tnaflix xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.md
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
new file mode 100644
index 000000000000..c62ecbbf1845
--- /dev/null
+++ b/net-misc/youtube-viewer/Manifest
@@ -0,0 +1,14 @@
+DIST youtube-viewer-3.1.9.tar.gz 222276 SHA256 9b7ba2b50cea054898024bc871e231673269ab50db0526ee3f1a7ae62a51e8d2 SHA512 60ff81defd4d8d1bc1f6b5bceaa03c9bbe64e8fea2083ce60b04b6c14d8b13ded6da255b9aa46bfcb1b76cf33121ddb738d0f0c159e4bd207999ca558a43e86e WHIRLPOOL 2e6a79992c7760d93c2e28f1e4f5c14861b6fefed8e0bebb9a7d88c6cf27000904971b12274a972ca66471ffee7c3bfee8c90218c16ddd0ec96cc8f46779bffd
+DIST youtube-viewer-3.2.0.tar.gz 222528 SHA256 60a4ded8798da3cdadadf816b1c4e87c6feb697f01db70630f014584e5a2392e SHA512 bda3592874ded71e6a60d87b669d2c80999425ef2f2061e942a8db5755d9d6f2dabf038b8b7984efb1cccc3a5f9f12b2fa56290be9db871b2784b2c464367c3b WHIRLPOOL 73ec965bf4cf65d545b99d73e003ce7d74d92dcdc1f5d29c8b925e4d96e93d5924b66e06ec40e22f16119b6df6445344d650d5ca086e52aeb60a350c7ca8ce0d
+DIST youtube-viewer-3.2.4.tar.gz 224282 SHA256 ca37024ce018e31bd4c99f5df208e842f44979c07c5d31647c1fbe4e17b1b296 SHA512 06bb763460b90f26aa1671c29056374df62d4e840acb3a800f4840160535fef30e60e6655b1d4ba7423a0424384acdfc00aa068a420aa836110974a5f7152ec2 WHIRLPOOL bfeb12bacd98b6da8ecb0ee4b626a8fdc98331f21049bdd99524d65ff5de109abe859c882dac5347fa07cee704d229e64496a369ae1c3ae6d24557c4ff142b59
+DIST youtube-viewer-3.2.5.tar.gz 228801 SHA256 306199649972137e7181fac4efccb295b5c3aedc3f103975cca533db3be1f53b SHA512 093c62a3fcbfdf538ae5a205b4263ef91408e4aa7f1824a12f4b5d7b387437fe48af5914e792d743b135e1389534ddba89aaa9a1226969d3cc360515a0d885ae WHIRLPOOL 5d0168866d58ee88e6d7fa98f2a7ffdc3527203680c224bcd5998e322f6329e28cecbc33986aea764137c9917b78e65f250afe664af6fd5c308a50cfa626c869
+DIST youtube-viewer-3.2.8.tar.gz 233912 SHA256 50e26c4f9548f0211cb0dd35ade192939ec12c5aab9d0d55692223390dbb9039 SHA512 ae4012f164ff86208975968efe3460774f6740ada9badbfbb373b1e4a22b9983667d96c0f8d857431a6b344bbd061895abab39d353e850662b0b131ef9016f45 WHIRLPOOL ac0c6176ec9636e0b9192e3018f73f3ef3e5ddd4498994e024392164510607891af0ee8c487d159822ad9601552c38c6f755307274df7798b7d1dcd33ba7f041
+EBUILD youtube-viewer-3.1.9.ebuild 2425 SHA256 835eb282afef3b899c2a8fced3a8c4b34964036203cf1664ef4edc49c7bf4d04 SHA512 3314727682ff9d77b761b391fcae9d70d541321f2d3dc5e2ca0bab3f87bf36cda06ec0f84a085172caae9df621722bb0c0c21e6c20af7452ef11b9468e3be56c WHIRLPOOL 5cde3cdd7f129ccb445b2d3797dd6a52bb2e57e253204b3dab854b954243fa1dab5188d5f602e8e987c92c4f5a966d00022294ed4685be29d98a1777a4ca37ca
+EBUILD youtube-viewer-3.2.0.ebuild 2335 SHA256 fcadb0e27116d266a40ff21854dfa6b9e6c52f94bee8616906e626d542595800 SHA512 ab8c7996de65d8b439356360815f4fa744837785bfaee9db454ec3d4f419d290cad98517b03c4e97acff046d76983051dfe738dd5d88de5c2635be71536f5ad6 WHIRLPOOL e7aac869605a6a714a1cb11ed9c17db0e619bb670807b55576aa9fabca57622730ff611a456d3f3dfe6235dbc28e84c1fc44001071a63cd0f467581d16d7b07b
+EBUILD youtube-viewer-3.2.4.ebuild 2302 SHA256 ec2434d7170ec3f29e040707f10c65658fb612226fcd875d531075862af87995 SHA512 401d3e44d86c4fcf8397e39ae2b05e06664c6ac53c7048d419138851e2ec5b21ee5beed3e170bb9156e313c3c36b91b11adf6ecd1704e75031194e322cb5775d WHIRLPOOL 914648ca13fe790a45a90ba467ba5abf433f302cbb96041e34fcfee528db255d2451041ca70b97aa24de797469632cc7dc4dcba3eae17b0cc5d41f3d6359f955
+EBUILD youtube-viewer-3.2.5.ebuild 2258 SHA256 f79a4652a53cb65ab494ad5557e2a20ece393be6d7b8f04ce48290f2dcb8b9c1 SHA512 1b2d4d344fb4406a0a9fa8ca70c6e73ea0c597069a92a95684b2f34111799f2bd94d1d4e9eae23f67a3355f5545c8f3237122de80264b2e465d04cd5d363ea87 WHIRLPOOL 3db5b5636f992c5471f5d9a0e927c92a84d00cb83b68fb99254075af2a72324841a86c031014e44979360e75a4d3dc8a74dfe569faaf325514cf9e255c5caf67
+EBUILD youtube-viewer-3.2.8.ebuild 2027 SHA256 dea9544643dcb85b7dbc064c91eb9662f3eb1c46a2f49b685e1f2a7152e9ed0b SHA512 c860812a399f1fbc482ba4baf8794f7cad8b265fa6fa417b20074fef9ac24ee9ec2e025c41ba509b7484e6a7298c3e56484beccd0056a42b0de9ee446677c930 WHIRLPOOL bd1774624e93d8bf5d9898463b5716bfa16201d6b9ea6551b3f9dd1ceceb4b31483520248e62b3009a2da28f7d419dc7666ed57b5b14c417ee7e6380833f7dd8
+EBUILD youtube-viewer-9999.ebuild 2252 SHA256 c2424ddaf9b6810b5f36758e879a7bd2f692c819615d56671d9057acda3fd415 SHA512 15f2acb1b4346ada4d71913569ef91852657ac52861ff89b6b7952903ef20c6a9bcb438f89a024aaab030c9e0a4820c2f0cab08a7ce4fbe92884a5d3e4044f04 WHIRLPOOL 7894353dd376b6b6f57f301264f54227669b7f8da2fbda80ac486fbe48d118c4b8b08cba8a4469b5493ceb4158f1a1e5b729b570d7b2c91657241b7dbfa4f529
+MISC ChangeLog 5720 SHA256 4ff2fca5aec1bf21b6664627738846539a12e4f7c3da413f54ab6f9a9f242d87 SHA512 a62c3d368021223144fa822b68afbae81cfdad5860f150ee0aeca50ce991284acc446574a7287ef997fd2735bef4966e4ed50680a293b9a01a4b9227d449f81a WHIRLPOOL c766bbc9e62f12a343be8c73527881a480fa5dbb7944064ced05c202b666486cf83bc71590b3186419e29d78e78654c360cc6d98357453c31547834adb732310
+MISC ChangeLog-2015 7306 SHA256 76ac38bd81d2d4a7c281acef5e2e663d79f9b033956475c8a84fa75872ec3995 SHA512 71db02fa8896dd18c04f0467d383d53beb11b7eac0fa142e36cd53935af66ace21d62d9a7a5fdba57ee410ceb38c9f1ad64d6888ee2941d82a502643ddcf95a6 WHIRLPOOL 31ab03a4949c88620def9307002f802e634034a4b0543456f9b1c9e4ef3516104bf761540db46bcce3394e90c8159808e8d7e0c8c9593b98c30c69371a4b0329
+MISC metadata.xml 1066 SHA256 f993a49aad678cc83f45533fcc64e28d57627af5512788b883a9e991f6e1cd88 SHA512 2278da4a5e3aefec4edd96c2fddc61ef6ef025131d38414a7931e84c0b42a9b9056e06f2ee531f4e9afb82a613fb9ce4ba2de25bf00bf5594f5f882970b282c1 WHIRLPOOL 2aed3fa5639e6e407f0271cca029c85a26e683cfec5da6bd8fd0449b71aff4cc467596f8fb2470cef94fcda3486430ec3942d26c6b3709d714a2d7e6d39ac8e2
diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml
new file mode 100644
index 000000000000..a06da39dbccb
--- /dev/null
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+		<description>Proxied maintainer, CC him on bugs.</description>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>trizenx@gmail.com</email>
+			<name>Daniel Șuteu</name>
+		</maintainer>
+		<bugs-to>https://github.com/trizen/youtube-viewer/issues</bugs-to>
+		<remote-id type="github">trizen/youtube-viewer</remote-id>
+	</upstream>
+	<use>
+		<flag name="gtk">Install the gtk GUI, called gtk-youtube-viewer</flag>
+	</use>
+	<longdescription lang="en">
+		Youtube Viewer is a CLI application dedicated for searching and
+		streaming Youtube Videos with MPlayer. It has been written in Perl
+		and plays videos from Youtube at the best quality available without
+		using a flash player.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
new file mode 100644
index 000000000000..91888a284dbe
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit gnome2-utils eutils perl-module vcs-snapshot
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
+SRC_URI="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-lang/perl-5.16.0
+	dev-perl/Data-Dump
+	dev-perl/JSON
+	dev-perl/libwww-perl[ssl]
+	dev-perl/Term-ReadLine-Gnu
+	virtual/perl-Encode
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Term-ReadLine
+	virtual/perl-Text-ParseWords
+	virtual/perl-Text-Tabs+Wrap
+	gtk? (
+		dev-perl/File-ShareDir
+		>=dev-perl/Gtk2-1.244.0
+		virtual/freedesktop-icon-theme
+		x11-libs/gdk-pixbuf:2[X,jpeg]
+	)"
+DEPEND="dev-perl/Module-Build"
+
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+}
+
+# build system installs files on "perl Build.PL" too
+# do all the work in src_install
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local myconf
+	if use gtk ; then
+		myconf="--gtk-youtube-viewer"
+	fi
+	perl-module_src_configure
+	perl-module_src_install
+
+	if use gtk ; then
+		domenu share/gtk-youtube-viewer.desktop
+		doicon share/icons/gtk-youtube-viewer.png
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+	perl_set_version
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+	elog
+	elog "optional dependencies:"
+	elog "  dev-perl/LWP-UserAgent-Cached (cache support)"
+	elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
+	elog "  dev-perl/JSON-XS (faster JSON to HASH conversion)"
+	elog "  dev-perl/Mozilla-CA (just in case if there are SSL problems)"
+	elog "  dev-perl/Text-CharWidth (print the results in a fixed-width"
+	elog "    format (--fixed-width, -W))"
+	elog "  virtual/perl-threads (threads support)"
+	elog
+	elog "You also need a compatible video player, possible choices are:"
+	elog "  media-video/gnome-mplayer"
+	elog "  media-video/mplayer[network]"
+	elog "  media-video/mpv"
+	elog "  media-video/smplayer"
+	elog "  media-video/vlc"
+	elog "Also check the configuration file in ~/.config/youtube-viewer/"
+	elog "and configure your video player backend."
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.2.0.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.2.0.ebuild
new file mode 100644
index 000000000000..26931b92caf5
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-3.2.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils gnome2-utils perl-module vcs-snapshot
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
+SRC_URI="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-lang/perl-5.16.0
+	dev-perl/Data-Dump
+	dev-perl/JSON
+	dev-perl/libwww-perl[ssl]
+	dev-perl/Term-ReadLine-Gnu
+	virtual/perl-Encode
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Term-ReadLine
+	virtual/perl-Text-ParseWords
+	virtual/perl-Text-Tabs+Wrap
+	gtk? (
+		dev-perl/File-ShareDir
+		>=dev-perl/Gtk2-1.244.0
+		virtual/freedesktop-icon-theme
+		x11-libs/gdk-pixbuf:2[X,jpeg]
+	)"
+DEPEND="dev-perl/Module-Build"
+
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+}
+
+# build system installs files on "perl Build.PL" too
+# do all the work in src_install
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local myconf
+	if use gtk ; then
+		myconf="--gtk-youtube-viewer"
+	fi
+	perl-module_src_configure
+	perl-module_src_install
+
+	if use gtk ; then
+		domenu share/gtk-youtube-viewer.desktop
+		doicon share/icons/gtk-youtube-viewer.png
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+	perl_set_version
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+	elog "Optional dependencies:"
+	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
+	optfeature "better STDIN support" dev-perl/Term-ReadLine-Gnu
+	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
+	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
+	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "threads support" virtual/perl-threads
+	elog
+	elog "You also need a compatible video player, possible choices are:"
+	elog "  media-video/mpv"
+	elog "  media-video/smplayer"
+	elog "  media-video/vlc"
+	elog "Also check the configuration file in ~/.config/youtube-viewer/"
+	elog "and configure your video player backend."
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.2.4.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.2.4.ebuild
new file mode 100644
index 000000000000..8b5631d0d697
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-3.2.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils perl-module
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
+SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	dev-perl/Data-Dump
+	dev-perl/JSON
+	dev-perl/libwww-perl[ssl]
+	dev-perl/Term-ReadLine-Gnu
+	virtual/perl-Encode
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Term-ReadLine
+	virtual/perl-Text-ParseWords
+	virtual/perl-Text-Tabs+Wrap
+	gtk? (
+		dev-perl/File-ShareDir
+		>=dev-perl/Gtk2-1.244.0
+		virtual/freedesktop-icon-theme
+		x11-libs/gdk-pixbuf:2[X,jpeg]
+	)"
+DEPEND="dev-perl/Module-Build"
+
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+}
+
+# build system installs files on "perl Build.PL" too
+# do all the work in src_install
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local myconf
+	if use gtk ; then
+		myconf="--gtk-youtube-viewer"
+	fi
+	perl-module_src_configure
+	perl-module_src_install
+
+	if use gtk ; then
+		domenu share/gtk-youtube-viewer.desktop
+		doicon share/icons/gtk-youtube-viewer.png
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+	perl_set_version
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+	elog "Optional dependencies:"
+	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
+	optfeature "better STDIN support" dev-perl/Term-ReadLine-Gnu
+	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
+	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
+	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "threads support" virtual/perl-threads
+	elog
+	elog "You also need a compatible video player, possible choices are:"
+	elog "  media-video/mpv"
+	elog "  media-video/mplayer"
+	elog "  media-video/smplayer"
+	elog "  media-video/vlc"
+	elog "Also check the configuration file in ~/.config/youtube-viewer/"
+	elog "and configure your video player backend."
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.2.5.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.2.5.ebuild
new file mode 100644
index 000000000000..738342f0e3b4
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-3.2.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils perl-module
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
+SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	dev-perl/Data-Dump
+	dev-perl/JSON
+	dev-perl/libwww-perl[ssl]
+	dev-perl/Term-ReadLine-Gnu
+	media-video/ffmpeg[openssl]
+	virtual/perl-Encode
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Term-ReadLine
+	virtual/perl-Text-ParseWords
+	virtual/perl-Text-Tabs+Wrap
+	gtk? (
+		dev-perl/File-ShareDir
+		>=dev-perl/Gtk2-1.244.0
+		virtual/freedesktop-icon-theme
+		x11-libs/gdk-pixbuf:2[X,jpeg]
+	)
+	|| ( media-video/mpv media-video/mplayer media-video/smplayer media-video/vlc )
+	"
+DEPEND="dev-perl/Module-Build"
+
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+}
+
+# build system installs files on "perl Build.PL" too
+# do all the work in src_install
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local myconf
+	if use gtk ; then
+		myconf="--gtk-youtube-viewer"
+	fi
+	perl-module_src_configure
+	perl-module_src_install
+
+	if use gtk ; then
+		domenu share/gtk-youtube-viewer.desktop
+		doicon share/icons/gtk-youtube-viewer.png
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+	perl_set_version
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+	elog "Optional dependencies:"
+	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
+	optfeature "better STDIN support" dev-perl/Term-ReadLine-Gnu
+	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
+	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
+	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "threads support" virtual/perl-threads
+	elog
+	elog "Check the configuration file in ~/.config/youtube-viewer/"
+	elog "and configure your video player backend."
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.2.8.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.2.8.ebuild
new file mode 100644
index 000000000000..537ee784c3de
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-3.2.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils perl-module
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
+SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	dev-perl/Data-Dump
+	dev-perl/JSON
+	dev-perl/libwww-perl[ssl]
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/LWP-Protocol-https
+	virtual/perl-Encode
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Term-ReadLine
+	virtual/perl-Text-ParseWords
+	virtual/perl-Text-Tabs+Wrap
+	gtk? (
+		dev-perl/File-ShareDir
+		>=dev-perl/Gtk2-1.244.0
+		virtual/freedesktop-icon-theme
+		x11-libs/gdk-pixbuf:2[X,jpeg]
+	)
+	|| ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] )
+	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
+DEPEND="dev-perl/Module-Build"
+
+src_configure() {
+	local myconf
+	if use gtk ; then
+		myconf="--gtk-youtube-viewer"
+	fi
+	perl-module_src_configure
+}
+
+src_install() {
+	perl-module_src_install
+
+	if use gtk ; then
+		domenu share/gtk-youtube-viewer.desktop
+		doicon share/icons/gtk-youtube-viewer.png
+	fi
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+	elog "Optional dependencies:"
+	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
+	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
+	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
+	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "threads support" virtual/perl-threads
+	elog
+	elog "Check the configuration file in ~/.config/youtube-viewer/"
+	elog "and configure your video player backend."
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
new file mode 100644
index 000000000000..94ebef6a27a5
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils eutils perl-module git-r3
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/trizen/${PN}.git"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS=""
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-lang/perl-5.16.0
+	dev-perl/Data-Dump
+	dev-perl/JSON
+	dev-perl/libwww-perl[ssl]
+	dev-perl/Term-ReadLine-Gnu
+	media-video/ffmpeg[openssl]
+	virtual/perl-Encode
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Term-ReadLine
+	virtual/perl-Text-ParseWords
+	virtual/perl-Text-Tabs+Wrap
+	gtk? (
+		dev-perl/File-ShareDir
+		>=dev-perl/Gtk2-1.244.0
+		virtual/freedesktop-icon-theme
+		x11-libs/gdk-pixbuf:2[X,jpeg]
+	)
+	|| ( media-video/mpv media-video/mplayer media-video/smplayer media-video/vlc )"
+DEPEND="dev-perl/Module-Build"
+
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+}
+
+# build system installs files on "perl Build.PL" too
+# do all the work in src_install
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local myconf
+	if use gtk ; then
+		myconf="--gtk-youtube-viewer"
+	fi
+	perl-module_src_configure
+	perl-module_src_install
+
+	if use gtk ; then
+		domenu share/gtk-youtube-viewer.desktop
+		doicon share/icons/gtk-youtube-viewer.png
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+	perl_set_version
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+	elog "Optional dependencies:"
+	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
+	optfeature "better STDIN support" dev-perl/Term-ReadLine-Gnu
+	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
+	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
+	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "threads support" virtual/perl-threads
+	elog
+	elog "Check the configuration file in ~/.config/youtube-viewer/"
+	elog "and configure your video player backend."
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/ytalk/Manifest b/net-misc/ytalk/Manifest
new file mode 100644
index 000000000000..597c4222105a
--- /dev/null
+++ b/net-misc/ytalk/Manifest
@@ -0,0 +1,7 @@
+AUX ytalk-3.3.0-tinfo.patch 1427 SHA256 5cfe4ce9141d50318a5b4c5bdc6a5eae03e2ed6ee3dcaf7a5c15b152dba84a83 SHA512 cd3316fe6d1efb8af1f6bd6ede72b519d914a07b663aa47c4edc9cc4ef76581039f88f4274b22cd0dd8100e3f9eb20a110dc68dd1fa99365a0fb1d558ecbec70 WHIRLPOOL 767b2a5df282706388b38d02870f0f9d51b7bdb8c1419fbe3aeba88a7b45de605d6f603a749529753ee69dee3bbd5125575b5f3dd9712cc109a48aecb6b7c7ee
+DIST ytalk-3.3.0.tar.gz 137989 SHA256 6ecb34f71f723a7b96f90e411c78dff2735c08dc4228c765f7fdbf8ca48572b4 SHA512 ee4c5b13b70c832899c9f62e1eb71e736b74812e6e47d56a9aad34fc5f8cd344d91c0ee9eb652eb11d9aa9578f51bd87213bc7181dfad9933e0fd73af363b8ef WHIRLPOOL 446a0a11fb1a4b82a38c41d73a67c41d0574e7a52036ce5273a29b2fd7e6ecdd262dcd501cff71685def6328aeb2f44c4a3fca9784de549fd468eccd1e392d63
+EBUILD ytalk-3.3.0-r1.ebuild 526 SHA256 96bff9c8f05a0b9b0b20dad90b1249b806d8453030c678b8bb52b3680c1f4801 SHA512 fb0a12a85082bec6573b5fc18236f15ca2c92c140a951c4b1a451be738508e98ac42c6150a1043c53b8db90a6945a1ff717c3ad49c06c1517b9ec6fb0f8de316 WHIRLPOOL 9a64e363a3eed2b6e297f3516fdff03c280981c917f32665687c0c65ca824fa4a2f35b831ad51f0ae515bbcd543cee354c17e60123641e4bb4fcfbd2dff83691
+EBUILD ytalk-3.3.0.ebuild 545 SHA256 aa730c5e08d9b19bc4a8d4d2beeee9baac907d5f0193ad2cf2bdd6dbc9bd3797 SHA512 4b268ae7139137a9d51ce1992d301391b2c97888f611190ee768d12eea1bb96a3119d6699b1279580f533d56c3da90e346c699d2acfc2c1466f97606b4a84a04 WHIRLPOOL 0b0dc37922a20b0914fe3cbbf6a797c87b5de0fb47cf10f364559762a58b19846f0c2ccd6f0441369e3d7ca782eb93373d7b349b6eeba035d48c2e2adfb10d6a
+MISC ChangeLog 2453 SHA256 bedfb3f2d0c34fcd95affe8df1d8185c5daa6c56efcbb3b0c67c8c51a9f42d99 SHA512 5493cd200be287eea413e30c4ebfcace06c617ac9e36fa9c763d53be5da3e19051bdbe779721a2ba9d61a0d794925ef756d1ff80945a41193c0a2407b814c9f1 WHIRLPOOL 23dcb7559e71c8109b26abfe24c0a0e5bc0e37d3cd68bd77bf56d96dfb180b6027858ae304b35c3c1e7632fc16dc9a005bccb97a072a0fc3d4c294323b915f3e
+MISC ChangeLog-2015 3699 SHA256 45347dcfb49ad08a20875f59edec7e69fb808f35951271b612ce1abacc93b86a SHA512 6827ae71484f311f9a47c9e87fbd61faa4ddbd4b1a8a9170fbb85b44321099d011c7d561bc1dbfd219824852718adb45cb71754a9a60cf4ce08f238d8c43b570 WHIRLPOOL 17293b5af1c003a882bbe67125a161aa3cc01aa487ea54d914b2e3aea7c5d9bd8485add3ec89f409ced49af8b0bc6978983a1f4ed356102c85ffec6804b5b4e3
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-misc/ytalk/files/ytalk-3.3.0-tinfo.patch b/net-misc/ytalk/files/ytalk-3.3.0-tinfo.patch
new file mode 100644
index 000000000000..bdfb2aa8aa48
--- /dev/null
+++ b/net-misc/ytalk/files/ytalk-3.3.0-tinfo.patch
@@ -0,0 +1,47 @@
+--- a/configure.in
++++ b/configure.in
+@@ -22,7 +22,6 @@
+ esac
+ AC_SUBST(SYSTEM_DEFS)
+ 
+-AC_DEFINE_DIR([sysconfdir], [sysconfdir], [sysconfdir])
+ AC_DEFINE_UNQUOTED(SYSTEM_YTALKRC, ["${sysconfdir}/ytalkrc"], ["Location of default ytalkrc file"])
+ 
+ dnl Checks for programs.
+@@ -35,30 +34,12 @@
+ AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(u_int)
+ 
+-ytalk_cv_curses=/usr
+-AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where curses is installed]),
+-	[if test $withval != yes; then
+-		ytalk_cv_curses=$withval
+-	fi
+-	if test x$ytalk_cv_curses != x/usr; then
+-		LDFLAGS="-L${ytalk_cv_curses}/lib $LDFLAGS"
+-		CPPFLAGS="$CPPFLAGS -I${ytalk_cv_curses}/include"
+-	fi])
+-
+-AC_CHECK_LIB(ncurses, initscr,
+-	[LIBS="$LIBS -lncurses"
+-	if test x$ytalk_cv_curses = x/usr -a -d /usr/include/ncurses; then
+-		CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+-	fi
+-	AC_CHECK_HEADERS(ncurses.h)],
+-	[CF_CURSES_LIBS])
+-
+-dnl Check for keypad()
+-AC_CHECK_LIB(ncurses, keypad,
+-	[AC_DEFINE(HAVE_KEYPAD, 1, [Define to 1 if you have keypad()])],
+-[AC_CHECK_LIB(curses, keypad,
+-	[AC_DEFINE(HAVE_KEYPAD, 1, [Define to 1 if you have keypad()])],
+-[])])
++PKG_CHECK_MODULES(ncurses, ncurses,
++  LIBS="$LIBS $ncurses_LIBS"
++  CFLAGS="$CFLAGS $ncurses_CFLAGS"
++  AC_DEFINE(HAVE_KEYPAD, 1, [Define to 1 if you have keypad()]),
++  AC_MSG_ERROR([Could not find ncurses])
++)
+ 
+ dnl Look for termios, and if that fails, try sgtty.
+ AC_CHECK_FUNC(tcgetattr, [\
diff --git a/net-misc/ytalk/metadata.xml b/net-misc/ytalk/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-misc/ytalk/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-misc/ytalk/ytalk-3.3.0-r1.ebuild b/net-misc/ytalk/ytalk-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..68a755b4b33a
--- /dev/null
+++ b/net-misc/ytalk/ytalk-3.3.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Multi-user replacement for UNIX talk"
+HOMEPAGE="http://www.impul.se/ytalk/"
+SRC_URI="http://www.impul.se/ytalk/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	sys-libs/ncurses:0="
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-misc/ytalk/ytalk-3.3.0.ebuild b/net-misc/ytalk/ytalk-3.3.0.ebuild
new file mode 100644
index 000000000000..f03dde55d34b
--- /dev/null
+++ b/net-misc/ytalk/ytalk-3.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Multi-user replacement for UNIX talk"
+HOMEPAGE="http://www.impul.se/ytalk/"
+SRC_URI="http://www.impul.se/ytalk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
+
+RDEPEND=">=sys-libs/ncurses-5.2:0="
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog INSTALL README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
new file mode 100644
index 000000000000..32630757b23a
--- /dev/null
+++ b/net-misc/zerotier/Manifest
@@ -0,0 +1,5 @@
+AUX zerotier.init 436 SHA256 02bf5ae5acb1bc2b3369c08f94ef7bedd0c13aa4499671ba99b594b18b5b9898 SHA512 e65232b9525ac347232d66adf97094e479a7883b545b5e9686474f43480a8c1b507a19fd3c0f5e22c69a83c26c6922f0031b6606230ec76129bb0471d151ee7b WHIRLPOOL 5359a648562d679e389ec8aff71d275893dd4e940e90bdbd968c3dd0302fcd58d187f2b1d4806309a198d42be804e2613262d25764036bdd8e118d5b502480fa
+AUX zerotier.service 179 SHA256 50b4f70da424b824c1e0864178a7229d9a16da933704e8d0c7177e79ff726611 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701 WHIRLPOOL fd910554298d4a555c0dd82020ac9d1721071bffdb01d7f8a7a1e1428bf0e73ad70c48b4d575976841285b4bb66e335ce411fb6b25dfb335f74483c9e2b26d5b
+DIST zerotier-1.2.4.tar.gz 7963254 SHA256 9f275b3732b721f02cc4b8df75b51e6a8fb56dfe1a542a7bd681538d852b0358 SHA512 82adb110208d24ae2745e3839810afcac87955de050ebfe0517a7dc2a875881dafd40c1b16a041742d8c4d0f6513abcc71d6ea3e06c2fb89b47be2630a500363 WHIRLPOOL 661af8a0255ceedbedaf540c77711753d28041986811f30552a2f04432f02ea41b0d6f23786c4dfc664e4d9bd385b7a8da30c42ce902204d4a3ab64e0b17d839
+EBUILD zerotier-1.2.4.ebuild 910 SHA256 a5a120a9fbbf81db1e9e0f6fa27b0b5e85b15214634bb74bd8b9a22c7e780aa3 SHA512 0b0e295145b5c3b149a41a3645f080e644ca336e151a0dd7c7f6be4c8bfb508414616415b1c95e1f8f4dd34a00cec87ecec6cb67ad1a1642d833e6531a472d67 WHIRLPOOL 0835f01ec1d104c754048a7e478c7a34e6d61427e27a86d7a6ed0bcd8b1023c70f9b2d30eaa005537d74f28159ba62b055c98ebc9786c298584cd6b2205d6e7e
+MISC metadata.xml 364 SHA256 52234b4f25a7fd8f2cb1a2644f4f6ae2187c917082cb9cb1da1341eb2845f2c1 SHA512 d8a7578f93e8c5a0de0dd9ce1f35ebab60657c4b5df0358fba04e788c72d81ce4c6521f46ab2dad9460e9135b69c35033c86635d1b66d97b946294ea21e24e8b WHIRLPOOL 822b253a40ca801462203b121ed270213c10ecec38a52d81d0f9267bca531c44d9a2430ab6f3d0e1bece484393645cbf17e6e5c957730cc0a29e39ea1ac6beb5
diff --git a/net-misc/zerotier/files/zerotier.init b/net-misc/zerotier/files/zerotier.init
new file mode 100644
index 000000000000..7d226552dad2
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier.init
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+
+ZEROTIERONE_PIDFILE="/var/run/${SVCNAME}.pid"
+PN="zerotier-one"
+PN_PATH="/usr/bin/${PN}"
+
+depend() {
+    need net
+}
+
+start() {
+    ebegin "Starting ${PN}"
+    start-stop-daemon --start \
+        --exec "${PN_PATH}" --make-pidfile --pidfile "${ZEROTIERONE_PIDFILE}" --background
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${PN}"
+    start-stop-daemon --stop --quiet --pidfile "${ZEROTIERONE_PIDFILE}"
+    eend $?
+}
diff --git a/net-misc/zerotier/files/zerotier.service b/net-misc/zerotier/files/zerotier.service
new file mode 100644
index 000000000000..c4a1c4d29979
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=ZeroTier One
+After=network.target
+
+[Service]
+ExecStart=/var/lib/zerotier-one/zerotier-one
+Restart=always
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
new file mode 100644
index 000000000000..af9de97a426e
--- /dev/null
+++ b/net-misc/zerotier/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>neil@digimed.co.uk</email>
+		<name>Neil Bothwick</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/zerotier/zerotier-1.2.4.ebuild b/net-misc/zerotier/zerotier-1.2.4.ebuild
new file mode 100644
index 000000000000..9150c0a91052
--- /dev/null
+++ b/net-misc/zerotier/zerotier-1.2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs systemd
+
+HOMEPAGE="https://www.zerotier.com/"
+DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
+SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> zerotier-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/ZeroTierOne-${PV}"
+
+RDEPEND="
+	net-libs/miniupnpc
+	net-libs/libnatpmp
+	dev-libs/json-glib
+	net-libs/http-parser"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.9.3"
+
+QA_PRESTRIPPED="/usr/sbin/zerotier-one"
+
+DOCS=( README.md AUTHORS.md )
+
+src_compile() {
+	append-ldflags -Wl,-z,noexecstack
+	emake CXX="$(tc-getCXX)" one
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}.init" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	doman "${S}/doc/zerotier-"{cli.1,idtool.1,one.8}
+}
diff --git a/net-misc/zssh/Manifest b/net-misc/zssh/Manifest
new file mode 100644
index 000000000000..df2c5593577d
--- /dev/null
+++ b/net-misc/zssh/Manifest
@@ -0,0 +1,6 @@
+AUX zssh-1.5a-gentoo-include.diff 321 SHA256 afdcf65f386cdac6104b595a82869279db79fc26b0bd318cb3986843ed43e51e SHA512 e26c32832f537311f6804936a2ca88daf403ec5e8d263f3a84f29fadae68b0d35a514c97348867bbab584cbc845b1dfc5fb83fda7edad0714091e11165b965a2 WHIRLPOOL 0ba4715957677c49482502f73cdc80e25336ee925cd9becabc1a11ba8b042f874975bc38c03742f812e74a1835c5efae0d158d3876c097aab2df8037d2540ace
+DIST zssh-1.5c.tgz 344964 SHA256 a2e840f82590690d27ea1ea1141af509ee34681fede897e58ae8d354701ce71b SHA512 799ce3bbea5e94a800f61e6c38879746a579992396304861b7584b6bad967214b811b6bf9aecb36d9d60a15857377cb2fee80b495ad69778903fc45593efeebd WHIRLPOOL c0e8b06f04ccf0522267317308d4b87cf78eafd6fafaed1e330f9fec7b59561defd1a74652cc53ab2a662a299c021059fe49c1c252b50cb6dd6735086bf0333b
+EBUILD zssh-1.5c-r1.ebuild 891 SHA256 68d1038b99fa62e2a20fddd7535bdbf9c3ec130263e92a9b92d9ff701d15b4fa SHA512 43e9793f1f0de9aa998584babdb81140b9772237fb509ab333b192d3d813f5e91ded067571fa887ab6f38f9982f4d0f52369ec697ce95db871bc45ab5a88a728 WHIRLPOOL 8713f4ead45d39bbb3617792fd02e86478210026f7f5a374f0786ef01628fb6ae35d75832d6600e838646ebe1830dfbd7c0f245c0414fd232b1f2ee28aa906b6
+MISC ChangeLog 2294 SHA256 1f5511590480714c476f219bdba78a177134d616284963feaa8d100af866f5df SHA512 311469850bb142c615dcbad46fea08ca6da006ccfa641adee9567572a01430f3513777a72b8144d91de595863d88825ab6763245e3abe2abd824e14b663ba00e WHIRLPOOL ef8138d84e52df648976e0e4033282f877b7a401fc79831df95daf8bbc1b714e92fe0693559d66466ca7c36a16e07b47d2a3acc6997ba61c957392e0e713b6c5
+MISC ChangeLog-2015 2880 SHA256 c23ac6d51f780b2297616923f448674dd2e42364ed26b0027d30a4b673ec8e90 SHA512 f4fc6cd6fc18291330fd45611fbafd5f48e9fef69699b1d4ccf94f5e61ba9e076ded68f25027567bbf1ae0a5e2d0b543e01a08f1b39fe749075d29ad2f2276c8 WHIRLPOOL 6bef600c32e4d28f733ec7ecc4d672be1b375dc0fc4b34248ae08ef4fb1158ab86cfb67d2181865de16203d8564b31bc509b6e9f7f577ce7ec03e2de4bc2eaf6
+MISC metadata.xml 429 SHA256 64f99b7d9ac1c92f11cfec472e2f23aaac93f8937167f77fe28d78a57abd28e2 SHA512 dd4d5ff90a156df887316a4c6915cf23dd670ae81dfb8549fb7c2ec70bb2dd02cb1e039b9e262091673f25d4dcb728d5a1e5fff1322cba6dec358affb73d75ca WHIRLPOOL ad3b5eeec9ed2488da28efacaba5d6be612ded2d26959b6c69b955a42373ed2fcf1e1cfe8e70713c7587ff93db319ecc7d59f625b19fc16df4d5221ab897d9e6
diff --git a/net-misc/zssh/files/zssh-1.5a-gentoo-include.diff b/net-misc/zssh/files/zssh-1.5a-gentoo-include.diff
new file mode 100644
index 000000000000..4fc670ac8055
--- /dev/null
+++ b/net-misc/zssh/files/zssh-1.5a-gentoo-include.diff
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Sep 20 10:34:40 2002
++++ Makefile.in	Fri Sep 20 10:34:56 2002
+@@ -19,7 +19,7 @@
+ AR		=  @AR@
+ RANLIB		=  @RANLIB@
+ CC		=  @CC@
+-CFLAGS		=  @CFLAGS@ @DEFS@ @EXTRA_CFLAGS@
++CFLAGS		=  @CFLAGS@ @DEFS@ @EXTRA_CFLAGS@ -I.
+ CPPFLAGS	=  @CPPFLAGS@
+ LIBS		=  @LIBS@  @EXTRA_LIBS@ 
+ LDFLAGS 	=  @LDFLAGS@
diff --git a/net-misc/zssh/metadata.xml b/net-misc/zssh/metadata.xml
new file mode 100644
index 000000000000..0d47f13935cb
--- /dev/null
+++ b/net-misc/zssh/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">zssh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/zssh/zssh-1.5c-r1.ebuild b/net-misc/zssh/zssh-1.5c-r1.ebuild
new file mode 100644
index 000000000000..31bceeeb6c2f
--- /dev/null
+++ b/net-misc/zssh/zssh-1.5c-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An ssh wrapper enabling zmodem up/download in ssh"
+HOMEPAGE="http://zssh.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="nls readline"
+
+DEPEND="readline? (
+		sys-libs/ncurses
+		sys-libs/readline:0
+	)"
+RDEPEND="${DEPEND}
+	net-misc/openssh
+	net-dialup/lrzsz"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.5a-gentoo-include.diff"
+
+	# Fix linking with sys-libs/ncurses[tinfo], bug #527036
+	sed -i -e 's/-ltermcap/-ltinfo/g' configure || die
+
+	epatch_user
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+	econf \
+		$(use_enable nls) \
+		$(use_enable readline)
+}
+
+src_install() {
+	dobin ${PN} ztelnet
+	doman ${PN}.1 ztelnet.1
+	dodoc CHANGES FAQ README TODO
+}
diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest
new file mode 100644
index 000000000000..a556c79501b8
--- /dev/null
+++ b/net-misc/zsync/Manifest
@@ -0,0 +1,7 @@
+AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 SHA256 b7ca3e3352bd6d6d6efe4df0340adb2df01849216fb2ca20e2d6b7caf72eeedb SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47 WHIRLPOOL fac89cf7dc6731e4e192753deea82b9daf2757bf92d45c8e14cd5990efaf5e9ed50ec14d891f858761f9e975b5c88af6dbef891ba93c0af0b03c57477f7fded8
+DIST zlib-1.2.3.tar.bz2 425209 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 WHIRLPOOL e874b123296f5d77daf60617501b30f4beebccb64b3910c2539f75f6c194a2cf4885dc7a3904bf790e1651120ec33b55c48e95970dd6bfd6c4d0a2ea48d7d0f4
+DIST zsync-0.6.2.tar.bz2 245592 SHA256 0b9d53433387aa4f04634a6c63a5efa8203070f2298af72a705f9be3dda65af2 SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d WHIRLPOOL d7f2d864b791fc38522d376eef8cb2ea38e57d91da7f8d2ea1379ecdb8397b4ff672c954dc5fd6e90f786d8d48836fd8b637cf8a60229646a1a9c2635bffb51f
+EBUILD zsync-0.6.2-r1.ebuild 1086 SHA256 5ffa05c4dc12f12ec934cf32aab029b3362d66c54f631aed03d942a5f5f9b4a5 SHA512 e2fec8aa4c44a1380edce1a8e5ce727693924f16f2cf4addf6b450aed03f6492f84be08605699b033ae62fa35053e8a881d12ede1f5bbcd831f48947f7fbf5e5 WHIRLPOOL 0bae602711c1826647319a9de2e956fc58044ff8b10db27398f39c324622414145667103224a8d2995d92357d4d958d5b064f0ea54f06cb7900b7c0f25b26500
+MISC ChangeLog 2223 SHA256 6545b7be9ac9e11669b1c8182788643794710c4bfd4a3ee0c9a153870a91fe60 SHA512 df87bfd83e17019e655e7f6eda69226a13e5627d7eda995bff07aa19ec0bbcc65f518fb11769951700272dbf61c9b575d22de1340426529d4b311569f9e54185 WHIRLPOOL 6b90bee07a416f63f18bf67a647b5f4e852e6e5a9c06ee927ddad9c009de6f3c8e3a3f0602c255bc3bd59d6e13fda8b347425016975a01d9eb4ce92f33442f60
+MISC ChangeLog-2015 1945 SHA256 9b2c8cf4be5d20a6040e95bdf51f98d129968121f16e9f5b9a9814b43f1ec3ca SHA512 831d040440f422a1803c105124d4f6116e0bc3a9b409567f30121dd950970393d49dee0ed10d43b65a13d036104044cd87b025ba0bd506455ae25a1559113111 WHIRLPOOL 59d1906123570c6d1564f064548274bddcb30740e63acee85ab2c32f34b6ae6124f94b9d6a829e96293cc5a708b5532e50272e6cb45ce324d8c7a72baa8a1d01
+MISC metadata.xml 1264 SHA256 fcded9365f56d4f6d75893dbf5f336666aff04f7c759bd714260a9a86af19197 SHA512 2b426d47519f21b1a560e8efc4be732803a2c577b28e8cef0aa10a46544495e32ca8c933860e09a75ff860427aa517bde415d5f30f15bde47b2d4a81a1ca94c8 WHIRLPOOL 6220ceaaa8e26d87165c1729ba163cf3feaa8a1f7cc18c21a286e0c5c36e93cfde240aee522b951f0e16ca529d12f29ef2144f5208f851112b240091cfebfcce
diff --git a/net-misc/zsync/files/zsync-0.6.2-zlib-1.2.3-support.patch b/net-misc/zsync/files/zsync-0.6.2-zlib-1.2.3-support.patch
new file mode 100644
index 000000000000..38729b06db73
--- /dev/null
+++ b/net-misc/zsync/files/zsync-0.6.2-zlib-1.2.3-support.patch
@@ -0,0 +1,201 @@
+This is a forward-port to zlib-1.2.3 of the zlib-1.2.11 changes found in
+zsync-0.6.2.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude Makefile.in zlib-1.2.3.orig/deflate.c zlib-1.2.3/deflate.c
+--- zlib-1.2.3.orig/deflate.c	2005-07-18 02:27:31.000000000 +0000
++++ zlib-1.2.3/deflate.c	2011-02-09 21:36:02.000000000 +0000
+@@ -807,7 +807,7 @@
+         }
+         if (bstate == block_done) {
+             if (flush == Z_PARTIAL_FLUSH) {
+-                _tr_align(s);
++	      //                _tr_align(s);
+             } else { /* FULL_FLUSH or SYNC_FLUSH */
+                 _tr_stored_block(s, (char*)0, 0L, 0);
+                 /* For a full flush, this empty block will be recognized
+diff -Nuar --exclude Makefile.in zlib-1.2.3.orig/inflate.c zlib-1.2.3/inflate.c
+--- zlib-1.2.3.orig/inflate.c	2005-06-14 21:50:12.000000000 +0000
++++ zlib-1.2.3/inflate.c	2011-02-09 21:36:02.000000000 +0000
+@@ -6,6 +6,12 @@
+ /*
+  * Change history:
+  *
++ * cph          26 Oct 2004
++ * - A few minor hacks to allow me to locate safe start points in streams
++ *   and to position a new inflate on the right bit. I hereby place any 
++ *   changes to this file (and the zlib.h and inflate.h in this dir) into 
++ *   the public domain.
++ *
+  * 1.2.beta0    24 Nov 2002
+  * - First version -- complete rewrite of inflate to simplify code, avoid
+  *   creation of window when not needed, minimize use of window when it is
+@@ -83,7 +89,6 @@
+ #include "zutil.h"
+ #include "inftrees.h"
+ #include "inflate.h"
+-#include "inffast.h"
+ 
+ #ifdef MAKEFIXED
+ #  ifndef BUILDFIXED
+@@ -93,7 +98,6 @@
+ 
+ /* function prototypes */
+ local void fixedtables OF((struct inflate_state FAR *state));
+-local int updatewindow OF((z_streamp strm, unsigned out));
+ #ifdef BUILDFIXED
+    void makefixed OF((void));
+ #endif
+@@ -320,7 +324,7 @@
+    output will fall in the output data, making match copies simpler and faster.
+    The advantage may be dependent on the size of the processor's data caches.
+  */
+-local int updatewindow(strm, out)
++int updatewindow(strm, out)
+ z_streamp strm;
+ unsigned out;
+ {
+@@ -925,6 +929,9 @@
+             /* handle error breaks in while */
+             if (state->mode == BAD) break;
+ 
++            if (state->mode == BAD)
++                break;
++
+             /* build code tables */
+             state->next = state->codes;
+             state->lencode = (code const FAR *)(state->next);
+@@ -948,12 +955,10 @@
+             Tracev((stderr, "inflate:       codes ok\n"));
+             state->mode = LEN;
+         case LEN:
+-            if (have >= 6 && left >= 258) {
+-                RESTORE();
+-                inflate_fast(strm, out);
+-                LOAD();
+-                break;
+-            }
++	    state->mode = LENDO;
++	    goto inf_leave;
++	case LENDO:
++	    /* cph - remove inflate_fast */
+             for (;;) {
+                 this = state->lencode[BITS(state->lenbits)];
+                 if ((unsigned)(this.bits) <= bits) break;
+@@ -1366,3 +1371,48 @@
+     dest->state = (struct internal_state FAR *)copy;
+     return Z_OK;
+ }
++
++/* cph 2004/10/17 
++ * Extra stuff I need to move around in gzip files
++ */
++
++void inflate_advance(strm,zoffset,b,s)
++     z_streamp strm;
++     int zoffset;
++     int b;
++     int s;
++{
++  struct inflate_state FAR* state = (struct inflate_state FAR *)strm->state;
++
++  if (s)
++    state->mode = TYPEDO;
++  else if (state->mode == COPY) {
++    /* Reduce length remaining to copy by correct number */
++    state->length -= zoffset - strm->total_in;
++  } else
++    state->mode = LENDO;
++
++  strm->total_in = zoffset; /* We are here, plus a few more bits. */
++
++  if (b) {
++    state->hold = *(strm->next_in)++;
++    state->hold >>= b;
++    state->bits = 8-b;
++    strm->avail_in--;
++    strm->total_in++;
++  } else {
++    state->bits = 0;
++    state->hold = 0;
++  }
++}
++
++int ZEXPORT inflateSafePoint(strm)
++z_streamp strm;
++{
++    struct inflate_state FAR *state;
++
++    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
++    state = (struct inflate_state FAR *)strm->state;
++    return (state->mode == LENDO || state->mode == COPY);
++}
++
+diff -Nuar --exclude Makefile.in zlib-1.2.3.orig/inflate.h zlib-1.2.3/inflate.h
+--- zlib-1.2.3.orig/inflate.h	2004-11-13 05:38:28.000000000 +0000
++++ zlib-1.2.3/inflate.h	2011-02-09 21:36:02.000000000 +0000
+@@ -37,6 +37,7 @@
+         LENLENS,    /* i: waiting for code length code lengths */
+         CODELENS,   /* i: waiting for length/lit and distance code lengths */
+             LEN,        /* i: waiting for length/lit code */
++            LENDO,      /* i: same, but skip exit check */
+             LENEXT,     /* i: waiting for length extra bits */
+             DIST,       /* i: waiting for distance code */
+             DISTEXT,    /* i: waiting for distance extra bits */
+diff -Nuar --exclude Makefile.in zlib-1.2.3.orig/Makefile.am zlib-1.2.3/Makefile.am
+--- zlib-1.2.3.orig/Makefile.am	1970-01-01 00:00:00.000000000 +0000
++++ zlib-1.2.3/Makefile.am	2011-02-09 21:36:06.000000000 +0000
+@@ -0,0 +1,6 @@
++
++noinst_LIBRARIES = libinflate.a libdeflate.a
++
++libinflate_a_SOURCES = zlib.h inflate.c inflate.h inffixed.h adler32.c inftrees.c inftrees.h zutil.c zutil.h crc32.c crc32.h zconf.h
++
++libdeflate_a_SOURCES = deflate.c deflate.h compress.c trees.c trees.h
+diff -Nuar --exclude Makefile.in zlib-1.2.3.orig/zconf.h zlib-1.2.3/zconf.h
+--- zlib-1.2.3.orig/zconf.h	2005-05-28 06:40:35.000000000 +0000
++++ zlib-1.2.3/zconf.h	2011-02-09 21:36:06.000000000 +0000
+@@ -284,9 +284,8 @@
+    typedef Byte       *voidp;
+ #endif
+ 
+-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
++#if 1           /* HAVE_UNISTD_H -- this line is updated by ./configure */
+ #  include <sys/types.h> /* for off_t */
+-#  include <unistd.h>    /* for SEEK_* and off_t */
+ #  ifdef VMS
+ #    include <unixio.h>   /* for off_t */
+ #  endif
+diff -Nuar --exclude Makefile.in zlib-1.2.3.orig/zlib.h zlib-1.2.3/zlib.h
+--- zlib-1.2.3.orig/zlib.h	2005-07-18 02:26:49.000000000 +0000
++++ zlib-1.2.3/zlib.h	2011-02-09 21:36:06.000000000 +0000
+@@ -1110,9 +1110,10 @@
+    of bytes into the buffer.
+      gzread returns the number of uncompressed bytes actually read (0 for
+    end of file, -1 for error). */
+-
++#if 0
+ ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
+                                    voidpc buf, unsigned len));
++#endif
+ /*
+      Writes the given number of uncompressed bytes into the compressed file.
+    gzwrite returns the number of uncompressed bytes actually written
+@@ -1308,6 +1309,8 @@
+    len2.
+ */
+ 
++ZEXTERN int ZEXPORT updatewindow OF((z_streamp strm, unsigned out));
++ZEXTERN void ZEXPORT inflate_advance OF((z_streamp strm, int zoffset, int b, int s));
+ 
+                         /* various hacks, don't look :) */
+ 
+@@ -1348,6 +1351,7 @@
+ 
+ ZEXTERN const char   * ZEXPORT zError           OF((int));
+ ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
++ZEXTERN int            ZEXPORT inflateSafePoint OF((z_streamp z));
+ ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+ 
+ #ifdef __cplusplus
diff --git a/net-misc/zsync/metadata.xml b/net-misc/zsync/metadata.xml
new file mode 100644
index 000000000000..ca294a5c6757
--- /dev/null
+++ b/net-misc/zsync/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+		From the zsync web page:
+
+		"zsync is a file transfer program. It allows you to download a file from a 
+		remote web server, where you have a copy of an older version of the file on your 
+		computer already. zsync downloads only the new parts of the file. It uses the 
+		same algorithm as rsync.
+
+		zsync does not require any special server software or a shell account on the 
+		remote system (rsync, in comparison, requires that you have an rsh or ssh 
+		account, or that the remote system runs rsyncd). Instead, it uses a control file 
+		-- a .zsync file -- that describes the file to be downloaded and enables zsync to 
+		work out which blocks it needs. This file can be created by the admin of the web 
+		server hosting the download, and placed alongside the file to download -- it is 
+		generated once, then any downloaders with zsync can use it. Alternatively, 
+		anyone can download the file, make a .zsync and provide it to other users (this 
+		is what I am doing for the moment)."
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/zsync/zsync-0.6.2-r1.ebuild b/net-misc/zsync/zsync-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..cc19d4024ce0
--- /dev/null
+++ b/net-misc/zsync/zsync-0.6.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+ZLIB_PV=1.2.3
+ZLIB_P="zlib-${ZLIB_PV}"
+
+DESCRIPTION="Partial/differential file download client over HTTP which uses the rsync algorithm"
+HOMEPAGE="http://zsync.moria.org.uk/"
+SRC_URI="
+	http://zsync.moria.org.uk/download/${P}.tar.bz2
+	http://www.gzip.org/zlib/${ZLIB_P}.tar.bz2
+	http://www.zlib.net/${ZLIB_P}.tar.bz2"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+ZLIB_S="${WORKDIR}/${ZLIB_P}"
+
+src_prepare() {
+	# Move old zlib-1.2.11 out the way
+	mv "${S}"/zlib zlib-1.2.11-modified || die
+
+	cd "${ZLIB_S}" || die
+	# I am not sure how many other zlib patches we will need to port as well
+	# This covers the security vuln in 1.2.11
+	epatch "${FILESDIR}"/${P}-${ZLIB_P}-support.patch
+	rm -f Makefile || die
+
+	cd "${S}" || die
+	cp -a "${ZLIB_S}" "${ZLIB_P}-modified" || die
+	ln -s "${ZLIB_P}-modified" zlib || die
+
+	eautoreconf
+}
+
+src_install() {
+	dobin zsync zsyncmake
+	dodoc NEWS README
+	doman doc/zsync.1 doc/zsyncmake.1
+}