From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 48A0915800F for ; Sat, 14 Jan 2023 19:17:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23E04E08FC; Sat, 14 Jan 2023 19:17:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 0BCBEE08FC for ; Sat, 14 Jan 2023 19:17:34 +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 3AAEB340ED4 for ; Sat, 14 Jan 2023 19:17:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C3C13891 for ; Sat, 14 Jan 2023 19:17:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1673723700.5aa4c76fb27530fedc2c020e0a9148634b046e49.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/protobuf-java/protobuf-java-9999.ebuild X-VCS-Directories: dev-java/protobuf-java/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5aa4c76fb27530fedc2c020e0a9148634b046e49 X-VCS-Branch: master Date: Sat, 14 Jan 2023 19:17:29 +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: 66737cfb-239d-4e35-a339-6501068444eb X-Archives-Hash: 5fdba9bd4d41d8b4ab41c26b5dd2296c commit: 5aa4c76fb27530fedc2c020e0a9148634b046e49 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Jan 11 14:40:46 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 14 19:15:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aa4c76f dev-java/protobuf-java: drop 9999 Closes: https://bugs.gentoo.org/890481 Drop live ebuild since upstream pushes new versions every couple of weeks and this package has only one single consumer. Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/29066 Signed-off-by: Sam James gentoo.org> dev-java/protobuf-java/protobuf-java-9999.ebuild | 109 ----------------------- 1 file changed, 109 deletions(-) diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild deleted file mode 100644 index f269a7bc8533..000000000000 --- a/dev-java/protobuf-java/protobuf-java-9999.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 2008-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -# Version based on value in (java/)core/pom.xml from main branch -# Please update me when new release -# Maybe find a way to automatically change it? -MAVEN_ID="com.google.protobuf:${PN}:3.21.7" -# Tests not enabled, depend on com.google.truth which is not packaged -# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40 -# JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit edo java-pkg-2 java-pkg-simple - -PARENT_PN="${PN/-java/}" -PARENT_PV="${PV}" -PARENT_P="${PARENT_PN}-${PARENT_PV}" - -if [[ "${PV}" == *9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git" - EGIT_SUBMODULES=() - EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" -else - SRC_URI=" - https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz - -> ${PARENT_P}.tar.gz - " - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" -fi - -DESCRIPTION="Google's Protocol Buffers - Java bindings" -HOMEPAGE=" - https://developers.google.com/protocol-buffers/ -" - -LICENSE="BSD" -SLOT="0/32" - -S="${WORKDIR}/${PARENT_P}/java" - -BDEPEND=" - dev-libs/protobuf:${SLOT} -" -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/guava:0 - dev-java/mockito:4 - ) -" -RDEPEND=" - >=virtual/jre-1.8:* -" - -JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" -JAVA_JAR_FILENAME="protobuf.jar" -JAVA_RESOURCE_DIRS="core/src/main/resources" -JAVA_SRC_DIR="core/src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" -JAVA_TEST_RESOURCE_DIRS="../src" -JAVA_TEST_SRC_DIR="core/src/test/java" - -# Same than PATCHES but from repository's root directory, -# please see function `src_prepare` below. -# Simplier for users IMHO. -PARENT_PATCHES=( -) - -# Here for patches within "java/" subdirectory. -PATCHES=( -) - -src_prepare() { - pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die - [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" - eapply_user - popd > /dev/null || die - - # Remove bundled jars - java-pkg_clean - - java-pkg-2_src_prepare - - # There is also compiler/plugin, but not in this list because in a subdirectory - core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers ) - - # Copy resources from ../src/google/protobuf according to - # https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L45-L61 - mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die - local core_proto - for core_proto in "${core_protos[@]}"; do - cp "../src/google/protobuf/${core_proto}.proto" \ - "${JAVA_RESOURCE_DIRS}/google/protobuf" \ - || die - done - cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die - - # Generate 146 .java files according to - # https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml - for core_proto in "${core_protos[@]}" compiler/plugin; do - edo "${BROOT}/usr/bin/protoc" \ - --java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${core_proto}".proto - done -}