[kde-base/kdebindings-*:4.5] Merge krossruby -> kdebindings-ruby, update metapackage

9 files changed, 14 insertions, 133 deletions

diff --git a/kde-base/kdebindings-meta/Manifest b/kde-base/kdebindings-meta/Manifest
index 06b50286ab9..3b8d58fba7d 100644
--- a/kde-base/kdebindings-meta/Manifest
+++ b/kde-base/kdebindings-meta/Manifest
@@ -1,5 +1,5 @@
 EBUILD kdebindings-meta-4.4.75.ebuild 674 RMD160 edc50c3c00717c475d2f970a42c73cfd317424cd SHA1 07b39c0da7e621ab656add76b4162106011f3e35 SHA256 2e1730823556cab59efd1f2c6b8e1c9b9d512e4d9ed95a5e1a429cfab6c1f754
-EBUILD kdebindings-meta-4.4.80.ebuild 674 RMD160 edc50c3c00717c475d2f970a42c73cfd317424cd SHA1 07b39c0da7e621ab656add76b4162106011f3e35 SHA256 2e1730823556cab59efd1f2c6b8e1c9b9d512e4d9ed95a5e1a429cfab6c1f754
+EBUILD kdebindings-meta-4.4.80.ebuild 640 RMD160 0c7b192f579c610d53513d1d20a2ecdb5d898007 SHA1 06adaef470df621b239a77b2524b4e16d5eb1b9c SHA256 4123d59e20b607c3e4e62397396c1cf0b3e9b2bba0bb5f09c070df5d46723fbf
 EBUILD kdebindings-meta-4.4.9999.ebuild 663 RMD160 457c321d0554006dcbb3e784b64add9caf7001fa SHA1 64339023cf3593caa8c9866c8097f935f15b599a SHA256 9ad82f08d9385f4c428fe2368e1b539544b038991a209a4219f7207225cbb9ee
-EBUILD kdebindings-meta-9999.ebuild 664 RMD160 19f3c4d1fa8e01d4a3ad5d4707fd58dc8c2f32fe SHA1 97401bbcfbf661e535b876e8e74c272da1bfa5bd SHA256 b294e3e351c39143f5af7b4a18dfd9729be518a5357ca67f003949d8c85b79bf
+EBUILD kdebindings-meta-9999.ebuild 630 RMD160 db7f1e22d23a370f86dfe6d1f4b1be6b9dc72637 SHA1 767ab73fcaaa8edf5793477bfec76435315e25b2 SHA256 99d558eac3d981dc2d5379189039ef21867935abe84eb6ebc68f9e871c58d802
 MISC metadata.xml 240 RMD160 bf8910a663c01730fa21c1468d5f2f01292e6c96 SHA1 b452f1ba7e388829077599a3270394ff27698183 SHA256 23ea425f0bff5efcebfbde39011e6058fa19d239554cc12bd682f12706e377af
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.4.80.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.4.80.ebuild
index da3b4ba509e..6ff0bc643e0 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-4.4.80.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-4.4.80.ebuild
@@ -21,9 +21,6 @@ RDEPEND="
 		$(add_kdebase_dep krosspython)
 		$(add_kdebase_dep pykde4)
 	)
-	ruby? (
-		$(add_kdebase_dep kdebindings-ruby)
-		$(add_kdebase_dep krossruby)
-	)
+	ruby? ( $(add_kdebase_dep kdebindings-ruby) )
 	$(block_other_slots)
 "
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
index fdf412bcdb7..61043019701 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
@@ -21,9 +21,6 @@ RDEPEND="
 		$(add_kdebase_dep krosspython)
 		$(add_kdebase_dep pykde4)
 	)
-	ruby? (
-		$(add_kdebase_dep kdebindings-ruby)
-		$(add_kdebase_dep krossruby)
-	)
+	ruby? ( $(add_kdebase_dep kdebindings-ruby) )
 	$(block_other_slots)
 "
diff --git a/kde-base/kdebindings-ruby/Manifest b/kde-base/kdebindings-ruby/Manifest
index 248b0592bc4..e943be38843 100644
--- a/kde-base/kdebindings-ruby/Manifest
+++ b/kde-base/kdebindings-ruby/Manifest
@@ -2,7 +2,7 @@ AUX kdebindings-ruby-fix-linkage.patch 1726 RMD160 7f23b1526b7ab6b2f73b31a45bfa6
 DIST kdebindings-4.4.75.tar.xz 3941788 RMD160 cbf6e0cadd2dfb1db6542264bed9ed77908669b8 SHA1 3c0f5f289f0e6ca5c20c4427ee373c48f1d694f1 SHA256 2404976301612078441beb88987a5e9df5a12810c2b1872b2df90c0f0b8522b3
 DIST kdebindings-4.4.80.tar.bz2 4941567 RMD160 be23f50a2aab396dd83dddf1f23fd865138bc800 SHA1 8ecb3a86363c85f854f3fb90cb1e91dc42528a76 SHA256 e1164b0e5c973ae85d9e5d585930cc2bd1aae34f62a13973aeb86cf68a1da6e5
 EBUILD kdebindings-ruby-4.4.75.ebuild 2035 RMD160 69ea7175fb0f9c9f14d389966bec2b38cfef768f SHA1 9f782c0f826ff4cdef4b8f34edb3b7a1ed5be01d SHA256 1cdfb43ec20d83eb8fbcfd33449036dd318fc5c0ffca83c0d18b6aa9381d3aec
