[gentoo-commits] proj/kde:master commit in: kde-apps/knotes/, kde-apps/ktnef/, kde-apps/noteshared/, kde-apps/kdepim-meta/

[Michael Palimaka]

commit:     a007b9560d4c803ed492793fae119543ced5450a
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb 17 15:00:04 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 14:23:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a007b956

kde-apps/noteshared: Drop obsolete stable branch ebuild

Package-Manager: portage-2.2.27

 .../kdepim-meta/kdepim-meta-15.12.49.9999.ebuild   |   1 -
 kde-apps/knotes/knotes-15.12.49.9999.ebuild        | 100 +++++++++++++++
 kde-apps/knotes/knotes-9999.ebuild                 |  91 ++++++++++++++
 kde-apps/ktnef/ktnef-15.12.1-r1.ebuild             | 139 ---------------------
 .../noteshared/noteshared-15.12.49.9999.ebuild     |  53 --------
 5 files changed, 191 insertions(+), 193 deletions(-)

diff --git a/kde-apps/kdepim-meta/kdepim-meta-15.12.49.9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-15.12.49.9999.ebuild
index 47f01e0..4d5b201 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-15.12.49.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/knotes/knotes-15.12.49.9999.ebuild b/kde-apps/knotes/knotes-15.12.49.9999.ebuild
new file mode 100644
index 0000000..f0c1103
--- /dev/null
+++ b/kde-apps/knotes/knotes-15.12.49.9999.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_PIM_KEEP_SUBDIR="noteshared"
+KDE_PIM_KONTACTPLUGIN="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="Akonadi developer console"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=""
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(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 kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep libakonadi)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	x11-libs/libX11
+	dev-libs/grantlee:5
+	kontact? (
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kparts)
+		$(add_kdeapps_dep kcalcore)
+		$(add_kdeapps_dep kcalutils)
+		$(add_kdeapps_dep kcontacts)
+		$(add_kdeapps_dep libkdepim)
+	)
+"
+# Imposed by root CMakeLists.txt
+DEPEND="${DEPEND}
+	>=app-crypt/gpgme-1.3.2
+	dev-libs/boost:=
+	dev-libs/libxslt
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+	!kde-apps/noteshared:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_prepare() {
+	kde5_src_prepare
+
+	# necessary for 15.12 branch aka split-in-adv-of-upstream
+	sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+	)
+# 	# FIXME: Does not build (last checked 2016-02-17)
+# 		$(cmake-utils_use_find_package X Qt5X11Extras)
+# 		$(cmake-utils_use_find_package X X11)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/knotes/knotes-9999.ebuild b/kde-apps/knotes/knotes-9999.ebuild
new file mode 100644
index 0000000..54313f9
--- /dev/null
+++ b/kde-apps/knotes/knotes-9999.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_PIM_KEEP_SUBDIR="noteshared"
+KDE_PIM_KONTACTPLUGIN="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="Akonadi developer console"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=""
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(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 kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	x11-libs/libX11
+	dev-libs/grantlee:5
+	kontact? (
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kparts)
+		$(add_kdeapps_dep kcalcore)
+		$(add_kdeapps_dep kcalutils)
+		$(add_kdeapps_dep kcontacts)
+		$(add_kdeapps_dep libkdepim)
+	)
+"
+# Imposed by root CMakeLists.txt
+DEPEND="${DEPEND}
+	>=app-crypt/gpgme-1.3.2
+	dev-libs/boost:=
+	dev-libs/libxslt
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+	!kde-apps/noteshared:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+	)
+# 	# FIXME: Does not build (last checked 2016-02-17)
+# 		$(cmake-utils_use_find_package X Qt5X11Extras)
+# 		$(cmake-utils_use_find_package X X11)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/ktnef/ktnef-15.12.1-r1.ebuild b/kde-apps/ktnef/ktnef-15.12.1-r1.ebuild
deleted file mode 100644
index a9705dd..0000000
--- a/kde-apps/ktnef/ktnef-15.12.1-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="A viewer for TNEF attachments"
-HOMEPAGE="https://www.kde.org/"
-KEYWORDS=" ~amd64 ~x86"
-
-IUSE=""
-
-# Actual dependencies
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libktnef)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-# Imposed by root CMakeLists.txt
-DEPEND="${DEPEND}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdewebkit)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep composereditor)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep gpgmepp)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kaddressbookgrantlee)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kblog)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdgantt2)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libakonadi)
-	$(add_kdeapps_dep libfollowupreminder)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkdepimdbusinterfaces)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagecomposer)
-	$(add_kdeapps_dep messagecore)
-	$(add_kdeapps_dep messagelist)
-	$(add_kdeapps_dep messageviewer)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-	$(add_kdeapps_dep templateparser)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwebkit)
-	>=app-crypt/gpgme-1.3.2
-	dev-libs/boost:=
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	media-libs/phonon[qt5]
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-15.12.1-r2:5
-"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
-src_prepare() {
-	kde5_src_prepare
-
-	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
-		-i CMakeLists.txt || die
-	# necessary for 15.12 branch aka split-in-adv-of-upstream
-	sed -e '/find_package(KF5NoteShared/ s/^/#DONT/' \
-		-i CMakeLists.txt || die
-	sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild b/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild
deleted file mode 100644
index 3095e1b..0000000
--- a/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 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
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-apps/kdepim-common-libs:4
-"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi