diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 45bc6b1..b0afcf9 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1 +1 @@
-DIST slf4j-1.7.26.tar.gz 3403983 BLAKE2B 0400367412c19eb1b37cdb31d87836d950971ad0d28a9b3800fc5d7d947cdb8de5eb2e87417e166b0e76f3b44669ae4583273995c6dbd29ea898a76c8370faa0 SHA512 a033aca563914d3a718dfad2b47c20cb84e734c2450c75d0c4cb42438ac2c2f993b9cae44eaab91d1f9daba925162bf5c7601926c7564737d45442a0ed52829c
+DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
diff --git a/dev-java/slf4j-api/files/1.7.26-build.xml b/dev-java/slf4j-api/files/1.7.30-build.xml
similarity index 99%
rename from dev-java/slf4j-api/files/1.7.26-build.xml
rename to dev-java/slf4j-api/files/1.7.30-build.xml
index e955e62..69989f1 100644
--- a/dev-java/slf4j-api/files/1.7.26-build.xml
+++ b/dev-java/slf4j-api/files/1.7.30-build.xml
@@ -13,7 +13,7 @@
   <property file="${user.home}/.m2/maven.properties"/>
   <property file="maven-build.properties"/>
 
-  <property name="maven.build.finalName" value="slf4j-api-1.7.26"/>
+  <property name="maven.build.finalName" value="slf4j-api-1.7.30"/>
   <property name="maven.build.dir" value="target"/>
   <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
   <property name="maven.build.srcDir.0" value="src/main/java"/>
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.26.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30.ebuild
similarity index 80%
rename from dev-java/slf4j-api/slf4j-api-1.7.26.ebuild
rename to dev-java/slf4j-api/slf4j-api-1.7.30.ebuild
index edada0b..454a67c 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.26.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.30.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Simple Logging Facade for Java"
 HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-api/}.tar.gz"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> ${P/-api/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.8"
 DEPEND=">=virtual/jdk-1.8
@@ -23,7 +24,7 @@ DEPEND=">=virtual/jdk-1.8
 		dev-java/ant-junit:0
 	)"
 
-S="${WORKDIR}/${P/-api/}/${PN}"
+S="${WORKDIR}/${PN/-api/}-v_${PV}/${PN}"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_TEST_GENTOO_CLASSPATH="junit-4"
@@ -32,7 +33,6 @@ EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 
 src_prepare() {
 	cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die
-	find "${WORKDIR}" -iname '*.jar' -delete || die
 	java-pkg-2_src_prepare
 }
 
diff --git a/dev-java/slf4j-ext/Manifest b/dev-java/slf4j-ext/Manifest
index 45bc6b1..b0afcf9 100644
--- a/dev-java/slf4j-ext/Manifest
+++ b/dev-java/slf4j-ext/Manifest
@@ -1 +1 @@
-DIST slf4j-1.7.26.tar.gz 3403983 BLAKE2B 0400367412c19eb1b37cdb31d87836d950971ad0d28a9b3800fc5d7d947cdb8de5eb2e87417e166b0e76f3b44669ae4583273995c6dbd29ea898a76c8370faa0 SHA512 a033aca563914d3a718dfad2b47c20cb84e734c2450c75d0c4cb42438ac2c2f993b9cae44eaab91d1f9daba925162bf5c7601926c7564737d45442a0ed52829c
+DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
diff --git a/dev-java/slf4j-ext/files/1.7.26-build.xml b/dev-java/slf4j-ext/files/1.7.30-build.xml
similarity index 98%
rename from dev-java/slf4j-ext/files/1.7.26-build.xml
rename to dev-java/slf4j-ext/files/1.7.30-build.xml
index a703961..de7b0b7 100644
--- a/dev-java/slf4j-ext/files/1.7.26-build.xml
+++ b/dev-java/slf4j-ext/files/1.7.30-build.xml
@@ -9,7 +9,7 @@
   <property file="${user.home}/.m2/maven.properties"/>
   <property file="maven-build.properties"/>
 
-  <property name="maven.build.finalName" value="slf4j-ext-1.7.26"/>
+  <property name="maven.build.finalName" value="slf4j-ext-1.7.30"/>
   <property name="maven.build.dir" value="target"/>
   <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
   <property name="maven.build.srcDir.0" value="src/main/java"/>
