[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad-packages3d/

[Sam James]

commit:     87a4058ac34974dc62874f70b32036487c8998c2
Author:     JonRB <jon.roadleybattin <AT> gmail <DOT> com>
AuthorDate: Mon Nov 22 19:24:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 17:15:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87a4058a

sci-electronics/kicad-packages3d: add 6.0.0_rc1

Signed-off-by: JonRB <jon.roadleybattin <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-electronics/kicad-packages3d/Manifest          |  1 +
 .../kicad-packages3d-6.0.0_rc1.ebuild              | 34 +++++++++++++++++++++
 .../kicad-packages3d-9999.ebuild.orig              | 35 ++++++++++++++++++++++
 3 files changed, 70 insertions(+)

diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 369ec8947b8a..352f9983a4e7 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1 +1,2 @@
 DIST kicad-packages3d-5.1.11.tar.bz2 727201396 BLAKE2B bdc66638d6a366bde20f7dba5c3470c729d21177ce8d3ae4ee501ec43531e72dca76350dd16912d4326ef96c7269fed6728031fe870b57c2a588e4e3040b60ca SHA512 c7eea38b75c87a684e00dce0bf8436f907eeddd386dd3c36814b0452de8e6002ad3399924f9b145945fd341276619ac61961bc6e436c4233faa53f2df05cc48d
+DIST kicad-packages3d-6.0.0_rc1.tar.gz 943436657 BLAKE2B 19be6acc72969d62ed6db7ec8b7ed0899644caf494240919b79c87f2ddd299b6502fd097e22ea0b9b99a2fa3ed0ab2445461703553fc0cb611e4dc1a455c1f5f SHA512 b1b21bcbfd2fc2a7b8e18f1457109f783cb268312d9e076adf81cec38e4511b944c0bce6bd39a06f84211e8f5dd60afc4daffd07affce6199db51b9c2cd3084d

diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild
new file mode 100644
index 000000000000..a01ce4d34d88
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git"
+	inherit git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~arm64"
+	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d"
+fi
+
+IUSE="+occ"
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]"
+
+# TODO fix this (ezzieyguywuf)
+S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d"
+
+CHECKREQS_DISK_BUILD="11G"

diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild.orig b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild.orig
new file mode 100644
index 000000000000..19eef9145781
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild.orig
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git"
+	inherit git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+    MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+<<<<<<< HEAD
+    SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+=======
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}" # check for directory hash
+>>>>>>> 9a2ae2b8a99 (re-add S back into package3D build)
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="+occ"
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-5.99[occ=]"
+
+CHECKREQS_DISK_BUILD="11G"