Make semantic-desktop a hard dep, workaround for bug 395679

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 37 insertions, 29 deletions

diff --git a/kde-base/korundum/ChangeLog b/kde-base/korundum/ChangeLog
index bd334b694bd6..45930e6d3ff1 100644
--- a/kde-base/korundum/ChangeLog
+++ b/kde-base/korundum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/korundum
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.96 2011/12/11 18:52:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.97 2011/12/27 21:35:45 dilfridge Exp $
+
+  27 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> korundum-4.7.3.ebuild,
+  korundum-4.7.4.ebuild:
+  Make semantic-desktop a hard dep, workaround for bug 395679
 
 *korundum-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/korundum/Manifest b/kde-base/korundum/Manifest
index 41e7e061f90e..0fc2dcb7b923 100644
--- a/kde-base/korundum/Manifest
+++ b/kde-base/korundum/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST korundum-4.7.3.tar.bz2 180120 RMD160 145a61fcafa79a3af6d57bfbc3302a99eb7c35b7 SHA1 bf41817298a8b18ba3542e45256c1c6ddb08c900 SHA256 79a0eb94137cb3f8620ec9bc8676d1e1f9d0ae217af6fd106f921d80d8b6ffd7
 DIST korundum-4.7.4.tar.bz2 179936 RMD160 f3f349343144cdd3f9d38c533fadf6f4203e0cb5 SHA1 e220dc672461aa1369e58de325f980139fcd52f6 SHA256 590c92c6d4e993ff69b737bc8906888c083d567f8e01cf201f88265680538d08
-EBUILD korundum-4.7.3.ebuild 1809 RMD160 84b5256bb72298986dae329e675969757f08898e SHA1 0f6f9b056aba6f41dccfca6c58c54bf1b8d5ca18 SHA256 56cb71ff807af6c0ee76898253a7bd11948a908be39bdfc387f16a172b3e94cb
-EBUILD korundum-4.7.4.ebuild 1809 RMD160 93ddd78e19e4d336dfdabb2719d445263f40218e SHA1 5f81e630a6b837eb06e4c1f96d87d08469dde953 SHA256 cb2fc3535940c3d950731ac13779c7e24696e55b39778d5a7d109de84a7e8439
-MISC ChangeLog 1439 RMD160 2cd6ae69bacc8793198d044f419b82d00e475d67 SHA1 92982f209e36685d5bde99e23cb318f1d0c3749f SHA256 332dee26f2747ff4d0dad530ec6877f567d393827158c23f161c4cceba1620f7
+EBUILD korundum-4.7.3.ebuild 1923 RMD160 5ad92265e5770974012ec356e0303750ee3e54dc SHA1 6358dc951be3dfa4a8c75c8d7f3e631be1916f24 SHA256 4950416d1ae00623bc2e9fd5100a09e7f68993b45841c7370aae943c561f1a3a
+EBUILD korundum-4.7.4.ebuild 1925 RMD160 5a4e25a36d5ee8616111402998fdac6beccb504d SHA1 018d055e80c163adfac340c0400de8d2416bb69b SHA256 492ba87f2d4b87a2903c1c6c603d2b0ed8552f56ea92afc9975dbeeef772674c
+MISC ChangeLog 1610 RMD160 69cf84d151a627d08f6aa501996c010f802b8d7b SHA1 177d8ab076598c161a948d932c7bd490a90bf76a SHA256 71238d856975e88ed76391d828580c23815f8b2fb27265f76f8100635fccf1cf
 MISC metadata.xml 378 RMD160 d8da5a248460a3ff61818c3d45b41f5a2624f421 SHA1 32df382091137d10c21f3f9161fd9d8271564655 SHA256 aae120c7f59186a5a54a15e5332f50b618a0a5492eb89328061fcb3c1fe1223b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO5PzSAAoJEOf+E+/4L5LmupkQAKF6B/N3o73pVEqaco8QHHhU