@@ -29,14 +29,14 @@
   <!-- ====================================================================== -->
 
   <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
     <pathelement location="${maven.repo.local}/ch/qos/cal10n/cal10n-api/0.8.1/cal10n-api-0.8.1.jar"/>
     <pathelement location="${maven.repo.local}/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
     <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
   </path>
   <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.26/slf4j-log4j12-1.7.26.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-log4j12/1.7.30/slf4j-log4j12-1.7.30.jar"/>
     <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
     <pathelement location="${maven.repo.local}/ch/qos/cal10n/cal10n-api/0.8.1/cal10n-api-0.8.1.jar"/>
     <pathelement location="${maven.repo.local}/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.26.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.30.ebuild
similarity index 85%
rename from dev-java/slf4j-ext/slf4j-ext-1.7.26.ebuild
rename to dev-java/slf4j-ext/slf4j-ext-1.7.30.ebuild
index adcec06..b61f0e9 100644
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.26.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.30.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Simple Logging Facade for Java"
 HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> ${P/-ext/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -26,7 +25,7 @@ DEPEND=">=virtual/jdk-1.8
 	app-arch/unzip
 	${COMMON_DEP}"
 
-S="${WORKDIR}/${P/-ext/}/${PN}"
+S="${WORKDIR}/${PN/-ext/}-v_${PV}/${PN}"
 
 RESTRICT="test" # causes loop with log4j:2
 
@@ -38,7 +37,6 @@ EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 
 src_prepare() {
 	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
-	find "${S}" -name "*.jar" -delete || die
 	java-pkg-2_src_prepare
 }
 
diff --git a/dev-java/slf4j-jdk14/Manifest b/dev-java/slf4j-jdk14/Manifest
index 45bc6b1..b0afcf9 100644
--- a/dev-java/slf4j-jdk14/Manifest
+++ b/dev-java/slf4j-jdk14/Manifest
@@ -1 +1 @@
-DIST slf4j-1.7.26.tar.gz 3403983 BLAKE2B 0400367412c19eb1b37cdb31d87836d950971ad0d28a9b3800fc5d7d947cdb8de5eb2e87417e166b0e76f3b44669ae4583273995c6dbd29ea898a76c8370faa0 SHA512 a033aca563914d3a718dfad2b47c20cb84e734c2450c75d0c4cb42438ac2c2f993b9cae44eaab91d1f9daba925162bf5c7601926c7564737d45442a0ed52829c
+DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
diff --git a/dev-java/slf4j-jdk14/files/1.7.26-build.xml b/dev-java/slf4j-jdk14/files/1.7.30-build.xml
similarity index 98%
rename from dev-java/slf4j-jdk14/files/1.7.26-build.xml
rename to dev-java/slf4j-jdk14/files/1.7.30-build.xml
index 1b83607..9eaf832 100644
--- a/dev-java/slf4j-jdk14/files/1.7.26-build.xml
+++ b/dev-java/slf4j-jdk14/files/1.7.30-build.xml
@@ -9,7 +9,7 @@
   <property file="${user.home}/.m2/maven.properties"/>
   <property file="maven-build.properties"/>
 
-  <property name="maven.build.finalName" value="slf4j-jdk14-1.7.26"/>
+  <property name="maven.build.finalName" value="slf4j-jdk14-1.7.30"/>
   <property name="maven.build.dir" value="target"/>
   <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
   <property name="maven.build.srcDir.0" value="src/main/java"/>
@@ -29,11 +29,11 @@
   <!-- ====================================================================== -->
 
   <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
   </path>
   <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-tests.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-tests.jar"/>
     <pathelement location="${maven.repo.local}/junit/junit/4.12/junit-4.12.jar"/>
     <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
   </path>
diff --git a/dev-java/slf4j-jdk14/slf4j-jdk14-1.7.26.ebuild b/dev-java/slf4j-jdk14/slf4j-jdk14-1.7.30.ebuild
similarity index 81%
rename from dev-java/slf4j-jdk14/slf4j-jdk14-1.7.26.ebuild
rename to dev-java/slf4j-jdk14/slf4j-jdk14-1.7.30.ebuild
index 273fa37..f5996cd 100644
--- a/dev-java/slf4j-jdk14/slf4j-jdk14-1.7.26.ebuild
+++ b/dev-java/slf4j-jdk14/slf4j-jdk14-1.7.30.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Simple Logging Facade for Java"
 HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-jdk14/}.tar.gz"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> ${P/-jdk14/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -22,7 +21,7 @@ DEPEND=">=virtual/jdk-1.8
 	app-arch/unzip
 	dev-java/slf4j-api:0"
 
