[kde-base] Always depend on semantic-desktop= instead of semantic-desktop?

38 files changed, 59 insertions, 340 deletions

diff --git a/kde-base/activitymanager/Manifest b/kde-base/activitymanager/Manifest
index a781f78f051..9961e9840f5 100644
--- a/kde-base/activitymanager/Manifest
+++ b/kde-base/activitymanager/Manifest
@@ -1,23 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD activitymanager-4.6.9999.ebuild 487 RMD160 0b84a263fb252e97d77023de116a21a662022a10 SHA1 eaddb3a9553503066450e61607c49b8b3ea20947 SHA256 416da810e2175e09344dd7a53c6a2dcf88d593164c4699e3a50616166658a2dd
-EBUILD activitymanager-9999.ebuild 487 RMD160 0b84a263fb252e97d77023de116a21a662022a10 SHA1 eaddb3a9553503066450e61607c49b8b3ea20947 SHA256 416da810e2175e09344dd7a53c6a2dcf88d593164c4699e3a50616166658a2dd
+EBUILD activitymanager-4.6.9999.ebuild 487 RMD160 e07d1bb70d76b24fe25effcbf7a7316df1f0e5b3 SHA1 4c88602e4697105df476012c2f85aa94729492aa SHA256 70efd10798ab5ad83fb086d55dcc27a6dd86150acc5fa011ef50798164447978
+EBUILD activitymanager-9999.ebuild 487 RMD160 e07d1bb70d76b24fe25effcbf7a7316df1f0e5b3 SHA1 4c88602e4697105df476012c2f85aa94729492aa SHA256 70efd10798ab5ad83fb086d55dcc27a6dd86150acc5fa011ef50798164447978
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNridFAAoJELHSF2kinlg4D6IQAIQxZ5j872P1sQF65vGwS+2X
-l6sm90D03uuPQ7lhRjYs+mu5fRaicVc/QmPlmIIy11+Iig0t4hRtBnRkGY+7VlAo
-2nWfxuJgr0+E5F0mCo87+gTizfjf9WrXRjLFgEvKMSfqC/pDvBCDiQqFLgCgAL03
-tc/4i22RFcXoQl5dN/37gFigvpGybXkhNzlrAwI1G+60hqSrE3d7t2Gay2zs+qGT
-UT0esc99YbZjptTYKU2GvA/UR9S+vMV5wrn1u9ZIrHfQSFBtSrL4hqFOxKwrgINB
-NXmpTRswGpMF06s/CWkuDi7Mxg4VVpemDxxndqtoB3SinDBHmoiuv3cy0PK9psB5
-0P+q9eoJNovyc7ho8gl7jN6g13zCs2tL3Qp2YDPQzT1EbCu4PmxV9tcn649O6G4f
-PitpphpISayEU2FpQGbR3RSin6dg/goIauitZ4FXv3C9JrHVMah0NcwZxALnGT6Y
-LJ7eCTCFqLiTbPmv/2J1r/ynay9aVrrv8YHHtmv+aMHZfN4SGUI0zoqKpDSHRMFO
-6hUProyD/72Vkhh7wyYxOAvNMxPGRpzpFk6ti6OmfYqxSitFaSqPZ2TnziQ3XyeV
-h5R2zyeHIIWnb2QQ/AUJd/SmX/C8DkinyVPMeFOCrV1kdcTaaj2DXZBi9pQGcZvA
-XGOXDd810o3ML5lTh+fx
-=9nCY
------END PGP SIGNATURE-----
diff --git a/kde-base/activitymanager/activitymanager-4.6.9999.ebuild b/kde-base/activitymanager/activitymanager-4.6.9999.ebuild
index 39ac2f6a332..94592598ed1 100644
--- a/kde-base/activitymanager/activitymanager-4.6.9999.ebuild
+++ b/kde-base/activitymanager/activitymanager-4.6.9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Activity manager"
 KEYWORDS=""
 IUSE="debug semantic-desktop"
 
-DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
+DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop=')"
 RDEPEND=${DEPEND}
 
 src_configure() {
diff --git a/kde-base/activitymanager/activitymanager-9999.ebuild b/kde-base/activitymanager/activitymanager-9999.ebuild
index 39ac2f6a332..94592598ed1 100644
--- a/kde-base/activitymanager/activitymanager-9999.ebuild
+++ b/kde-base/activitymanager/activitymanager-9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Activity manager"
 KEYWORDS=""
 IUSE="debug semantic-desktop"
 
-DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
+DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop=')"
 RDEPEND=${DEPEND}
 
 src_configure() {
diff --git a/kde-base/dolphin/Manifest b/kde-base/dolphin/Manifest
index a094d345fba..4c639e5208e 100644
--- a/kde-base/dolphin/Manifest
+++ b/kde-base/dolphin/Manifest
@@ -1,24 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX dolphin-4.5.0-tooltips.patch 19833 RMD160 2443c1abe9c099bc633692aa4c812f025e61d01c SHA1 f179b966d2c0600ad4845713b46f3f2e1f273322 SHA256 589db980c89230a8bc0e2080dc92b4337af17ed9060ecc912d5549c6a408e0c7
-EBUILD dolphin-4.6.9999.ebuild 748 RMD160 80d87c77b007ec14da06286bf4dae37b92bf5a5b SHA1 55d42638b3026e8f3e55ba1ce4317c605842ec9f SHA256 0e8a8e7a58ba8ba565293a45b0214199ad6f41f8b15beaeac1ac6b1ebf2f5f6f
-EBUILD dolphin-9999.ebuild 748 RMD160 80d87c77b007ec14da06286bf4dae37b92bf5a5b SHA1 55d42638b3026e8f3e55ba1ce4317c605842ec9f SHA256 0e8a8e7a58ba8ba565293a45b0214199ad6f41f8b15beaeac1ac6b1ebf2f5f6f
+EBUILD dolphin-4.6.9999.ebuild 748 RMD160 71d3d4362734ee3dc10284c7e977ba172355fd04 SHA1 150b29ba2f2b5c89fa0501eedc38aa68b9724220 SHA256 fbe276d817c10ca4e8b8e0f4100ad0d3057c0aea33babede98bbe8cf1ad19404
+EBUILD dolphin-9999.ebuild 748 RMD160 71d3d4362734ee3dc10284c7e977ba172355fd04 SHA1 150b29ba2f2b5c89fa0501eedc38aa68b9724220 SHA256 fbe276d817c10ca4e8b8e0f4100ad0d3057c0aea33babede98bbe8cf1ad19404
 MISC metadata.xml 287 RMD160 6079a550c87093424f04a1d307864f6558608f59 SHA1 cd35c8ff7336bf936094660061f6ef58dd16276d SHA256 f8ca0fcb27fae3e13bce985f13164013ba54c573c50a047622953f03c48a6969
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNric/AAoJELHSF2kinlg4oPoQAI+sluyyKESJ4zx3NNIvjxTL
-ASL+ub5BriCQgBnb0dTkz3pH9pGj+Y11y6FBMbmyN4DKV7M/ko+DWlP8YZ4XOksF
-SnjMT+D2PjvqLQxz3BEtmX6ounNr5mvFIS3ASxTu+M80hqJy2w4Eu8ms0hrTBYwK
-WvgPsLfKNmRa6CxYwTWRfB/gBnM42WYNvRzEqbLtYCC/1HGn7iEsCsCRXpW6Cdq/
-OAfVwYjexDBvnjvBqVg2/AXK5cwncyz3fUUD45fCWOpssRTfIrob+m6ekqxfAbhn
-gxMs1z33Amv4D3uDaHlBibWGKgC+M+xdyhLfowf52Oj79Sx+aaH6cNWRK4wEzLUh
-5PE7U/GbOKZxvCVstMHlySCVEKrIBCE9Ws52kOaps5lYxKEUshsNY1mzqXyxYVac
-JVO+Yv2ml+Dsk+KPpWws4JOhU3/eF5yYWk0apCIhce9tWkSvYa+ibCo4NULpWKb9
-xORxeJ6iFkZJcf/m2wX2nG9fdSV5YnW6kwza+uMA3yggruUCEHkEhbeeGF4LYvyc
-1PK0jLYsdv7tj7aNMdgKYX090feDvB4AXsQh4Ue75N6Q+adjxBGLqW4CZsPrjRC7
-RmCUYfbaG/tYxakac0WdrERGGod8KYr237/0JDi5p6gqLEPG8FGVwzuaOjWuvFFu
-nZESZBXn6L7rMzorZP2d
-=g6IF
------END PGP SIGNATURE-----
diff --git a/kde-base/dolphin/dolphin-4.6.9999.ebuild b/kde-base/dolphin/dolphin-4.6.9999.ebuild
index 50805c4bb81..ecb24f09583 100644
--- a/kde-base/dolphin/dolphin-4.6.9999.ebuild
+++ b/kde-base/dolphin/dolphin-4.6.9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug semantic-desktop thumbnail"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
 	$(add_kdebase_dep libkonq)
 	semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 )
 "
diff --git a/kde-base/dolphin/dolphin-9999.ebuild b/kde-base/dolphin/dolphin-9999.ebuild
index 50805c4bb81..ecb24f09583 100644
--- a/kde-base/dolphin/dolphin-9999.ebuild
+++ b/kde-base/dolphin/dolphin-9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug semantic-desktop thumbnail"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
 	$(add_kdebase_dep libkonq)
 	semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 )
 "
