kde-apps/noteshared: Included into knotes in master

8 files changed, 1 insertions, 57 deletions

diff --git a/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live b/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live
index 5be8293bf7..c0c3511583 100644
--- a/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live
+++ b/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live
@@ -46,7 +46,6 @@
 ~kde-apps/messagecore-9999 **
 ~kde-apps/messagelist-9999 **
 ~kde-apps/messageviewer-9999 **
-~kde-apps/noteshared-9999 **
 ~kde-apps/pimcommon-9999 **
 ~kde-apps/syndication-9999 **
 ~kde-apps/templateparser-9999 **
diff --git a/Documentation/package.accept_keywords/kde-applications-live.keywords b/Documentation/package.accept_keywords/kde-applications-live.keywords
index 5c0cbb5169..11609a44c5 100644
--- a/Documentation/package.accept_keywords/kde-applications-live.keywords
+++ b/Documentation/package.accept_keywords/kde-applications-live.keywords
@@ -138,7 +138,6 @@
 ~kde-apps/messagecore-9999 **
 ~kde-apps/messagelist-9999 **
 ~kde-apps/messageviewer-9999 **
-~kde-apps/noteshared-9999 **
 ~kde-apps/pimcommon-9999 **
 ~kde-apps/syndication-9999 **
 ~kde-apps/templateparser-9999 **
diff --git a/Documentation/package.mask/kde-applications-live b/Documentation/package.mask/kde-applications-live
index 7716b28506..ab42b94990 100644
--- a/Documentation/package.mask/kde-applications-live
+++ b/Documentation/package.mask/kde-applications-live
@@ -138,7 +138,6 @@
 ~kde-apps/messagecore-9999
 ~kde-apps/messagelist-9999
 ~kde-apps/messageviewer-9999
-~kde-apps/noteshared-9999
 ~kde-apps/pimcommon-9999
 ~kde-apps/syndication-9999
 ~kde-apps/templateparser-9999
diff --git a/Documentation/package.unmask/kde-applications-live b/Documentation/package.unmask/kde-applications-live
index 7716b28506..ab42b94990 100644
--- a/Documentation/package.unmask/kde-applications-live
+++ b/Documentation/package.unmask/kde-applications-live
@@ -138,7 +138,6 @@
 ~kde-apps/messagecore-9999
 ~kde-apps/messagelist-9999
 ~kde-apps/messageviewer-9999
-~kde-apps/noteshared-9999
 ~kde-apps/pimcommon-9999
 ~kde-apps/syndication-9999
 ~kde-apps/templateparser-9999
diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index e84bb27829..c5a3250dca 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -61,7 +61,6 @@ RDEPEND="
 	$(add_kdeapps_dep messagecore)
 	$(add_kdeapps_dep messagelist)
 	$(add_kdeapps_dep messageviewer)
-	$(add_kdeapps_dep noteshared)
 	$(add_kdeapps_dep pimcommon)
 	$(add_kdeapps_dep syndication)
 	$(add_kdeapps_dep templateparser)
diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index 2d05612214..5031738c96 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -92,7 +92,6 @@ DEPEND="
 	$(add_kdeapps_dep messagecore)
 	$(add_kdeapps_dep messagelist)
 	$(add_kdeapps_dep messageviewer)
-	$(add_kdeapps_dep noteshared)
 	$(add_kdeapps_dep pimcommon)
 	$(add_kdeapps_dep syndication)
 	$(add_kdeapps_dep templateparser)
@@ -121,6 +120,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
+	!kde-apps/noteshared
 	!kde-base/akonadiconsole:4
 	!kde-base/akregator:4
 	!kde-base/blogilo:4
@@ -172,7 +172,6 @@ src_prepare() {
 		messagecore		\
 		messagelist		\
 		messageviewer		\
-		noteshared		\
 		pimcommon		\
 		templateparser		\
 		|| die "Failed to remove split libraries"
diff --git a/kde-apps/noteshared/noteshared-9999.ebuild b/kde-apps/noteshared/noteshared-9999.ebuild
deleted file mode 100644
index 0766153915..0000000000
--- a/kde-apps/noteshared/noteshared-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="true"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Common notes library"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi-contact)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libakonadi)
-	$(add_kdeapps_dep pimcommon)
-	dev-libs/libxslt
-	dev-qt/designer:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-base/kdepim-common-libs:4
-"
-
-S="${WORKDIR}/${P}/${PN}"
diff --git a/sets/kdepim-live b/sets/kdepim-live
index 49780251e8..e1029d2a00 100644
--- a/sets/kdepim-live
+++ b/sets/kdepim-live
@@ -46,7 +46,6 @@
 ~kde-apps/messagecore-9999
 ~kde-apps/messagelist-9999
 ~kde-apps/messageviewer-9999
-~kde-apps/noteshared-9999
 ~kde-apps/pimcommon-9999
 ~kde-apps/syndication-9999
 ~kde-apps/templateparser-9999