-h+upsoIJ3SasP6ix1P1s4kG5RZg0NDy99L4nAg4rB2ODlMfAM2TpTyxi2olgRCzC
-kno7/OOkXlfYiPxmwluYXAHyfE8pcABpIhirEyIlmoT/i/U8/kkj9GSg7IpnilLC
-kwPjN2FMD/xrJq27iOiRshis9z9aXtwW19ugeh4FiJI1YcIALW220/OlZ8Qtu6fc
-L2vwj64F8KS9g5T+6ye9ZpFmIACJW+sB7EqDblO4AKPab0TD0t1uSbHBafl6dEDp
-TbzwlNDaxKf6uoNTKAdFDnAhoE3UeytOm4fWvEsDFP+qcxX3xC01Y1w2p9S1LJz7
-N+QmU1qMYjg6yWcdVID8k7XEc7jCyBUEauwGJMkovPX+vokzCnktDE3im1ZVd3Zs
-YhHjuqDNXBfQC9EZAiEklLgTDNM/75mr0Y7zpBD6nnhKJtin1nrw+a5ceQa8rvid
-i2CST2d0YtZqhUGpUbI3xkZAsUSXv9ynjzWxv6RNH1S/uswmfXUrJrZPtAAi4ggl
-7YOB8jcXqBVL5r+jKRGvGoCk4ylaLn6SjyaSlO+tQQL1YFL/MxuWYsJDCZg2yWia
-FSe81hzk83dyzLwyXCXZtsZC9XtiwWGhHqBvvz98SRaueYHOjQQ2AUS/soNQ3yuY
-sbkpjJGtVaboWyJFRGQZ
-=lyGZ
+iQIcBAEBCgAGBQJO+jqxAAoJEEb+UGWnxTyHsTEP/0el0JDuIFI0y7KZgv+e8zpi
+qq7kr9mJpv0uQua+nmTDLsGxB6L2PYkkf/9V07neNw6FkuwOp8GFUVq0nQLiuV/V
+BmSUM5rQhGvQhgTNUiVWOBgfmU9qEqrcUvYuiYm5LZDwAhvJnU0I15MzMiEkLIY6
+ukLLiZ1161GzJOxlrO1+PRo7t0u5jSJK64jjRcgvrmkrUnbTWZAWYC9FGgR2WVdw
+ZLpl7a+O1ZEyNBMJ5iLOKPoQAuh/GkPR6qeYB8o3FfqmF+3FqLAeXUvPUgyWYdaN
+8wQIjpZVS34pxcp8Lz7/watB1POPg59sfBC5CChqRC/OhNPP6In+kX7y8Li+scR3
+uyyuLyqCDrN7ZztxVtdKXDcsQizZNFqaZoOLARcAbZk6kiuhEwJBWHsIGr+lGPCA
+9UKZ3bIojG1/Xi+7Kes1xknReEObO7i32kXcAbHbUiV0qrAuDojcHZcB65vSfjwm
+whgJzabhQTGAXB43BgGWDNdUOkruBjqDIH8ev4N3YdSNk6tYl4WN1GmPKqIFWBC3
+qjhsqZ1mbGDrRcZUCJVxh8Cxk7OlQDdHM1w75dijvbI+Y9Ys56FCZlAVx1sBgmi7
+AKEms2isyeMX7v+GDXnpLp/ClKDCtRtw9WyIuD9q+HSfdZm3eOvnlIZgv57EbrOl
+YpKbguSDC94TeguJ3jz5
+=hz6M
 -----END PGP SIGNATURE-----
diff --git a/kde-base/korundum/korundum-4.7.3.ebuild b/kde-base/korundum/korundum-4.7.3.ebuild
index 8890f970f149..ed1cf4d23cc9 100644
--- a/kde-base/korundum/korundum-4.7.3.ebuild
+++ b/kde-base/korundum/korundum-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.7.3.ebuild,v 1.3 2011/12/07 22:13:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.7.3.ebuild,v 1.4 2011/12/27 21:35:45 dilfridge Exp $
 
 EAPI=4
 
@@ -18,11 +18,15 @@ inherit kde4-base ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
 KEYWORDS="amd64 x86"
-IUSE="akonadi debug kate okular semantic-desktop"
+IUSE="akonadi debug kate okular"
+
+# unfortunately single modules cannot be disabled with cmake defines
+# possible more useflags have no effect... does anyone actually build this stuff?
+# may need some hacking, for now semantic-desktop just becomes a hard dependency
 
 DEPEND="
 	$(add_kdebase_dep qtruby)
-	$(add_kdebase_dep smokekde 'akonadi?,kate?,okular?,semantic-desktop=')
+	$(add_kdebase_dep smokekde 'akonadi?,kate?,okular?,semantic-desktop')
 	$(add_kdebase_dep smokeqt)
 "
 RDEPEND="${DEPEND}
@@ -59,8 +63,6 @@ each_ruby_configure() {
 		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_disable kate)
 		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
 	)
 	kde4-base_src_configure
 }
diff --git a/kde-base/korundum/korundum-4.7.4.ebuild b/kde-base/korundum/korundum-4.7.4.ebuild
index add27cde8bac..0010e0a325b2 100644
--- a/kde-base/korundum/korundum-4.7.4.ebuild
+++ b/kde-base/korundum/korundum-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.7.4.ebuild,v 1.1 2011/12/11 18:52:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.7.4.ebuild,v 1.2 2011/12/27 21:35:45 dilfridge Exp $
 
 EAPI=4
 
@@ -18,11 +18,15 @@ inherit kde4-base ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
 KEYWORDS="~amd64 ~x86"
-IUSE="akonadi debug kate okular semantic-desktop"
+IUSE="akonadi debug kate okular"
+
+# unfortunately single modules cannot be disabled with cmake defines
+# possible more useflags have no effect... does anyone actually build this stuff?
+# may need some hacking, for now semantic-desktop just becomes a hard dependency
 
 DEPEND="
 	$(add_kdebase_dep qtruby)
-	$(add_kdebase_dep smokekde 'akonadi?,kate?,okular?,semantic-desktop=')
+	$(add_kdebase_dep smokekde 'akonadi?,kate?,okular?,semantic-desktop')
 	$(add_kdebase_dep smokeqt)
 "
 RDEPEND="${DEPEND}
@@ -59,8 +63,6 @@ each_ruby_configure() {
 		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_disable kate)
 		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
 	)
 	kde4-base_src_configure
 }