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

[Sam James]

commit:     e6cab4378e123c2a3a638b6fb5cb2a922644888b
Author:     JonRB <jon.roadleybattin <AT> gmail <DOT> com>
AuthorDate: Mon Nov 22 20:20:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 17:15:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6cab437

sci-electronics/kicad-packages3d: update OCE use-flag

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

 .../kicad-packages3d-5.1.11.ebuild                 |  2 +-
 .../kicad-packages3d-9999.ebuild.orig              | 35 ----------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.11.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.11.ebuild
index ce0d62fefa15..db1b8d147cd3 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.11.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.11.ebuild
@@ -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-9999.ebuild.orig b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild.orig
deleted file mode 100644
index 19eef9145781..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild.orig
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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"