-S="${WORKDIR}/${P/-jdk14/}/${PN}"
+S="${WORKDIR}/${PN/-jdk14/}-v_${PV}/${PN}"
 
 RESTRICT="test"
 
@@ -32,7 +31,6 @@ EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 
 src_prepare() {
 	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
-	find "${S}" -name "*.jar" -delete || die
 	java-pkg-2_src_prepare
 }
 
diff --git a/dev-java/slf4j-log4j12/Manifest b/dev-java/slf4j-log4j12/Manifest
index 45bc6b1..b0afcf9 100644
--- a/dev-java/slf4j-log4j12/Manifest
+++ b/dev-java/slf4j-log4j12/Manifest
@@ -1 +1 @@
-DIST slf4j-1.7.26.tar.gz 3403983 BLAKE2B 0400367412c19eb1b37cdb31d87836d950971ad0d28a9b3800fc5d7d947cdb8de5eb2e87417e166b0e76f3b44669ae4583273995c6dbd29ea898a76c8370faa0 SHA512 a033aca563914d3a718dfad2b47c20cb84e734c2450c75d0c4cb42438ac2c2f993b9cae44eaab91d1f9daba925162bf5c7601926c7564737d45442a0ed52829c
+DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
diff --git a/dev-java/slf4j-log4j12/files/1.7.26-build.xml b/dev-java/slf4j-log4j12/files/1.7.30-build.xml
similarity index 98%
rename from dev-java/slf4j-log4j12/files/1.7.26-build.xml
rename to dev-java/slf4j-log4j12/files/1.7.30-build.xml
index ddbbc18..3724a68 100644
--- a/dev-java/slf4j-log4j12/files/1.7.26-build.xml
+++ b/dev-java/slf4j-log4j12/files/1.7.30-build.xml
@@ -9,7 +9,7 @@
   <property file="${user.home}/.m2/maven.properties"/>
   <property file="maven-build.properties"/>
 
-  <property name="maven.build.finalName" value="slf4j-log4j12-1.7.26"/>
+  <property name="maven.build.finalName" value="slf4j-log4j12-1.7.30"/>
   <property name="maven.build.dir" value="target"/>
   <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
   <property name="maven.build.srcDir.0" value="src/main/java"/>
@@ -29,13 +29,13 @@
   <!-- ====================================================================== -->
 
   <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
     <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
   </path>
   <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
     <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-tests.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-tests.jar"/>
     <pathelement location="${maven.repo.local}/junit/junit/4.12/junit-4.12.jar"/>
     <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
   </path>
diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.26.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild
similarity index 82%
rename from dev-java/slf4j-log4j12/slf4j-log4j12-1.7.26.ebuild
rename to dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild
index 7868c03..a8845ff 100644
--- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.26.ebuild
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Simple Logging Facade for Java (SLF4J) log4j bindings"
 HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-log4j12/}.tar.gz"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> ${P/-log4j12/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-java/log4j:0
@@ -29,7 +30,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-java/ant-junit4:0
 	)"
 
-S=${WORKDIR}/${P/-log4j12/}/${PN}
+S="${WORKDIR}/${PN/-log4j12/}-v_${PV}/${PN}"
 
 EANT_GENTOO_CLASSPATH="log4j,slf4j-api"
 EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
@@ -38,7 +39,6 @@ EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 
 src_prepare() {
 	cp "${FILESDIR}"/${PV}-build.xml build.xml || die
-	find "${S}" -iname '*.jar' -delete || die
 	java-pkg-2_src_prepare
 }
 
diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index 45bc6b1..b0afcf9 100644
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/Manifest
@@ -1 +1 @@
-DIST slf4j-1.7.26.tar.gz 3403983 BLAKE2B 0400367412c19eb1b37cdb31d87836d950971ad0d28a9b3800fc5d7d947cdb8de5eb2e87417e166b0e76f3b44669ae4583273995c6dbd29ea898a76c8370faa0 SHA512 a033aca563914d3a718dfad2b47c20cb84e734c2450c75d0c4cb42438ac2c2f993b9cae44eaab91d1f9daba925162bf5c7601926c7564737d45442a0ed52829c
+DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
diff --git a/dev-java/slf4j-nop/files/1.7.26-build.xml b/dev-java/slf4j-nop/files/1.7.30-build.xml
similarity index 98%
rename from dev-java/slf4j-nop/files/1.7.26-build.xml
rename to dev-java/slf4j-nop/files/1.7.30-build.xml
index e2233f1..f3e284d 100644
--- a/dev-java/slf4j-nop/files/1.7.26-build.xml
+++ b/dev-java/slf4j-nop/files/1.7.30-build.xml
@@ -9,7 +9,7 @@
   <property file="${user.home}/.m2/maven.properties"/>
   <property file="maven-build.properties"/>
 
