[kbluetooth] moved kdebluetooth4 -> kbluetooth to follow tree

6 files changed, 3 insertions, 95 deletions

diff --git a/net-wireless/kbluetooth/Manifest b/net-wireless/kbluetooth/Manifest
new file mode 100644
index 00000000000..0517c5b68e9
--- /dev/null
+++ b/net-wireless/kbluetooth/Manifest
@@ -0,0 +1,2 @@
+EBUILD kbluetooth-9999.ebuild 916 RMD160 19e41e4beba8d6e544d0372b86c42052eee91877 SHA1 973dd2951c330ba280dbdf309322008f2c0fe497 SHA256 cf3d249e698e387ee5e24e8eae80d70f64d2f192d30f56ee9cfa0ba09c3c6b34
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/net-wireless/kdebluetooth4/kdebluetooth4-9999.ebuild b/net-wireless/kbluetooth/kbluetooth-9999.ebuild
index ee2003de2a0..50c17979f01 100644
--- a/net-wireless/kdebluetooth4/kdebluetooth4-9999.ebuild
+++ b/net-wireless/kbluetooth/kbluetooth-9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}
 	>=kde-base/kdialog-${KDE_MINIMAL}
 	>=kde-base/konqueror-${KDE_MINIMAL}
 	>=kde-base/nepomuk-${KDE_MINIMAL}
+	!net-wireless/kdebluetooth4
 "
 
 src_configure() {
diff --git a/net-wireless/kdebluetooth4/metadata.xml b/net-wireless/kbluetooth/metadata.xml
index 8d1e86a9cef..8d1e86a9cef 100644
--- a/net-wireless/kdebluetooth4/metadata.xml
+++ b/net-wireless/kbluetooth/metadata.xml
diff --git a/net-wireless/kdebluetooth4/Manifest b/net-wireless/kdebluetooth4/Manifest
deleted file mode 100644
index dd2026943ea..00000000000
--- a/net-wireless/kdebluetooth4/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX FindLibKNotificationItem-1.cmake 1165 RMD160 70035443dd43d537dbaecd5077acd53507199095 SHA1 14549fc6251a29f727f7717a9d88fa75c4dee171 SHA256 d1077e8986b69fcad8782452d957c179dd2850076d02adfc451d2d4c5ba1cbbc
-DIST 112110-kbluetooth-0.4beta1.tar.bz2 97722 RMD160 4047f2cf77c0b15eebca9357079df2940845861a SHA1 b3e17e641fed8fac994014989b304b80f7b4bf85 SHA256 26ff4df431ef4c68075081e165f04a1f111e0594d311b2f046be2b23b2f338aa
-EBUILD kdebluetooth4-0.4_beta1.ebuild 1149 RMD160 49e5281bbc53ce7f935d498fdb099669ed445664 SHA1 9cfe0e140fcfb26100b66cc79ada435780fc3175 SHA256 d387f43f75d2895a90183fa28c130baa8a649e88393892155d3efb7823a07861
-EBUILD kdebluetooth4-9999.ebuild 887 RMD160 28285746d0f63173ea83d0eb72e9266726af268f SHA1 31b2b287ea72682a44d9d8b19af833ca6f06fc2b SHA256 4ea99c3865a2e0840eef7979fce29bfe6eccf00d03c5700522dd8c16bd10678d
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/net-wireless/kdebluetooth4/files/FindLibKNotificationItem-1.cmake b/net-wireless/kdebluetooth4/files/FindLibKNotificationItem-1.cmake
deleted file mode 100644
index b9a8c662fea..00000000000
--- a/net-wireless/kdebluetooth4/files/FindLibKNotificationItem-1.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
-# - Find libkonitification-1
-# Find the libkonitification-1
-#
-# This module defines
-#  LIBKNOTIFICATIONITEM-1_FOUND - whether the libkonitification-1 library was found
-#  KNOTIFICATIONITEM_LIBRARIES - the libkonitification-1 library
-#  KNOTIFICATIONITEM_INCLUDE_DIR - the include path of the libkonitification-1 library
-#
-
-if (KNOTIFICATIONITEM_INCLUDE_DIR AND KNOTIFICATIONITEM_LIBRARIES)
-
-  # Already in cache
-  set (LIBKNOTIFICATIONITEM-1_FOUND TRUE)
-
-else (KNOTIFICATIONITEM_INCLUDE_DIR AND KNOTIFICATIONITEM_LIBRARIES)
-
-  find_library (KNOTIFICATIONITEM_LIBRARIES
-    NAMES
-    knotificationitem-1
-    PATHS
-    ${LIB_INSTALL_DIR}
-    ${KDE4_LIB_DIR}
-  )
-
-  find_path (KNOTIFICATIONITEM_INCLUDE_DIR
-    NAMES
-    knotificationitem.h
-    PATH_SUFFIXES
-    knotificationitem-1
-    PATHS
-    ${INCLUDE_INSTALL_DIR}
-    ${KDE4_INCLUDE_DIR}
-  )
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(LibKNotificationItem-1 DEFAULT_MSG KNOTIFICATIONITEM_LIBRARIES KNOTIFICATIONITEM_INCLUDE_DIR)
-
-endif (KNOTIFICATIONITEM_INCLUDE_DIR AND KNOTIFICATIONITEM_LIBRARIES)
-
-mark_as_advanced(KNOTIFICATIONITEM_INCLUDE_DIR KNOTIFICATIONITEM_LIBRARIES)
diff --git a/net-wireless/kdebluetooth4/kdebluetooth4-0.4_beta1.ebuild b/net-wireless/kdebluetooth4/kdebluetooth4-0.4_beta1.ebuild
deleted file mode 100644
index 23d4a88de0a..00000000000
--- a/net-wireless/kdebluetooth4/kdebluetooth4-0.4_beta1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KMNAME="playground/network"
-KMMODULE="kbluetooth"
-KDE_MINIMAL="4.3"
-
-MY_P="${KMMODULE}-${PV/_/}"
-inherit kde4-base
-
-DESCRIPTION="KDE Bluetooth Framework"
-HOMEPAGE="http://bluetooth.kmobiletools.org/"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/112110-${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="debug semantic-desktop"
-
-DEPEND="
-	>=app-mobilephone/obex-data-server-0.4.2
-	>=app-mobilephone/obexftp-0.23_alpha[bluetooth]
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
-	>=kde-base/solid-${KDE_MINIMAL}[bluetooth]
-"
-RDEPEND="${DEPEND}
-	>=kde-base/kdialog-${KDE_MINIMAL}
-	>=kde-base/konqueror-${KDE_MINIMAL}
-	>=kde-base/nepomuk-${KDE_MINIMAL}
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	mkdir -p cmake/modules || die "mkdir failed"
-	cp "${FILESDIR}"/FindLibKNotificationItem-1.cmake cmake/modules/ \
-		|| die "cp failed"
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	"
-	kde4-base_src_configure
-}