diff --git a/kde-base/gwenview/Manifest b/kde-base/gwenview/Manifest
index db0a219f270..8607356bdfd 100644
--- a/kde-base/gwenview/Manifest
+++ b/kde-base/gwenview/Manifest
@@ -1,23 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD gwenview-4.6.9999.ebuild 892 RMD160 2f480c12476b3642174b68ebcf021ee2533fd137 SHA1 bc661caae5a1326d605708705e4cb7e6417c745f SHA256 d6be243dd57154aa610af0fde2c45b766cbf00493907d275d475e1374f8bd469
-EBUILD gwenview-9999.ebuild 1002 RMD160 ba610bf49fa70cdb4e6cf373c7892906723ee0db SHA1 25b169541b9be2fd3bf488d0d222829eff579043 SHA256 b3ffb3a8ecdae7178a2674c0941768666678e9dcea81516327515f0583489635
+EBUILD gwenview-4.6.9999.ebuild 1002 RMD160 162d0e60506f714feab9a6dc0d14ffa90fbfeb0f SHA1 3c4c4f86553465e12212191c2a16c83e3f408d3c SHA256 2fba81ab6776a4feba8c70ff6e988833012895bff4cf93ba18ce79a650608d62
+EBUILD gwenview-9999.ebuild 1002 RMD160 162d0e60506f714feab9a6dc0d14ffa90fbfeb0f SHA1 3c4c4f86553465e12212191c2a16c83e3f408d3c SHA256 2fba81ab6776a4feba8c70ff6e988833012895bff4cf93ba18ce79a650608d62
 MISC metadata.xml 239 RMD160 b218b61258c1ece22447d55118fe7ff55e99a00f SHA1 35300419c890900492c7accf7a1cacd20c1100ab SHA256 ebd8c616ad3cd4d1f1f9b5b1f2bba51432942a82e2138c687e4ad25b5fcbe5b1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNric1AAoJELHSF2kinlg4OCUP/2JzY0eM8o6F3PBGcEGmauUS
-WSMm4fqu4NNtxvQuuWElx+ot80wOTvefLYqtQqyHqJTttHxnG+2RhYTR2mGTytE+
-I3mt94/4DH9k+3DcKA9j4iGev/poiNtKAjZWtm/iMR4+EgCaTOX1otLv0iUlGdbV
-aaB0/5Xx+zBZXGFhk8rI+mb4DjXdVeMg+pygG0yFHg3lt42UC4eibj8lZqTJhCua
-0aibrC86Tn0VuVMc4WXx77DvOW/bItv5jxwTv+OJt97GoP4OXtDe5urDDGKH6J3A
-G+EkazFMdoGrlK5TXJ0XdGyetQmaPy35/JP9mwN3iM7BwZqQb0Ur427AyXltdK17
-rFn50FjF86q4KhEUjyTuAcexxbJoJR0KRZfrDOtZFZ3dqi46Z0gSwFQxLDlkgefj
-ffJXn2fRq83JiQZhpccst/fXpuliGmBfsJcDS4tKtWV54SctigyeZpH0DVMyyh7w
-nvTPqhy7CA0mMBhuU9Sig4cEKbafEHbFoyC8k7T07tzZgW7uwqD1YLiLOIl/18gd
-TDUGnS6KphrSoxzOE7Fh39X/ku13i/Dcjyu8QdS9MOJCp9RdWCtYAEh+cOk2W2Na
-k/whvLce8Sc08hAkQsJd5CYlz78xAsxWvmBAmO6iEYhT7i6eDr3cyumTYcKiRTum
-uRMjrzzavOO7ZybWTnX/
-=/fkW
------END PGP SIGNATURE-----
diff --git a/kde-base/gwenview/gwenview-4.6.9999.ebuild b/kde-base/gwenview/gwenview-4.6.9999.ebuild
index a2a59bafced..41203ff4979 100644
--- a/kde-base/gwenview/gwenview-4.6.9999.ebuild
+++ b/kde-base/gwenview/gwenview-4.6.9999.ebuild
@@ -5,8 +5,14 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+if [[ ${PV} == *9999 ]]; then
+KDE_SCM="git"
+kde_eclass="kde4-base"
+else
 KMNAME="kdegraphics"
-inherit kde4-meta
+kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE image viewer"
 KEYWORDS=""
@@ -16,7 +22,7 @@ IUSE="debug kipi semantic-desktop"
 RESTRICT="test"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
 	>=media-gfx/exiv2-0.18
 	virtual/jpeg
 	kipi? ( $(add_kdebase_dep libkipi) )