-EBUILD kdebindings-ruby-4.4.80.ebuild 1833 RMD160 0358f9b374a947c3e5ca38bf22377471c891013d SHA1 bcb53dfd74f66e0ccebf01a0663ae36b4784d2bd SHA256 d751fd1916112e4455898c4859659ca1a072343ce35a317af461fcf4add385e3
+EBUILD kdebindings-ruby-4.4.80.ebuild 1812 RMD160 e946c0d2835e0225897a870cc18265330bcce6dc SHA1 088a5a52899a36b71f44563c3f6abef239412773 SHA256 e09b38f6d68e9618d8b0d53bacfe03962f817deee6271e9bf4f5e9f5c6651f68
 EBUILD kdebindings-ruby-4.4.9999.ebuild 2039 RMD160 6f22bbb2c2360a2f03d6692261bd2ca331f30a4a SHA1 298c79a55a94a54f8e25c70ed276e6ba7bb2e059 SHA256 70346cef376b1a6566404a591f4ed8d2c5072a91d656cebe4cc2670dac9ba4a8
-EBUILD kdebindings-ruby-9999.ebuild 1822 RMD160 d3d5756ed87b777daeda4f25eb3fa8d00883a062 SHA1 948a949df7e0855f495e77f4901ff6211507f7ca SHA256 a66e7d2bd7f086770b927b1396682cd9e24516fe802cc479e33bd14dde49cf9f
+EBUILD kdebindings-ruby-9999.ebuild 1801 RMD160 8e72787856f8c896f03b6740ff42a5af170b8d7d SHA1 f2c01fb76c06b06786d0e8a89f2cf141f2f74997 SHA256 754d15c0d22abfb26fae733f5f615e33441207371d6ebd826498d67d1a977b5a
 MISC metadata.xml 661 RMD160 a61a940860b170381d3b8561f3f2cbd8cb97782a SHA1 189491f1d99cfd0db78d4717111486c610428450 SHA256 5346957821b2b5f5cb1f927e4005400910d14f5b85c0c533d6ea4f98619861d5
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.80.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.80.ebuild
index d39b353c2de..1d4cb7070e0 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.80.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.80.ebuild
@@ -14,19 +14,17 @@ inherit kde4-meta ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
 KEYWORDS="~amd64 ~x86"
-IUSE="akonadi debug phonon plasma qscintilla qwt semantic-desktop"
+IUSE="akonadi debug okular phonon plasma qscintilla qwt semantic-desktop"
 
 DEPEND="
 	$(add_kdebase_dep smoke 'akonadi?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?')
 "
