commit: 3159d8e5f612ca0f75710b54eb2dbd13676538d2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun Apr 7 13:55:23 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Apr 9 07:06:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3159d8e5
dev-java/gson: slotmove 2.6 -> 0 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36150/commits/889e2369240e74a0f115a16abaaf82d03c634448 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../{sleuthkit-4.11.1-r1.ebuild => sleuthkit-4.11.1-r2.ebuild} | 4 ++-- .../{sleuthkit-4.12.1.ebuild => sleuthkit-4.12.1-r1.ebuild} | 4 ++-- dev-java/gson/gson-2.10.2_pre20231128.ebuild | 2 +- .../{reflections-0.9.12-r5.ebuild => reflections-0.9.12-r6.ebuild} | 6 +++--- .../tuprolog/{tuprolog-3.2.0-r1.ebuild => tuprolog-3.2.0-r2.ebuild} | 4 ++-- profiles/updates/2Q-2024 | 1 + 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app-forensics/sleuthkit/sleuthkit-4.11.1-r1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.11.1-r2.ebuild similarity index 99% rename from app-forensics/sleuthkit/sleuthkit-4.11.1-r1.ebuild rename to app-forensics/sleuthkit/sleuthkit-4.11.1-r2.ebuild index c2c595846cbe..4d0ad720368c 100644 --- a/app-forensics/sleuthkit/sleuthkit-4.11.1-r1.ebuild +++ b/app-forensics/sleuthkit/sleuthkit-4.11.1-r2.ebuild @@ -35,7 +35,7 @@ DEPEND=" >=dev-java/c3p0-0.9.5:0 dev-java/commons-lang:3.6 >=dev-java/commons-validator-1.6:0 - >=dev-java/gson-2.8.5:2.6 + >=dev-java/gson-2.8.5:0 dev-java/guava:0 >=dev-java/jdbc-postgresql-9.4:0 >=dev-java/joda-time-2.4:0 @@ -244,7 +244,7 @@ src_compile() { java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0 java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6 java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-validator - java-pkg_jar-from --into "${TSK_JAR_DIR}" gson:2.6 + java-pkg_jar-from --into "${TSK_JAR_DIR}" gson java-pkg_jar-from --into "${TSK_JAR_DIR}" guava java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time diff --git a/app-forensics/sleuthkit/sleuthkit-4.12.1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild similarity index 99% rename from app-forensics/sleuthkit/sleuthkit-4.12.1.ebuild rename to app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild index 867afbdccfcb..3322803dbb6f 100644 --- a/app-forensics/sleuthkit/sleuthkit-4.12.1.ebuild +++ b/app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild @@ -36,7 +36,7 @@ DEPEND=" >=dev-java/c3p0-0.9.5.5:0 dev-java/commons-lang:3.6 >=dev-java/commons-validator-1.6:0 - >=dev-java/gson-2.8.5:2.6 + >=dev-java/gson-2.8.5:0 dev-java/guava:0 >=dev-java/jdbc-postgresql-9.4:0 >=dev-java/joda-time-2.4:0 @@ -257,7 +257,7 @@ src_compile() { java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0 java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6 java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-validator - java-pkg_jar-from --into "${TSK_JAR_DIR}" gson:2.6 + java-pkg_jar-from --into "${TSK_JAR_DIR}" gson java-pkg_jar-from --into "${TSK_JAR_DIR}" guava java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time diff --git a/dev-java/gson/gson-2.10.2_pre20231128.ebuild b/dev-java/gson/gson-2.10.2_pre20231128.ebuild index a8894239bea7..4247c08c2190 100644 --- a/dev-java/gson/gson-2.10.2_pre20231128.ebuild +++ b/dev-java/gson/gson-2.10.2_pre20231128.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/google/gson/archive/${MY_COMMIT}.tar.gz -> ${P}.tar. S="${WORKDIR}/gson-${MY_COMMIT}/gson" LICENSE="Apache-2.0" -SLOT="2.6" +SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" diff --git a/dev-java/reflections/reflections-0.9.12-r5.ebuild b/dev-java/reflections/reflections-0.9.12-r6.ebuild similarity index 96% rename from dev-java/reflections/reflections-0.9.12-r5.ebuild rename to dev-java/reflections/reflections-0.9.12-r6.ebuild index 4b2b9ab7668c..630e94c431ca 100644 --- a/dev-java/reflections/reflections-0.9.12-r5.ebuild +++ b/dev-java/reflections/reflections-0.9.12-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml -# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:2.6 +# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:0 # org.dom4j:dom4j:2.1.1 -> >=dev-java/dom4j-2.1.3:1 # org.javassist:javassist:3.26.0-GA -> !!!suitable-mavenVersion-not-found!!! # org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0 @@ -30,7 +30,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" dev-java/dom4j:1 - dev-java/gson:2.6 + dev-java/gson:0 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 diff --git a/dev-lang/tuprolog/tuprolog-3.2.0-r1.ebuild b/dev-lang/tuprolog/tuprolog-3.2.0-r2.ebuild similarity index 94% rename from dev-lang/tuprolog/tuprolog-3.2.0-r1.ebuild rename to dev-lang/tuprolog/tuprolog-3.2.0-r2.ebuild index e02c94400f8b..4f1069f34211 100644 --- a/dev-lang/tuprolog/tuprolog-3.2.0-r1.ebuild +++ b/dev-lang/tuprolog/tuprolog-3.2.0-r2.ebuild @@ -21,7 +21,7 @@ RESTRICT="!test? ( test )" RDEPEND="virtual/jdk:1.8 dev-java/javassist:3 dev-java/commons-lang:3.6 - dev-java/gson:2.6" + dev-java/gson:0" DEPEND="${RDEPEND} >=dev-java/ant-1.10.14 @@ -33,7 +33,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${P} -EANT_GENTOO_CLASSPATH="javassist:3,commons-lang:3.6,gson:2.6" +EANT_GENTOO_CLASSPATH="javassist:3,commons-lang:3.6,gson" PATCHES=( "${WORKDIR}/${PV}" ) diff --git a/profiles/updates/2Q-2024 b/profiles/updates/2Q-2024 index 2dd66dabca92..70d7cbf7b719 100644 --- a/profiles/updates/2Q-2024 +++ b/profiles/updates/2Q-2024 @@ -1,2 +1,3 @@ move dev-python/lazy_loader dev-python/lazy-loader slotmove dev-lang/clojure 1.11 0 +slotmove dev-java/gson 2.6 0
