Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-10-15 07:49:11 +00:00
13 changed files with 279 additions and 244 deletions
-2
View File
@@ -1,5 +1,3 @@
DIST commons-io-2.15.1-src.tar.gz 618534 BLAKE2B 6fc539f28ce610e9947bf529154c79f6924d74872d6f03561d477feba6013e48d74cb5097c851173b690b27052d59c38a9ca4048c1ed54736d29d962746182d6 SHA512 809c7aa66354f2e35fd23f295c4e2f325596ee7f842b7f63f6acc3bd9377c17d4dd276ce62c477fff8d51d0d660e9addbc068270a876097cbecfe3e64f57f385
DIST commons-io-2.15.1-src.tar.gz.asc 488 BLAKE2B 5fb3128a63d2fbc74cd96bf00919cca0fbf7b0a2cbd48287c8495c0fdb78c9df53dcc06a443b626b52ff3f9c32c55425ba619a4f61de542f3dd912916f3b2469 SHA512 1d358d3acd88816fb4d95746d8e4bd4351062cf35caad8c6f4d2da42c7974a4a583db4f7d98d8768ca7fcb4900172b869c6d6f714b8df71bb214634f83c7a55a
DIST commons-io-2.16.1-src.tar.gz 634766 BLAKE2B 5bdc09ec07666ae513944040aae730a8bd5fe4fe65f05aa1f8295b6687f99c588ac4071113b5fa3bdc8f2e4fe0d8b40677c3afba18f332e283f28b5270d5f41c SHA512 07298e3af85726f2ec07a660fbb743f82cd88f8043a57e2e1063b758c81429dfafd77a024e2cdd48efe5d403299c20e898f5b3dd729f52bd55b8a6fb50c9a13a
DIST commons-io-2.16.1-src.tar.gz.asc 488 BLAKE2B e42af1fe9cbb50371c981737e7899b30d99b8e7045485562614a72307068942b433614e4a1c3cdb17261917a1a5382c5828e290e50f3f3a12a3ed297be53cace SHA512 74e22fd7bf5daf58611537f6c21bd41e10942e3051785e13d771e5fd50e5403144a8d2ed9472de13263da5cbf579911a1aafaa7e43dea9f99fe6ad4011ecb74a
DIST commons-io-2.17.0-src.tar.gz 652908 BLAKE2B c87f10584d7933215aa24e8bde1037eced0738098149e9423371a1fef0255e36e38a6c92cdafd75eecbf56d13c4c38d479fe2706afc86224900fcaf7cae5e5f5 SHA512 5681b7bab9e34e9051e4f7a48925ecdf5d8814894c2626298dfca7aa0566c2dc46c15843850e3e14a3e05613ae9ef9fd08077042931e2fe552057f9c1bee6b69
@@ -1,30 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# No tests, #839681
JAVA_PKG_IUSE="doc source"
MAVEN_ID="commons-io:commons-io:${PV}"
inherit java-pkg-2 java-pkg-simple verify-sig
DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
HOMEPAGE="https://commons.apache.org/proper/commons-io/"
SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz
verify-sig? ( https://archive.apache.org/dist/commons/io/source/${P}-src.tar.gz.asc )"
S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
RESTRICT="test" #839681
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.io"
JAVA_ENCODING="iso-8859-1"
JAVA_SRC_DIR="src/main/java"
+2
View File
@@ -1,2 +1,4 @@
DIST xz-java-1.10.zip 179204 BLAKE2B ffe19ed1de7370879bb5c3c3f777e367fff9868c5113a2920c02409e7ab7a325cd03d30ddd2bcc95e1509d2f38723e51eaf21b4aa767792e7a3c9850cd658e36 SHA512 be293545b9510906334ecbc092834599b36abe7498836ab111726a195fd4fc8731d2cb57109b51ac0de7d14da8b59fea7a48aaa2f5c61075b4b16c0e1d4f5579
DIST xz-java-1.10.zip.sig 566 BLAKE2B 4a0e146f9a8ccffbf62d775b6d7c647611464fbf23fe0f0d9fa0f768487c642c1a9277b820af9ebdaeb9cefb3f5bf399a226000622838c81c02747b31158441b SHA512 e9bfe7eb28a6f9d8f7eb4c7620fc1598fe70c08a03fd2bfc5a1183110b0f8539704921f6224de352080cb3b6affb33163fd739503f4e8f279e06533445ebe8a6
DIST xz-java-1.9.zip 155868 BLAKE2B e1e355e75b3d14cae9a12dd00105ff38e25ab9c270cecafc83f27a7a03b36aa7a33647b40b7458b3592319a2b574e10cef9786413f0a12af585199a8f00731de SHA512 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb
DIST xz-java-1.9.zip.sig 566 BLAKE2B 9702fa3021c4274aacc74ef84903429ed5301eac11cae6bf79014a5bad590c51b169c35f64add85c964cb815129acf920a014e5601acfcd075147f5fb8e9df1e SHA512 5f511260da0f5a9338106ac56511b7a105996852103a3f40cc4a44a7e4e03dc39a645bb0a57ae99bcde8267d5a2d514a7c956a8bfe226c0472e1fa3c7d28e3d5
+58
View File
@@ -0,0 +1,58 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc examples source"
MAVEN_ID="org.tukaani:xz:1.10"
inherit java-pkg-2 java-pkg-simple verify-sig
DESCRIPTION="Implementation of xz data compression in pure java"
HOMEPAGE="https://tukaani.org/xz/java.html"
SRC_URI="https://tukaani.org/xz/${P}.zip
verify-sig? ( https://tukaani.org/xz/${P}.zip.sig )"
S="${WORKDIR}"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
BDEPEND="
app-arch/unzip
verify-sig? ( sec-keys/openpgp-keys-lassecollin )
"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lassecollin.asc"
JAVA_SRC_DIR="src"
DOCS=( {AUTHORS,NEWS,README,THANKS}.md )
src_compile() {
local JAVA_MODULE_NAME="org.tukaani.xz"
JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar"
java-pkg-simple_src_compile # creates a legacy jar file without module-info
# compile module-info.java
ejavac \
-source 9 -target 9 \
--patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \
-d target/versions/9 \
-sourcepath src9 \
$(find src9 -type f -name '*.java')
# package
JAVA_JAR_FILENAME="${PN}.jar"
jar cvf "${JAVA_JAR_FILENAME}" \
-C target/classes . \
--release 9 -C target/versions/9 . || die
}
src_install() {
java-pkg-simple_src_install
use examples && java-pkg_doexamples src/*Demo.java
}
-1
View File
@@ -1,3 +1,2 @@
DIST Ardour-8.6.0.tar.bz2 17588463 BLAKE2B e8d3b603fecaf453eae9e0c2cac531a5c2d35850b282d27c25dbd22a930a6537fbbff3f1fa58f4dcc525dcc65ef8343172642d16ad473c8b80b0e373364a06cb SHA512 c4a3b6369fe1a1789ba2b5cbcfd23b6ac6b93f819b016aac2c071f1135e32826ca4f5bb99d4c3e4e1d8f91f82719ae17bcf2991eb29072c14e60f282545f934a
DIST Ardour-8.7.0.tar.bz2 17807972 BLAKE2B 9bbe4ed5c3ad62d643518881a45b71642f5ce41c8620eb4c82befcb9df1053b08b60d3683961d78825f99e3a74222404c511073491972f138edaaaea445c6961 SHA512 cd2cdc1360b01d23cd3df62ee949ecab9d5d8da5112636438c2ef8a88d188503bcd7f09f2a5d8e07460dacbc35cecd96e8edbc748adccc50b5a90375f2f742d0
DIST Ardour-8.9.0.tar.bz2 17811448 BLAKE2B ca38836a9e38c62e18c64fcdf78d1faab0622a0b8bf220edee74625390e1fc8a61479983c2edf055594c66652c830073c00b3bef5f921c9540633f0d2db97744 SHA512 b67a053c1e1d2f42fa32eaaee7b0841f13074cf877716d192c563d25cba9527e0719a3dbb310442d27119df809aa37321909bc0c3be53a1fbaeae0b74ac47af7
-200
View File
@@ -1,200 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{9..13} )
PYTHON_REQ_USE='threads(+)'
PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
DESCRIPTION="Digital Audio Workstation"
HOMEPAGE="https://ardour.org/"
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
inherit git-r3
else
KEYWORDS="amd64 ~loong ~x86"
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
S="${WORKDIR}/Ardour-${PV}.0"
fi
LICENSE="GPL-2"
SLOT="8"
IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
RDEPEND="
dev-cpp/glibmm:2
dev-cpp/gtkmm:2.4
dev-libs/boost:=
dev-libs/glib:2
dev-libs/libsigc++:2
dev-libs/libxml2:2
media-libs/alsa-lib
media-libs/aubio
media-libs/flac:=
media-libs/freetype:2
media-libs/liblo
media-libs/liblrdf
media-libs/libsamplerate
media-libs/libsndfile
media-libs/libsoundtouch
media-libs/raptor:2
media-libs/rubberband
media-libs/taglib
media-libs/vamp-plugin-sdk
net-libs/libwebsockets
net-misc/curl
sys-libs/readline:0=
sci-libs/fftw:3.0[threads]
virtual/libusb:1
x11-libs/cairo
x11-libs/gtk+:2
x11-libs/pango
jack? ( virtual/jack )
pulseaudio? ( media-libs/libpulse )
media-libs/lilv
media-libs/sratom
dev-libs/sord
media-libs/suil[X,gtk2]
media-libs/lv2"
# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
DEPEND="${RDEPEND}
${PYTHON_DEPS}
dev-util/itstool
sys-devel/gettext
virtual/pkgconfig
doc? ( app-text/doxygen[dot] )
jack? ( virtual/jack )"
PATCHES=(
"${FILESDIR}/${PN}-6.8-metadata.patch"
"${FILESDIR}/${PN}-6.8-boost-1.85.patch"
)
pkg_pretend() {
[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
ewarn "Linking with gold linker might produce broken executable, see bug #733972"
}
pkg_setup() {
if has_version \>=dev-libs/libsigc++-2.6 ; then
append-cxxflags -std=c++11
fi
python-any-r1_pkg_setup
}
src_prepare() {
default
# delete optimization flags
sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
# handle arch
MARCH=$(get-flag march)
OPTFLAGS=""
if use cpu_flags_x86_sse; then
if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
elog "You enabled sse but use an march that does not support sse!"
elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
fi
OPTFLAGS="sse"
fi
if use cpu_flags_x86_mmx; then
if [[ ${MARCH} == "i486" ]]; then
elog "You enabled mmx with i486 set as march! You have been warned!"
fi
OPTFLAGS="${OPTFLAGS} mmx"
fi
if use cpu_flags_x86_3dnow; then
OPTFLAGS="${OPTFLAGS} 3dnow"
fi
sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-i "${S}"/wscript || die
sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
# boost and shebang
append-flags "-lboost_system"
python_fix_shebang "${S}"/wscript
python_fix_shebang "${S}"/waf
# handle locales
my_lcmsg() {
rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
}
plocale_for_each_disabled_locale my_lcmsg
}
src_configure() {
# avoid bug https://bugs.gentoo.org/800067
local -x AS="$(tc-getCC) -c"
# -Werror=odr
# https://tracker.ardour.org/view.php?id=9649
# https://bugs.gentoo.org/917095
filter-lto
local backends="alsa,dummy"
use jack && backends+=",jack"
use pulseaudio && backends+=",pulseaudio"
tc-export CC CXX
local myconf=(
--configdir=/etc
--freedesktop
--noconfirm
--optimize
--no-ytk
--with-backends=${backends}
$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
echo '' || echo "--no-fpu-optimization")
$(usex doc "--docs" '')
$(usex nls '' "--no-nls")
$(usex phonehome '' "--no-phone-home")
# not possible right now --use-external-libs
# missing dependency: https://github.com/c4dm/qm-dsp
)
waf-utils_src_configure "${myconf[@]}"
}
src_compile() {
waf-utils_src_compile
use nls && waf-utils_src_compile i18n
}
src_install() {
local s
waf-utils_src_install
mv ${PN}.1 ${PN}${SLOT}.1 || die
doman ${PN}${SLOT}.1
for s in 16 22 32 48 256 512; do
newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
done
# the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6
find "${D}/usr/share/icons/" -name ardour6.png -delete
sed -i \
-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
-e 's/;AudioEditing;/;X-AudioEditing;/' \
build/gtk2_ardour/ardour${SLOT}.desktop || die
domenu build/gtk2_ardour/ardour${SLOT}.desktop
insinto /usr/share/mime/packages
newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
rm "${D}/usr/share/mime/packages/ardour.xml" || die
}
pkg_postinst() {
xdg_pkg_postinst
elog "Please do _not_ report problems with the package to ${PN} upstream."
elog "If you think you've found a bug, check the upstream binary package"
elog "before you report anything to upstream."
}
@@ -1,10 +0,0 @@
--- a/src/framework/extensions/devtools/apidumpmodel.cpp
+++ b/src/framework/extensions/devtools/apidumpmodel.cpp
@@ -22,6 +22,7 @@
#include "apidumpmodel.h"
#include <QClipboard>
+#include <QGuiApplication>
#include "extensions/api/extapi.h"
@@ -62,7 +62,6 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
"${FILESDIR}/${PN}-4.4.0-include.patch"
"${FILESDIR}/${PN}-4.5.0-missing-include.patch"
)
src_unpack() {
@@ -1,6 +1,7 @@
DIST openpgp-keys-apache-tomcat-10.1.28-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
DIST openpgp-keys-apache-tomcat-10.1.30-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
DIST openpgp-keys-apache-tomcat-10.1.31-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
DIST openpgp-keys-apache-tomcat-11.0.0-KEYS.asc 36169 BLAKE2B 6e29022080dc7cc4e3c9af841ab9274ba8cc983f5cd663699d1c7b29c0d12b6c8e778bac6aa59a1ba9b90d9ff00781e3f715741e27f5b37b1b1e9c87fe4c20fb SHA512 f953bea7820e203608dbe2483d3cee0c082352c7ef86627acc37db3bbef3699b72c5709ce5cbe4ec24379fc7a9b648aa3f31bb7c98847105acb56a283b331239
DIST openpgp-keys-apache-tomcat-9.0.93-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
DIST openpgp-keys-apache-tomcat-9.0.95-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
DIST openpgp-keys-apache-tomcat-9.0.96-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
@@ -0,0 +1,19 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
HOMEPAGE="https://tomcat.apache.org/download-11.cgi"
SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
S="${WORKDIR}"
LICENSE="public-domain"
SLOT="${PV}"
KEYWORDS="amd64 arm64"
src_install() {
local files=( ${A} )
insinto /usr/share/openpgp-keys
newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
}
+2
View File
@@ -4,6 +4,8 @@ DIST apache-tomcat-10.1.30-src.tar.gz 6924092 BLAKE2B ef1473ba50e7916691e10dc533
DIST apache-tomcat-10.1.30-src.tar.gz.asc 833 BLAKE2B d12710695f14d662f2e8a410ef4fac63db7fbd1086ac5d9175aadf94a0cee7bfb1b21347aa0e6fa9f64a94ee282efc62b46115a343141d75193ffccb8ef0553e SHA512 1e959b29fa706c6cb1130b27863a3b51e105153eea5f14961058c3f65bb2d93eaba6a7b0b37380e5d8a84610986f423a3a548a8e1940254fc30dfc4f05ecaa9c
DIST apache-tomcat-10.1.31-src.tar.gz 6898465 BLAKE2B bcc4b1e973be8f83a02b046bd0df046367d1eaef897e0e5ef88127ede77988ed97243e39f240542a24ab81ffbe3d97abef81a39b790a63e2319e1990c2aacb84 SHA512 79d4052935c6f1757de34cd5cab1560095c901764d363509d84a3c77527e146f38776c78ae934adde19cf04d863b0e6010adba5cb403dae1ff48bdc99e9126e9
DIST apache-tomcat-10.1.31-src.tar.gz.asc 833 BLAKE2B 59d59001cdaa03d52ab807689959349b41d59fed0a896106567c8fc2392966aa365c355fd1ac944943e0571202a088c3ebbd439b62b8e446a1d48c001d9d7be3 SHA512 11f917d616ea00c1d53b7e439cfe0033fa922bb8a0a3c4d430e3bfae536c24af0de5fbba4ab99b2cd84dc0e3b4f98a5ac4c8fe776e2d2f2fb7335fef6a7c78b1
DIST apache-tomcat-11.0.0-src.tar.gz 6827697 BLAKE2B 7568d29fea915cd0dfbb62961eac1d864c8760706b1f76c6244c124ee3f00ea650b5a702c11439352cd5de9515dded91958666d6bf45bba7745ca5dbd53caf1d SHA512 1628ff115e3c44a6f66051e78cd5910bc9a748d1f47f484098b3a24c10c50b74c554997d35558e8e563694f718a9017c0f2ad33f4159d206dde1c838369ec426
DIST apache-tomcat-11.0.0-src.tar.gz.asc 849 BLAKE2B a6974cd097f30f2b46654362d1f05d9d02d82c5c6c2555500a42b094ab1835f70c700b7b3f6994a794bc2532a9f81cccd0cf81f66ef37626d278a7bc9f1c64ed SHA512 745338894fe8f579ec51b9b18d43c7419af8756bd9adcfaefb3eba8a8bd6cf0436fecfb38decc4accb3b47f89ca7a513077bf05a3968d0df8f9927b6b99649d3
DIST apache-tomcat-9.0.93-src.tar.gz 6472760 BLAKE2B 85e7da7eca0ac2a6d73b92b7eec73808309399513f326809e5f9343177cca6c8cf321489f6f1bae86426d626f5afda10f844bc77792d05cfdc8ccefb60d51d2a SHA512 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac
DIST apache-tomcat-9.0.93-src.tar.gz.asc 833 BLAKE2B 93f12701716013d17c4b3dc9b18713274fd1ad0f4455c3ef1bd9469920fc337f8f75784b961a8b83de90da28aff5b9e6e6a12cfc9aa217f9af4826fc6ee51871 SHA512 90977bc66413f1962cc1a00e645718e0f9cec93295110c29685df6cd62602994d142b6909087d7eece05b28fae5194d2c9a42c12027e6cb6e82c177d1fcd4f51
DIST apache-tomcat-9.0.95-src.tar.gz 7066563 BLAKE2B 9d00ad14c8bdbd9f63d9a9dc1651a36430eee09ebeb6c0b313802236544243866d75d7ca33544bcc8e9cdf4d3f636b9ccd8f754ea3212fe1c221b292d8a74984 SHA512 8ab69edd3761f2be112dbef9047cf331ad4d5ff8feb83dc35bebcdc1384853ed33313cc152f38f0604629d94e32a5eaf242a1dda8e7b04b9442dc03eb6b3b7db
@@ -0,0 +1,12 @@
--- a/build.xml
+++ b/build.xml
# javadoc would fail without network access
@@ -2413,8 +2410,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
<link href="../elapi"/>
<link href="../websocketapi"/>
<link href="../jaspicapi"/>
- <link href="https://docs.oracle.com/en/java/javase/17/docs/api/"/>
- <link href="https://jakarta.ee/specifications/platform/11/apidocs/"/>
<packageset dir="${tomcat.dist}/src/java/">
<include name="org/**"/>
<exclude name="org/apache/el/parser/**"/>
+185
View File
@@ -0,0 +1,185 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 prefix verify-sig
MY_P="apache-${P}-src"
DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
HOMEPAGE="https://tomcat.apache.org/"
SRC_URI="mirror://apache/${PN}/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz
verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )"
S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="11"
KEYWORDS="~amd64 ~arm64 ~amd64-linux"
IUSE="extra-webapps"
RESTRICT="test" # can we run them on a production system?
ECJ_SLOT="4.33"
COMMON_DEP="
dev-java/bnd-annotation:0
dev-java/eclipse-ecj:${ECJ_SLOT}
dev-java/jax-rpc-api:0
>=dev-java/jakartaee-migration-1.0.7-r2:0
dev-java/wsdl4j:0"
# jre-17:* because of line 1081, build.xml
# <filter token="target.jdk" value="${compile.release}"/>
RDEPEND="
${COMMON_DEP}
acct-group/tomcat
acct-user/tomcat
>=virtual/jre-17:*"
DEPEND="
${COMMON_DEP}
app-admin/pwgen
>=dev-java/ant-1.10.14-r3:0
dev-java/bnd:0
dev-java/bnd-ant:0
dev-java/bnd-util:0
dev-java/bndlib:0
dev-java/libg:0
dev-java/osgi-cmpn:8
dev-java/osgi-core:0
dev-java/slf4j-api:0
>=virtual/jdk-17:*
test? (
>=dev-java/ant-1.10.14-r3:0[junit]
dev-java/easymock:3.2
)"
BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
PATCHES=(
"${FILESDIR}/tomcat-10.1.20-do-not-copy.patch"
"${FILESDIR}/tomcat-11.0.0-offline.patch"
"${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch"
)
src_prepare() {
default #780585
java-pkg-2_src_prepare
java-pkg_clean
cat > build.properties <<-EOF || die
compile.debug=false
execute.download=false
exist=true # skip target="downloadfile-2"
version=${PV}-gentoo
version.number=${PV}
ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
bnd-annotation.jar=$(java-pkg_getjars bnd-annotation)
bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
bnd.jar=$(java-pkg_getjars --build-only bnd)
bndlib.jar=$(java-pkg_getjars --build-only bndlib)
jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api)
jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT})
libg.jar=$(java-pkg_getjars --build-only libg)
migration-lib.jar=$(java-pkg_getjars jakartaee-migration)
osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8)
osgi-core.jar=$(java-pkg_getjars --build-only osgi-core)
slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api)
wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j)
EOF
if use test; then
echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \
>> build.properties || die "easymock"
fi
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
bin/catalina.sh || die
}
# revisions of the scripts
IM_REV="-r2"
INIT_REV="-r1"
src_compile() {
LC_ALL=C eant
use doc && LC_ALL=C eant javadoc
}
src_test() {
eant test
}
src_install() {
local dest="/usr/share/${PN}-${SLOT}"
java-pkg_jarinto "${dest}"/bin
java-pkg_dojar output/build/bin/*.jar
exeinto "${dest}"/bin
doexe output/build/bin/*.sh
java-pkg_jarinto "${dest}"/lib
java-pkg_dojar output/build/lib/*.jar
dodoc RELEASE-NOTES RUNNING.txt
use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
use source && java-pkg_dosrc java/*
### Webapps ###
# add missing docBase
local apps="host-manager manager"
for app in ${apps}; do
sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
output/build/webapps/${app}/META-INF/context.xml || die
done
insinto "${dest}"/webapps
doins -r output/build/webapps/{host-manager,manager,ROOT}
use extra-webapps && doins -r output/build/webapps/{docs,examples}
### Config ###
# create "logs" directory in $CATALINA_BASE
# and set correct perms, see #458890
dodir "${dest}"/logs
fperms 0750 "${dest}"/logs
# replace the default pw with a random one, see #92281
local randpw="$(pwgen -s -B 15 1)"
sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
# prepend gentoo.classpath to common.loader, see #453212
sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
insinto "${dest}"
doins -r output/build/conf
### rc ###
cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
insinto "${dest}"/gentoo
doins "${T}"/tomcat.conf
exeinto "${dest}"/gentoo
newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
}
pkg_postinst() {
einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
ewarn "Please note that since version 10 the primary package for all implemented APIs"
ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat"
}