gentoo resync : 19.03.2019

23 files changed, 1075 insertions, 406 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index a50749121e15..f07fac5d8c79 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 472f4fc7c86c..576850d378a4 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,15 +1,20 @@
 AUX 0.7.5_p1321-ext.patch 921 BLAKE2B b4753f6fa635e7906bf6ba360ea992c88f4e147d51f4131a875bd4e7e121579b017b309da32eadfcd46ebc8dd631864d979ec9874051224a51fd765591dd1986 SHA512 974998abecb041f8912a7791ec2867445f85108e8c43a567ea5fc0977d220e838789b40a24f2b822aef89f0a8a9a7571e370d93d4bfe89ca3c460cbbf7cc86e1
 AUX 0.7.5_p1475-remove-git.patch 926 BLAKE2B 258b60eb73ee7ae78b6722a56a5e059131a51c1a0b402209b0f769e12fc960aed414033c058dca959ed546cf039e692aadcc0aa7fdda7ded9fb767f95e1de485 SHA512 d24cc1ecd7a991927d8e65378b9dabe1e7e75d8902a40cc6ae7bf19104133e9708da8768ee38230f93fc41609324ae3a9f7f7998ba261c4f4f3254d38ffaa792
+AUX 0.7.5_p1483-ext.patch 991 BLAKE2B 82397c986c5496c25593df490f116a9c5fa6169c3e6f402c0671a41458052164e56a6bb41f07ea4e131693b643a51047b4c87317bc527fc95aba1f4d04868809 SHA512 8dc5abc99f9f10a29e56956508c6c013ec543133802d628d324ade3aab58f5a31b85d289b65a80a170b9e26a17cf650de4f2ba244bf9d2d443852374fe026af4
+AUX build-clean.xml 18184 BLAKE2B 5cc7287b1475b830b1fe9708f6cb53316fd611e6a5757ea7ca403ccc7e7a6b3797454345c28a6fd21c7c35d0bf491ac207dc2b3098c48a9ef24bfb342fa72f67 SHA512 74a4a77d900d225264606c7413a14aa9fd526c9324165493e955a6efb5f32ffad1aa735dd13570f4f6fe764baab8f0170945d75bafeb28c82b5fba9826bc0f40
+AUX build.properties 2655 BLAKE2B 137de56b6118d7306c036d7ed00fee314446bd9b221d39c04ddf0e45235d03df9b8596127153eb713d2f6f790a99f94f33f095f8b880d5251f2fbfd0c69d61cb SHA512 dd7bf150ced2aa08a7250818f59b931908ea341917bce812d641cf2c77eea60bcf6d264d5caa99bb3669e6e93b8798af3e43629b33983bdeda70f94b17f6cd81
 AUX freenet 474 BLAKE2B f50fbfaaaf6a919ac15b078a627eb1b2fbc9e6b6c83e4229ae4032e64436926c40410f1182bdbc6bcd005677d9ef9c5be252fbd008ad6fffb6df5bfce38a2148 SHA512 8bfaf754106cd5476f96554932d3a394efbfbbdd51d6a62b32259e3c65ef562cf92f0f7fb2a2cb768037312780a990cdd05f758e23c4cc57e7543aaaed85f285
 AUX freenet-0.7.5_p1474-wrapper.conf 949 BLAKE2B 6832683015aff6db0ad2b4116a6b8aea2ca23c1ac38da72ae71ac3a339a2efe69a7bab37911035d82a15d6ff725fb8d481deae42bd1bbaf0ad62119194674354 SHA512 a6d30afc502176a6e0bab480368553c1df50add8fe18b65cede38be752c989125999cbb8bedfd68641623fd4498e19610c16d02fcf9d951da450a9612301cdeb
 AUX freenet.service 271 BLAKE2B 7d47ad525f4bb13e07c50a0bdf19f1ef234d5219e82f426254c316abc4517180c22267a245ca022edf68e615a2865fe0dd08f694ee5ee2ced8c5391b3c5e33ad SHA512 2f3d4ec0ba05eff328e8176cbe130176a82a1bb432599de44ab78ca27e9c96e0eafe0871f12b0165247f941a2e929635a6abe6cd61351b1305c0d0e8cff83d2b
 AUX run.sh-20090501 16217 BLAKE2B 249254104ca2d0a20131a5d6b36a07b14fe6407d1915d75ecf98a617de6e532def710975ff1b2e0b580f7148099cd7f6915d8adc0b15e1f67af4fc4713e0e5af SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67
 DIST freenet-0.7.5_p1478.zip 5082260 BLAKE2B 4f08b5eff361b0666647f67152fb9709d35ca6c5996a0ac1e899de16510d2f25afb89c8af150a4f9d0785da25ff5db2e80fc2e851e0c42c763b72952d456bde1 SHA512 4147ef68e9c61a7d90c378cd9a3896933c4b931c31caf95107d1e188b4bf51d187381200d262fc1adaf939be7b0ea0eec9f795a09c897c1d20765325ac5faf03
 DIST freenet-0.7.5_p1480.zip 5099654 BLAKE2B cdbe32e90f61f664c0aff8dea81a68a46ced7ba5aef3068243d99a1b189597dfc4126c6e83c0fd4de547d6d076939c601ed3d3f8ec4fa6d4a5dd5d6ef5322069 SHA512 8e6c11014554cba0591f5f98a6af22660643a2d62c46fb003ec16d1dd3643178300081bef78083d87608c012f232f46f71fdd201d031248bf28e91899f71547e
+DIST freenet-0.7.5_p1483.zip 5548445 BLAKE2B 275e9d86d5d2aff94c227d774ce8853a0aeefb8963d6365f684e5e9b07ee4ba3779908d35e0b2ca92fc980c4199a1d29be73cce476c9e3d2f237734e4f9a35e7 SHA512 6c959c0ece7faaa07cd3c228cd2de7c15063ccd30f91b45b180d4d79e0060c5c156470d03eb421418ccd207931f9737e1a63b8be639b348cb0d15dacca89e4cc
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
 DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497
 DIST seednodes-20160521.fref.bz2 13751 BLAKE2B f464eb99fcefd690867246b1a77175230ac1cc9e037f3dc465d56ad70d293df78f990cfd75e6be64c26d77f2bc7bfa0bbdedd9d1720a4afa658ed3c381139eb1 SHA512 3530ac6bf9de886930bb403c2d2ec27102d5dc6904582ee69987e369dbfaf7170aadbc02b95836ff43fef2531fb06087a494b426662cd5529c87316590fd2686
 EBUILD freenet-0.7.5_p1478-r1.ebuild 4240 BLAKE2B b42422f22a2d862f259347306781b4023b7cb7add0b10294288eea3ca8a95b86e1a5d0d05a125c87530e1c06f943d7571aae9686d30a197e6845357623e4980c SHA512 3329c581704206df82e1a823947a4f64b6a3f347acc3908376e3055ba0bb684e64e70bf521788297def4918a759502e6220df3bfaa4e526dca837544903fad1a
 EBUILD freenet-0.7.5_p1478.ebuild 4240 BLAKE2B b42422f22a2d862f259347306781b4023b7cb7add0b10294288eea3ca8a95b86e1a5d0d05a125c87530e1c06f943d7571aae9686d30a197e6845357623e4980c SHA512 3329c581704206df82e1a823947a4f64b6a3f347acc3908376e3055ba0bb684e64e70bf521788297def4918a759502e6220df3bfaa4e526dca837544903fad1a
 EBUILD freenet-0.7.5_p1480.ebuild 4298 BLAKE2B 2f01470434fbc26103814728c6a0614227e1fd39a3a5fba273eec0970da749a08056e81805b2346280154adfa9cfe81891c3c6dea9e5734db14aa8cc25d73c9b SHA512 353064278dc061132a7d48037ae74fa53d129f40d79372e8f5cbf5ad4d91401d1d8062ea16d7710317a06988637efdfca4ad1b79c341b8a75a7a4ae1d790bd12
+EBUILD freenet-0.7.5_p1483.ebuild 4640 BLAKE2B efbd14d417e37ab120f8b5f1e984806cc154aecc4b9b0c70998e8f3e6406fdc30ffc24b9e217ccc45ac68b093674f880ac0c032c846bb741090fef267a10a206 SHA512 58a0a6df60f777055a11dba1e76ed41b8df7b75263d035441d2e591d589eb83220eb721b02bbcb90e40d6399f9564e664c49a81924cc7d9bc16117e62c3779db
 MISC metadata.xml 333 BLAKE2B a43991a83e4f80ef55bf5e3858670d45bddfb5a1168a638124642260dc4c498430a6f5892a47d68af14fe3b63968d71561b92b1b31507d04770269d352843e21 SHA512 73b9b7fc476aba6342a92820a2a4d200735370173f10fd93521daa89c711d9152006dbb00aa1f513558cf0fb7e33ca97f7442ddce4a7bcc58c8a3ec8a08403c8