@@ -35,11 +41,11 @@ src_configure() {
 		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
 	fi
 
-	kde4-meta_src_configure
+	${kde_eclass}_src_configure
 }
 
 pkg_postinst() {
-	kde4-meta_pkg_postinst
+	${kde_eclass}_pkg_postinst
 
 	echo
 	elog "For SVG support, emerge -va kde-base/svgpart"
diff --git a/kde-base/gwenview/gwenview-9999.ebuild b/kde-base/gwenview/gwenview-9999.ebuild
index b7a28bc2dcc..41203ff4979 100644
--- a/kde-base/gwenview/gwenview-9999.ebuild
+++ b/kde-base/gwenview/gwenview-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="debug kipi semantic-desktop"
 RESTRICT="test"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
 	>=media-gfx/exiv2-0.18
 	virtual/jpeg
 	kipi? ( $(add_kdebase_dep libkipi) )
diff --git a/kde-base/kdebindings-csharp/Manifest b/kde-base/kdebindings-csharp/Manifest
index 888f1edb4f5..06d96db7249 100644
--- a/kde-base/kdebindings-csharp/Manifest
+++ b/kde-base/kdebindings-csharp/Manifest
@@ -1,24 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX kdebindings-csharp-4.4.1-make-stuff-optional.patch 1660 RMD160 fcb7f8fb159383180560517463df81d2c964c9ae SHA1 d373fd84c63225f1fd41b96ffa492c5f1da3d71a SHA256 88dabb10a0aa38a2c28b69a3ed15f93a6ce0ee0d7984a5909967cbd174924f9c
-EBUILD kdebindings-csharp-4.6.9999.ebuild 1160 RMD160 ea944bb72981f6a363c31920fa30b9bb523bd500 SHA1 77d605fe346e04b90d27f2cb3ba6935dcdcfad7e SHA256 622122568ebe800213d3feb25d728d83e1ddced98c0ea30cf99e5669edbc9e09
-EBUILD kdebindings-csharp-9999.ebuild 1160 RMD160 ea944bb72981f6a363c31920fa30b9bb523bd500 SHA1 77d605fe346e04b90d27f2cb3ba6935dcdcfad7e SHA256 622122568ebe800213d3feb25d728d83e1ddced98c0ea30cf99e5669edbc9e09
+EBUILD kdebindings-csharp-4.6.9999.ebuild 1160 RMD160 cddb3e05a8e97a187a5294802afe5b41a343bd2a SHA1 ca8d920afe7251fffdd58a5a4252c2f2d939ead7 SHA256 0562c18cb829f17d77979d754d7ffd230d2be3f33efea376fbd849f31f5d8011
+EBUILD kdebindings-csharp-9999.ebuild 1160 RMD160 cddb3e05a8e97a187a5294802afe5b41a343bd2a SHA1 ca8d920afe7251fffdd58a5a4252c2f2d939ead7 SHA256 0562c18cb829f17d77979d754d7ffd230d2be3f33efea376fbd849f31f5d8011
 MISC metadata.xml 602 RMD160 0e158f6f29d4a3c37e8013ee418e17cc87783823 SHA1 9074537b8ee5c3d3b882c0704a99433a73aa888e SHA256 34098292938931b570737accb01f4f124e79a7b1bfa2a59079fa51bdee3d24a5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNridHAAoJELHSF2kinlg4dVsQAKCYA26+LmzshHjI8Uc/imYc
-VFxzTuXhUTMD8QX5GYnsoXFKNAkySHAArkRdGIposrNLi34OB7DNONW4/rSBuKJu
-BlSRHGMmxmWa/qP4melepiEVQbC7DdKDQpJfco2BMlNd1Sdg91mxzZ4V13KsFbnJ
-gBo3bQjbqZmT6fPJxAjftCW/egNVic+Ij5U9c6s4pLwFubfylZQ/4KaoznFeaZO4
-UQagQ8E+5iFn+kHowQX4+ow4ZZRrQEUwfdEUHft8PgJ4LHxuof7vTUidXMdPboxy
-HuXEVYfwZ7viFcVmlT20SgUbADCY4d4a6HdaLhjOJC3pa/c55n9s0uoPhurwI2ms
-TyjXvZnkw1yP6oJ47Cimd6fpkMwkmf9fAX01A5Wo2zaH037mmQg8wpO+nKxhQ7NC
-D0MFp5M0mFwvVyLdQ4ocGX9dGXHjG0ONHjlvPMOXhift0AgKzG/IE1ugFGFBZ8pu
-H6ZV3C0eB9HIaUxW7KninNF84pV1y4SFrjFu1R0fHPk7JWVGk6SysztT65N0El6+
-T2SfKF60G2daZpkYPexaHyaBOadvyZLALaUDkj6bNb8o00tV2qpxaH4tCKR3tfkU
-rEJtvYMVHh8gfvIgcz7S6dspr2BNF2rGc+d8S86E0aLQ/TAJ7AVmaKZHLeHheSV+
-ZbfBjyA3ZJ/edgofS+QM
-=1BkR
------END PGP SIGNATURE-----
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-4.6.9999.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.6.9999.ebuild
index 212a49d117a..0882672599e 100644
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.6.9999.ebuild
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-4.6.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="akonadi debug +phonon plasma qimageblitz qscintilla semantic-desktop"
 
 DEPEND="
 	dev-lang/mono
-	$(add_kdebase_dep smoke 'akonadi?,phonon?,qimageblitz?,qscintilla?,semantic-desktop?,webkit?')
+	$(add_kdebase_dep smoke 'akonadi?,phonon?,qimageblitz?,qscintilla?,semantic-desktop=,webkit?')
 	semantic-desktop? ( >=dev-libs/soprano-2.4.64[clucene] )
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild
index 212a49d117a..0882672599e 100644
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild
@@ -15,7 +15,7 @@ IUSE="akonadi debug +phonon plasma qimageblitz qscintilla semantic-desktop"
 
 DEPEND="
 	dev-lang/mono
-	$(add_kdebase_dep smoke 'akonadi?,phonon?,qimageblitz?,qscintilla?,semantic-desktop?,webkit?')
+	$(add_kdebase_dep smoke 'akonadi?,phonon?,qimageblitz?,qscintilla?,semantic-desktop=,webkit?')
 	semantic-desktop? ( >=dev-libs/soprano-2.4.64[clucene] )
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kdebindings-perl/Manifest b/kde-base/kdebindings-perl/Manifest
index 526858f7788..750f403f339 100644
--- a/kde-base/kdebindings-perl/Manifest
+++ b/kde-base/kdebindings-perl/Manifest
@@ -1,23 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD kdebindings-perl-4.6.9999.ebuild 1529 RMD160 9ea50408454de8cc8399e4895b57142c73b918b2 SHA1 283aca37eee097ec7cf6ae76e13c84de7ad895f3 SHA256 381497b8f0f27f94eead31173b038d474c9ce9370fe4a2396fde6b308ed992bd
-EBUILD kdebindings-perl-9999.ebuild 1529 RMD160 9ea50408454de8cc8399e4895b57142c73b918b2 SHA1 283aca37eee097ec7cf6ae76e13c84de7ad895f3 SHA256 381497b8f0f27f94eead31173b038d474c9ce9370fe4a2396fde6b308ed992bd
+EBUILD kdebindings-perl-4.6.9999.ebuild 1529 RMD160 41ac101a26554d583d76045a508fdc12ae2d2600 SHA1 cae3c47263b499d437f86707ca2b865e2b456bc7 SHA256 d68bfd2e2ccda50932b2e50557a4cf00124ba750f16cddb8103eecb38627b65c
+EBUILD kdebindings-perl-9999.ebuild 1529 RMD160 41ac101a26554d583d76045a508fdc12ae2d2600 SHA1 cae3c47263b499d437f86707ca2b865e2b456bc7 SHA256 d68bfd2e2ccda50932b2e50557a4cf00124ba750f16cddb8103eecb38627b65c
 MISC metadata.xml 1176 RMD160 1e67a0794d60406a04bbc01dfa4b8a5e1a340bcc SHA1 d29246ac1e3a9112f367069a1a9e70d6cb041e2b SHA256 90d5d5bc1b1b559c0edf184f66d1e161804f2a1cc63f17910744e790fd29aa73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNridKAAoJELHSF2kinlg4bXcP/3iYqF205by88nT8sxBpqERC
-wKUM+9y6GJHVLKTyIOdZn2VMeKZD9xMfkf8VzGNQkcOLe7vScMV5nDL71ESsDry4
-FPzfFOAhy5Jnu+fCLH5VqBSQB9XI4K/JQ1AtuXBE8Vk+A08yFOwmhfOEZMjLtNEM
-PnsAItjR+qWqkikEiXimFfS4YtdeAP8ExvsYle3ESUvdA+ptROipqznlWX/y7Y8v
-cOjal91l924zUieBlWjAwquaXPJHuhLR4BeHxd4iXjcwKDP7Tq1q70cxGqWj4s7u
-KNYbMoFuV0exhtPuzSfgi+dYVAySQYN0bLRIhWBnPgJ9jrNkf1ELuSTZq2Zrp5RF
-f7CB7Wz1T0wwomKSUM8BbtZKZd3jqDTmtyxAAHCm1CV/Zlq+yfijjEYtHAnx5dJH
-XiieA1n4+Qz/O8HOadD7QJAV0vvpH++X4bIm9xo1o5CZQ2P/GIitk9NCoe3vONUO
-+EBpX0EAAuoqpbheMNIrUqsrG5MXcvO5lwEYVen8zaAVevgoCqw19kFemVaqzb1Q
-sM7UYQIkX4K9J3zl5rvPIqyl8SFBEki6NVPBZam9E2Ly2ht1Lo63aRIs+5nnzLUF
-6KhXvNcH/11MrQAVyJhS26mqr+WGsUIv0UgK6nmKGeVnuyrtfLh6OBw8GzkfBKxK
-3ENU0/h+WuVOQptI/23K
-=xeEo
------END PGP SIGNATURE-----
diff --git a/kde-base/kdebindings-perl/kdebindings-perl-4.6.9999.ebuild b/kde-base/kdebindings-perl/kdebindings-perl-4.6.9999.ebuild
index ebae3013803..45f60ced3ae 100644
--- a/kde-base/kdebindings-perl/kdebindings-perl-4.6.9999.ebuild
+++ b/kde-base/kdebindings-perl/kdebindings-perl-4.6.9999.ebuild
@@ -18,7 +18,7 @@ IUSE="akonadi attica debug kate okular phonon plasma qimageblitz qscintilla qwt
 
 DEPEND="
 	>=dev-lang/perl-5.10.1
-	$(add_kdebase_dep smoke 'akonadi?,attica?,declarative?,kate?,multimedia?,okular?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,semantic-desktop?,webkit?')
+	$(add_kdebase_dep smoke 'akonadi?,attica?,declarative?,kate?,multimedia?,okular?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,semantic-desktop=,webkit?')
 	semantic-desktop? ( >=dev-libs/soprano-2.4.64 )
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kdebindings-perl/kdebindings-perl-9999.ebuild b/kde-base/kdebindings-perl/kdebindings-perl-9999.ebuild
index ebae3013803..45f60ced3ae 100644
--- a/kde-base/kdebindings-perl/kdebindings-perl-9999.ebuild
+++ b/kde-base/kdebindings-perl/kdebindings-perl-9999.ebuild
@@ -18,7 +18,7 @@ IUSE="akonadi attica debug kate okular phonon plasma qimageblitz qscintilla qwt
 
 DEPEND="
 	>=dev-lang/perl-5.10.1
-	$(add_kdebase_dep smoke 'akonadi?,attica?,declarative?,kate?,multimedia?,okular?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,semantic-desktop?,webkit?')
+	$(add_kdebase_dep smoke 'akonadi?,attica?,declarative?,kate?,multimedia?,okular?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,semantic-desktop=,webkit?')
 	semantic-desktop? ( >=dev-libs/soprano-2.4.64 )
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kdebindings-ruby/Manifest b/kde-base/kdebindings-ruby/Manifest
index 963bd4f9b7d..84fe55fc2ce 100644
--- a/kde-base/kdebindings-ruby/Manifest
+++ b/kde-base/kdebindings-ruby/Manifest
@@ -1,24 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX kdebindings-ruby-fix-linkage.patch 1726 RMD160 7f23b1526b7ab6b2f73b31a45bfa6fed0bd62c29 SHA1 c44db3400dae4c81f6c4f6e3941896204fcfd8b8 SHA256 d9ea60a9271db666384ffc0542a7ff3e6d45e0058bcbf14b7ee11907de6052a8
-EBUILD kdebindings-ruby-4.6.9999.ebuild 3616 RMD160 a53400a2ac215a34996feaefbd717c96242db8b0 SHA1 18d021362885f063f2aecca8ece7f9c3f567e6ab SHA256 2d2b8c50b9d187f784bbc7e3e6cc916d15287abc990a6bd505ac79efe87e92cb
-EBUILD kdebindings-ruby-9999.ebuild 3616 RMD160 a53400a2ac215a34996feaefbd717c96242db8b0 SHA1 18d021362885f063f2aecca8ece7f9c3f567e6ab SHA256 2d2b8c50b9d187f784bbc7e3e6cc916d15287abc990a6bd505ac79efe87e92cb
+EBUILD kdebindings-ruby-4.6.9999.ebuild 3616 RMD160 ed1969ccb857668f0539669b79c17092d01d03a0 SHA1 32d161e234c085d17c403adc2b777e2442d7a9d6 SHA256 8b7cf16a3469c3031c617852a0a13100c0b58b4fd079569617f3feb244f5c2b5
+EBUILD kdebindings-ruby-9999.ebuild 3616 RMD160 ed1969ccb857668f0539669b79c17092d01d03a0 SHA1 32d161e234c085d17c403adc2b777e2442d7a9d6 SHA256 8b7cf16a3469c3031c617852a0a13100c0b58b4fd079569617f3feb244f5c2b5
 MISC metadata.xml 824 RMD160 e0f4c2f6839966b3cb27a9366af5b4bed34efdb8 SHA1 a064dd6a83051fd2c78f78657be856fc77a0abf7 SHA256 47ce246de6c9f8a1f7f4be7a4afe4c68bc0a431c059a0a4596f1df8dc1228c68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJNpgZDAAoJENwGBM22xffeTvcQAI9f4B5guEpEqbOhTu0Ws/D2
-RQD8S21iteOadrGMbCSXS1GhUIO3me6AqQbru/nQTOPoNwtXIskkB+MUACWZtqs+
-IZotPQcjfc7YtvaeiRepoKSgWFGWLVGo8l81YZoweZXymZ/4/o5tuQaKklPMxwu4
-BoV/IMPIe7xPBEknfxtXjPu9A6bNAhsjuk91pHSOOa4VNerDv+wfQE+lJg32sbDe
-XvYLHN5sMvCK2snbi31ZtuSv7ubB9vlK5MW+QlA6j6FMSg7QMX4ojBfRh+psunjh
-SkZK1SN8dRYqjEJ96W2dtN8dq2cGpWti49RE87WgJ37vi9dXarqzEiIlkxV/7hdU
-llTGf5Jg3KikfWSFajcERacCm+Q2Lrgk0g1MG0hEQn66WI24MAEZu/mvjYJSnAbR
-m24K9mE2ncCCaw+DGeqmaNuA8jgEsNlHcdAs60+pMoKnAmqxpHWcxCpRoMi/zACy
-gRtIjp+S0mMRrymRTXlfHdKTQ9TBpjiCQn8hMORUZxOHvJfj7bVOYKKKiv0jQxgs
-ZCwlLTh+IIB2dN1sqQTgjT7pZPafionFJNx3Yp2F+iDsVkwmH9Gqm9o8GJZU8pdV
-LCC7m7ScSpUEPww1+SfbqrqCYQiSBNFWw8VvYz8JJOgwZo6LhDAbk2XBRTvdzHkw
-N6z2uqSBhooxgPzmNCzj
-=1G6I
------END PGP SIGNATURE-----
diff --git a/kde-base/kdebindings-ruby/files/kdebindings-ruby-fix-linkage.patch b/kde-base/kdebindings-ruby/files/kdebindings-ruby-fix-linkage.patch
deleted file mode 100644
index 3e087ff1603..00000000000
--- a/kde-base/kdebindings-ruby/files/kdebindings-ruby-fix-linkage.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Unfortunately, it seems upstream hasn't added all the needed libraries for linking... fix that
-
---- kdebindings/ruby/qtscript/CMakeLists.txt
-+++ kdebindings/ruby/qtscript/CMakeLists.txt
-@@ -4,7 +4,7 @@
- set(qtscript_LIBRARY_SRC qtscript.cpp qtscripthandlers.cpp)
- 
- add_library(qtscript MODULE ${qtscript_LIBRARY_SRC})
--target_link_libraries(qtscript ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqtcore smokeqtscript qtruby4shared)
-+target_link_libraries(qtscript ${QT_QTCORE_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${RUBY_LIBRARY} smokeqtcore smokeqtscript qtruby4shared)
- set_target_properties(qtscript PROPERTIES PREFIX "")
- install(TARGETS qtscript DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
- install(FILES qtscript.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qtscript)
---- kdebindings/ruby/soprano/CMakeLists.txt
-+++ kdebindings/ruby/soprano/CMakeLists.txt
-@@ -3,7 +3,7 @@
- 
- set(rubysoprano_LIBRARY_SRC soprano.cpp sopranohandlers.cpp)
- add_library(rubysoprano MODULE ${rubysoprano_LIBRARY_SRC})
--target_link_libraries(rubysoprano ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqtcore smokesoprano qtruby4shared)
-+target_link_libraries(rubysoprano ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${SOPRANO_LIBRARIES} smokeqtcore smokesoprano qtruby4shared)
- set_target_properties(rubysoprano PROPERTIES PREFIX "" OUTPUT_NAME soprano)
- install(TARGETS rubysoprano DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
- install(FILES soprano.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/soprano)
---- kdebindings/ruby/nepomuk/CMakeLists.txt
-+++ kdebindings/ruby/nepomuk/CMakeLists.txt
-@@ -7,6 +7,7 @@
- target_link_libraries(rubynepomuk 
-     ${RUBY_LIBRARY} 
-     ${NEPOMUK_LIBRARIES}
-+    ${SOPRANO_LIBRARIES}
-     smokeqtcore 
-     smokesoprano
-     smokekdecore 
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild
index e646c4eafaa..83cad086be4 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild
@@ -23,7 +23,7 @@ KEYWORDS=""
 IUSE="akonadi debug kate okular phonon plasma qscintilla qwt semantic-desktop"
 
 DEPEND="
-	$(add_kdebase_dep smoke 'akonadi?,declarative?,kate?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?,webkit?')
+	$(add_kdebase_dep smoke 'akonadi?,declarative?,kate?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop=,webkit?')
 "
 
 ruby_add_bdepend dev-ruby/rubygems
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
index e646c4eafaa..83cad086be4 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
@@ -23,7 +23,7 @@ KEYWORDS=""
 IUSE="akonadi debug kate okular phonon plasma qscintilla qwt semantic-desktop"
 
 DEPEND="
-	$(add_kdebase_dep smoke 'akonadi?,declarative?,kate?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?,webkit?')
+	$(add_kdebase_dep smoke 'akonadi?,declarative?,kate?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop=,webkit?')
 "
 
 ruby_add_bdepend dev-ruby/rubygems
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index eca0a50f235..4654655a1ea 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,23 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD kdepimlibs-4.6.9999.ebuild 2014 RMD160 2a849bc5f1fd2270fa5df28641b858e8e1dcf756 SHA1 493940324be3f9310249bc02bd7c7ba2f5610532 SHA256 196a34145a79e805b28da5ab36a63a62946eaa5f0e36317f6c731e3bf3a5dc67
-EBUILD kdepimlibs-9999.ebuild 2014 RMD160 2a849bc5f1fd2270fa5df28641b858e8e1dcf756 SHA1 493940324be3f9310249bc02bd7c7ba2f5610532 SHA256 196a34145a79e805b28da5ab36a63a62946eaa5f0e36317f6c731e3bf3a5dc67
+EBUILD kdepimlibs-4.6.9999.ebuild 2014 RMD160 d31d0c5e040521a053c7b694a718533b9bb3b715 SHA1 3602617a2c4af0f92615a6b1740e3fbfdd540656 SHA256 fed8734a3c1adb682a878b70c84e46f89aec8ae35de385acddb50ba5f9b19d84
+EBUILD kdepimlibs-9999.ebuild 2014 RMD160 d31d0c5e040521a053c7b694a718533b9bb3b715 SHA1 3602617a2c4af0f92615a6b1740e3fbfdd540656 SHA256 fed8734a3c1adb682a878b70c84e46f89aec8ae35de385acddb50ba5f9b19d84
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNric9AAoJELHSF2kinlg4GvwP/A9h0MoF4cSAyKBv+kt/Ltdz
-w7f7JdTDcn7ur5bNJkx38mHtNUKkaCnoU2ZVneIWASlQwewod8Wjrn8tjyxhqlA+
-xIalpFZAIE8fm+aKzZV5lq3vMleXOTvcjLo0INKkVHhfk8GzuKTSNS1mKnMbJWSE
-4mXGU70nWC32BZkWx37V0l3kByOJwQCTIqVIWwnzEIj3HcsMVXoRRrXYoFOUh5ef
-NN8sK6hvIIJAhs0eOsKzDUlm2ryb2nTcGg4WAbRd/pT4Na1BNpYgk9oKlX80Kd7U
-DopG5XKfN177dRXlJ+42/FQsgvIu7/maUPux2u6ZDkj2VIk6HSBj64GrmYR1ktfw
-p27Ypyxs3EcyVnWoFWMjObOKMM6dZ2DFdbrJy5HzyLPaKIQkiHc2/+ET0d8z6WWj
-LLnVSKnxu4cCuZ1Vhm2yQBLtNixL82QRjVvXVlMrcOUMhMqj+cYjNS1YANfGpBRj
-p2r8DHGlbUHfnag03V+yCjTnnfQB/8sDcOzZWZyESDOkJiJ9bJjf9yHPTMheUVdq
-b8Kk7mjf8pIf8KL95R3LZbFPryv+ryf+gZVo0NcXYfz/08qagzuVDOvc7YbkNpvi
-XU+TKztuqhMcs2wu70BJ2SwHBdlauVxIz25YKJkTk4K0sOYCZvRN3iYtT7sDLE16
-r4PazgMiIjTjPPXSOPM8
-=TSAq
------END PGP SIGNATURE-----
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.6.9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.6.9999.ebuild
index 94f2f86da96..aa77b98376f 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.6.9999.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.6.9999.ebuild
@@ -25,9 +25,9 @@ DEPEND="
 	dev-libs/libgpg-error
 	>=dev-libs/libical-0.43
 	dev-libs/cyrus-sasl
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
 	semantic-desktop? (
 		>=app-office/akonadi-server-1.4.52
-		$(add_kdebase_dep kdelibs 'semantic-desktop')
 		media-libs/phonon
 		x11-misc/shared-mime-info
 	)
diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
index 94f2f86da96..aa77b98376f 100644
--- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
@@ -25,9 +25,9 @@ DEPEND="
 	dev-libs/libgpg-error
 	>=dev-libs/libical-0.43
 	dev-libs/cyrus-sasl
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
 	semantic-desktop? (
 		>=app-office/akonadi-server-1.4.52
-		$(add_kdebase_dep kdelibs 'semantic-desktop')
 		media-libs/phonon
 		x11-misc/shared-mime-info
 	)
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index 250fe71e84d..abb5dd8572e 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -1,23 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD kdeplasma-addons-4.6.9999.ebuild 2099 RMD160 a9cd9d8f07a3bed233cd5f7b97ae5b61c27d2d46 SHA1 8fa80101e5ded83149a8056f944edcbe9ac01c66 SHA256 4774030d1b8f404dafd14b4d9f8dcc9289922be53ca92e9c0f1394caab5944d0</