From c68c71f4fc818cd57c501cd668e68a38ad82be7e Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 17 Jul 2024 09:11:33 +0200 Subject: [PATCH 1/7] dev-java/jdom: drop 1.1.3-r1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/934484 Signed-off-by: Volkmar W. Pogatzki Signed-off-by: Miroslav Šulc --- dev-java/jdom/jdom-1.1.3-r1.ebuild | 51 ------------------------------ 1 file changed, 51 deletions(-) delete mode 100644 dev-java/jdom/jdom-1.1.3-r1.ebuild diff --git a/dev-java/jdom/jdom-1.1.3-r1.ebuild b/dev-java/jdom/jdom-1.1.3-r1.ebuild deleted file mode 100644 index f176d2284a819..0000000000000 --- a/dev-java/jdom/jdom-1.1.3-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc examples source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java API to manipulate XML data" -SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz" -HOMEPAGE="http://www.jdom.org" - -LICENSE="JDOM" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -RDEPEND=">=virtual/jre-1.8:*" -DEPEND=">=virtual/jdk-1.8:*" - -S="${WORKDIR}/${PN}" - -src_prepare() { - default - java-pkg_clean - - rm -r build/apidocs || die - - rm -v src/java/org/jdom/xpath/JaxenXPath.java \ - || die "Unable to remove Jaxen Binding class." - - sed -i -e 's|${name}-${version.impl}|${name}|g' \ - -e 's||build.javadocs}" /> -->|' \ - "${S}"/build.xml || die - - if ! use doc; then - sed -i -e 's|depends="compile,javadoc"|depends="compile"|' \ - "${S}"/build.xml || die - fi -} - -EANT_BUILD_TARGET="package" - -src_install() { - java-pkg_dojar build/*.jar - dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt - use doc && java-pkg_dojavadoc build/apidocs - use examples && java-pkg_doexamples samples - use source && java-pkg_dosrc src/java/org -} From c1c52d2953b5b80fff19e9c06d50502a10e9eebc Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 17 Jul 2024 09:13:03 +0200 Subject: [PATCH 2/7] dev-java/xpp2: drop 2.1.10-r3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/934483 Signed-off-by: Volkmar W. Pogatzki Signed-off-by: Miroslav Šulc --- dev-java/xpp2/xpp2-2.1.10-r3.ebuild | 73 ----------------------------- 1 file changed, 73 deletions(-) delete mode 100644 dev-java/xpp2/xpp2-2.1.10-r3.ebuild diff --git a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild deleted file mode 100644 index c4b5aaa7a88b7..0000000000000 --- a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="pull-parser:pull-parser:2" - -inherit java-pkg-2 java-ant-2 - -MY_PN="PullParser" -MY_P="${MY_PN}${PV}" - -DESCRIPTION="A streaming pull XML parser used to quickly process input elements" -HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/" -SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz" - -LICENSE="Apache-1.1 IBM" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" - -# Some failures, partly because we haven't patched Xerces but probably -# also because this software is ancient. :( -RESTRICT="test" - -CDEPEND="dev-java/xerces:2" -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/junit:4 ) - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${P}-fix-java5+.patch" -) - -EANT_GENTOO_CLASSPATH="xerces-2" -EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true" -EANT_BUILD_TARGET="intf intf_jar impl x2impl" -EANT_DOC_TARGET="api" -EANT_TEST_TARGET="junit" - -src_prepare() { - default - - rm -r build/ lib/ || die - - # Our usual rewriting stomps over the existing classpath, which - # isn't helpful here. - sed -i -r \ - -e 's/\bclasspath="/\0${gentoo.classpath}:/g' \ - -e 's/\$\{java\.class\.path\}/${gentoo.classpath}/g' \ - build.xml || die -} - -src_install() { - local suffix - - for suffix in "" -intf -standard -x2; do - java-pkg_newjar build/lib/${MY_PN}${suffix}-${PV}.jar ${MY_PN}${suffix}.jar - done - - dodoc README.html - use doc && java-pkg_dojavadoc doc/api - use source && java-pkg_dosrc $(find src/java -name org -o -name javax) -} - -src_test() { - java-pkg-2_src_test -} From a9bd9e75393f5b8cbd95588bd655118bb1210e8e Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 17 Jul 2024 09:14:29 +0200 Subject: [PATCH 3/7] dev-java/jcalendar: drop 1.4-r1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Signed-off-by: Miroslav Šulc --- dev-java/jcalendar/jcalendar-1.4-r1.ebuild | 52 ---------------------- 1 file changed, 52 deletions(-) delete mode 100644 dev-java/jcalendar/jcalendar-1.4-r1.ebuild diff --git a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild b/dev-java/jcalendar/jcalendar-1.4-r1.ebuild deleted file mode 100644 index c0de4b6cfb3e7..0000000000000 --- a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java date chooser bean for graphically picking a date" -HOMEPAGE="https://www.toedter.com/en/jcalendar/" -SRC_URI="https://www.toedter.com/download/${P}.zip" - -LICENSE="LGPL-2.1" -SLOT="1.2" -KEYWORDS="amd64 x86" - -CDEPEND="dev-java/jgoodies-looks:2.6" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:*" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -RESTRICT="test" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="jgoodies-looks-2.6" -EANT_BUILD_XML="src/build.xml" -EANT_BUILD_TARGET="jar" -EANT_DOC_TARGET="" - -src_prepare() { - default - java-pkg_clean -} - -src_install() { - java-pkg_newjar lib/${P}.jar - - dodoc readme.txt - - use doc && java-pkg_dohtml -r doc/* - use source && java-pkg_dosrc src/com -} From 0e53a66dca08ee97028eac56d41783fb6b67d1a8 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 17 Jul 2024 09:16:54 +0200 Subject: [PATCH 4/7] dev-java/cpptasks: drop 1.0_beta5-r2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/852956 Closes: https://bugs.gentoo.org/852920 Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/37585 Signed-off-by: Miroslav Šulc --- .../cpptasks/cpptasks-1.0_beta5-r2.ebuild | 64 ------------------- 1 file changed, 64 deletions(-) delete mode 100644 dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild deleted file mode 100644 index 4908c223c0ceb..0000000000000 --- a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Ant-tasks to compile various source languages and produce executables" -HOMEPAGE="https://ant-contrib.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz" -S="${WORKDIR}/${P/_beta/b}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -CP_DEPEND=" - >=dev-java/ant-1.10.14:0 - dev-java/xerces:2 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} - test? ( - >=dev-java/ant-1.10.14:0[junit] - dev-java/junit:0 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS="javac javadoc" - -EANT_BUILD_TARGET="jars" -EANT_TEST_TARGET="run-tests -Djunit-available=true" -EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api" - -src_prepare() { - java-pkg_clean - use test && eapply "${FILESDIR}/${P}-test-classpath.patch" - java-pkg-2_src_prepare -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar target/lib/${PN}.jar - - java-pkg_register-ant-task - - dodoc NOTICE - use doc && java-pkg_dojavadoc build/api - use examples && java-pkg_doexamples src/samples/* - use source && java-pkg_dosrc src/main/java/* -} From 9bd74bd161b14afd2f1a5dd924968d84c8cb0587 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Wed, 17 Jul 2024 12:50:09 +0300 Subject: [PATCH 5/7] sys-fs/btrfs-progs: Stabilize 6.9.2 arm, #936190 Signed-off-by: Arthur Zamarin --- sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild index 699be8c16ad37..0fe0ac94b99c9 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild @@ -26,7 +26,7 @@ else S="${WORKDIR}"/${PN}-${MY_PV} if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi fi From fbaa5fb3467185426bf7f1a80c15a382a80ffb75 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Wed, 17 Jul 2024 12:50:10 +0300 Subject: [PATCH 6/7] app-office/calcurse: Stabilize 4.8.1-r1 ppc64, #936199 Signed-off-by: Arthur Zamarin --- app-office/calcurse/calcurse-4.8.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-office/calcurse/calcurse-4.8.1-r1.ebuild b/app-office/calcurse/calcurse-4.8.1-r1.ebuild index 0b35c3f066f28..9d5aef2e1653d 100644 --- a/app-office/calcurse/calcurse-4.8.1-r1.ebuild +++ b/app-office/calcurse/calcurse-4.8.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://calcurse.org/files/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc ppc64 x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" IUSE="caldav doc" From 56a1c31360b4adfe32e461f192e3b1b9c71b8360 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Wed, 17 Jul 2024 12:50:11 +0300 Subject: [PATCH 7/7] app-office/calcurse: Stabilize 4.8.1-r1 ppc, #936199 Signed-off-by: Arthur Zamarin --- app-office/calcurse/calcurse-4.8.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-office/calcurse/calcurse-4.8.1-r1.ebuild b/app-office/calcurse/calcurse-4.8.1-r1.ebuild index 9d5aef2e1653d..632595c7f0b22 100644 --- a/app-office/calcurse/calcurse-4.8.1-r1.ebuild +++ b/app-office/calcurse/calcurse-4.8.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://calcurse.org/files/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ppc64 x86" +KEYWORDS="~amd64 ~arm64 ppc ppc64 x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" IUSE="caldav doc"