diff --git a/net-p2p/freenet/files/0.7.5_p1483-ext.patch b/net-p2p/freenet/files/0.7.5_p1483-ext.patch
new file mode 100644
index 000000000000..5b778dd619f4
--- /dev/null
+++ b/net-p2p/freenet/files/0.7.5_p1483-ext.patch
@@ -0,0 +1,22 @@
+--- src/freenet/node/NodeStarter.java	2019-03-17 12:44:12.000000000 +0100
++++ src/freenet/node/NodeStarter.java.new	2019-03-17 12:58:51.000000000 +0100
+@@ -51,8 +51,8 @@
+ 	public static final String extRevisionNumber;
+ 
+ 	static {
+-		extBuildNumber = ExtVersion.extBuildNumber();
+-		extRevisionNumber = ExtVersion.extRevisionNumber();
++		extBuildNumber = 29;
++		extRevisionNumber = "";
+ 	}
+ 
+ 	private FreenetFilePersistentConfig cfg;
+@@ -109,7 +109,7 @@
+ 			System.out.println("Usage: $ java freenet.node.Node <configFile>");
+ 			return Integer.valueOf(-1);
+ 		}
+-		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + ExtVersion.buildNumber + " r" + ExtVersion.cvsRevision+" running with ext build "+extBuildNumber+" r" + extRevisionNumber;
++		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber +" running with ext build "+extBuildNumber;
+ 		Logger.normal(this, builtWithMessage);
+ 		System.out.println(builtWithMessage);
+ 
diff --git a/net-p2p/freenet/files/build-clean.xml b/net-p2p/freenet/files/build-clean.xml
new file mode 100644
index 000000000000..89698df2675f
--- /dev/null
+++ b/net-p2p/freenet/files/build-clean.xml
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="freenet" default="package" basedir=".">
+	<description>
+Freenet is free software that lets you publish and retrieve information without
+fear of censorship. To achieve this, the network is entirely decentralized, and
+all actions are anonymous. Without anonymity, there can never be true freedom
+of speech, and without decentralization the network would be vulnerable to attack.
+
+This file is to build Freenet entirely from source. The builder is responsible
+for satisfying all library dependencies, e.g. via override.properties. Package
+maintainers may prefer to use this instead of build.xml.
+	</description>
+
+	<!-- =================================================================== -->
+	<!-- Global properties                                                   -->
+	<!-- =================================================================== -->
+
+	<!-- user overrides (properties are immutable, so set overrides first) -->
+	<property file="override.properties"/>
+	<property file="build.properties"/>
+	<property file="dependencies.properties"/>
+
+	<property name="version.src" value="freenet/node/Version.java" />
+	<property name="version.make" value="freenet/node/Version.class" />
+
+	<path id="lib.path">
+		<fileset dir="${lib.contrib.dir}" includes="${lib.contrib.jars}"/>
+		<fileset dir="${lib.dir}" includes="${lib.jars}"/>
+		<fileset dir="/usr/share/java" includes="${lib.jars}" erroronmissingdir="false"/>
+	</path>
+	<path id="libtest.path">
+		<path refid="lib.path"/>
+		<fileset dir="${lib.dir}" includes="${libtest.jars}"/>
+		<fileset dir="/usr/share/java" includes="${libtest.jars}" erroronmissingdir="false"/>
+		<pathelement path="${main.make}"/>
+		<pathelement path="${test.make}"/>
+	</path>
+
+	<property name="gjs.dst" value="${main.src}/freenet/clients/http/staticfiles/freenetjs"/>
+	<property name="gjs.dir" value="generator/js"/>
+	<path id="gjs.lib.path">
+		<fileset dir="${gjs.dir}" includes="lib/*.jar"/>
+		<pathelement location="${gjs.dir}/war/WEB-INF/classes"/>
+		<fileset dir="${lib.dir}" includes="${gjs.lib.jars}"/>
+	</path>
+
+	<path id="pmd.classpath">
+		<fileset dir="${pmd.dir}" erroronmissingdir="false" includes="lib/*.jar"/>
+	</path>
+
+	<property environment="env"/>
+	<property name="keystore" value="${env.jarsignerStoreLocation}"/>
+	<property name="keystore_alias" value="${env.jarsignerAlias}"/>
+	<property name="keystore_pass" value="${env.jarsignerStorePassword}"/>
+	<property name="key_pass" value="${env.jarsignerCodeSigningKeyPassword}"/>
+
+	<property name="jar.dst" value="${main.dst}/freenet.jar"/>
+
+	<assertions><enable/></assertions>
+
+	<!-- set version string based on git-describe -->
+	<exec executable="git" failifexecutionfails="false"
+		errorProperty="git.errror" outputproperty="git.describe" resultproperty="git.result">
+		<arg value="describe" />
+		<arg value="--always" />
+		<arg value="--abbrev=4" />
+		<arg value="--dirty" />
+	</exec>
+	<condition property="git.revision" value="${git.describe}" else="@unknown@">
+		<and>
+			<equals arg1="${git.result}" arg2="0" />
+			<isset property="git.describe" />
+		</and>
+	</condition>
+
+	<!-- =================================================================== -->
+	<!-- Miscellaneous                                                       -->
+	<!-- =================================================================== -->
+
+	<target name="dist" depends="clean-all, all" description="clean-build everything"/>
+
+	<target name="sign" description="Sign the distribution" depends="package">
+		<echo message="Signing the distribution"/>
+		<signjar jar="${jar.dst}" strict="false" tsaurl="http://timestamp.comodoca.com/rfc3161" alias="${keystore_alias}" keystore="${keystore}" storepass="${keystore_pass}" keypass="${key_pass}" sigalg="SHA256withRSA" digestalg="SHA-256"/>
+		<!-- TODO: Should have strict="true", but it was introduced in Java 7, which we cannot yet require. -->
+		<verifyjar jar="${jar.dst}" alias="${keystore_alias}" keystore="${keystore}" storepass="${keystore_pass}" keypass="${key_pass}"/>
+	</target>
+
+	<target name="all" depends="package, doc, findbugs, pmd, cpd" description="build everything, incl. docs, GWT js"/>
+
+	<target name="clean-all" depends="clean, clean-doc, clean-gjs" description="clean all build products, incl. docs, GWT js"/>
+
+	<target name="help" description="display help on parameters">
+		<echo message="For main build targets, see `ant -p`"/>
+		<echo message=""/>
+		<echo message="Test parameters (-Dtest.PARAM=true)"/>
+		<echo message="  skip        Skip all tests"/>
+		<echo message="  verbose     Report additional information"/>
+		<echo message="  benchmark   Run benchmark tests"/>
+		<echo message="  extensive   Run extensive tests"/>
+		<echo message=""/>
+		<echo message="Misc parameters (-DPARAM=VALUE)"/>
+		<echo message="  javac.args  Command line arguments to pass to javac"/>
+		<echo message=""/>
+	</target>
+
+	<target name="findbugs" depends="package" unless="${findbugs.skip}">
+		<antcall target="libdep-findbugs"/>
+		<echo message="Running Findbugs"/>
+		<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.path}"/>
+
+		<findbugs home="${findbugs.dir}"
+		output="xml"
+		outputFile="${test.dst}/findbugs.xml"
+		warningsProperty="findbugs.module.warnings"
+		failOnError="true"
+		jvmargs="-Xmx1536m -XX:MaxPermSize=384m -XX:ReservedCodeCacheSize=128m" >
+		<auxClasspath refid="lib.path" />
+		<sourcePath path="${main.src}" />
+		<class location="${jar.dst}" />
+		</findbugs>
+	</target>
+
+	<target name="pmd" depends="package" unless="${pmd.skip}">
+		<antcall target="libdep-pmd"/>
+		<echo message="Running PMD"/>
+		<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
+		<pmd rulesetfiles="rulesets/java/design.xml" encoding="utf-8">
+			<formatter type="xml" toFile="${test.dst}/pmd.xml"/>
+			<fileset dir="${main.src}">
+				<include name="**/*.java"/>
+			</fileset>
+		</pmd>
+	</target>
+
+	<target name="cpd" depends="package" unless="${cpd.skip}">
+		<antcall target="libdep-cpd"/>
+		<echo message="Running CPD"/>
+		<taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask" classpathref="pmd.classpath"/>
+		<cpd minimumTokenCount="100" format="xml" outputFile="${test.dst}/cpd.xml">
+			<fileset dir="${main.src}">
+				<include name="**/*.java"/>
+			</fileset>
+		</cpd>	
+	</target>
+
+	<target name="debug">
+		<echoproperties/>
+	</target>
+
+	<!-- =================================================================== -->
+	<!-- Library dependencies                                                -->
+	<!-- =================================================================== -->
+
+	<!--
+	currently we only check for the most common cases of missing libraries.
+	this does result in less clear error messages for more obscure setups, e.g.
+	if you have debian's gwt-dev.jar but not commons-collections3.jar. however,
+	to cover all scenarios would be a pain.
+	-->
+
+	<target name="env">
+		<available property="lib.contrib.present" classname="freenet.node.ExtVersion" classpathref="lib.path"/>
+		<available property="lib.bouncycastle.present" classname="org.bouncycastle.crypto.signers.HMacDSAKCalculator" classpathref="lib.path"/>
+		<available property="lib.junit.present" classname="org.junit.runners.JUnit4" classpathref="libtest.path"/>
+		<available property="lib.hamcrest.present" classname="org.hamcrest.SelfDescribing" classpathref="libtest.path"/>
+		<available property="lib.findbugs.present" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.path}"/>
+		<available property="lib.pmd.present" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
+		<available property="lib.cpd.present" classname="net.sourceforge.pmd.cpd.CPDTask" classpathref="pmd.classpath"/>
+		<available property="gjs.lib.gwt-user.present" classname="com.google.gwt.user.client.Window" classpathref="gjs.lib.path"/>
+		<available property="gjs.lib.gwt-dev.present" classname="com.google.gwt.dev.About" classpathref="gjs.lib.path"/>
+		<condition property="gjs.lib.gwt.present">
+			<and>
+				<isset property="gjs.lib.gwt-user.present"/>
+				<isset property="gjs.lib.gwt-dev.present"/>
+			</and>
+		</condition>
+	</target>
+
+	<target name="libdep-ext" depends="env" unless="lib.contrib.present">
+		<fail message="freenet-ext not available"/>
+	</target>
+
+	<target name="libdep-bc" depends="env" unless="lib.bouncycastle.present">
+		<fail message="Bouncycastle not available (or not recent enough); try https://www.bouncycastle.org/download/${bc.jar}"/>
+	</target>
+
+	<target name="libdep-junit" depends="env" unless="lib.junit.present">
+		<fail message="JUnit4 not available"/>
+	</target>
+
+	<target name="libdep-hamcrest" depends="env" unless="lib.hamcrest.present">
+		<fail message="Hamcrest-core not available"/>
+	</target>
+
+	<target name="libdep-findbugs" depends="env" unless="lib.findbugs.present">
+		<fail message="findbugs not available"/>
+	</target>
+
+	<target name="libdep-pmd" depends="env" unless="lib.pmd.present">
+		<fail message="PMD not available"/>
+	</target>
+
+	<target name="libdep-cpd" depends="env" unless="lib.cpd.present">
+		<fail message="CPD not available"/>
+	</target>
+
+	<target name="libdep-gwt-user" depends="env" unless="gjs.lib.gwt-user.present">
+		<fail message="GWT-user not present"/>
+	</target>
+
+	<target name="libdep-gwt-dev" depends="env" unless="gjs.lib.gwt-dev.present">
+		<fail message="GWT-dev not present"/>
+	</target>
+
+	<!-- =================================================================== -->
+	<!-- Standard build                                                      -->
+	<!-- =================================================================== -->
+
+	<target name="init">
+		<mkdir dir="${main.make}"/>
+		<mkdir dir="${main.dst}"/>
+		<mkdir dir="${test.make}"/>
+		<mkdir dir="${test.dst}"/>
+	</target>
+
+	<target name="dep" depends="ensure-ext, ensure-bc, ensure-gjs"/>
+
+	<target name="check-version-file">
+		<uptodate property="version.uptodate"
+		  targetfile="${main.make}/${version.src}"
+		  srcfile="${main.src}/${version.src}"/>
+	</target>
+
+	<target name="build-version-file" depends="check-version-file" unless="version.uptodate">
+		<!-- Create the Version file with patched revision number in ${main.make} -->
+		<copy file="${main.src}/${version.src}" tofile="${main.make}/${version.src}" overwrite="true" />
+		<delete file="${main.make}/${version.make}" quiet="true" />
+		<replace file="${main.make}/${version.src}">
+			<replacefilter token="@custom@" value="${git.revision}"/>
+		</replace>
+		<echo message="Updated build version to ${git.revision} in ${main.make}/${version.src}"/>
+	</target>
+
+	<target name="build" depends="init, dep, build-version-file">
+		<!-- Create the time stamp -->
+		<tstamp/>
+		<!-- Create the build directory structure used by compile -->
+		<javac srcdir="${main.src}" destdir="${main.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
+			<compilerarg line="${javac.args}"/>
+			<classpath refid="lib.path"/>
+			<!-- tell javac to find Version.java in ${main.make}, not ${main.src} -->
+			<sourcepath><pathelement path="${main.make}"/></sourcepath>
+			<!-- following a very temporary list of files to be build -->
+			<include name="**/*.java"/>
+			<exclude name="**/package-info.java"/>
+			<exclude name="${version.src}"/>
+		</javac>
+
+		<!-- Force compile of Version.java in case compile of ${main.src} didn't trigger it -->
+		<javac srcdir="${main.make}" destdir="${main.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
+			<compilerarg line="${javac.args}"/>
+			<classpath refid="lib.path"/>
+			<include name="${version.src}"/>
+		</javac>
+
+		<!-- Copy web interface static files to the build dir -->
+		<copy todir="${main.make}/freenet/clients/http/staticfiles">
+			<fileset dir="${main.src}/freenet/clients/http/staticfiles"/>
+		</copy>
+		<!-- Copy translation files to the build dir -->
+		<copy todir="${main.make}/freenet/l10n">
+			<fileset dir="${main.src}/freenet/l10n">
+				<include name="freenet.l10n.*.properties"/>
+				<include name="iso-*.tab"/>
+			</fileset>
+		</copy>
+		<!-- Copy the dependencies.properties file -->
+		<copy todir="${main.make}" file="dependencies.properties"/>
+	</target>
+
+	<target name="package-only" depends="build">
+		<property name="lib.contrib.loc" location="${lib.contrib.dir}" />
+		<property name="lib.loc" location="${lib.dir}" />
+		<pathconvert property="lib.jars.package" refid="lib.path" pathsep=" ">
+			<map from="${lib.contrib.loc}/" to=""/>
+			<map from="${lib.loc}/" to=""/>
+		</pathconvert>
+		<jar jarfile="${jar.dst}" basedir="${main.make}">
+			<manifest>
+				<attribute name="Permissions" value="all-permissions"/>
+				<attribute name="Application-Name" value="Freenet REference Daemon"/>
+
+				<attribute name="Required-Ext-Version" value="29"/>
+				<attribute name="Recommended-Ext-Version" value="29"/>
+				<section name="common">
+					<attribute name="Specification-Title" value="Freenet"/>
+					<attribute name="Specification-Version" value="0.7.5"/>
+					<attribute name="Specification-Vendor" value="freenetproject.org"/>
+					<attribute name="Implementation-Title" value="Freenet"/>
+					<attribute name="Implementation-Version" value="0.7.5 ${git.revision}"/>
+					<attribute name="Implementation-Vendor" value="freenetproject.org"/>
+				</section>
+			</manifest>
+			<exclude name="${version.src}"/>
+		</jar>
+	</target>
+
+	<target name="package" depends="unit, package-only" description="build standard binary packages (Freenet daemon)"/>
+
+	<target name="unit-build" depends="build" unless="${test.skip}">
+		<antcall target="libdep-junit"/>
+		<antcall target="libdep-hamcrest"/>
+		<javac srcdir="${test.src}" destdir="${test.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
+			<compilerarg line="${javac.args}"/>
+			<classpath refid="libtest.path"/>
+			<include name="**/*.java"/>
+			<exclude name="*.java"/>
+		</javac>
+		<copy todir="${test.make}/freenet/client/filter/png" overwrite="true">
+			<fileset dir="${test.src}/freenet/client/filter/png"/>
+		</copy>
+		<copy todir="${test.make}/freenet/client/filter/bmp" overwrite="true">
+			<fileset dir="${test.src}/freenet/client/filter/bmp"/>
+		</copy>
+		<copy todir="${test.make}/freenet/client/filter/mp3" overwrite="true">
+			<fileset dir="${test.src}/freenet/client/filter/mp3"/>
+		</copy>
+		<copy todir="${test.make}/freenet/client/filter/gif" overwrite="true">
+			<fileset dir="${test.src}/freenet/client/filter/gif"/>
+		</copy>
+		<copy todir="${test.make}/freenet/crypt/ciphers/rijndael-gladman-test-data" overwrite="true">
+			<fileset dir="${test.src}/freenet/crypt/ciphers/rijndael-gladman-test-data"/>
+		</copy>
+		<copy todir="${test.make}/freenet/l10n" overwrite="true">
+			<fileset dir="${test.src}/freenet/l10n" includes="*.properties"/>
+		</copy>
+	</target>
+
+	<target name="unit" depends="unit-build" unless="${test.skip}">
+		<junit printsummary="yes" haltonfailure="${test.haltonfailure}" logfailedtests="yes" showoutput="yes" filtertrace="no" fork="on" forkmode="perTest" maxmemory="256m" dir="${test.dst}">
+			<classpath refid="libtest.path"/>
+			<formatter type="plain" usefile="false"/>
+			<formatter type="xml" if="${test.xml_output}"/>
+			<formatter classname="org.apache.tools.ant.taskdefs.optional.junit.TearDownOnVmCrash" usefile="false"/>
+			<test if="test.class" name="${test.class}" todir="${test.dst}"/>
+			<batchtest unless="test.class" fork="yes" todir="${test.dst}">
+				<fileset dir="${test.make}" includes="**/*Test.class"/>
+			</batchtest>
+			<sysproperty key="test.verbose" value="${test.verbose}"/>
+			<sysproperty key="test.benchmark" value="${test.benchmark}"/>
+			<sysproperty key="test.extensive" value="${test.extensive}"/>
+			<!-- TODO source needs to be edited too; the old variables were "benchmark" and "extensiveTesting" -->
+			<assertions><enable/></assertions>
+		</junit>
+	</target>
+
+	<target name="clean" description="clean standard build products">
+		<delete dir="${main.make}"/>
+		<delete dir="${main.dst}"/>
+		<delete dir="${test.make}"/>
+		<delete dir="${test.dst}"/>
+	</target>
+
+	<!-- =================================================================== -->
+	<!-- Dependencies (contrib, ie. freenet-ext.jar)                         -->
+	<!-- =================================================================== -->
+
+	<target name="ensure-ext" depends="libdep-ext">
+		<!-- clean build does nothing, since this is external library. -->
+	</target>
+
+	<target name="ensure-bc" depends="libdep-bc">
+		<!-- clean build does nothing, since this is external library. -->
+	</target>
+
+	<!-- =================================================================== -->
+	<!-- Generate GWT code                                                   -->
+	<!-- =================================================================== -->
+
+	<target name="env-gjs">
+		<available property="gjs.present" file="${gjs.dst}" type="dir"/>
+	</target>
+
+	<target name="ensure-gjs" depends="env-gjs" unless="gjs.present">
+		<antcall target="build-gjs"/>
+	</target>
+
+	<target name="build-gjs" depends="libdep-gwt-user, libdep-gwt-dev">
+		<ant antfile="build.xml" dir="${gjs.dir}">
+			<reference refid="gjs.lib.path" torefid="project.class.path"/>
+		</ant>
+	</target>
+
+	<target name="clean-gjs">
+		<ant antfile="build.xml" dir="${gjs.dir}" target="deleteGenerated"/>
+	</target>
+
+	<!-- =================================================================== -->
+	<!-- Documentation                                                       -->
+	<!-- =================================================================== -->
+
+	<target name="init-doc" unless="${doc.skip}">
+		<mkdir dir="${doc.api}"/>
+	</target>
+
+	<target name="javadoc" depends="init-doc, dep" unless="${doc.skip}">
+		<javadoc classpathref="lib.path" sourcepath="${main.src}" destdir="${doc.api}" use="true">
+			<link href="http://docs.oracle.com/javase/6/docs/api/"/>
+		</javadoc>
+	</target>
+
+	<target name="doc" depends="javadoc" description="build documentation">
+		<!-- currently freenet has no other documentation apart from javadocs -->
+	</target>
+
+	<target name="clean-doc" unless="${doc.skip}">
+		<delete dir="${doc.api}"/>
+	</target>
+
+</project>
diff --git a/net-p2p/freenet/files/build.properties b/net-p2p/freenet/files/build.properties
new file mode 100644
index 000000000000..21fecf30c803
--- /dev/null
+++ b/net-p2p/freenet/files/build.properties
@@ -0,0 +1,95 @@
+##
+# Properties you can set to affect the build process.
+#
+# This file contains default values that are checked-in to version control.
+#
+# End users should not edit this file to set machine-specific properties;
+# instead, create a new file called override.properties and set them there.
+#
+
+################################################################################
+## build files/directories
+
+main.src=src
+main.make=build/main
+main.dst=dist
+
+test.src=test
+test.make=build/test
+test.dst=run
+
+doc.src=doc
+doc.dst=javadoc
+doc.api=javadoc
+
+################################################################################
+## external dependencies
+
+# dir for common library jars
+lib.dir = lib
+
+# dir for freenet library jars (aka freenet-ext or "contrib" jars)
+lib.contrib.dir = lib/freenet
+## if you use the git submodule in ./contrib (legacy-27 branch)
+## by running `git submodule init && git submodule update`
+## contrib.ant is needed for the old legacy layout
+#lib.contrib.dir = contrib/freenet_ext
+#contrib.ant = ${lib.contrib.dir}/build.xml
+## if you clone the contrib package separately (master branch)
+#lib.contrib.dir = ../contrib/freenet-ext/dist
+
+# dir that freenet library jars will be installed to, relative to freenet.jar
+lib.contrib.dir.rel = freenet
+
+# jars from ${lib.dir} to use
+bc.jar = bcprov-jdk15on-154.jar
+lib.jars = ${bc.jar}
+#lib.jars = wrapper.jar db-je.jar bdb-je.jar commons-compress.jar
+
+# jars from ${lib.dir} to use, for tests
+libtest.jars = junit4.jar hamcrest-core.jar
+
+# jars from ${lib.contrib.dir} to use
+lib.contrib.jars = freenet-ext.jar bitcollider-core.jar db4o.jar lzmajio.jar mantissa.jar \
+ wrapper.jar db-je.jar bdb-je.jar commons-compress.jar
+
+# jars from ${lib.dir} to use, for compiling GWT javascript
+gjs.lib.jars = null
+#gjs.lib.jars = gwt-dev-linux.jar gwt-dev-windows.jar gwt-dev.jar gwt-user.jar \
+# commons-collections3.jar ant.jar eclipse-ecj.jar
+
+findbugs.dir = findbugs
+findbugs.path = ${findbugs.dir}/lib/findbugs-ant.jar
+
+pmd.dir =
+################################################################################
+## build tool options
+
+# Javac
+javac.args=-Xlint -Xlint:-deprecation
+
+# Test properties
+test.skip=false
+test.verbose=false
+test.benchmark=false
+test.extensive=false
+test.xml_output=true
+test.haltonfailure=yes
+
+# select a single test to run
+#test.class=
+
+# Build javadoc
+doc.skip=false
+
+# Run findbugs
+findbugs.skip=false
+pmd.skip=false
+cpd.skip=false
+
+################################################################################
+## misc options
+
+# Hack around property expansion not featured in ant <= 1.7.1
+# see http://ant.apache.org/manual/properties.html#if+unless
+true=true
diff --git a/net-p2p/freenet/freenet-0.7.5_p1483.ebuild b/net-p2p/freenet/freenet-0.7.5_p1483.ebuild
new file mode 100644
index 000000000000..104ad58ab195
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1483.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DATE=20160521
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 multilib systemd user
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://freenetproject.org/"
+#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
+SRC_URI="
+	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
+	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
+	mirror://gentoo/freenet-ant-1.7.1.jar"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/bcprov:1.54
+	dev-java/commons-compress:0
+	dev-java/fec:0
+	dev-java/java-service-wrapper:0
+	dev-java/jbitcollider-core:0
+	dev-java/jna:0
+	dev-java/lzma:0
+	dev-java/lzmajio:0
+	dev-java/mersennetwister:0"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.7
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	dev-java/ant-core:0"
+
+RDEPEND="
+	>=virtual/jre-1.7
+	net-libs/nativebiginteger:0
+	${CDEPEND}"
+
+PDEPEND="net-libs/NativeThread:0"
+
+JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+JAVA_ANT_ENCODING="utf8"
+
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
+EANT_BUILD_XML="build-clean.xml"
+EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna,lzma,lzmajio,mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
+
+S="${WORKDIR}/fred-build0${PV#*p}"
+
+RESTRICT="test" # they're broken in the last release.
+
+MY_PATCHES=(
+	"${FILESDIR}"/0.7.5_p1483-ext.patch
+	"${FILESDIR}/"0.7.5_p1475-remove-git.patch
+)
+
+pkg_setup() {
+	has_version dev-java/icedtea[cacao] && {
+		ewarn "dev-java/icedtea was built with cacao USE flag."
+		ewarn "freenet may compile with it, but it will refuse to run."
+		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
+		ewarn "if you plan to use it for running freenet."
+	}
+	java-pkg-2_pkg_setup
+	enewgroup freenet
+	enewuser freenet -1 -1 /var/freenet freenet
+}
+
+src_unpack() {
+#	unpack ${P}.zip seednodes-${PV}.zip
+	unpack ${P}.zip seednodes-0.7.5_p1480.zip
+}
+
+src_prepare() {
+#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
+	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
+	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
+	cp "${FILESDIR}"/build.properties build.properties || die
+
+	epatch "${MY_PATCHES[@]}"
+
+	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
+		freenet-wrapper.conf || die "sed failed"
+
+	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die
+
+	local i=2 pkg jars jar
+	local ifs_original=${IFS}
+	IFS=","
+	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
+		jars="$(java-pkg_getjars ${pkg})"
+		for jar in ${jars} ; do
+			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
+		done
+	done
+	IFS=${ifs_original}
+	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
+
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+	eapply_user
+}
+
+EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/freenet.jar
+	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
+
+	if has_version =sys-apps/baselayout-2*; then
+		doinitd "${FILESDIR}"/freenet
+	else
+		newinitd "${FILESDIR}"/freenet.old freenet
+	fi
+
+	systemd_dounit "${FILESDIR}"/freenet.service
+
+	dodoc AUTHORS
+	newdoc README.md README
+	insinto /etc
+	doins freenet-wrapper.conf
+	insinto /var/freenet
+	doins run.sh seednodes.fref
+	fperms +x /var/freenet/run.sh
+	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
+}
+
+pkg_postinst() {
+	elog " "
+	elog "1. Start freenet with /etc/init.d/freenet start."
+	elog "2. Open localhost:8888 in your browser for the web interface."
+	#workaround for previously existing freenet user
+	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
+		freenet:freenet /var/freenet
+}
+
+pkg_postrm() {
+	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
+		elog " "
+		elog "If you dont want to use freenet any more"
+		elog "and dont want to keep your identity/other stuff"
+		elog "remember to do 'rm -rf /var/freenet' to remove everything"
+	fi
+}
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index 2c1de5a18c70..f0c957b92c39 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -1,19 +1,14 @@
 AUX ipfs.confd 30 BLAKE2B 7ecaa40f2a4097690f9d8091da5891e0bbfb0f298bed4a59769c8d0ef978a2471865a01177950da5869b61f3b8c124f43eab97daf297c06efecdc25785a5846d SHA512 c55afeb3efe381d18258ddf00f58325b77156375cf223fb2daa049df056efe22e9139cce0f81dc4c73759dad5097af5f3201414beb5950bd894df9ae8c7c4ed1
 AUX ipfs.init 464 BLAKE2B f5927ab792427a87c330772fca4adc177ae84899be5c6b856f763d6e71d1cbdf1d151bf6eea46ff13ba5ce5996a55468a4749d37c1e8306c4d07f897f17430a1 SHA512 6616a0114039a7c178ee9788c748e4abf143a875df2a9d6d823249d7adef2024cd3f537cf45a624e76751792e8c24b1d42b0dd536686b14d6f53f59ca53ca1f4
 AUX ipfs.service 245 BLAKE2B b2d528a82a79d1e7fd5cfedac1a4db2412e7e02c87c3e5e902b0bd1a9259fd4156328b8c289df42a898a64a396d83ef93f24743d042b4fe24a2d97f8f0c5235e SHA512 58e21b8c7a7c0af0b05ee936fcd7e8e61903755f1c124a4d59758bb094d520d3dafb9b5b8b92d2a4b414367fbdaf2ec0025c05cbc796d0ee26f2916d12dde472
