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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 13AB7138359 for ; Mon, 6 Jul 2020 10:56:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F620E08F7; Mon, 6 Jul 2020 10:56:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29A47E08F3 for ; Mon, 6 Jul 2020 10:56:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C945134F2CC for ; Mon, 6 Jul 2020 10:56:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E03FB2D3 for ; Mon, 6 Jul 2020 10:56:07 +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: <1594028907.59131006cb675af7b176225af7a670e2803649d8.fordfrog@gentoo> Subject: [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/portage/ X-VCS-Repository: proj/java-ebuilder X-VCS-Files: src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java X-VCS-Directories: src/main/java/org/gentoo/java/ebuilder/portage/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 59131006cb675af7b176225af7a670e2803649d8 X-VCS-Branch: master Date: Mon, 6 Jul 2020 10:56:07 +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: d8fbe7ad-6f9d-4d6e-9164-ad267f5aa0e3 X-Archives-Hash: 250f9db6f22cf6554045cf7445b7d334 commit: 59131006cb675af7b176225af7a670e2803649d8 Author: zongyu gmail com> AuthorDate: Thu Jun 18 07:11:21 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Jul 6 09:48:27 2020 +0000 URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=59131006 initial code to support MAVEN_PROVIDE Signed-off-by: zongyu gmail.com> .../java/org/gentoo/java/ebuilder/portage/PortageParser.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java index 9da0fb7..a222956 100644 --- a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java @@ -258,6 +258,7 @@ public class PortageParser { String groupId = null; String artifactId = null; String mavenVersion = null; + String[] mavenProvide = null; try (final BufferedReader reader = new BufferedReader( new InputStreamReader(Files.newInputStream(ebuild.toPath(), @@ -298,6 +299,9 @@ public class PortageParser { } else if (line.startsWith("MAVEN_ID=")) { mavenId = line.substring("MAVEN_ID=".length()). replace("\"", ""); + } else if (line.startsWith("MAVEN_PROVIDE=")) { + mavenProvide = line.substring("MAVEN_PROVIDE=".length()). + replace("\"", "").split(" "); } } @@ -354,6 +358,13 @@ public class PortageParser { cacheItems.add(new CacheItem(category, pkg, version, slot, useFlag, groupId, artifactId, mavenVersion, eclasses)); + if (mavenP != null) { + for (String providedId: mavenProvide) { + parts = mavenProvide.split(":") + cacheItems.add(new CacheItem(category, pkg, version, slot, useFlag, + parts[0], parts[1], parts[2], eclasses)); + } + } countEclasses(eclasses); }