kio-extra and kdeplasma-addons fixed.

desktop/kde/plasma/kdeplasma-addons/pspec.xml

@@ -16,14 +16,24 @@
         <Archive sha1sum="53e8a0b5a55fb03eb156f401167fb02a06515d2a" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/kdeplasma-addons-5.3.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-        <Dependency>libgcc</Dependency>
             <Dependency>libxcb-devel</Dependency>
             <Dependency>glib2-devel</Dependency>    
             <Dependency>scim-devel</Dependency>   
             <Dependency>ibus-devel</Dependency>  
             <Dependency>kdoctools-devel</Dependency>
+            <Dependency>knewstuff-devel</Dependency>
+            <Dependency>kemoticons-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kross-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
+            <Dependency>kcmutils-devel</Dependency>
+            <Dependency>kdesignerplugin</Dependency>
+            <Dependency>krunner-devel</Dependency>
             <Dependency>kdelibs4-support-devel</Dependency>
+            <Dependency>plasma-framework-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 

desktop/kde/plasma/kio-extras/pspec.xml

@@ -15,15 +15,8 @@
         <Description>Additional KIO-slaves for KDE5 applications</Description>
         <Archive sha1sum="d9fa8e1034d13d155d93fecf337884fef019a33b" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/kio-extras-5.3.2.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>exiv2-devel</Dependency>
-	    <Dependency>python3</Dependency>
+            <Dependency>gettext-devel</Dependency>
-        <Dependency>libgcc</Dependency>
-	    <Dependency>gettext</Dependency>
-	    <Dependency>shared-mime-info</Dependency>
-	    <Dependency>libmtp-devel</Dependency>
-	    <Dependency>shared-mime-info</Dependency>
-	    <Dependency>openexr-devel</Dependency>
-	    <Dependency>openslp-devel</Dependency>
             <Dependency>karchive-devel</Dependency>
             <Dependency>kconfig-devel</Dependency>
             <Dependency>kcoreaddons-devel</Dependency>
@@ -31,55 +24,62 @@
             <Dependency>kdelibs4-support-devel</Dependency>
             <Dependency>kdnssd-devel</Dependency>
             <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kemoticons-devel</Dependency>
             <Dependency>khtml-devel</Dependency>
             <Dependency>ki18n-devel</Dependency>
             <Dependency>kiconthemes-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
             <Dependency>kio-devel</Dependency>
-	    <Dependency>solid-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kpty-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
             <Dependency>libjpeg-turbo-devel</Dependency>
+            <Dependency>libmtp-devel</Dependency>
             <Dependency>libssh-devel</Dependency>
-	    <Dependency>openslp-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-phonon-devel</Dependency>
+            <Dependency>qt5-svg-devel</Dependency>
             <Dependency>samba-devel</Dependency>
-	    <Dependency>exiv2-devel</Dependency>
+            <Dependency>shared-mime-info</Dependency>
+            <Dependency>solid-devel</Dependency>
+            <Dependency>docbook-xsl</Dependency>
+            <Dependency>kdesignerplugin</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>kio-extras</Name>
         <RuntimeDependencies>
-            <Dependency>qt5-base</Dependency>
+            <Dependency>exiv2-libs</Dependency>
-	    <Dependency>qt5-svg</Dependency>
-        <Dependency>libgcc</Dependency>
-	    <Dependency>libmtp</Dependency>
-	    <Dependency>kpty</Dependency>
-	    <Dependency>kparts</Dependency>
-	    <Dependency>kcodecs</Dependency>
-	    <Dependency>kxmlgui</Dependency>
-	    <Dependency>kservice</Dependency>
-	    <Dependency>kbookmarks</Dependency>
-	    <Dependency>kguiaddons</Dependency>
-	    <Dependency>kconfigwidgets</Dependency>
-	    <Dependency>openexr</Dependency>
             <Dependency>karchive</Dependency>
+            <Dependency>kbookmarks</Dependency>
+            <Dependency>kcodecs</Dependency>
             <Dependency>kconfig</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
             <Dependency>kcoreaddons</Dependency>
             <Dependency>kdbusaddons</Dependency>
             <Dependency>kdelibs4-support</Dependency>
             <Dependency>kdnssd</Dependency>
