Moved 4.6.4 to main tree

(Portage version: 2.1.10/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

2 files changed, 13 insertions, 138 deletions

diff --git a/kde-base/kdebindings-ruby/Manifest b/kde-base/kdebindings-ruby/Manifest
index d89e530638f..fecfe6c1201 100644
--- a/kde-base/kdebindings-ruby/Manifest
+++ b/kde-base/kdebindings-ruby/Manifest
@@ -1,9 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST kdebindings-4.6.4.tar.bz2 7077300 RMD160 8322437b3c897bdd19f27795b1506453553186a5 SHA1 ee5d85598e278bda76f7937c0a832723785ffe49 SHA256 880587671dee144d25d7ae7b74fe9f35a42719a76cba860acf2d7179b926f587
 DIST kdebindings-4.6.80.tar.bz2 402249 RMD160 7ec90f867118985853094bf59107e46e847413fa SHA1 4e6586d612c9ed817a70cceff5b2518fdd19ef60 SHA256 de9a6fef848f56c62db30f2a927b90b1455520c0c3a5f9928408a680ac9b3c8b
-EBUILD kdebindings-ruby-4.6.4.ebuild 3639 RMD160 123158e30d463639e5b2105a7b57ec959f77e2fd SHA1 5ce553b9201b4701d372e408d1d1349cc9c17b9b SHA256 dc287c9f0486739ee5bf18054636a49616a6ae2c5f185b3ee17b75dac24d9038
 EBUILD kdebindings-ruby-4.6.49.9999.ebuild 3623 RMD160 a57e36ccf79dc58ad4fc62353b56a6a14df3d40f SHA1 df17c5c47e57c6b8523f0b312d1048cf912bbd6b SHA256 e6f3ee27a24acaea8048fa6b47a47788643dbe9c95eccffbd80ef4c7fcfe0e25
 EBUILD kdebindings-ruby-4.6.80.ebuild 3658 RMD160 242bcb678934b7bf78cd083237fb0504e6e3bf65 SHA1 fe17c2a2f2887e37f7745389a834bed1c7fa61f2 SHA256 10fc25a29f42c546534f232ddaafe0d365cddc503904f5be3584ea22cc198ea4
 EBUILD kdebindings-ruby-9999.ebuild 3623 RMD160 a57e36ccf79dc58ad4fc62353b56a6a14df3d40f SHA1 df17c5c47e57c6b8523f0b312d1048cf912bbd6b SHA256 e6f3ee27a24acaea8048fa6b47a47788643dbe9c95eccffbd80ef4c7fcfe0e25
@@ -11,17 +9,17 @@ MISC metadata.xml 824 RMD160 e0f4c2f6839966b3cb27a9366af5b4bed34efdb8 SHA1 a064d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN7XmhAAoJELHSF2kinlg4uI4QAKGoyF2/9uwoqnHMVvh54H/y
-wvAdJiv477uShDfc5OPVKdHDyepX5BCB/AahYUd5i8TvaHKXhkulxU8WeMsZk4kO
-32YPFc44kP/0NDBTXbGXtjzzV+Lri9xs8UfSUm7JL4FW+9XVqqeGYer7fB0bdyQQ
-CDwHcSLD4PzEJVuAVwIIg4tYCrV6PvdWj9wqAqZvif9CfC28JLK+1qKweuqJVKdn
-Y0W6nmhbqz9v20ql85oW4nWYUrScmWOijbPGF0YpJJzXdFA34iQcJBcZLmVNbdGg
-4+I0GbJeVd7whESrBcQ92BsxvD7s97xxtIBhh3FvtKV4nY9mXC+wGZGOLkfNf7OX
-V1DHV3EZJMcqz215rjFuhTkMIZOEkv+fHtkNcG5/iNKMimJQDsVde2F6vTP8Dpbu
-2fgnZGl5dpqtbMjD1RhleuDVxdKBqpcQUHhsQomUj6ij4jtiLeGi7IoSTgSwN9qR
-vH/3zpgq7WIZuwjkU3VJocPoLmJxPteFWThrWRpR2f1gCQGtTWVlnkSupOBPcwJk
-bPJrA5XalLAtynZvf8qACmkOjfCMVAIJKNCXxuECl4y/UZXP+ZjqR6Qy1YssdOzT
-TFgxo9k+f1U+caXByAG+o9d8fiKMJcPhcJ8nkPSoRNEguR323cn0MQKx/7Qkzugu
-FgkJs+9vFhLEhKZw/BGK
-=P/nZ
+iQIcBAEBCgAGBQJN8l6LAAoJENwGBM22xffe8PEP/RSq13BLr9RfPwKYW0IZqJAv
+mTdFAiYSODBk1tn05t3iInjy+HWLK1W9AsChEVJAQSfe9ZmZCPUq00zbQmjksaZk
+R5deUyDi7FhFuDVoUqIY38qPlXsmD0liJ69XLpJC5OOU07DDlrfaKr62rG+SwQQd
+Lv5b5kowf1vdg0Dn2mnoMVydW/+BJpMM3jcCNLUcYVd+YfN90CKte0GXYn2d4BY9
+iU165QW3W6q+CEXKafxbuTVoTQ/aFNIu62RcHzXKYzU2CHCd5jzDnFfW37NQIbD0
+aYQSvkqIjn16l32asgpNCtL+wpAqM9WxW+iD6IovUiyFivZcLWj20W+5Zcb/MTUk
+2rDg0H3wgFreY3y2kCp60WyFkKvV9P9JUukjoZ77fVYjr0tEPcp0qy+IBu7+mSJW
+QZBEduxGXODL89jFLHg9PtFMfj3PV++YHkdXQjkowYAHjOUy8ICqmBlFebBld2GQ
+c2OUiTGpIcmQ9g6y1BUQduc9vf3n0c8ifnReK5u0Y4oBroJJDSqZ5yAzrDEoIpRd
+Zhr/sYYvTiTvixTPOtLWMKH9dhlGo4BILqqkuYBkh0/MTZKNYM0yP5FYKxy+tIWK
+umSY7Gc+GKgU8IRk3MHu2Lop6004qJlXPCGmfe8g6TU3MPl7B28PbFlDYw6gTfdZ
+5Rm8uvFDWdPKrt+R/beN
+=B5mX
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.4.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.4.ebuild
deleted file mode 100644
index fe592e9c847..00000000000
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KMNAME="kdebindings"
-KMMODULE="ruby"
-DECLARATIVE_REQUIRED="optional"
-
-USE_RUBY="ruby18"
-# No ruby19 for three reasons:
-# 1) it does not build (yet) - will likely be solved soon
-# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-meta ruby-ng
-
-DESCRIPTION="KDE Ruby bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="akonadi debug kate okular phonon plasma qscintilla qwt semantic-desktop webkit"
-
-DEPEND="
-	$(add_kdebase_dep smoke 'akonadi?,declarative?,kate?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop=,webkit?')
-"
-
-ruby_add_bdepend dev-ruby/rubygems
-
-RDEPEND="${DEPEND}
-	!dev-ruby/qt4-qtruby
-"
-
-# Merged with kdebindings-ruby after 4.4.80
-add_blocker krossruby
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	local S="${WORKDIR}/${P}"
-	kde4-meta_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-meta_src_prepare
-
-	sed -i -e "s#smoke/smoke.h#smoke.h#" \
-		ruby/qtruby/src/handlers.cpp \
-		ruby/qtruby/src/marshall.h \
-		ruby/qtruby/src/marshall_types.h \
-		ruby/qtruby/src/Qt.cpp \
-		ruby/qtruby/src/qtruby.cpp \
-		ruby/qtruby/src/qtruby.h \
-		ruby/qtruby/src/smokeruby.h || die
-
-	sed -i -e "s#include <smoke/qt/#include <smoke/#" -e "s#include <smoke/kde/#include <smoke/#" \
-		ruby/qtruby/src/Qt.cpp \
-		ruby/qtruby/src/marshall_types.cpp \
-		ruby/qtruby/modules/phonon/phonon.cpp \
-		ruby/qtruby/modules/qscintilla/qscintilla.cpp \
-		ruby/qtruby/modules/qtdeclarative/qtdeclarative.cpp \
-		ruby/qtruby/modules/qtuitools/qtuitools.cpp \
-		ruby/qtruby/modules/qtscript/qtscript.cpp \
-		ruby/qtruby/modules/qwt/qwt.cpp	\
-		ruby/qtruby/modules/qttest/qttest.cpp \
-		ruby/qtruby/modules/qtwebkit/qtwebkit.cpp \
-		ruby/qtruby/src/qtruby.cpp \
-		ruby/korundum/src/Korundum.cpp \
-		ruby/korundum/modules/soprano/soprano.cpp \
-		ruby/korundum/modules/akonadi/akonadi.cpp \
-		ruby/korundum/modules/kate/kate.cpp \
-		ruby/korundum/modules/khtml/khtml.cpp \
-		ruby/korundum/modules/kio/kio.cpp \
-		ruby/korundum/modules/ktexteditor/ktexteditor.cpp \
-		ruby/korundum/modules/okular/okular.cpp \
-		ruby/korundum/modules/solid/solid.cpp \
-		ruby/korundum/modules/nepomuk/nepomuk.cpp \
-		ruby/korundum/modules/plasma/src/plasma.cpp \
-		ruby/korundum/modules/plasma/src/plasmahandlers.cpp \
-		ruby/korundum/modules/nepomuk/nepomukhandlers.cpp || die
-
-	echo 'target_link_libraries(rubyqtdeclarative ${QT_QTDECLARATIVE_LIBRARY})' >> \
-		ruby/qtruby/modules/qtdeclarative/CMakeLists.txt || die
-}
-
-each_ruby_configure() {
-	CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with qwt Qwt5)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	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
-}