-
 RDEPEND="${DEPEND}
 	!dev-ruby/qt4-qtruby
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-linkage.patch
-)
+# Merged with kdebindings-ruby after 4.4.80
+add_blocker krossruby
 
 pkg_setup() {
 	ruby-ng_pkg_setup
@@ -57,7 +55,6 @@ all_ruby_prepare() {
 each_ruby_configure() {
 	CMAKE_USE_DIR=${S}
 	mycmakeargs=(
-		-DDISABLE_KrossRuby=ON
 		-DRUBY_LIBRARY=$(ruby_get_libruby)
 		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
 		-DRUBY_EXECUTABLE=${RUBY}
@@ -65,7 +62,7 @@ each_ruby_configure() {
 		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_with okular)
 		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qimageblitz QImageBlitz)
+		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use_with qscintilla QScintilla)
 		$(cmake-utils_use_with qwt Qwt)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
index 93d104c1ec1..efcf73f00ec 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
@@ -14,19 +14,17 @@ inherit kde4-meta ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
 KEYWORDS=""
-IUSE="akonadi debug phonon plasma qscintilla qwt semantic-desktop"
+IUSE="akonadi debug okular phonon plasma qscintilla qwt semantic-desktop"
 
 DEPEND="
 	$(add_kdebase_dep smoke 'akonadi?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?')
 "
-
 RDEPEND="${DEPEND}
 	!dev-ruby/qt4-qtruby
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-linkage.patch
-)
+# Merged with kdebindings-ruby after 4.4.80
+add_blocker krossruby
 
 pkg_setup() {
 	ruby-ng_pkg_setup
@@ -57,7 +55,6 @@ all_ruby_prepare() {
 each_ruby_configure() {
 	CMAKE_USE_DIR=${S}
 	mycmakeargs=(
-		-DDISABLE_KrossRuby=ON
 		-DRUBY_LIBRARY=$(ruby_get_libruby)
 		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
 		-DRUBY_EXECUTABLE=${RUBY}
@@ -65,7 +62,7 @@ each_ruby_configure() {
 		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_with okular)
 		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qimageblitz QImageBlitz)
+		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use_with qscintilla QScintilla)
 		$(cmake-utils_use_with qwt Qwt)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
diff --git a/kde-base/krossruby/Manifest b/kde-base/krossruby/Manifest
index a2ea51e7e34..37d92c40994 100644
--- a/kde-base/krossruby/Manifest
+++ b/kde-base/krossruby/Manifest
@@ -1,9 +1,6 @@
 DIST kdebindings-4.4.1.tar.bz2 5048901 RMD160 683a2192510c89ca3ad66d82b432f4aeb915b85e SHA1 bc5fcf04c4721014fbe11ca5b876173530625bbe SHA256 818d9e5b76db4ca42adab4c348222ab2aeb415d4efab9059c9a00029bd35a9bf
 DIST kdebindings-4.4.75.tar.xz 3941788 RMD160 cbf6e0cadd2dfb1db6542264bed9ed77908669b8 SHA1 3c0f5f289f0e6ca5c20c4427ee373c48f1d694f1 SHA256 2404976301612078441beb88987a5e9df5a12810c2b1872b2df90c0f0b8522b3
-DIST kdebindings-4.4.80.tar.bz2 4941567 RMD160 be23f50a2aab396dd83dddf1f23fd865138bc800 SHA1 8ecb3a86363c85f854f3fb90cb1e91dc42528a76 SHA256 e1164b0e5c973ae85d9e5d585930cc2bd1aae34f62a13973aeb86cf68a1da6e5
 EBUILD krossruby-4.4.1-r1.ebuild 911 RMD160 8d477ec8ff007c2db9c75379c790ec5485d234e6 SHA1 8a5e68cf9d0ca08299d789c74be8f35532d4e968 SHA256 e1190cd66c727a57daec3d548c342ee38aa2c3f65144212956f73e17d7f30a74
 EBUILD krossruby-4.4.75.ebuild 911 RMD160 8d477ec8ff007c2db9c75379c790ec5485d234e6 SHA1 8a5e68cf9d0ca08299d789c74be8f35532d4e968 SHA256 e1190cd66c727a57daec3d548c342ee38aa2c3f65144212956f73e17d7f30a74
-EBUILD krossruby-4.4.80.ebuild 911 RMD160 8d477ec8ff007c2db9c75379c790ec5485d234e6 SHA1 8a5e68cf9d0ca08299d789c74be8f35532d4e968 SHA256 e1190cd66c727a57daec3d548c342ee38aa2c3f65144212956f73e17d7f30a74
 EBUILD krossruby-4.4.9999.ebuild 869 RMD160 c85a4c0c827a57ec65b53fca4d4c9fa71633c3e6 SHA1 97b9bed44d3d3f4b7924fee10502272295987585 SHA256 b4ace6cb0894b7cf3d318bd0614d9dda52b43cb1809d2f673e9a1fcc7800f6f7
-EBUILD krossruby-9999.ebuild 869 RMD160 c85a4c0c827a57ec65b53fca4d4c9fa71633c3e6 SHA1 97b9bed44d3d3f4b7924fee10502272295987585 SHA256 b4ace6cb0894b7cf3d318bd0614d9dda52b43cb1809d2f673e9a1fcc7800f6f7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/krossruby/krossruby-4.4.80.ebuild b/kde-base/krossruby/krossruby-4.4.80.ebuild
deleted file mode 100644
index fd0c1cb54b8..00000000000
--- a/kde-base/krossruby/krossruby-4.4.80.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-KMMODULE="ruby/krossruby"
-USE_RUBY="ruby18"
-
-inherit kde4-meta ruby-ng
-
-DESCRIPTION="Ruby plugin for the kdelibs/kross scripting framework."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	kde4-meta_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-meta_src_prepare
-}
-
-each_ruby_configure() {
-	CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-	)
-	kde4-meta_src_configure
-}
-
-each_ruby_compile() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_compile
-}
-
-each_ruby_install() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_install
-}
diff --git a/kde-base/krossruby/krossruby-9999.ebuild b/kde-base/krossruby/krossruby-9999.ebuild
deleted file mode 100644
index 1efd610a09a..00000000000
--- a/kde-base/krossruby/krossruby-9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-KMMODULE="ruby/krossruby"
-USE_RUBY="ruby18"
-
-inherit kde4-meta ruby-ng
-
-DESCRIPTION="Ruby plugin for the kdelibs/kross scripting framework."
-KEYWORDS=""
-IUSE="debug"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	kde4-meta_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-meta_src_prepare
-}
-
-each_ruby_configure() {
-	CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-	)
-	kde4-meta_src_configure
-}
-
-each_ruby_compile() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_compile
-}
-
-each_ruby_install() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_install
-}