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 E17451382C5 for ; Tue, 16 Mar 2021 20:19:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36855E05C1; Tue, 16 Mar 2021 20:19:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 1BE79E05C1 for ; Tue, 16 Mar 2021 20:19:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 44E8F340E08 for ; Tue, 16 Mar 2021 20:19:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A7EF25A7 for ; Tue, 16 Mar 2021 20:19:49 +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: <1615925979.0c3d0633e401244cabe56e285da172418accec0d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jflex/jflex-1.6.1-r1.ebuild X-VCS-Directories: dev-java/jflex/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0c3d0633e401244cabe56e285da172418accec0d X-VCS-Branch: master Date: Tue, 16 Mar 2021 20:19:49 +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: 1547d07a-c6c7-417e-9b97-135bd699ba66 X-Archives-Hash: 7d9bfb779d3ac060defdcf0b7816e75e commit: 0c3d0633e401244cabe56e285da172418accec0d Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Tue Mar 16 16:03:29 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 16 20:19:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c3d0633 dev-java/jflex: fix regression (circular dep) Closes: https://bugs.gentoo.org/776736 Previous commit introduced circular dependency ( DEPEND="dev-java/javacup:0 ) Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/19955 Signed-off-by: Sam James gentoo.org> dev-java/jflex/jflex-1.6.1-r1.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild index 0306f5b6643..6c0b6396e1f 100644 --- a/dev-java/jflex/jflex-1.6.1-r1.ebuild +++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild @@ -23,8 +23,7 @@ RDEPEND=">=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) ${CDEPEND}" -DEPEND="dev-java/javacup:0 - >=virtual/jdk-1.8:* +DEPEND=">=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) ${CDEPEND}" @@ -35,7 +34,7 @@ JAVA_SRC_DIR="src/main/java" src_prepare() { # See below for details. - eapply_user "${FILESDIR}/icedtea-arm.patch" + eapply "${FILESDIR}/icedtea-arm.patch" # We need the bundled jflex.jar. rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die