-DIST go-ipfs-bin-0.4.15.bash 20856 BLAKE2B 60370fabf7dee1f157c242fef5709b486428db4dde24388fca1a21655b44e9cbd07a523af05c66f70e8a7ac43a40cb4a439faaae856bfe52c74853e7539b4f3e SHA512 17568f42a0980734e57a6c22bab4bac149719ab4d586a5a477f4b11610c2c982c1b5c395b9244c73aa95c82bd40688b8368960bfc0fd5db2e6139660d38e6c9a
-DIST go-ipfs-bin-0.4.17.bash 20856 BLAKE2B 60370fabf7dee1f157c242fef5709b486428db4dde24388fca1a21655b44e9cbd07a523af05c66f70e8a7ac43a40cb4a439faaae856bfe52c74853e7539b4f3e SHA512 17568f42a0980734e57a6c22bab4bac149719ab4d586a5a477f4b11610c2c982c1b5c395b9244c73aa95c82bd40688b8368960bfc0fd5db2e6139660d38e6c9a
 DIST go-ipfs-bin-0.4.18.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
-DIST go-ipfs_v0.4.15_linux-386.tar.gz 8189548 BLAKE2B 6f82260f92b55d863189ad6f0cdeff4972df863953d132cbb11623e06c33b154e650e9fd0bd03d4a3f8477cce22447603a0207f0afc6eed074fcf7d05ead01af SHA512 11b4f11da0754819456dc7b5d149d72670582cd3e9c90b518546024356857c49a9a97ebebf1bc495e48e4bde96884e58f979a51fc57993bdff0509bccc6fad31
-DIST go-ipfs_v0.4.15_linux-amd64.tar.gz 10209630 BLAKE2B ce6fec2968765ac54f1376f0e8f9f3728338b06104a4b841b7993b5955f889e62e0bcf4e79fe6e180ef2e6cb4e9b07745935aaea74d7d6a050b7484e6d6ba9be SHA512 d77790c5c58f49229989b0e08fa537bc084bf9e2953479e307557e96924f96b913f00c4a7a76c687f2db63f098a18a575f34d88a3f226e7933039e8d8910dd10
-DIST go-ipfs_v0.4.15_linux-arm.tar.gz 8124892 BLAKE2B 8f3ab08f83ca7c4067a230fc0557393f107a08d1df069fd2029393cc1320d5cf678316e988472696aeceadea2d4f04e8c0bb85526284627c1d9e5f0acb2cc3e7 SHA512 4e98fda84d0f8c1e118150771b03a238cec96631d8ea798bf5c494f60711f1d272abe0830edfafb9f7fa6e246c59f30fe7896f231217f1b5aa2bdb6ccd3a94a5
-DIST go-ipfs_v0.4.17_linux-386.tar.gz 8625346 BLAKE2B e72b51a25eb0c18958f434483d28c45b43120ec9e583184cad8ac57c9470d685c568d9e166899d355200f89a0fe9fb3b05f9ce4c00c8c03bb928b0714b5d67c8 SHA512 031ee1624499ba9fd72efef780b1a04dee9a69dccc41190cebefcf5c271f676829fc220281db24d75a9159cd52fbbe3c85855911a5925efa23db85d2daefb500
-DIST go-ipfs_v0.4.17_linux-amd64.tar.gz 10726868 BLAKE2B bde05330dec16a9d40cf6ab0a872a2b2640e9d6811bc70b0a77a2149c36f0f9ddca927dcf66a7264b71b9a39ca49ab4e698ddaa7683b4b4ce871e207032ba9f5 SHA512 1d0b1b14b544c81ed6ecf4b5481e9b186d11d29afe1c63ad49abcc54346ec98ba28f7cfd712b5947a988ea7b810c71178ee79aadc87f3a946ecbfd5dcfd00b17
-DIST go-ipfs_v0.4.17_linux-arm.tar.gz 8541559 BLAKE2B a0633f414a2b8e6bfd1679442653cdcecaa1f3e5072ed9ca3afb64dd0183155077af71723a282285f2d70b7ac256d4e2e27515175453f16cd900ee01dcfb7440 SHA512 586b40575a18933eccd3a5af81efac8c0b6ea941bb5cef9e5bfc95ce56134863934c0e2fde29aa24944791c4842f0055ef43d1aab64b339649033801e4739cb6
+DIST go-ipfs-bin-0.4.19.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
 DIST go-ipfs_v0.4.18_linux-386.tar.gz 11128726 BLAKE2B 2f1289bb0aa93d0d03585bb90f577f91c8db922ba7905aab90c6e6b7804b7fab5c52b861aa0cdd927de8ea0b6e20f22f1c42c390628cd2e660fbaecd55b04d24 SHA512 7fff0da87827dcef7c84f959f4cfdc0b5e43e82c636b77fd600d4f62d7b78b8f1660ea346caa5eaf2d791ab275f41c0f83d606e4b36f29f3284a1851a82fbce5
 DIST go-ipfs_v0.4.18_linux-amd64.tar.gz 13791729 BLAKE2B 777d20792d089216010574798245e0eac0a5ec46549aef3ec4162c289d1d4fec1b381d8fba39ad2a57d88fcbeee5cdd1bd8509fa8883dd946fb452c4266f95de SHA512 ef5b44a0aaed604890c83322ca02228061204085b87b20dd173edfe6b6631fc7a54724d2e00202488c86886992a0d409f43e09f022cdf8b1138f8419cf7614b0
 DIST go-ipfs_v0.4.18_linux-arm.tar.gz 10933477 BLAKE2B b846926b33c78a6d089717689993c6a9c9b6ae03b32f184c2a74ecc1a9c290e7b29a9e35f2e7691e504e86c6f6229d86bbf956d90d939decb91a22fe04f74504 SHA512 c60cf427109c9c08a73a8270fe9d2792932894cfd68c1a90ec159733d121c5c12647e4b8ab2ed24865c9a4b7f8cb94db9dbe47667e48b5525b39f0c3a0acf085
