From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7A38F158B20 for ; Thu, 06 Feb 2025 18:20:41 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 64DAF34305F for ; Thu, 06 Feb 2025 18:20:41 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 65A3D1103CB; Thu, 06 Feb 2025 18:20:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 54C601103CB for ; Thu, 06 Feb 2025 18:20:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF1C334305F for ; Thu, 06 Feb 2025 18:20:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79F3F2195 for ; Thu, 06 Feb 2025 18:20:38 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1738866030.6e4cf80106cc3c9c454357f867d9a762cc61dd2e.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/trang/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/trang/Manifest app-text/trang/trang-20220510-r1.ebuild X-VCS-Directories: app-text/trang/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 6e4cf80106cc3c9c454357f867d9a762cc61dd2e X-VCS-Branch: master Date: Thu, 06 Feb 2025 18:20:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e66de2b3-ae8d-4573-adbf-6b9e28e823f1 X-Archives-Hash: ec3ddb88c4582d2bfb3d9390147c7914 commit: 6e4cf80106cc3c9c454357f867d9a762cc61dd2e Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Feb 5 14:26:17 2025 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Feb 6 18:20:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4cf801 app-text/trang: drop 20220510-r1 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/40451/commits/bd30ef7718769c8eaf93a623253eb5e23c7655f3 Signed-off-by: Miroslav Šulc gentoo.org> app-text/trang/Manifest | 1 - app-text/trang/trang-20220510-r1.ebuild | 117 -------------------------------- 2 files changed, 118 deletions(-) diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest index 4c93e5b233ad..62ce12d8b9fd 100644 --- a/app-text/trang/Manifest +++ b/app-text/trang/Manifest @@ -1,2 +1 @@ -DIST trang-20220510.tar.gz 14317698 BLAKE2B b7337e9555094989955e33f711db9981521c31a3708dd6a862f36cecae0496d8c86fdf09b2d60b8646d8e35e214f57ba7bcd49773fe002eef26ed6b81b4101c1 SHA512 51c44817b396ec45bb82987e0aee8e8d2e5f3f6a1e2f967bae717a31b1bd49c5fc7015466104b19ac62de6ee0270c018dcf19b467763ad1aaa92800bd4edd7a0 DIST trang-20241231.tar.gz 14317272 BLAKE2B 420bd2148f90bbda03d91c0e748fb785e89286e5b9b565cc31e81306e5c832a6b683b51bd132b7f16e7cbce798eaf1b13d23a4b035ef77a1b13bb25366866523 SHA512 6e0d9c69b5fe663b2e014e0a30b6d92018a349b982698631f346a1fe7657e8a8c5b785df1c1188f4caf61acfccbaf9fc2f6478f2dfb425ef6ef510a865bdaaa3 diff --git a/app-text/trang/trang-20220510-r1.ebuild b/app-text/trang/trang-20220510-r1.ebuild deleted file mode 100644 index f0a81ed3509e..000000000000 --- a/app-text/trang/trang-20220510-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc test" -JAVA_TESTING_FRAMEWORKS="testng" - -inherit java-pkg-2 java-pkg-simple prefix - -DESCRIPTION="Multi-format schema converter based on RELAX NG" -HOMEPAGE="http://thaiopensource.com/relaxng/trang.html" -SRC_URI="https://github.com/relaxng/jing-trang/archive/V${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/jing-${P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64" - -BDEPEND=" - app-i18n/unicode-data - dev-java/saxon:9 -" -CP_DEPEND=" - dev-java/xerces:2 - dev-java/xml-commons-resolver:0 -" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" -JAVACC_SLOT="7.0.13" - -#934306 restrict to >=virtual/jdk-11:* -DEPEND="${CP_DEPEND} - dev-java/javacc:${JAVACC_SLOT} - dev-java/testng:0 - >=virtual/jdk-11:*" - -JAVA_TEST_RESOURCE_DIRS="src/test" -JAVA_TEST_SRC_DIR="src/test" - -src_prepare() { - java-pkg-2_src_prepare - java-pkg_clean - - eprefixify mod/regex/mod.xml # Do we still need this? - - # separating some sources which are needed only for compilation - mkdir helper || die - cp -r mod/{catalog,datatype,jaxp,pattern,resolver,rng-parse}/src helper || die - - # most of the mods are not needed for the final trang.jar - rm -r mod/{dtdinst,nvdl,picl,rng-jarv,rng-validate,schematron,validate,xerces} || die - rm -r mod/{jaxp,pattern,rng-jaxp} || die - - # move all remainig stuff to "src/main" resp. "src/test" - mkdir -p resources src meta/META-INF/services || die - mv {mod/,}regex-gen || die # but not this one which is needed in two JAVA_SRC_DIRs - cp -r mod/*/src/{main,test} src || die - - # populate META-INF/services - echo com.thaiopensource.datatype.xsd.DatatypeLibraryFactoryImpl \ - > meta/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory || die - echo com.thaiopensource.datatype.xsd.regex.xerces2.RegexEngineImpl \ - > meta/META-INF/services/com.thaiopensource.datatype.xsd.regex.RegexEngine || die - - echo "version=${PV}" \ - > src/main/com/thaiopensource/relaxng/translate/resources/Version.properties || die - - # java-pkg-simple expects resources in JAVA_RESOURCE_DIRS - find src -type f ! -name '*.java' ! -name 'CompactSyntax.jj' ! -name 'package.html' \ - | xargs cp --parent -t resources || die - - # code generation according to mod/rng-parse/mod.xml - local OUT_DIR="gensrc/main/com/thaiopensource/relaxng/parse/compact" - mkdir -p "${OUT_DIR}" - "javacc-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \ - -JDK_VERSION=1.8 \ - -OUTPUT_DIRECTORY="${OUT_DIR}" \ - helper/src/main/com/thaiopensource/relaxng/parse/compact/CompactSyntax.jj \ - || die "Code generation with java.jj failed" - rm "${OUT_DIR}/JavaCharStream.java" || die - - # mod/rng-parse/mod.xml lines 16-17 - 's/java.io.IOException/EOFException/' - eapply "${FILESDIR}/trang-20220510-CompactSyntaxTokenManager.patch" || die -} - -src_compile() { - einfo "Compiling some classes needed for code generation" - ejavac -d util \ - $(find regex-gen/src/main mod/util/src/main -name "*.java") || die - - einfo "Code generation" - "$(java-config -J)" -cp "util" \ - com.thaiopensource.datatype.xsd.regex.java.gen.NamingExceptionsGen \ - "com.thaiopensource.datatype.xsd.regex.java.NamingExceptions" \ - "src/main" || die - - "$(java-config -J)" -cp "util" \ - com.thaiopensource.datatype.xsd.regex.java.gen.CategoriesGen \ - "com.thaiopensource.datatype.xsd.regex.java.Categories" \ - "src/main" \ - "/usr/share/unicode-data/UnicodeData.txt" || die - - einfo "Compiling classes which are not needed for the final trang.jar" - ejavac -d helper \ - -cp "util:$(java-pkg_getjars --build-only xml-commons-resolver)" \ - $(find gensrc/main helper/src/main -name "*.java") || die - - einfo "Compiling trang.jar" - JAVA_CLASSPATH_EXTRA="testng" - JAVA_GENTOO_CLASSPATH_EXTRA="util:helper" - JAVA_JAR_FILENAME="trang.jar" - JAVA_MAIN_CLASS="com.thaiopensource.relaxng.translate.Driver" - JAVA_RESOURCE_DIRS=( meta resources/src/main ) - JAVA_SRC_DIR=( {gen,}src/main ) - java-pkg-simple_src_compile -}