From 588f72e07478bf64daddc4eb22a2b51e550ee959 Mon Sep 17 00:00:00 2001
From: Anton Bolshakov <blshkv@pentoo.ch>
Date: Sun, 27 Jun 2021 08:57:59 +0800
Subject: [PATCH] gradle-bin: keep 6.3 until we convert our ebuilds

---
 dev-java/gradle-bin/Manifest                  |  1 +
 dev-java/gradle-bin/gradle-bin-6.3.ebuild     | 49 +++++++++++++++++++
 .../base/package.accept_keywords/dev-java     |  5 +-
 .../base/package.accept_keywords/dev-util     | 16 +++---
 4 files changed, 58 insertions(+), 13 deletions(-)
 create mode 100644 dev-java/gradle-bin/gradle-bin-6.3.ebuild

diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index ab340068e..355175988 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1 +1,2 @@
 DIST gradle-bin-5.2.1.zip 132549774 BLAKE2B c6d6fa9975bc28030672a99f22f0e9c4c2cb3d667ae3658c1062428d0ab2fd8c3b4df0479f4fde7b2d75b8fcb64c7f5b208e53c5b30a9b3c7afb5ad7e1a4139d SHA512 e2a17072c10d27acbe4a0282dfdfed907ab5c57109668595feaec681ab1d4be017ac0f6090c2c2b64a057d71c1e244bb50f4047509d36c5930e894837a96171b
+DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d
diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.3.ebuild
new file mode 100644
index 000000000..fc9ba5186
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-6.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="amd64 x86"
+
+BDEPEND="app-arch/unzip"
+DEPEND=">=virtual/jre-1.8"
+RDEPEND=">=virtual/jdk-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	insinto "${gradle_dir}"
+	doins -r lib/
+
+	exeinto "${gradle_dir}"/bin
+	doexe bin/${MY_PN}
+	dosym "../${gradle_dir#/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
+
+	docinto html
+	dodoc -r docs/release-notes.html
+
+	if use doc ; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	if use source ; then
+		java-pkg_dosrc src/*
+	fi
+}
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-java b/profiles/pentoo/base/package.accept_keywords/dev-java
index 808cffeeb..bbe237909 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-java
+++ b/profiles/pentoo/base/package.accept_keywords/dev-java
@@ -3,14 +3,11 @@
 ~dev-java/msgpack-0.6.12
 
 =dev-java/gradle-bin-6*
+~app-eselect/eselect-gradle-0.2
 
 #recaf
 dev-java/swt:4.10
 
-# downgrade back to stable (and install python2) if dev-java/oracle-javamail fails to compile
-# https://bugs.gentoo.org/698954
-=dev-java/javatoolkit-0.6.1*
-
 #jetty
 dev-java/jetty-util
 dev-java/jetty-io
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-util b/profiles/pentoo/base/package.accept_keywords/dev-util
index acd9607a0..ea491607e 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-util
+++ b/profiles/pentoo/base/package.accept_keywords/dev-util
@@ -1,9 +1,7 @@
-##Pentoo
+## Pentoo
 dev-util/AndroidProjectCreator-bin
 dev-util/androguard
 dev-util/appmon
-~dev-util/bokken-1.8
-=dev-util/cutter-1*
 dev-util/dependency-check-bin
 =dev-util/dex2jar-2.1*
 dev-util/dwarf-debugger
@@ -11,19 +9,19 @@ dev-util/dwarf-debugger
 #dev-util/ghidra
 dev-util/jd-gui
 =dev-util/lief-0.10*
-dev-util/mobsf **
+dev-util/mobsf
 dev-util/objection
 ~dev-util/pyew-2.0
 dev-util/qark
 dev-util/recaf-bin
 dev-util/redasm
-~dev-util/unicorn-1.0.2_rc3
-
 dev-util/sonarqube-bin
 
-# Gentoo
-#dev-libs/ocl-icd fails to build with this version
-#=dev-util/opencl-headers-2021*
+
+## Gentoo unstable
+=dev-util/cutter-2*
+=dev-util/rizin-0.2*
+=dev-libs/tree-sitter-0.19*
 
 ~dev-util/edb-debugger-1.3.0
 dev-util/jenkins-bin ~amd64