-EBUILD go-ipfs-bin-0.4.15-r1.ebuild 1287 BLAKE2B 3666b649191a0a28df535b602c5b72f710c3e4bbbd6d86a87d6a7738f8f6340c5b339734c8f302601621709b1b3a8a140dbe4d8caa1183ec2261d5091f6e8af7 SHA512 e14ef66905312d4492ad994ba3d51d3e133a9545bfd96ccf04e1086298230324f4677e456f968739dc4dd359269a975cc3267c520a7c8d1bfeeae272fdfd3078
-EBUILD go-ipfs-bin-0.4.17.ebuild 1287 BLAKE2B 3666b649191a0a28df535b602c5b72f710c3e4bbbd6d86a87d6a7738f8f6340c5b339734c8f302601621709b1b3a8a140dbe4d8caa1183ec2261d5091f6e8af7 SHA512 e14ef66905312d4492ad994ba3d51d3e133a9545bfd96ccf04e1086298230324f4677e456f968739dc4dd359269a975cc3267c520a7c8d1bfeeae272fdfd3078
+DIST go-ipfs_v0.4.19_linux-386.tar.gz 11313754 BLAKE2B ac45961d7af003b28668c208be8e5d4457f28284a9b2ce21d9958a52204212fa08c4a8077382913027b0e79cfd8a230227494ca7897d25ee4900f9747039d6af SHA512 9fc7b467098613786788d41c04257b119d124a03279439c16c6a541d5057ce769b295eae16a42b10561f42f5eb982221dc2beacec42d56e517566115e72124da
+DIST go-ipfs_v0.4.19_linux-amd64.tar.gz 14068171 BLAKE2B e108fcbeeca0823a90df049c870501406ec68d5750d300d5e50fb8f8b2e8c3a1cbdceecc76687cfa9ca0185e7661ad5fb91bf0f33cdef1e1e7c4fc5e0c25dd6c SHA512 66d930bef0196c70f25cb207c00da6e36f6c2c17ff0e785f45d360e710502c233aeeeaaa5ee0bfc984919d42225c74c6474e5e5ce5c8cd6993580903fa8ec0c4
+DIST go-ipfs_v0.4.19_linux-arm.tar.gz 11118746 BLAKE2B 08ea24e8367d22577798636faec3ecdacb2dad9dd635f727a129b875ab02d1b37712b20ce6a387046a7be753032b437aa1feb8fab79aff99140c543652f3d7c6 SHA512 00084c0ecdf2d78e792519dbfcc7f62897283d5d81e7df90745ac41091dabaf44674a62c0ebc6a63bfea9bed97f98ed1dde260d8eb05f4bef2f4d35d3ebe9f5b
 EBUILD go-ipfs-bin-0.4.18.ebuild 1284 BLAKE2B 03fee910022a804913d3adb50beaa93cae9d14d12a73157c125561bd0b42b6ecd8c40391b517e9bb2233513ead6903781cb8733c4d2b524f82399dd159afbc2d SHA512 14291ab9b9bacb9b9ce40e943ac3be80a69bdfa8d59bfcd2bd5ee2902c07acc28351f582105b358aea7134b4edb61c346225c771906110394509fc111cb45956
