gentoo auto-resync : 05:11:2022 - 15:18:09

4 files changed, 178 insertions, 4 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 54e7ee0a8c29..1167706d6da2 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -7,8 +7,10 @@ AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827
 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
 DIST kicad-6.0.6.tar.gz 45086249 BLAKE2B fbf1f11cbf4838186e1ecb42127f7b182d3cd13b4af147211c85244d361cbf83387f5d102efdc80a63cfff36e343e6c4e07fef7f95dac4c6666844c5bc9d0ec2 SHA512 c472a6b81e3065e0499cad8467527d3531dc4d5861f50079ecb2ae6fccaf2c4d24fbeae8e9fe0cdde5ef548458fcef9615d6539426abe391a629dd539406065a
 DIST kicad-6.0.7.tar.gz 45143677 BLAKE2B 4ab9132be84cb6c6c566a826e5966f4fe64922dcd66f78c558126b37a276e075af80440da35071c864457298f6f964ba15511d0038424f473c3fb079d5f042e6 SHA512 0466650d166becbde23f1202e8bbe73ac7c743b5baad9608252fe4e960f0d15aad363664b69d840ef4568bf6d1c042b94252afce8657594a5f8193c979613e0e
+DIST kicad-6.0.8.tar.gz 45155261 BLAKE2B fda898c4a4e435b9f61bc706a29814a14ee3882e26043355bb14d4e99a334602d83453d6164a4589a106104ce1a5e4cd7b774ce89fb3b0f40cf140aee16d8e73 SHA512 8ecba5481e1876075976316f94af44116098cf652dba263b5d4a5c1eeb3628ba4814a3698c8cacf40c8c7b4c118e47db3d9db198ccfd30f532576343a7a62791
 EBUILD kicad-5.1.12-r3.ebuild 4841 BLAKE2B 3650e3d50347526b847db5ff1d49d64a57942f224ece8ec8b4cd5b4301520bb81757c24e76276c18e09635041f8e1e35bfcc8e830f37d47c85a21019de6725fb SHA512 455617db4a03f75cd6b1ad6857843b7a1e699c43e31d265690de107030202899dfa1e380c92e48ea47b25aabafa09ff3678c73efbcd2d5900e24a39366a62e4f
-EBUILD kicad-6.0.6.ebuild 4435 BLAKE2B 5dc647e0aea007666f9b2bcdef5cff53da80ba3657fcfc1966ce37c746dc55b34e0a05d35f4a6bc7ac8874996868b665bbd830727a24fe27465839197ff3aff5 SHA512 d31b82a375bf72417e23d44193767d63b64a48c82e16c0b2dfb409f97bd2f51bf63964b938403fcce51ecdaece10949495829fae2beb909fc14201f0124e9ea0
-EBUILD kicad-6.0.7.ebuild 4443 BLAKE2B ba5b290076cb008c908fada65aede54d3f1d92defc1002996c78ed8146c3b592afcadb07a650de2ff0dfb0a3de0a6b60ccd257d965d17f1b4fd704ff65281f40 SHA512 0823b9619d6223d0bca930e68e2eb370cf8b2afb4df9658e5152813b2d99469ced3047c196762fab6ec3c8ed18f00389355ce7010a10dc640dcb9f0a66052ddd
+EBUILD kicad-6.0.6.ebuild 4366 BLAKE2B 3691d12f5a1875490334899073158bffc7b1b87c412812cb04326e446b4491d4a8bd0d4a3a304532abce9fe94edaa642320ea6878f5fb35b4987d2315418d3b9 SHA512 14006927420f0c3a0cc2a1fc47c98abeb3e060042d0b71be96f590ba7c70d545b6d333ee48b947b762b693376793c25628b3d2384cf5e62702bdc1210c3f9650
+EBUILD kicad-6.0.7.ebuild 4374 BLAKE2B e18a4fcfc2d3cbbbc08857975dccb13f7cdf11f0e92e15ea4a6b5b2de4a47128296f4081e33e63cb616d6311c2b85079b6648e20886376c62c57da6aa4d10a73 SHA512 d5a4c1d2f896cdcf6274e689b6c87a93f1b0a0ae06b2ba80c1b99c7efe471b7637a530f5b947caf549b9a4f3b639f947c889e9256daf4637765043d9677b0471
+EBUILD kicad-6.0.8.ebuild 4374 BLAKE2B e18a4fcfc2d3cbbbc08857975dccb13f7cdf11f0e92e15ea4a6b5b2de4a47128296f4081e33e63cb616d6311c2b85079b6648e20886376c62c57da6aa4d10a73 SHA512 d5a4c1d2f896cdcf6274e689b6c87a93f1b0a0ae06b2ba80c1b99c7efe471b7637a530f5b947caf549b9a4f3b639f947c889e9256daf4637765043d9677b0471
 EBUILD kicad-9999.ebuild 4326 BLAKE2B a87d6d2c4716a94244514dfdfcdbefb4088608e062bb8ac8c1aa10389eaaf3cd0a9a5f0f9e3525a7c230779dfaab2e612f7d8e516fbbc4b46ffa142f8c790951 SHA512 a048bac273f48ce9023fdde226cc5f451fa85eaeb26a7b07397055c938477735c98a5181fc653d619ba91ec3296db7ad942767700011176881755137741bd6f0
 MISC metadata.xml 1047 BLAKE2B 1ed5807dc4f194f6f66e6e0743fe186dd046128bfec2fd3e2a72919e4cf714b0ac6d1ba7da0764ce0b4202eb0a068e5c3e261dfcccf309198400e8be009b7845 SHA512 dc7b727047452b1398fe4029c3b7e70826074733be7c1f2c6c2d485948380da208561a738427d0a5f8a67dbec07593c529b4f8b6690b8a5de7b3bb291576ab59