-	    <Dependency>kdoctools</Dependency>
+            <Dependency>kguiaddons</Dependency>
             <Dependency>khtml</Dependency>
             <Dependency>ki18n</Dependency>
             <Dependency>kiconthemes</Dependency>
             <Dependency>kio</Dependency>
-	    <Dependency>solid</Dependency>
+            <Dependency>kparts</Dependency>
+            <Dependency>kpty</Dependency>
+            <Dependency>kservice</Dependency>
+            <Dependency>kxmlgui</Dependency>
+            <Dependency>libgcc</Dependency>
             <Dependency>libjpeg-turbo</Dependency>
+            <Dependency>libmtp</Dependency>
             <Dependency>libssh</Dependency>
-	    <Dependency>openslp</Dependency>
+            <Dependency>qt5-base</Dependency>
             <Dependency>qt5-phonon</Dependency>
+            <Dependency>qt5-svg</Dependency>
             <Dependency>samba</Dependency>
-	    <Dependency>exiv2-libs</Dependency>
+            <Dependency>solid</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>

x11/im/scim/actions.py

@@ -15,8 +15,6 @@ def setup():
     shelltools.system("intltoolize --force")
     autotools.configure("\
                          --with-x \
-                         --with-qt5-moc=/usr/lib/qt5/bin/moc \
-                         --with-gtk-version=2,3 \
                          --disable-static \
                          --enable-ld-version-script \
                          --x-includes=/usr/include/X11 \
@@ -35,8 +33,8 @@ def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
     #Remove scim-setup related stuff
-    pisitools.removeDir("/usr/share/pixmaps")
+    #pisitools.removeDir("/usr/share/pixmaps")
-    pisitools.removeDir("/usr/share/applications")
+    #pisitools.removeDir("/usr/share/applications")
-    pisitools.removeDir("/usr/share/control-center-2.0")
+    #pisitools.removeDir("/usr/share/control-center-2.0")
 
     pisitools.dodoc("AUTHORS", "NEWS", "README*", "TODO", "THANKS")

x11/im/scim/pspec.xml

@@ -18,10 +18,11 @@
             <AdditionalFile permission="0644" target="configs/global">scim-system-global</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
-            <Dependency>gtk3-devel</Dependency>
+            <!--Dependency>gtk3-devel</Dependency-->
             <Dependency>libXt-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
             <Dependency>intltool</Dependency>
-            <Dependency>qt5-base-devel</Dependency>
+            <!--Dependency>qt5-base-devel</Dependency-->
         </BuildDependencies>
         <Patches>
             <Patch level="1">scim-1.4.14-compile.patch</Patch>
@@ -41,10 +42,10 @@
             <Dependency>libX11</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>scim-libs</Dependency>
-            <Dependency>gtk3</Dependency>
+            <!--Dependency>gtk3</Dependency>
-            <Dependency>glib2</Dependency>
             <Dependency>pango</Dependency>
-            <Dependency>gdk-pixbuf</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>gdk-pixbuf</Dependency-->
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -64,11 +65,11 @@
         <Name>scim-libs</Name>
         <Summary>Libraries of SCIM</Summary>
         <RuntimeDependencies>
-            <Dependency>pango</Dependency>
             <Dependency>libX11</Dependency>
+            <!--Dependency>pango</Dependency>
             <Dependency>gtk3</Dependency>
             <Dependency>cairo</Dependency>
-            <Dependency>glib2</Dependency>
+            <Dependency>glib2</Dependency-->
             <Dependency>libgcc</Dependency>
             <Dependency>libtool-ltdl</Dependency>
         </RuntimeDependencies>
@@ -84,7 +85,7 @@
         <Summary>Includes and pkgconfig for scim development</Summary>
         <RuntimeDependencies>
             <Dependency release="current">scim-core</Dependency>
-            <Dependency>gtk3-devel</Dependency>
+            <!--Dependency>gtk3-devel</Dependency-->
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
@@ -92,7 +93,7 @@
         </Files>
     </Package>
 
-    <Package>
+    <!--Package>
         <Name>scim-immodule-gtk3</Name>
         <Summary>IM Module for GTK3 applications</Summary>
         <RuntimeDependencies>
@@ -116,7 +117,7 @@
         <Files>
             <Path fileType="library">/usr/lib/gtk-2.0</Path>
         </Files>
-    </Package>
+    </Package-->
 
     <History>
         <Update release="4">