+EBUILD go-ipfs-bin-0.4.19.ebuild 1284 BLAKE2B b352def2375a823e31a688afcf169ba7ce81c7b00af076c24e811364db45ee23d10f0aa31df129492ee9938fb39f1b39c7ee0ed6c1c99f310758122796d99e7e SHA512 d35216cd49fbca3e778d39748012b0a7d27783a888707ebe53355debaebe36a1d42adf0631f3599dc5dcc76a51910c82c9b0e89daa0ec3cfbdb1c6001622c778
 MISC metadata.xml 514 BLAKE2B fb8cdd1bd3a7e9f4ee567d126e9a2e78c1a7e3237a13f831f0edd775d1ff5ebaab94d2bdfbd764fb32bc52d4fdd65a21e37af369efd6e2a9f932bbe2fa113256 SHA512 46e23df18c12c87434db22e3a22ebc9a9df8650b6a8235f655ee6e4657e706fd86dc468462a485483eb9ea440f38d40e262a3537cceb41eb1e68110651ba5d00
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.17.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.17.ebuild
deleted file mode 100644
index ac6442670566..000000000000
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.17.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 systemd user
-
-DESCRIPTION="Main implementation of IPFS"
-HOMEPAGE="https://ipfs.io/"
-SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
-	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
-	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
-
-	https://raw.githubusercontent.com/ipfs/go-ipfs/v${PV}/misc/completion/ipfs-completion.bash -> ${P}.bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-
-RDEPEND="sys-fs/fuse"
-S="${WORKDIR}/go-ipfs"
-
-QA_PREBUILT="/usr/bin/ipfs"
-
-src_install() {
-	dobin ipfs
-
-	systemd_dounit "${FILESDIR}/ipfs.service"
-	newinitd "${FILESDIR}/ipfs.init" ipfs
-	newconfd "${FILESDIR}/ipfs.confd" ipfs
-
-	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
-	keepdir /var/log/ipfs
-}
-
-pkg_preinst() {
-	enewgroup ipfs
-	enewuser ipfs "" "" /var/lib/ipfs ipfs
-
-	fowners -R ipfs:ipfs /var/log/ipfs
-}
-
-pkg_postinst() {
-	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
-	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
-	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
-}
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.15-r1.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.19.ebuild
index ac6442670566..d19ef9ab7104 100644
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.15-r1.ebuild
+++ b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.19.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit bash-completion-r1 systemd user
 
diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest
index 64603a841ab1..30c9cec52149 100644
--- a/net-p2p/resilio-sync/Manifest
+++ b/net-p2p/resilio-sync/Manifest
@@ -5,10 +5,10 @@ AUX resilio-sync.confd 312 BLAKE2B eee3179791594a3af6176abc2eba5b2db3e0a14d602dd
 AUX resilio-sync.initd 462 BLAKE2B 775e1824d9b374bef32798bb05bb7fb2fd66ff1b859aa50d72dd02c80033bcf8b12275bf1e4d9eae2b2fdc1a1da7a1710c8e5ce1bd6da37427a4433967afb1bb SHA512 06cc963db70c969ca81a249c17c467fd4013a7cde39b37f65c934393e9e891776f247397b976f5caf20b6d29cee64865703bb2b3b78cd7a0e68be102db46a7fb
 AUX resilio-sync.service 382 BLAKE2B f61c181137d41aeb59c721688a2b208c16d985c0b74c32e556cf3cc5218a549c7f58da50dde584bfbfca88ce6a00f1ecbbd67e58af04e88774b3e648d4d8513e SHA512 c278b35ba0cc888beb7d4b75e5b5c5c0304ec89ba1ac0136713256d05e95896254504b58f9c3a0a534aa04aee5e36468b579b2e18397f0bfb3615527b82195db
 AUX resilio-sync.tmpfile 41 BLAKE2B fb3e9001a32e45cd230f4efef60509f20f52253ad575fb2b1493bae9846ad46210eed639c7a3f9e4a4fa7c901b42a9a7756f8583c204a4bb847e6eb96a2af323 SHA512 d9d54076785ce601023980e3fe5e2eab42e5eaf3b0bdb9caefe508e0d5fda8d32faf1338c6b901deb29488401de74228023016d72d7b0ec9db362b4c2d87edd2
-DIST resilio-sync_2.5.12-1_amd64.deb 10466894 BLAKE2B d9125bfe49738db3a2cab0d66cad9fed2ae712ee613ccd104bc1d8764bd072b082f71fc0102b15d52f791b592d88ffa4f03892e7e4088e3bf4a847b6c15b4296 SHA512 bafc8dbce182253d585185e5d0a27f0a8ca18f768bba65c348752cc089e0e690c8c1848a71cb1b125c67d2c265cbbf13e98d7c99289b0bb0268d43d3e38454d3
-DIST resilio-sync_2.5.12-1_i386.deb 10334238 BLAKE2B 447baf18db1f6c47a6a2518f9ba6a27b0d9a7092cc41d63958a66be6492cab3868a0ecae9faadfa91cfc5f777e1289cb62017519a0994b93ae448042de9b32d3 SHA512 bb46498070f6aa0e3debee839f50a9292116bd5f9105fe75c65d11f9f3199e6e5b8f828b34b364e7f3cb896bf88fd37a255289c68158df7414acf809e4701b32
 DIST resilio-sync_2.6.1-1_amd64.deb 11576892 BLAKE2B 710bd96b91be84bc7210d8efe0d8954a33be878fc948694e7a1c62e7b53b5ac94133a16b89c4872e18798bc03f3508c7c130d4d56a3480c35d30edff5589ef3a SHA512 a37d73a621a740f57b4f2824cc2a3178f365ccc8180a0e814480dde8d1b74b9d54da4e07bd18c89cc6a93c12b526f8a43e08165d3c2f0fdc913e1f38e46eb183
 DIST resilio-sync_2.6.1-1_i386.deb 11465194 BLAKE2B b56e01f79c5beec6a5ebd09724bebd1ce8c6d44eac694cd7fb89dc44823ccba22531b14e241fdd985ae63e6e0f177021becb593923eac8ac0183629e533ac72d SHA512 84676c3fe5fcee484bcd58c6496aba0d2e3c86c339adb90b8b3cef28ae46d7b6f28c5fd0371a2cfe612ab8b3658eca2b9b2f6cfc9caa70aaff95946942a5c749
-EBUILD resilio-sync-2.5.12.ebuild 2349 BLAKE2B 3299319dec3fc935935c327a35a663307830a6d3ecb0caa1d9b4668385cfaf197796d9cb26b894eb784244f72ad9ff1eb4e4f92a751f33a5d18cc0ac75736d7b SHA512 8f8507ef0676b1265845201d3df6c4eb6b29b9d1a744967ab84414424c3edda4a805386898b6e9960eb56139ff7c04312f7bcc60c156242f6ba631b70f8bf628
+DIST resilio-sync_2.6.3-1_amd64.deb 12109918 BLAKE2B e89ca0eedadd29d1d0519f0e894f6cbb865b39600df6b516a85411da45e58751caf1c0988d13c821b134ac2318f6487cdad82a75b7357686bde1865b88779f3e SHA512 4531936a5ddd23cfcf2354ea9c7f285e08d1afdd0922d1254baec2900f1c4bfdbbe5d57a5f9cf079b8b3fee69cc9f0a1557218657c1386f800d6e19cc6de31a3
+DIST resilio-sync_2.6.3-1_i386.deb 12062106 BLAKE2B f070844fc513ce052e1cb480f4b521216da485ffc00fb0b7e512d877ae6d0bb39452015bc24f931850542490e69d3b210c5a4dd8635a43f16901791144134880 SHA512 18e01ae12c198e7e921a8fd74e934365f027607940ada7378adb239b5c8a25b94e47ac4290c738acac54c53beff25e1ba35f4e079ce8145852f385212bd8794b
 EBUILD resilio-sync-2.6.1.ebuild 2229 BLAKE2B d23975c7f37c48b79e94e0a30fbabd14fa715beadce66b9afe2f2c83d35a698afa2e4d20c4552197099b9575e68f55a4f3043d5e0936093d67aee8cfa6c56a4e SHA512 dc85455bd1943f99a664dfea988d8899a18db51c4fc5e349eea8211773487afa5d0326f918177a8a14dbccc171c442ca325fb19a6455f0c24664ae79e9c4745d
+EBUILD resilio-sync-2.6.3.ebuild 2208 BLAKE2B 8bece7919526363ce81ccb7e75be9a5988ac4139c7dd08a52b935d82304ab1594ad4d0116902d6c44912be98ec9bbf2fd835d0551e7054e854ed98321453031f SHA512 ad764e73f9acc60c926a3a57dbf792a4c25cd722d230b99e0a3d2534c0d95446553c3ff69b80f21d68bbeeafcb8671bb2f50cf11ce2b2ea5410656c802af399d
 MISC metadata.xml 889 BLAKE2B e6e81874032bbb5ae212b3894f04cb1dbcefae1bf87dd94f86e16a5e6547cfa4e17c1db9214bfe9d2da35c86011501776ee1ed0e0327a8aa607db39ddac2595a SHA512 0943a2d2215dbe2534622e3f90edf51b340613294d9b0b2ed2594b4223c7a26a8c1d054e7d90d957874e204f7fe32cf5d6f00d43e16164d618e193ac86a96b4c
