diff --git a/multimedia/graphics/tiff/dd1bcc7abb26094e93636e85520f0d8f81ab0fab.patch b/multimedia/graphics/tiff/files/dd1bcc7abb26094e93636e85520f0d8f81ab0fab.patch
similarity index 100%
rename from multimedia/graphics/tiff/dd1bcc7abb26094e93636e85520f0d8f81ab0fab.patch
rename to multimedia/graphics/tiff/files/dd1bcc7abb26094e93636e85520f0d8f81ab0fab.patch
diff --git a/multimedia/graphics/tiff/pspec.xml b/multimedia/graphics/tiff/pspec.xml
index 3b5700b2da..f9634cb7eb 100644
--- a/multimedia/graphics/tiff/pspec.xml
+++ b/multimedia/graphics/tiff/pspec.xml
@@ -22,13 +22,6 @@
         </BuildDependencies>
         <Patches>
             <Patch level="1">dd1bcc7abb26094e93636e85520f0d8f81ab0fab.patch</Patch>
-<!--             <Patch level="1">gentoo/tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch</Patch> -->
-<!--             <Patch level="1">gentoo/tiff-4.0.7-pdfium-0007-uninitialized-value.patch</Patch> -->
-<!--             <Patch level="1">gentoo/tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch</Patch> -->
-<!--             <Patch level="1">gentoo/tiff-4.0.7-pdfium-0013-validate-refblackwhite.patch</Patch> -->
-<!--             <Patch level="1">gentoo/tiff-4.0.7-pdfium-0017-safe_skews_in_gtTileContig.patch</Patch> -->
-<!--             <Patch level="1">gentoo/tiff-4.0.7-pdfium-0018-fix-leak-in-PredictorSetupDecode.patch</Patch> -->
-<!--             <Patch level="1">gentoo/tiff-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch</Patch> -->
         </Patches>
     </Source>
     <Package>
diff --git a/science/electronics/kicad/actions.py b/science/electronics/kicad/actions.py
index 31fa7d871b..52f79ee88c 100644
--- a/science/electronics/kicad/actions.py
+++ b/science/electronics/kicad/actions.py
@@ -19,33 +19,30 @@ def setup():
                           -DKICAD_SKIP_BOOST=ON         \
                           -DKICAD_SCRIPTING=ON          \
                           -DKICAD_SCRIPTING_MODULES=ON  \
+                          -DKICAD_USE_OCE=OFF \
+                          -DKICAD_USE_OCC=OFF \
+                          -DKICAD_USE_EGL=1 \
+                          -DKICAD_SCRIPTING_WXPYTHON=OFF \
+                          -DKICAD_BUILD_QA_TESTS=OFF \
+                          -DKICAD_I18N_UNIX_STRICT_PATH=ON \
                           -DBUILD_GITHUB_PLUGIN=ON", sourceDir="..")
     
-    shelltools.cd("..")
-    shelltools.cd("kicad-i18n-4.0.7")
-    shelltools.makedirs("Release")
-    shelltools.cd("Release")
-    cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
-                          -DKICAD_I18N_UNIX_STRICT_PATH=ON", sourceDir="..")
-    shelltools.cd("..")
+    #shelltools.cd("..")
+    #shelltools.cd("kicad-i18n-5.1.5")
+    #shelltools.makedirs("Release")
+    #shelltools.cd("Release")
+    #cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
+                          #-DKICAD_I18N_UNIX_STRICT_PATH=ON", sourceDir="..")
+    #shelltools.cd("..")
 
 def build():
     shelltools.cd("Release")
     cmaketools.make()
-    shelltools.cd("..")
-    shelltools.cd("kicad-i18n-4.0.7")
-    shelltools.cd("Release")
-    cmaketools.make()
-    shelltools.cd("..")
 
 def install():
     shelltools.cd("Release")
     cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
-    shelltools.cd("..")
-    shelltools.cd("kicad-i18n-4.0.7")
-    shelltools.cd("Release")
-    cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
-    
+
     #shelltools.cd("..")
 
     #pisitools.dodoc("AUTHORS*", "CHANGELOG*", "README*")
diff --git a/science/electronics/kicad/pspec.xml b/science/electronics/kicad/pspec.xml
index 1f286b7ddc..9a93963878 100644
--- a/science/electronics/kicad/pspec.xml
+++ b/science/electronics/kicad/pspec.xml
@@ -10,13 +10,16 @@
         </Packager>
         <License>GPLv1</License>
         <IsA>library</IsA>
+        <Icon>kicad</Icon>
         <Summary>Electronic schematic and printed circuit board (PCB) design tools</Summary>
         <Description>Electronic schematic and printed circuit board (PCB) design tools</Description>
-        <Archive sha1sum="6e4276edd0761f47008038c5ba8435653b2aee59" type="tarxz">https://launchpad.net/kicad/4.0/4.0.7/+download/kicad-4.0.7.tar.xz</Archive>
-        <Archive sha1sum="27a4ea6fc4efe7f9fcea4734c880241217d8d5e7" type="targz" target="kicad-4.0.7">https://github.com/KiCad/kicad-i18n/archive/4.0.7.tar.gz</Archive>
+        <Archive sha1sum="d60b7393617816192c2ddf228e09ebc97421713f" type="tarbz2">https://gitlab.com/kicad/code/kicad/-/archive/6.0.7/kicad-6.0.7.tar.bz2</Archive>
+<!--         <Archive sha1sum="2439effbc7ddd69aba51baee940c152bb1c37227" type="targz" target="kicad-5.1.5">https://github.com/KiCad/kicad-i18n/archive/refs/tags/5.1.5.tar.gz</Archive> -->
         <BuildDependencies>
+            <Dependency>glm</Dependency>
             <Dependency>swig</Dependency>
             <Dependency>cmake</Dependency>
+            <Dependency>wxGTK3</Dependency>
             <Dependency>curl-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>glew-devel</Dependency>
@@ -29,11 +32,12 @@
             <Dependency>openssl-devel</Dependency>
             <Dependency>python-devel</Dependency>
             <Dependency>mesa-glu-devel</Dependency>
+            <Dependency>ngspice-devel</Dependency>
             <Dependency>desktop-file-utils</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch>boost-1.61.patch</Patch>
-            <Patch>CheckCXXSymbolExists.patch</Patch>
+<!--             <Patch>boost-1.61.patch</Patch> -->
+<!--             <Patch>CheckCXXSymbolExists.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -42,15 +46,19 @@
         <RuntimeDependencies>
             <Dependency>curl</Dependency>
             <Dependency>glew</Dependency>
-            <Dependency>mesa</Dependency>
+            <Dependency>zlib</Dependency>
             <Dependency>boost</Dependency>
             <Dependency>cairo</Dependency>
-            <Dependency>wxGTK</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>wxGTK3</Dependency>
             <Dependency>libgcc</Dependency>
-            <Dependency>python</Dependency>
+            <Dependency>pixman</Dependency>
+            <Dependency>python3</Dependency>
             <Dependency>libgomp</Dependency>
             <Dependency>openssl</Dependency>
+            <Dependency>libglvnd</Dependency>
             <Dependency>mesa-glu</Dependency>
+            <Dependency>wxGTK-common</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -63,9 +71,9 @@
 
     <History>
         <Update release="4">
-            <Date>2022-08-01</Date>
-            <Version>4.0.7</Version>
-            <Comment>Rebuild</Comment>
+            <Date>2022-07-29</Date>
+            <Version>6.0.7</Version>
+            <Comment>Version bump.</Comment>
             <Name>Mustafa Cinasal</Name>
             <Email>muscnsl@gmail.com</Email>
         </Update>