gentoo resync : 20.03.2022

4 files changed, 9 insertions, 14 deletions

diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 5afe042d5243..22fb1c689990 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,6 +1,6 @@
 DIST kicad-packages3d-5.1.12.tar.bz2 727191578 BLAKE2B 534ba480de72ffbc8ac0968e5a7b04f2b7ccfb0ef8bb88bdad7e4e6d90536f9ae7bd101316512e1fa2e27b607fd0dd8e53d0729e48368362177b066c6bab3802 SHA512 eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2
-DIST kicad-packages3d-6.0.1.tar.gz 943455043 BLAKE2B 7d26b3f6eb9fe279343d9c43dfff875ba2f56b56ff1fe868a07fa43f9abe476f7b6c8e3e9122adf2bf5546b571f45573926055452bac9b5dc03618dd8ace245a SHA512 326ad5d3b4fea482921af2f69b21e7f36ad462632804c24c160b824e722d79050a2e7d81b499fad09c7e03381026a9d3d292a85ace79d7a7cc3a976454e8bb83
-EBUILD kicad-packages3d-5.1.12.ebuild 602 BLAKE2B 62514efac88725f127605ddac5ddfed4abbb7e5972b6bf818785caacdcb6cb201b969fe55894ac74f2e67af4342c81482bff1892476528b7694460a2bdcce88d SHA512 9ee93e24de865787430eae1c7e4d1dbe50061f389929011b143abc627a398e8ed8f1ccfa097c8005ec969fb1a8b8e2914a0b17b5f31130c16231bd9e5d019c3c
-EBUILD kicad-packages3d-6.0.1.ebuild 948 BLAKE2B 3f971388bf7c023551a22595fcf990574b57646a71906baa8ebd4afec2d05bcb121b90dd1444229f365d2d3d9b90ddd748e94f36a7e6c40db95706d8a038dc5f SHA512 33eb6a6eefbb62abe85d3dd9c2932575a72cf038581ec936c2c8b6fbf74a3dda3b21792c1a812ddee0bacbd9898906c2e8e028e88545bb90047b52916f33097d
+DIST kicad-packages3d-6.0.2.tar.gz 946918858 BLAKE2B 36fbb4e7acd4dba9644a700c2161d4c4bdb74b34e1ff53f458e003d69af6af2df1b2e48175cab0b3a0c1b6c7cb70c3d7b6f34f2d269b35901dd73763badb8f7f SHA512 10ca7da72f0da13affa1590c8f216aed7607a3fecc1073d4c3e14d986423563962835d4a097fb60367436dc70ffe9b30fcc513899d9f591761a935aa2af568cf
+EBUILD kicad-packages3d-5.1.12-r1.ebuild 559 BLAKE2B 698bb6c1eeb4f63d69f29095bd17b00d5b420c1dd16faec9910e2b5a13e8be124d9c087dc1678ca3d516d1a8f143e8b15e68244d150955f37f23a5d7b1f8a617 SHA512 0475814185604358e047f864a847b273cbe032cbb0a5997f49a3afdc77c66c7fdb15b762b6f5337016f737f857b036bd37b64d5315858fc082dc87156871b691
+EBUILD kicad-packages3d-6.0.2.ebuild 955 BLAKE2B 5954ff1978a413cb04f7b2b636c16455476eb387992254f6c36a4c392e7c89959c62dfe77abf23f755b5f13f3cb06775412af48fb8ee9034a2d3c4a7c6169118 SHA512 697472033d5a005aacd6d19db676445cb519b9cbd167d5cf18853b07cd0b9d6258bcf0e6718b18ec59237d843147aa00d44da72443a0e7b63ae01453d0439cb9
 EBUILD kicad-packages3d-9999.ebuild 933 BLAKE2B 7c56da88187d74ceb63e88691e124a9083e61e7703650d63689e256eb4c7b456cf48dac4f958d92a2ff8128d930ee1c1b4dda22e9fcf5cfba3d78212c05fda12 SHA512 038c920d7cf33eaf085ab5b0859c7ff8c4b6e0306b09ec65c09e0e1d4502a8a055f32056be171092f68245828be1f61e640fd386449e93b42b82669e7d867613
-MISC metadata.xml 976 BLAKE2B 70851f4db73dbf597cb669018fe27e4e1507cf4e86fa82488751a27fbdb8e85eb13d81ec42d62685c459a8c56cb1899579430132bc9ae4c0c0c2fdcb756bae1b SHA512 1e6512afe9ff98ee23c33bb339e1b6ad4b9da8d2bdf6ea52f40874ab77e4918aa565a550c384ecdc693a2f7b366cd07d4c5abae52dfc6177cf9262ad1a01d7b4
+MISC metadata.xml 897 BLAKE2B c306e73c992f4b4c6099176ed71b232aa196ff07c0ea2833b14d465a96f8db4623a17d629c66533d7a8dd5032dee74aaaf7ebacd3ed7c72359ad7b9b9746e348 SHA512 796a2eb49ff7d7f65d473217b2534a4ef811354828defb76005f694f37f7b638bb65be304de74507e89b99c0e97026503e74222fa972c389d638d2ef3ea059b1
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild
index 594ef53b2fc0..d37150d3243e 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,11 +12,9 @@ SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kic
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE="occ +oce"
+IUSE="+occ"
 
-REQUIRED_USE="|| ( occ oce )"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce(-)=]"
+RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]"
 
 CHECKREQS_DISK_BUILD="11G"
 S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.2.ebuild
index 5bf36a30f654..6375a1fe945c 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.2.ebuild
@@ -17,10 +17,10 @@ else
 	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"
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	fi
 
-	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-530926da52f5226de6fc3167cf2e0671fb7f0cec"
+	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-02c0df0309784b30de2d65ca2c7385942591135c"
 fi
 
 IUSE="+occ"
diff --git a/sci-electronics/kicad-packages3d/metadata.xml b/sci-electronics/kicad-packages3d/metadata.xml
index 8395544a695c..c3ec4ca93a12 100644
--- a/sci-electronics/kicad-packages3d/metadata.xml
+++ b/sci-electronics/kicad-packages3d/metadata.xml
@@ -19,9 +19,6 @@
 		<flag name="occ">
 			Use <pkg>sci-libs/opencascade</pkg> for data exchange
 		</flag>
-		<flag name="oce">
-			Use <pkg>sci-libs/oce</pkg> for data exchange
-		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">kicad/kicad-packages3d</remote-id>