diff --git a/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild b/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
deleted file mode 100644
index 33a5201ff219..000000000000
--- a/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASE_URI="http://linux-packages.resilio.com/${PN}/deb/pool/non-free/r/${PN}/${PN}_${PV}-1_@arch@.deb"
-
-inherit pax-utils readme.gentoo-r1 systemd tmpfiles unpacker user
-
-NAME="rslsync"
-QA_PREBUILT="usr/bin/${NAME}"
-
-DESCRIPTION="Resilient, fast and scalable file synchronization tool"
-HOMEPAGE="https://getsync.com/"
-SRC_URI="amd64? ( ${BASE_URI/@arch@/amd64} )
-	x86? ( ${BASE_URI/@arch@/i386} )"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-RESTRICT="mirror"
-
-S="${WORKDIR}"
-
-DOC_CONTENTS="You may need to review /etc/${PN}/config.json\\n
-Default metadata path is /var/lib/${PN}/.sync\\n
-Default web-gui URL is http://localhost:8888/\\n\\n"
-
-pkg_setup() {
-	enewgroup "${NAME}"
-	enewuser "${NAME}" -1 -1 /var/lib/"${PN}" "${NAME}"
-}
-
-src_unpack() {
-	unpacker_src_unpack
-
-	unpack usr/share/man/man1/"${PN}".1.gz
-}
-
-src_install() {
-	dobin usr/bin/"${NAME}"
-	use pax_kernel && pax-mark m "${ED%/}"/usr/bin/"${NAME}"
-
-	doman "${PN}".1
-
-	dodir /var/log/"${PN}"
-	keepdir /etc/"${PN}" /var/lib/"${PN}"/ /var/lib/"${PN}"/.sync /var/log/"${PN}"
-	fperms 0700 /etc/"${PN}" /var/lib/"${PN}" /var/lib/"${PN}"/.sync /var/log/"${PN}"
-	fowners -R "${NAME}":"${NAME}" /etc/"${PN}" /var/lib/"${PN}" /var/log/"${PN}"
-
-	newinitd "${FILESDIR}"/"${PN}".initd "${PN}"
-	newconfd "${FILESDIR}"/"${PN}".confd "${PN}"
-	newinitd "${FILESDIR}"/"${PN}"-user.initd "${PN}"-user
-	newconfd "${FILESDIR}"/"${PN}"-user.confd "${PN}"-user
-	systemd_dounit "${FILESDIR}"/"${PN}".service
-	systemd_douserunit "${FILESDIR}"/"${PN}"-user.service
-	newtmpfiles "${FILESDIR}"/resilio-sync.tmpfile resilio-sync.conf
-
-	readme.gentoo_create_doc
-
-	# Generate sample config
-	"${ED%/}"/usr/bin/"${NAME}" --dump-sample-config > \
-		"${ED%/}"/etc/"${PN}"/config.json || die "generate config failed"
-	fowners "${NAME}":"${NAME}" /etc/"${PN}"/config.json
-	# Uncomment config directives and change their values
-	sed -i \
-		-e "/storage_path/s|//| |g" \
-		-e "/pid_file/s|//| |g" \
-		-e "/storage_path/s|/home/user/.sync|/var/lib/${PN}/.sync|g" \
-		-e "/pid_file/s|resilio/resilio|${PN}/${PN}|g" \
-		"${ED%/}"/etc/"${PN}"/config.json || die "sed failed for config.json"
-}
-
-pkg_postinst() {
-	tmpfiles_process resilio-sync.conf
-	readme.gentoo_print_elog
-}
diff --git a/net-p2p/resilio-sync/resilio-sync-2.6.3.ebuild b/net-p2p/resilio-sync/resilio-sync-2.6.3.ebuild
new file mode 100644
index 000000000000..95ea559330a0
--- /dev/null
+++ b/net-p2p/resilio-sync/resilio-sync-2.6.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles unpacker user
+
+QA_PREBUILT="usr/bin/rslsync"
+BASE_URI="http://download-cdn.resilio.com/${PV}/Debian/${PN}_${PV}-1_@arch@.deb"
+
+DESCRIPTION="Resilient, fast and scalable file synchronization tool"
+HOMEPAGE="https://resilio.com/"
+SRC_URI="amd64? ( ${BASE_URI/@arch@/amd64} )
+	x86? ( ${BASE_URI/@arch@/i386} )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+DOC_CONTENTS="You may need to review /etc/resilio-sync/config.json\\n
+Default metadata path is /var/lib/resilio-sync/.sync\\n
+Default web-gui URL is http://localhost:8888/\\n\\n"
+
+pkg_setup() {
+	enewgroup rslsync
+	enewuser rslsync -1 -1 /var/lib/resilio-sync rslsync
+}
+
+src_unpack() {
+	unpacker_src_unpack
+
+	unpack usr/share/man/man1/resilio-sync.1.gz
+}
+
+src_install() {
+	dobin usr/bin/rslsync
+	use pax_kernel && pax-mark m "${ED%/}"/usr/bin/rslsync
+
+	doman resilio-sync.1
+
+	newinitd "${FILESDIR}"/resilio-sync.initd resilio-sync
+	newconfd "${FILESDIR}"/resilio-sync.confd resilio-sync
+	newinitd "${FILESDIR}"/resilio-sync-user.initd resilio-sync-user
+	newconfd "${FILESDIR}"/resilio-sync-user.confd resilio-sync-user
+	systemd_dounit "${FILESDIR}"/resilio-sync.service
+	systemd_douserunit "${FILESDIR}"/resilio-sync-user.service
+	newtmpfiles "${FILESDIR}"/resilio-sync.tmpfile resilio-sync.conf
+
+	readme.gentoo_create_doc
+
+	# Generate sample config, uncomment config directives and change values
+	insopts -orslsync -grslsync -m0644
+	insinto /etc/resilio-sync
+	newins - config.json < <("${ED%/}"/usr/bin/rslsync --dump-sample-config | \
+		sed \
+			-e "/storage_path/s|//| |g" \
+			-e "/pid_file/s|//| |g" \
+			-e "/storage_path/s|/home/user/.sync|/var/lib/resilio-sync/.sync|g" \
+			-e "/pid_file/s|resilio/resilio|resilio-sync/resilio-sync|g" \
+			|| die "sed failed for config.json" )
+
+	diropts -orslsync -grslsync -m0700
+	keepdir /etc/resilio-sync /var/lib/resilio-sync/ \
+		/var/lib/resilio-sync/.sync /var/log/resilio-sync
+}
+
+pkg_postinst() {
+	tmpfiles_process resilio-sync.conf
+	readme.gentoo_print_elog
+}
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 0c241dd8401c..aa2ca4d45f26 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -4,12 +4,8 @@ AUX strelaysrv.logrotate 102 BLAKE2B 3d19a7dcade5878e7b7f275572ab2d5232ea3d043b7
 AUX syncthing.confd 549 BLAKE2B f05ec8f3478566b285f26b57a0d4c4793a5b2577a9a994b32e33e32662627c1b16dac553e2fbee06754caa7f598327b7e9d91a75bc631c49358a2a03607bcd72 SHA512 a231c526c2e03caf06a8aeba790ca764477f738633e1d2d8ca82766be143705b1062c957822ac19406e0e6ac97c6af47cb7179639980492e112dd116d624c029
 AUX syncthing.initd 1195 BLAKE2B d3724b2ac5c2a746b8a9a1477bfb01b08e7d8136de89586546d48d72e6c45a63cda0b7825ee1d39157c7a3ceed167289a2086d3075bd41f0823b981d3d0f1863 SHA512 2e327a0f09523da2e746ec559c82ddb5667d98aff0c967b9d2d27c678163f80bdb0b19487ce7b7f1664c52754c92e5f6a5f78496a8b3cb1f450e2159ba68c1ae
 AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690907a2e2b8c2954da72154a885759589249c541f36b2740980f3fcd3e99db0d3f6d5a1bacee8c1574f9bc SHA512 73a5f7062b48ab4c7b343b43367b1999f8e133eadb624bd5e3e147ae41f135ded6acb4c617db2d385311441c9a52c288333791308c36762cb5273a853cce5a67
-DIST syncthing-0.14.38.tar.gz 8246629 BLAKE2B 93c01750fedd57cc07bffa14fe65d98fc1cf48b43eaf965fc3ff9546a24acada411a89a19b47e2f5b5e7508e57646d0560559c35bb3c378b7c04e3db14b7ffaa SHA512 be5f7527d63e8db427705c34b26d783d9abd7cb5727d3dcf08ee62b1ace5454b7dfed4f030ec53e847a34f560cf349460f68c859a1008c5105aef65ef42c5cc5
-DIST syncthing-0.14.51.tar.gz 10970620 BLAKE2B ba41debaddf217069b47901d0c43f163ff0ae3ca4aadb8689401195cfc9f11a3ed641d2d96a590821adac62d12d0ff83df26a4a336ca09476d755b8230a63c87 SHA512 d670b1df341c8da95d38170e03b40deb19dfcdf0c0df9b4630c74b4fcc979bd9a863c0ca0510e28739bac14b1aad51ce40abe695765186acad78ea0d7eb3a20c
 DIST syncthing-0.14.52.tar.gz 10583112 BLAKE2B cceaf0aba9dff96df0551d7aab855cb716be3d252fd677b82e20560f0a2e9eabf513ca7c7acdf4f1a3b4d3d8f6409692df7d2e92b86b1be1753bdd8913e06952 SHA512 cff48ea1d1286c8b1fe971b00423ad64ef10c9b0555f0cae6e008efc07a21698d54d402fe1a0ac3161c0b5180e5ca0099a0a302fd7e7c5da0f227bdb7e2853ce
-DIST syncthing-1.0.0.tar.gz 10601948 BLAKE2B f9b509b78850efb315e33afff49f8468e3ea97a4aac90752e07851604960e817dbdcdb9824f2a6174b1f066ac277a119eea5aff75f6247a43652b70a5ff4f9af SHA512 79adbce03524665d02c1ca772fdf5aca68d9e41ee4bc02bcb9ac6ed0d8dca2fe8582139f52a0fe895ad5eb15c372d686277077ff884b67de1d45419e19407603
-EBUILD syncthing-0.14.38.ebuild 3604 BLAKE2B 60ab7ee9417858f5732a894a19786e66aa875d68d2ae699dba844f0efd8c0db9addd91f88b21c3e54930fc55a14d3545ea65af1c2ed43b26fa1158bfe918f6a8 SHA512 7188b18639c97775e1aad68f8a8aa1e41e95e10855f491bee61aa5898599b34d7cc0c23ea7c585d2a30dcbf1e4f16a7b08b9a5f1fa55064b6e36bb7f35cb73be
-EBUILD syncthing-0.14.51.ebuild 3525 BLAKE2B 9a8bff37b22ba1fa7f90b457f3ddbae39252f188b52bb91d2ecafb8208be83af8e1ffc88e250180793e8126520c9e187602037374d0d76b02a5d9edab8be04dc SHA512 354fd1e41dc6ebd675d162f64ba3054f3ed1eca71343bec1f3ec23e80b1f575b3188d6e5bd574fd14e9a92ecbbbbc70c4c4deca791ad89a1122ccaa434c0ac3e
+DIST syncthing-1.0.1.tar.gz 7114455 BLAKE2B 71c80afaab5a546551e8e72e63272ab277df33645d4de19005376de599d8fe0bad9d4a1e7758321d116f8c46cd73067a770f641a0c736ad678a09579716f44a8 SHA512 7f9fd48e00fae2f0913eb9eeddadaad1d5d7559164a24020706e70411f8ec43420192c4c9422699be6faa1641a382d5b8627038ca9a5dad38ee0e189970efbb7
 EBUILD syncthing-0.14.52.ebuild 3519 BLAKE2B 16e32b0870241dda338ae5d189f417794d1c0d631c20e8a5898fafe362020ed0bb478e19eb2c46bdef9cced55da00ad5e272fc316ef775699ec1cf195c8d3e54 SHA512 66218c53a968625f6350de72d225c2a5a1a5b6fe707599c207bda1a05a3d03fd11c901d8c5433da3f59913bbd67d014d3c7277db2f236d54f437a4dbee59fa7c
