commit: 873b079c2b22939b8c04b95b243fe05cc37acd44
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 16:36:10 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 16:36:10 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=873b079c
[kde-plasma] Remove last bits of kde-plasma/bluez-qt
Package-Manager: portage-2.2.20
kde-plasma/bluedevil/bluedevil-5.3.1-r1.ebuild | 2 +-
kde-plasma/bluedevil/bluedevil-5.3.49.9999.ebuild | 4 +++-
kde-plasma/bluez-qt/bluez-qt-5.3.49.9999.ebuild | 27 ----------------------
kde-plasma/bluez-qt/metadata.xml | 5 ----
.../plasma-meta/plasma-meta-5.3.49.9999.ebuild | 1 -
5 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/kde-plasma/bluedevil/bluedevil-5.3.1-r1.ebuild
b/kde-plasma/bluedevil/bluedevil-5.3.1-r1.ebuild
index ae62080..384b84d 100644
--- a/kde-plasma/bluedevil/bluedevil-5.3.1-r1.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.3.1-r1.ebuild
@@ -12,6 +12,7 @@ KEYWORDS="~amd64"
IUSE=""
COMMON_DEPEND="
+ $(add_frameworks_dep bluez-qt)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -24,7 +25,6 @@ COMMON_DEPEND="
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep plasma)
- $(add_frameworks_dep bluez-qt)
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
diff --git a/kde-plasma/bluedevil/bluedevil-5.3.49.9999.ebuild
b/kde-plasma/bluedevil/bluedevil-5.3.49.9999.ebuild
index 76bc353..70ec25f 100644
--- a/kde-plasma/bluedevil/bluedevil-5.3.49.9999.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.3.49.9999.ebuild
@@ -12,6 +12,7 @@ KEYWORDS=""
IUSE=""
COMMON_DEPEND="
+ $(add_frameworks_dep bluez-qt)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -24,7 +25,6 @@ COMMON_DEPEND="
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep plasma)
- $(add_plasma_dep bluez-qt)
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
@@ -41,6 +41,8 @@ RDEPEND="${COMMON_DEPEND}
!net-wireless/kbluetooth
"
+PATCHES=( "${FILESDIR}"/${PN}-5.3.1-frameworks-fix.patch )
+
pkg_postinst() {
kde5_pkg_postinst
fdo-mime_mime_database_update
diff --git a/kde-plasma/bluez-qt/bluez-qt-5.3.49.9999.ebuild
b/kde-plasma/bluez-qt/bluez-qt-5.3.49.9999.ebuild
deleted file mode 100644
index f06229d..0000000
--- a/kde-plasma/bluez-qt/bluez-qt-5.3.49.9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit kde5 udev
-
-DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
-LICENSE="LGPL-2"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtnetwork:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
- )
-
- kde5_src_configure
-}
diff --git a/kde-plasma/bluez-qt/metadata.xml b/kde-plasma/bluez-qt/metadata.xml
deleted file mode 100644
index a23f444..0000000
--- a/kde-plasma/bluez-qt/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.3.49.9999.ebuild
b/kde-plasma/plasma-meta/plasma-meta-5.3.49.9999.ebuild
index e54849f..0d9f4a4 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.3.49.9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.3.49.9999.ebuild
@@ -43,7 +43,6 @@ RDEPEND="
$(add_plasma_dep systemsettings)
bluetooth? (
$(add_plasma_dep bluedevil)
- $(add_plasma_dep bluez-qt)
)
display-manager? (
sddm? ( x11-misc/sddm )
