gentoo auto-resync : 19:07:2023 - 01:02:32

3 files changed, 8 insertions, 50 deletions

diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 30a53ff624e6..09146d84b532 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,10 +1,8 @@
-DIST kicad-packages3d-6.0.11.tar.bz2 737065465 BLAKE2B 959ee6137a7d7cd818099bc86b3069cb77d280f60d3c3027fe4ffb02277a65aefc4e4d674bd7ce285fca4afde34482801d65e882c52cb86b9a6199956c22a230 SHA512 83d064ad893322c6ca5b6f8785005749ed7ffed5719a71abb6660557e537a100c4905d2e7dc26a6306381145cd356afa4830c7d90f210f1b9bd57e7e918bdd6d
-DIST kicad-packages3d-6.0.9.tar.gz 953182554 BLAKE2B a0f9810d1236c3ef1b0adae3cc2f1d8172fb52add6a9d5666dd32431725a1d3fd0456119ef21b05bd390ec90fce359b46e846f0af063feb4f8d97bc69da57f68 SHA512 fe014b35ce9071ed48d00481d509fba678dc0bea5170f626de9b18c0e0285cb441fcc635197da40af869e35c50104a9a69d991348d6031293ee166b734ba7cc9
 DIST kicad-packages3d-7.0.1.tar.bz2 768042873 BLAKE2B 1077e2deabfe75bfbaa9c6770c6bd1c273e7699b1b0bb4b88b6a9e2dd3f3becab583c0f2d143070d01021711548d0c6e8630286d0d63904ef4c09f39f5d2234f SHA512 f634ff5449cf5b9b619d09495b8a38fd58445589d73ba98442b2fa134d18b81e50d72eea37724e1460cafd4b1c4c2bb345a1e453371b9298e7d79bf54629d721
 DIST kicad-packages3d-7.0.2.tar.bz2 768222191 BLAKE2B 8e9485d0b4ee2c0d9e71675344f720b2af78a5f3541c56eabd0286ddfaf12a997456c7f9cd6e4bbde2dcea2ae5dd3f8f8fc2b2384266b5a7b0b9747a41544629 SHA512 248d39693045114631d5e9630b21ad5ea3bd019a64f372ca5fbe1c2920fc3e324ea86cced2ad11d20640389c473dc3dfd3333d0f8c283159af1cbcbcfdcd9320
-EBUILD kicad-packages3d-6.0.11.ebuild 944 BLAKE2B 9d16319cc7e92f88f05340b2fa8d756ec9eaeba6767fdd0c8bde5e9dc74aaeded6dce665708aadd071c49cb1a25837b5ecf9263d1138583df7884aee45041322 SHA512 d92ddc1831a5f77100562abc4761e6a1abb8cb403e2b944e0af26b1372ce3c72c2c53be69dece06f22a7887c08d3b111add9b2392a33248f317c86ad88085dba
-EBUILD kicad-packages3d-6.0.9.ebuild 941 BLAKE2B a3f3804f26c7c1189a51ae3329e1e87aa7aaf17b9f75480ecb0a6d5d9e44697d6084ffcec9a577eeeb34ee0ab0dcd9b618abcbfe229265e2426c1283ae4560a8 SHA512 3ddeb86a6c24a7d5de43a7d0c6b12b37f1a60805b296bf74ad6cb9a35bf60b5a63127e66d30ccb4b0595c0d9b44723ebe87431e1cce2fcae1cf61ba48a1b3f1e
+DIST kicad-packages3d-7.0.6.tar.bz2 768656951 BLAKE2B 249dd4326fbca08692a4c4068d0576c8edc09beaa32a2d21bc080f63232c8a335d77759811b0bce7beaac6a111db87fb6081bcf9bfffac69f538a73788be3de9 SHA512 9947a320e8d195ee15936a300b6d051952bd4bf9e2110e2dbf0c9c205328f81721a5266ba833db5db5742ce0ec76957e43d0953dca2c46e223e11bbbf450a762
 EBUILD kicad-packages3d-7.0.1.ebuild 841 BLAKE2B 1136c63c5557e700c5781bd5097e89d92cc31c9c989412cfe41eece9b3f3f745679c237125d73f6a1a95b59cc57581b01ada2a99a759392691cf268d5672c037 SHA512 f430d57576a72fa4c20680e867cceefbdaaa3862c7ef7d49fc4083e1f63355e1d876ec8a1330b8d88dac1b094cee743a0ad121e1ae411452f2cc77c3f40aed7c
 EBUILD kicad-packages3d-7.0.2.ebuild 842 BLAKE2B c77b6ce82a2f793a318fd81484566e965cdd9cf95adde3b88dc612e78e43e6baa286a2fd1ffb65e8556028780c3e89f93186003fba18b1f7a65e3ec0f499d8a2 SHA512 31df462a42e518312f0f8235ed2b90c7bab7537e3ac4b4c9281b5d941ab455a1f67a1169fc64d0ea484701d88a10174891868e1da4087b7fe77c27851fde578a
+EBUILD kicad-packages3d-7.0.6.ebuild 842 BLAKE2B c77b6ce82a2f793a318fd81484566e965cdd9cf95adde3b88dc612e78e43e6baa286a2fd1ffb65e8556028780c3e89f93186003fba18b1f7a65e3ec0f499d8a2 SHA512 31df462a42e518312f0f8235ed2b90c7bab7537e3ac4b4c9281b5d941ab455a1f67a1169fc64d0ea484701d88a10174891868e1da4087b7fe77c27851fde578a
 EBUILD kicad-packages3d-9999.ebuild 842 BLAKE2B a22a8effad98c5c2ba00af8a7121b516f5bcd05f1a1077d9d262131370f172f0343f557302a169cdf92fb1c38abe7c8fbf20a01828f055712119f464e4e6a43b SHA512 0f7996683ff97a77a359dd644fdd8ebb6e28b413934012e7a232952c4df8233550e637e722e9dd9251954b1f410d17c3dd5fb489d80baad24ceeda4e0acdaa4d
 MISC metadata.xml 907 BLAKE2B 645bfff1ab4f879a9cbb5994b57c959a06f669b0de25b37a9003b046beed955b54b29c6fe660060b3379d02eb247692bab9afdd6364da59318dbe590e5f8a68a SHA512 533862b4c7d390e749bbe0d745dd015d4aa86731f0478d8beca639a829444fab91ee61a3cf39cde43866e49fdac550fb2433d41f63c46f35aa68c0d5081aa7aa
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.11.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.11.ebuild
deleted file mode 100644
index f01fec709899..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/kicad-packages3D/-/archive/${MY_PV}/kicad-packages3D-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	fi
-fi
-
-IUSE="+occ"
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-
-RDEPEND=">=sci-electronics/kicad-6.0.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-6.0.9.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.6.ebuild
index 344b60c32007..0814793b5346 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.9.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.6.ebuild
@@ -12,21 +12,17 @@ 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/kicad-packages3D/-/archive/${MY_PV}/kicad-packages3D-${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-	fi
+	SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN/3d/3D}-${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
-IUSE="+occ"
+IUSE=""
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
 
-RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]"
+RDEPEND=">=sci-electronics/kicad-7.0.0"
 
 if [[ ${PV} == 9999 ]] ; then
 	# x11-misc-util/macros only required on live ebuilds