-EBUILD syncthing-1.0.0.ebuild 2366 BLAKE2B 281fda4131f5bda2c5631ec2e9dd2a60a9631bd5ea4a6402f157380a08f336f0a577d3221847f693ede53e30e9f57081608f119677c0b668a4b0aaed888953b7 SHA512 539ae3e284be9d757e141f1aa760b2c1a5e34c49e13f0ff417fd4985855807fa2ffe1fbc4312ed8f74d312273a42a2cccdba4d3697f722edb4abf0724ebc7d87
+EBUILD syncthing-1.0.1.ebuild 2405 BLAKE2B b86f9fd630a2b4c3dbd41cb8176ec040c27e956b46fefdf252f81e69b5f6448136830ccaad91d5a02e3c41c3583d9f2e0e1a6eafb09f2ce6d952f2917476c615 SHA512 58bfa070682a0037376da86054c456657f2ee9c7723a0d6198972516b0c8077a86acbe715c633c52556fe9cfc1bbb0f36b0e016baa113720e090258184f40e96
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-0.14.38.ebuild b/net-p2p/syncthing/syncthing-0.14.38.ebuild
deleted file mode 100644
index ca236b559e8e..000000000000
--- a/net-p2p/syncthing/syncthing-0.14.38.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-vcs-snapshot systemd user versionator
-
-DESCRIPTION="Open Source Continuous File Synchronization"
-HOMEPAGE="https://syncthing.net"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="selinux tools"
-
-RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
-
-DOCS=( README.md AUTHORS CONTRIBUTING.md )
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-
-	if use tools ; then
-		# separate user for the relay server
-		enewgroup strelaysrv
-		enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
-		# and his home folder
-		keepdir /var/lib/strelaysrv
-		fowners strelaysrv:strelaysrv /var/lib/strelaysrv
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i \
-		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
-		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
-		|| die
-}
-
-src_compile() {
-	export GOPATH="${S}:$(get_golibdir_gopath)"
-	cd src/${EGO_PN} || die
-	go run build.go -version "v${PV}" -no-upgrade install \
-		$(usex tools "all" "") || die "build failed"
-}
-
-src_test() {
-	cd src/${EGO_PN} || die
-	go run build.go test || die "test failed"
-}
-
-src_install() {
-	pushd src/${EGO_PN} >& /dev/null || die
-	doman man/*.[157]
-	einstalldocs
-
-	dobin bin/syncthing
-	if use tools ; then
-		exeinto /usr/libexec/syncthing
-		local exe
-		for exe in bin/* ; do
-			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
-		done
-	fi
-	popd >& /dev/null || die
-
-	# openrc and systemd service files
-	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
-	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use tools ; then
-		# openrc and systemd service files
-		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
-		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
-		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ $(get_version_component_range 2) -gt \
-				$(get_version_component_range 2 ${v}) ]]; then
-			ewarn "Version ${PV} is not protocol-compatible with version" \
-				"0.$(($(get_version_component_range 2) - 1)).x or lower."
-			ewarn "Make sure all your devices are running at least version" \
-				"0.$(get_version_component_range 2).0."
-		fi
-		ewarn "Syncthing OpenRC init script now uses the upstream default of"
-		ewarn ""
-		ewarn "  /var/lib/${PN}/.config/${PN}"
-		ewarn ""
-		ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
-		ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
-		ewarn "using the old Gentoo default. Systemd users are not affected."
-	done
-
-	# check if user syncthing-relaysrv exists
-	# if yes, warn that it has been moved to strelaysrv
-	if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
-		ewarn
-		ewarn "The user and group for the relay server have been changed"
-		ewarn "from syncthing-relaysrv to strelaysrv"
-		ewarn "The old user and group are not deleted automatically. Delete them by running:"
-		ewarn "    userdel -r syncthing-relaysrv"
-		ewarn "    groupdel syncthing-relaysrv"
-	fi
-}
diff --git a/net-p2p/syncthing/syncthing-0.14.51.ebuild b/net-p2p/syncthing/syncthing-0.14.51.ebuild
deleted file mode 100644
index ada15a2f82f9..000000000000
--- a/net-p2p/syncthing/syncthing-0.14.51.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-vcs-snapshot systemd user eapi7-ver
-
-DESCRIPTION="Open Source Continuous File Synchronization"
-HOMEPAGE="https://syncthing.net"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="selinux tools"
-
-RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
-
-DOCS=( README.md AUTHORS CONTRIBUTING.md )
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-
-	if use tools ; then
-		# separate user for the relay server
-		enewgroup strelaysrv
-		enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
-		# and his home folder
-		keepdir /var/lib/strelaysrv
-		fowners strelaysrv:strelaysrv /var/lib/strelaysrv
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i \
-		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
-		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
-		|| die
-}
-
-src_compile() {
-	export GOPATH="${S}:$(get_golibdir_gopath)"
-	cd src/${EGO_PN} || die
-	go run build.go -version "v${PV}" -no-upgrade install \
-		$(usex tools "all" "") || die "build failed"
-}
-
-src_test() {
-	cd src/${EGO_PN} || die
-	go run build.go test || die "test failed"
-}
-
-src_install() {
-	pushd src/${EGO_PN} >& /dev/null || die
-	doman man/*.[157]
-	einstalldocs
-
-	dobin bin/syncthing
-	if use tools ; then
-		exeinto /usr/libexec/syncthing
-		local exe
-		for exe in bin/* ; do
-			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
-		done
-	fi
-	popd >& /dev/null || die
-
-	# openrc and systemd service files
-	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
-	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use tools ; then
-		# openrc and systemd service files
-		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
-		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
-		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ $(ver_cut 2) -gt \
-				$(ver_cut 2 ${v}) ]]; then
-			ewarn "Version ${PV} is not protocol-compatible with version" \
-				"0.$(($(ver_cut 2) - 1)).x or lower."
-			ewarn "Make sure all your devices are running at least version" \
-				"0.$(ver_cut 2).0."
-		fi
-		ewarn "Syncthing OpenRC init script now uses the upstream default of"
-		ewarn ""
-		ewarn "  /var/lib/${PN}/.config/${PN}"
-		ewarn ""
-		ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
-		ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
-		ewarn "using the old Gentoo default. Systemd users are not affected."
-	done
-
-	# check if user syncthing-relaysrv exists
-	# if yes, warn that it has been moved to strelaysrv
-	if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
-		ewarn
-		ewarn "The user and group for the relay server have been changed"
-		ewarn "from syncthing-relaysrv to strelaysrv"
-		ewarn "The old user and group are not deleted automatically. Delete them by running:"
-		ewarn "    userdel -r syncthing-relaysrv"
-		ewarn "    groupdel syncthing-relaysrv"
-	fi
-}
diff --git a/net-p2p/syncthing/syncthing-1.0.0.ebuild b/net-p2p/syncthing/syncthing-1.0.1.ebuild
index d81107f9c516..6a2795b2434b 100644
--- a/net-p2p/syncthing/syncthing-1.0.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.0.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGO_PN="github.com/${PN}/${PN}"
 
-inherit golang-vcs-snapshot systemd user eapi7-ver
+inherit golang-vcs-snapshot systemd user xdg-utils
 
 DESCRIPTION="Open Source Continuous File Synchronization"
 HOMEPAGE="https://syncthing.net"
@@ -35,6 +35,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
 	default
 	sed -i \
 		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 38a4370e2dcb..88bac896d762 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,5 +1,4 @@
 AUX libsystemd.patch 630 BLAKE2B 1e7d9ac41ebc8971a86f051aaa5e7c4899004e4ae29b62d8b2963a16047cdd9ce7830156510d8e2f00967dcfb538991138f3b5c31bb2c841e5ddabfdb397ab47 SHA512 5babefd3ab0216dd1cf0b08b1ad10c79d034782ce744c9a4df402036ed1529655b9e05c641e876e9629a8366363ad0bf2d5e7581a621f2b0749ff02c6ed742eb
-AUX transmission-2.93-libressl.patch 353 BLAKE2B 62d7875b9cb96bba9d03da8a109545c755831dbdeb374081b719128746b5a1c2cb1a55e05b0e82ad615bc5a2d9e6e385ac6aab4370e98ebd582b31b24ecb43b0 SHA512 72489bc86a61d8c612b5d3b1b55897090c87423dd50b354b14cb8ee9f9fbdd5e2be75d3d6840369947c99d4231e5f23986040837bee5f45a2756631e4301bd2f
 AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a9bb84f93b54f7d13be1c430209647bae89054b60f5d8dd434049140f74c1cb4ad04064d03b37ad88a851c28c07fa SHA512 47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
diff --git a/net-p2p/transmission/files/transmission-2.93-libressl.patch b/net-p2p/transmission/files/transmission-2.93-libressl.patch
deleted file mode 100644
index 8c978ced269a..000000000000
--- a/net-p2p/transmission/files/transmission-2.93-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libtransmission/crypto-utils-openssl.c
-+++ b/libtransmission/crypto-utils-openssl.c
-@@ -230,7 +230,7 @@ tr_rc4_process (tr_rc4_ctx_t   handle,
- ****
- ***/
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
- static inline int
- DH_set0_pqg (DH     * dh,
-              BIGNUM * p,
diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index 38bac803f5f7..cac747ab28b9 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -1,14 +1,22 @@
 AUX xmr-stak 909 BLAKE2B 36ee36054b285af242065ebfdeb9d05dbcb28314e9e5ab9bebe247860847b7b85fb5b26bdffba871558d69b7df65345cec7ca9c52ff1c749de4d26145c023783 SHA512 fd9edee78230ccb361d279ba2f416123806b2b4576fa735fc999a1260798cce43343b615c315ed1eefe72262e3cc6ef5ebad999f74d7d0f4409595e8a37fa16d
 AUX xmr-stak-2.3.0.service 942 BLAKE2B a237a5273d6b1fc3a2dd69b121e1ca61471f9524ced84d3ae90082571148c563c4cdedf3085b246f8a8b5babc56c7cf742ea48f1f68165c443373f57efcd2139 SHA512 04ea288a2b51480db5ebde3926d453006aad1b8b028e6e60663ba8a11ad876ce2c4070a20715645187dd7e90898d2e865a286df170c82930622042ea14798359
+DIST xmr-stak-2.10.0.tar.gz 430083 BLAKE2B 112777b075352a2fabab7fbbbfd5d9ca26d5a304846c780d9c81acf100226d402fda670fda218a228722f8e1961a4ecc1c39c094cacd23a95087246e9b5016c2 SHA512 dca324b3daf7ba212c4533466f944d627ab71bc3335d6212dbd0d30f6f101e40c3b7406303b419986c8be1adb5ea48fb3d0f12fb9275a82f61dd101045381037
+DIST xmr-stak-2.10.1.tar.gz 430188 BLAKE2B c0a136c81e53d230eb95f63ead2eeb8dc380fe4692f370e39973246bf9be0c2d8c400f682c48057bb1b010e2d5a661995bedcf0be7c516f0a043f1a8cafc4613 SHA512 3d63e89200a9ce6c8666e842b934c04a2b61e2e5e40ada7ef80847835585998fd6619e520b97633333fbbd1beb4f19facdfc777d46cea296da15f7cf8c97ccff
+DIST xmr-stak-2.10.2.tar.gz 430337 BLAKE2B da7fcba03d3eb92402f2cd387af7f68471fd283121f07ca871f2b16163ab80de098535d6384fc34f64245cc75f0fee11848422f8f1095997bd041247129fae41 SHA512 e9074d8d5b9d4f7a987494d9ade037ca06c8de5fde73d82fde14772a280609624c8dc8ad5128d42f1f5e4087cf65e9c9a55988c22b4bfdf5fa65e98444232bfa
 DIST xmr-stak-2.7.0.tar.gz 376873 BLAKE2B 78dd64acf7fbae46bf150d97b00c8443fbd097789b6e1aef99a954d966b8a75add358c82636621bb8b5639883a6d79b17ba3691e72354034bd944fa1f44d8c1e SHA512 cb56de595225ab22f1c53f1dd971898fcb14610a11d1cbc789e144a5b34f24e56f44fb75bdefc809bde17e434a5e6d02830874b9b825af179cd4699587f5e7c7
 DIST xmr-stak-2.7.1.tar.gz 376919 BLAKE2B bdbd3f7ca522e200db072679f21ee79dc99167cf512f19008ca6b591d0c7ba73f58b68e0d2d7a2622cb88438922e28a4c78e4cbf9d617e28881cc37e1db8c08a SHA512 f33afa259ffde23bd0b5dd8efceadd98e4e176ccabbb68e79eb7cfcc88af9444e897c552e1eea2e3798291309847451ebfa1c44d5310e192014cf6b2aa5eb530
 DIST xmr-stak-2.8.0.tar.gz 388733 BLAKE2B cc75b2d80d7d9761b192f8d0752dde29d49c561675c63151f6cb915399dad715d133a17f2fa64c58ce8720a8de0a46bdb963c21571e29be3f99f0db3164aff40 SHA512 48803a9eb10e92763992dcbedb28b41735adf7da404312fe8358161cecef562bfc777a0b78ef90953db9c2a093adb30c4f9cd637f0613c949ff3b326662d2876
 DIST xmr-stak-2.8.2.tar.gz 388342 BLAKE2B bcdfbebb2f8b8aba9be97a1591921e267852cf7a1c3685b3cc3858a3ca0e06498eaf969bd09c27f294ecac6a8fbc969b600ec0bbf33331d555e1f13cfbaa0402 SHA512 eb29ebc6c0a31bd274ff094558e93da0191ab219adc8b7fd47efec02ebe49feb441bb0224b4f3e0ce012588002c450f7a12c0ce3792b7f309bdb9045b06e1906
 DIST xmr-stak-2.8.3.tar.gz 389352 BLAKE2B db4a52b99a950d81f6ae67b6a96f2cc7cbb5f86553c5a17b429ee7e7e84e486c81f62d9e45c9317d11160e86a89715102bf73281fff3e8a75cc93f68c52ee9c4 SHA512 ed930a93c59acfd086ad24403f58f4b545602f35c9641655b423657da24ed66ddff80c555d6bc364a09ba5a1015f66b20fa7f3d4bcfd75a0316f3ce30b9b9dd7
+DIST xmr-stak-2.9.0.tar.gz 411514 BLAKE2B 8016bb70bf5d6d3c5ec70534e1711b0d7607fc46f9c33d9f6c4a9129aae599496f7af4453eab88b5260d50f5718583ee24e9def766308987d60662aaffba3ce0 SHA512 226ab0580aaf5e6c40734fb7448ccb6ab46631ad151765c3bd4829b2151027d748c593fd97ac5cba63c631c4fc8f7de632b1e8c633d80e20e53fea2a0744f8dc
+EBUILD xmr-stak-2.10.0.ebuild 1887 BLAKE2B 7201b3135446ebe64b22fd6cb88402aa1d8d898e5c67cddb7b22398b50aed25c2f8dcf3e1c3f6e95b8e8a09275847355324391df2b31f55a517b86c05773ae08 SHA512 0266f6bc24791060ff5b5c80e3b0b4e899b9a9880118472576782e1c212952d745c4494d118c77c630b0d44e0a4e838d16bdcf84a46e5ee06fc50084b338d5c7
+EBUILD xmr-stak-2.10.1.ebuild 1887 BLAKE2B 7201b3135446ebe64b22fd6cb88402aa1d8d898e5c67cddb7b22398b50aed25c2f8dcf3e1c3f6e95b8e8a09275847355324391df2b31f55a517b86c05773ae08 SHA512 0266f6bc24791060ff5b5c80e3b0b4e899b9a9880118472576782e1c212952d745c4494d118c77c630b0d44e0a4e838d16bdcf84a46e5ee06fc50084b338d5c7
+EBUILD xmr-stak-2.10.2.ebuild 1887 BLAKE2B 7201b3135446ebe64b22fd6cb88402aa1d8d898e5c67cddb7b22398b50aed25c2f8dcf3e1c3f6e95b8e8a09275847355324391df2b31f55a517b86c05773ae08 SHA512 0266f6bc24791060ff5b5c80e3b0b4e899b9a9880118472576782e1c212952d745c4494d118c77c630b0d44e0a4e838d16bdcf84a46e5ee06fc50084b338d5c7
 EBUILD xmr-stak-2.7.0.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-2.7.1.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-2.8.0.ebuild 1887 BLAKE2B 7201b3135446ebe64b22fd6cb88402aa1d8d898e5c67cddb7b22398b50aed25c2f8dcf3e1c3f6e95b8e8a09275847355324391df2b31f55a517b86c05773ae08 SHA512 0266f6bc24791060ff5b5c80e3b0b4e899b9a9880118472576782e1c212952d745c4494d118c77c630b0d44e0a4e838d16bdcf84a46e5ee06fc50084b338d5c7
 EBUILD xmr-stak-2.8.2.ebuild 1887 BLAKE2B 7201b3135446ebe64b22fd6cb88402aa1d8d898e5c67cddb7b22398b50aed25c2f8dcf3e1c3f6e95b8e8a09275847355324391df2b31f55a517b86c05773ae08 SHA512 0266f6bc24791060ff5b5c80e3b0b4e899b9a9880118472576782e1c212952d745c4494d118c77c630b0d44e0a4e838d16bdcf84a46e5ee06fc50084b338d5c7
 EBUILD xmr-stak-2.8.3.ebuild 1887 BLAKE2B 7201b3135446ebe64b22fd6cb88402aa1d8d898e5c67cddb7b22398b50aed25c2f8dcf3e1c3f6e95b8e8a09275847355324391df2b31f55a517b86c05773ae08 SHA512 0266f6bc24791060ff5b5c80e3b0b4e899b9a9880118472576782e1c212952d745c4494d118c77c630b0d44e0a4e838d16bdcf84a46e5ee06fc50084b338d5c7
+EBUILD xmr-stak-2.9.0.ebuild 1887 BLAKE2B 7201b3135446ebe64b22fd6cb88402aa1d8d898e5c67cddb7b22398b50aed25c2f8dcf3e1c3f6e95b8e8a09275847355324391df2b31f55a517b86c05773ae08 SHA512 0266f6bc24791060ff5b5c80e3b0b4e899b9a9880118472576782e1c212952d745c4494d118c77c630b0d44e0a4e838d16bdcf84a46e5ee06fc50084b338d5c7
 EBUILD xmr-stak-9999.ebuild 1890 BLAKE2B 15f6c550c1f5a6ed2f9911972ff3c500ec9cd6292e1362b4b0b06aff52f681117fa176bcd8f65351c11901d1492d7dd617ca151a064e888bf874e7450f449ff2 SHA512 bf26e77719e5ac167555cd1efbb8e0d1ab7bf67c78d6f937a1cef9ca8ab8fc8555bf81adc2a65b9de39c77c0553ea70d0da947ced88e1cef046a38cd355e3c6c
 MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild
new file mode 100644
index 000000000000..3244143bb5fe
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:0= )
+	webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use devfee; then
+		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCUDA_ENABLE=$(usex cuda)
+		-DHWLOC_ENABLE=$(usex hwloc)
+		-DMICROHTTPD_ENABLE=$(usex webserver)
+		-DOpenCL_ENABLE=$(usex opencl)
+		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+	doinitd "${FILESDIR}"/${PN}
+	dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+		ewarn "To use xmr-stack:"
+		if use cuda || use opencl; then
+			ewarn "As root or as a user that is a member of the 'video' group,"
+		fi
+		ewarn "run:"
+		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt"
+		ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+	fi
+}
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild
new file mode 100644
index 000000000000..3244143bb5fe
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:0= )
+	webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use devfee; then
+		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCUDA_ENABLE=$(usex cuda)
+		-DHWLOC_ENABLE=$(usex hwloc)
+		-DMICROHTTPD_ENABLE=$(usex webserver)
+		-DOpenCL_ENABLE=$(usex opencl)
+		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+	doinitd "${FILESDIR}"/${PN}
+	dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+		ewarn "To use xmr-stack:"
+		if use cuda || use opencl; then
+			ewarn "As root or as a user that is a member of the 'video' group,"
+		fi
+		ewarn "run:"
+		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt"
+		ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+	fi
+}
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild
new file mode 100644
index 000000000000..3244143bb5fe
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:0= )
+	webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use devfee; then
+		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCUDA_ENABLE=$(usex cuda)
+		-DHWLOC_ENABLE=$(usex hwloc)
+		-DMICROHTTPD_ENABLE=$(usex webserver)
+		-DOpenCL_ENABLE=$(usex opencl)
+		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+	doinitd "${FILESDIR}"/${PN}
+	dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+		ewarn "To use xmr-stack:"
+		if use cuda || use opencl; then
+			ewarn "As root or as a user that is a member of the 'video' group,"
+		fi
+		ewarn "run:"
+		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt"
+		ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+	fi
+}
diff --git a/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild
new file mode 100644
index 000000000000..3244143bb5fe
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:0= )
+	webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use devfee; then
+		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCUDA_ENABLE=$(usex cuda)
+		-DHWLOC_ENABLE=$(usex hwloc)
+		-DMICROHTTPD_ENABLE=$(usex webserver)
+		-DOpenCL_ENABLE=$(usex opencl)
+		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+	doinitd "${FILESDIR}"/${PN}
+	dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+		ewarn "To use xmr-stack:"
+		if use cuda || use opencl; then
+			ewarn "As root or as a user that is a member of the 'video' group,"
+		fi
+		ewarn "run:"
+		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt"
+		ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+	fi
+}