diff --git a/sci-electronics/kicad/kicad-6.0.6.ebuild b/sci-electronics/kicad/kicad-6.0.6.ebuild
index 2ca2a1b0142c..ca3edd939568 100644
--- a/sci-electronics/kicad/kicad-6.0.6.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.6.ebuild
@@ -159,7 +159,6 @@ pkg_postinst() {
 	optfeature "Component footprints library" sci-electronics/kicad-footprints
 	optfeature "3D models of components " sci-electronics/kicad-packages3d
 	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
 	optfeature "Extended documentation" app-doc/kicad-doc
 	optfeature "Creating 3D models of components" media-gfx/wings
 
diff --git a/sci-electronics/kicad/kicad-6.0.7.ebuild b/sci-electronics/kicad/kicad-6.0.7.ebuild
index f54b1112fa14..7471c53d9dbd 100644
--- a/sci-electronics/kicad/kicad-6.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.7.ebuild
@@ -159,7 +159,6 @@ pkg_postinst() {
 	optfeature "Component footprints library" sci-electronics/kicad-footprints
 	optfeature "3D models of components " sci-electronics/kicad-packages3d
 	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
 	optfeature "Extended documentation" app-doc/kicad-doc
 	optfeature "Creating 3D models of components" media-gfx/wings
 
diff --git a/sci-electronics/kicad/kicad-6.0.8.ebuild b/sci-electronics/kicad/kicad-6.0.8.ebuild
new file mode 100644
index 000000000000..7471c53d9dbd
--- /dev/null
+++ b/sci-electronics/kicad/kicad-6.0.8.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples ngspice nls openmp +occ +pcm"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
+COMMON_DEPEND="
+	!sci-electronics/kicad-i18n
+	dev-libs/boost:=[context,nls]
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
+		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	ngspice? (
+		>sci-electronics/ngspice-27[shared]
+	)
+	nls? (
+		sys-devel/gettext
+	)
+	occ? (
+		>=sci-libs/opencascade-7.3.0:0=
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND=">=dev-lang/swig-3.0
+	doc? ( app-doc/doxygen )"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="900M"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-scripts-install-fix.patch"
+	"${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch"
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
+	setup-wxwidgets
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+
+		# Merged from separate -i18n package, bug #830274
+		-DKICAD_BUILD_I18N="$(usex nls)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
+
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+
+		-DKICAD_SPICE="$(usex ngspice)"
+		-DKICAD_PCM="$(usex pcm)"
+
+		-DKICAD_USE_OCC="$(usex occ)"
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+	)
+
+	use occ && mycmakeargs+=(
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doxygen-docs
+	fi
+}
+
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die
+		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}