gentoo resync : 05.12.2021

4 files changed, 80 insertions, 4 deletions

diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index bc584d2f3754..149b6d7c4a43 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,3 +1,6 @@
-DIST kicad-packages3d-5.1.10.tar.bz2 727194444 BLAKE2B 87d210be8e32e84f29d67f861962f869f62ba1828a6557f75642c652e81239543bbe4d3a2ae8dc34767266d16cb2a51dfb8c79062b9bb90ae359001f39b7684f SHA512 95c25fe94f3e198208f073c121d234508aa8e67a621d17bc1737d14fe860c9a8cece6e7b66037f9a9c7f1a06f104b942dc2ff59f318e8b6854bdddb1d238faf4
-EBUILD kicad-packages3d-5.1.10.ebuild 599 BLAKE2B ab86a7c3fa587e6c61a926b7dd24b3e18aaa151c45e4998a343b2c47a02f8ba0fc0cd86dab494e5f79185213520fa1673eece58c6c069348e349a22b980a7745 SHA512 c6d335f511e39a9732cf84c006e53c761c01c131efa826280a323b22db7c6168707d76b5d764899a7b3e0b86eddd67b72d76e455cc6e56b597f5931826f50b90
+DIST kicad-packages3d-5.1.12.tar.bz2 727191578 BLAKE2B 534ba480de72ffbc8ac0968e5a7b04f2b7ccfb0ef8bb88bdad7e4e6d90536f9ae7bd101316512e1fa2e27b607fd0dd8e53d0729e48368362177b066c6bab3802 SHA512 eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2
+DIST kicad-packages3d-6.0.0_rc1.tar.gz 943436657 BLAKE2B 19be6acc72969d62ed6db7ec8b7ed0899644caf494240919b79c87f2ddd299b6502fd097e22ea0b9b99a2fa3ed0ab2445461703553fc0cb611e4dc1a455c1f5f SHA512 b1b21bcbfd2fc2a7b8e18f1457109f783cb268312d9e076adf81cec38e4511b944c0bce6bd39a06f84211e8f5dd60afc4daffd07affce6199db51b9c2cd3084d
+EBUILD kicad-packages3d-5.1.12.ebuild 602 BLAKE2B 62514efac88725f127605ddac5ddfed4abbb7e5972b6bf818785caacdcb6cb201b969fe55894ac74f2e67af4342c81482bff1892476528b7694460a2bdcce88d SHA512 9ee93e24de865787430eae1c7e4d1dbe50061f389929011b143abc627a398e8ed8f1ccfa097c8005ec969fb1a8b8e2914a0b17b5f31130c16231bd9e5d019c3c
+EBUILD kicad-packages3d-6.0.0_rc1.ebuild 948 BLAKE2B aba3e55e129fad9feb303551a8ef5c04f9a5c78630b8bbc11219e7b55d8cb131f6fa33c3129b4a8f166a49b8f9333135b0e5817b2504b679757c4f976deb62d0 SHA512 b851cb00fd1ce776693027054a9b65f723081836b7bb6b8104fe953624a28ca357232b0d5e115ac3ea30953e4ea4d8a98d4b4a2fe7b23500872369ac3f51842b
+EBUILD kicad-packages3d-9999.ebuild 932 BLAKE2B 7b1542d38004eb7adee38b55af0d2f0d70f67408e21defb2bbb517f63b7da46d9bd29847f956313c983e7f754b16dc408b01b787699b4d0a8440466397e6d665 SHA512 b1a4d9011e6e54b0cc9bb71dfb2a98459c67988c4eebc17a7ae02e36f4e59a0613d6ee8820f17a60fde8a1c723f1a17136e709f415359931877738e38e8aa79e
 MISC metadata.xml 976 BLAKE2B 70851f4db73dbf597cb669018fe27e4e1507cf4e86fa82488751a27fbdb8e85eb13d81ec42d62685c459a8c56cb1899579430132bc9ae4c0c0c2fdcb756bae1b SHA512 1e6512afe9ff98ee23c33bb339e1b6ad4b9da8d2bdf6ea52f40874ab77e4918aa565a550c384ecdc693a2f7b366cd07d4c5abae52dfc6177cf9262ad1a01d7b4
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.10.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12.ebuild
index ce0d62fefa15..594ef53b2fc0 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.10.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit check-reqs cmake
 
@@ -16,7 +16,7 @@ IUSE="occ +oce"
 
 REQUIRED_USE="|| ( occ oce )"
 
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
+RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce(-)=]"
 
 CHECKREQS_DISK_BUILD="11G"
 S="${WORKDIR}/${P/3d/3D}"
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..f5a45cc6b9cd
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 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
+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"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~x86"
+	fi
+
+	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d"
+fi
+
+IUSE="+occ"
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="11G"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
new file mode 100644
index 000000000000..4ef1bc6b0f7e
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 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
+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"
+	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}" # check for directory hash
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~x86"
+	fi
+fi
+
+IUSE="+occ"
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-5.99[occ=]"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="11G"