-  <property name="maven.build.finalName" value="slf4j-nop-1.7.26"/>
+  <property name="maven.build.finalName" value="slf4j-nop-1.7.30"/>
   <property name="maven.build.dir" value="target"/>
   <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
   <property name="maven.build.srcDir.0" value="src/main/java"/>
@@ -29,10 +29,10 @@
   <!-- ====================================================================== -->
 
   <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
   </path>
   <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
     <pathelement location="${maven.repo.local}/junit/junit/4.12/junit-4.12.jar"/>
     <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
   </path>
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.26.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
similarity index 84%
rename from dev-java/slf4j-nop/slf4j-nop-1.7.26.ebuild
rename to dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
index 3cb0907..25debe9 100644
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.26.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Simple Logging Facade for Java"
 HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-nop/}.tar.gz"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> ${P/-nop/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,7 +26,7 @@ DEPEND=">=virtual/jdk-1.8
 	)
 	${CDEPEND}"
 
-S="${WORKDIR}/${P/-nop/}/${PN}"
+S="${WORKDIR}/${PN/-nop/}-v_${PV}/${PN}"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_GENTOO_CLASSPATH="slf4j-api"
@@ -37,7 +36,6 @@ EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 
 src_prepare() {
 	cp -v "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-	find "${S}" -name "*.jar" -delete || die
 	java-pkg-2_src_prepare
 }
 
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
index 45bc6b1..b0afcf9 100644
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@@ -1 +1 @@
-DIST slf4j-1.7.26.tar.gz 3403983 BLAKE2B 0400367412c19eb1b37cdb31d87836d950971ad0d28a9b3800fc5d7d947cdb8de5eb2e87417e166b0e76f3b44669ae4583273995c6dbd29ea898a76c8370faa0 SHA512 a033aca563914d3a718dfad2b47c20cb84e734c2450c75d0c4cb42438ac2c2f993b9cae44eaab91d1f9daba925162bf5c7601926c7564737d45442a0ed52829c
+DIST slf4j-1.7.30.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
diff --git a/dev-java/slf4j-simple/files/1.7.26-build.xml b/dev-java/slf4j-simple/files/1.7.30-build.xml
similarity index 98%
rename from dev-java/slf4j-simple/files/1.7.26-build.xml
rename to dev-java/slf4j-simple/files/1.7.30-build.xml
index 6839f18..dc2d4dc 100644
--- a/dev-java/slf4j-simple/files/1.7.26-build.xml
+++ b/dev-java/slf4j-simple/files/1.7.30-build.xml
@@ -9,7 +9,7 @@
   <property file="${user.home}/.m2/maven.properties"/>
   <property file="maven-build.properties"/>
 
-  <property name="maven.build.finalName" value="slf4j-simple-1.7.26"/>
+  <property name="maven.build.finalName" value="slf4j-simple-1.7.30"/>
   <property name="maven.build.dir" value="target"/>
   <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
   <property name="maven.build.srcDir.0" value="src/main/java"/>
@@ -29,11 +29,11 @@
   <!-- ====================================================================== -->
 
   <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
   </path>
   <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-tests.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-tests.jar"/>
     <pathelement location="${maven.repo.local}/junit/junit/4.12/junit-4.12.jar"/>
     <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
   </path>
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.26.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild
similarity index 82%
rename from dev-java/slf4j-simple/slf4j-simple-1.7.26.ebuild
rename to dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild
index 7da2890..8b6da56 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.26.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Simple Logging Facade for Java"
 HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> ${P/-simple/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-java/slf4j-api:0"
@@ -27,7 +27,7 @@ DEPEND=">=virtual/jdk-1.8
 		dev-java/ant-junit:0
 	)"
 
-S="${WORKDIR}/${P/-simple/}/${PN}"
+S="${WORKDIR}/${PN/-simple/}-v_${PV}/${PN}"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_GENTOO_CLASSPATH="slf4j-api"
@@ -37,7 +37,6 @@ EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 
 src_prepare() {
 	cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die
-	find "${S}" -name "*.jar" -delete || die
 	java-pkg-2_src_prepare
 }