diff options
Diffstat (limited to 'kde-misc')
| -rw-r--r-- | kde-misc/tellico/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-misc/tellico/files/tellico-2.3.4-kdepimlibs.patch | 71 | ||||
| -rw-r--r-- | kde-misc/tellico/tellico-2.3.4.ebuild | 61 |
3 files changed, 5 insertions, 133 deletions
diff --git a/kde-misc/tellico/ChangeLog b/kde-misc/tellico/ChangeLog index 7ed95801b51b..c06142f5e576 100644 --- a/kde-misc/tellico/ChangeLog +++ b/kde-misc/tellico/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-misc/tellico # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.110 2012/04/18 21:52:16 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.111 2012/04/18 22:09:49 johu Exp $ + + 18 Apr 2012; Johannes Huber <johu@gentoo.org> + -files/tellico-2.3.4-kdepimlibs.patch, -tellico-2.3.4.ebuild: + Remove old. 18 Apr 2012; Markus Meier <maekke@gentoo.org> tellico-2.3.5.ebuild: x86 stable, bug #409403 diff --git a/kde-misc/tellico/files/tellico-2.3.4-kdepimlibs.patch b/kde-misc/tellico/files/tellico-2.3.4-kdepimlibs.patch deleted file mode 100644 index 226c4d93a586..000000000000 --- a/kde-misc/tellico/files/tellico-2.3.4-kdepimlibs.patch +++ /dev/null @@ -1,71 +0,0 @@ -From: Robby Stephenson <robby@periapsis.org> -Date: Wed, 28 Sep 2011 02:27:06 +0000 -Subject: Use defined preprocessor command -X-Git-Url: http://quickgit.kde.org/?p=tellico.git&a=commitdiff&h=f5e0ff01a8e4285ce018efd1c4c10528d33bc442 ---- -Use defined preprocessor command ---- - - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -161,6 +161,7 @@ macro_bool_to_01(KSANE_FOUND HAVE_KSANE) - macro_bool_to_01(KDEMULTIMEDIA_FOUND HAVE_KCDDB) - macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KABC) - macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KCAL) -+macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KXMLRPC) - macro_bool_to_01(LIBV4L_FOUND HAVE_V4L) - macro_bool_to_01(QJSON_FOUND HAVE_QJSON) - macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPOMUK) - ---- a/config.h.cmake -+++ b/config.h.cmake -@@ -24,6 +24,8 @@ - - #cmakedefine HAVE_KCAL - -+#cmakedefine HAVE_KXMLRPC -+ - #cmakedefine HAVE_KCDDB - - #cmakedefine ENABLE_AMAZON - ---- a/src/fetch/CMakeLists.txt -+++ b/src/fetch/CMakeLists.txt -@@ -57,12 +57,12 @@ TARGET_LINK_LIBRARIES(fetch - - # Versions of KDE prior to 4.7 have a character encoding bug in libkxmlrpc - # Use internal version of libkxmlrpc if so --IF (${KDE_VERSION} VERSION_GREATER "4.6.99") -+IF (KDEPIMLIBS_FOUND AND ${KDE_VERSION} VERSION_GREATER "4.6.99") - TARGET_LINK_LIBRARIES(fetch ${KDEPIMLIBS_KXMLRPCCLIENT_LIBS}) --ELSE (${KDE_VERSION} VERSION_GREATER "4.6.99") -+ELSE (KDEPIMLIBS_FOUND AND ${KDE_VERSION} VERSION_GREATER "4.6.99") - ADD_SUBDIRECTORY(xmlrpc) - TARGET_LINK_LIBRARIES(fetch xmlrpc) --ENDIF (${KDE_VERSION} VERSION_GREATER "4.6.99") -+ENDIF (KDEPIMLIBS_FOUND AND ${KDE_VERSION} VERSION_GREATER "4.6.99") - - IF( YAZ_FOUND ) - TARGET_LINK_LIBRARIES(fetch ${YAZ_LIBRARIES}) - ---- a/src/fetch/moviemeterfetcher.cpp -+++ b/src/fetch/moviemeterfetcher.cpp -@@ -22,6 +22,7 @@ - * * - ***************************************************************************/ - -+#include "config.h" - #include "moviemeterfetcher.h" - #include "../collections/videocollection.h" - #include "../images/imagefactory.h" -@@ -43,7 +44,7 @@ - // since it doesn't handle character encoding correctly - // see https://git.reviewboard.kde.org/r/101838/ - #include <kdeversion.h> --#if KDE_IS_VERSION(4,7,0) -+#if defined(HAVE_KXMLRPC) && KDE_IS_VERSION(4,7,0) - #include <kxmlrpcclient/client.h> - #else - #include "xmlrpc/client.h" - diff --git a/kde-misc/tellico/tellico-2.3.4.ebuild b/kde-misc/tellico/tellico-2.3.4.ebuild deleted file mode 100644 index f17d3e434c06..000000000000 --- a/kde-misc/tellico/tellico-2.3.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-2.3.4.ebuild,v 1.6 2012/03/15 18:38:48 ssuominen Exp $ - -EAPI=4 - -KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl hu ia it ja lt ms nb nds nl nn -pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW" -inherit kde4-base - -DESCRIPTION="A collection manager for the KDE environment" -HOMEPAGE="http://tellico-project.org/" -SRC_URI="http://tellico-project.org/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="4" -KEYWORDS="amd64 ~ppc x86" -IUSE="addressbook cddb debug +handbook pdf scanner semantic-desktop taglib v4l xmp yaz" - -DEPEND=" - dev-libs/libxml2 - dev-libs/libxslt - dev-libs/qjson - $(add_kdebase_dep kdelibs 'semantic-desktop?') - media-libs/qimageblitz - x11-libs/qt-dbus:4 - addressbook? ( $(add_kdebase_dep kdepimlibs) ) - cddb? ( $(add_kdebase_dep libkcddb) ) - pdf? ( >=app-text/poppler-0.12.3-r3[qt4] ) - scanner? ( $(add_kdebase_dep libksane) ) - semantic-desktop? ( dev-libs/soprano[raptor,redland] ) - taglib? ( >=media-libs/taglib-1.5 ) - v4l? ( >=media-libs/libv4l-0.8.3 ) - xmp? ( >=media-libs/exempi-2 ) - yaz? ( >=dev-libs/yaz-2 ) -" -RDEPEND="${DEPEND}" - -# tests need network access and well-defined server responses -RESTRICT="test" - -DOCS=( AUTHORS ChangeLog README ) - -PATCHES=( - "${FILESDIR}/${PN}-2.3.4-kdepimlibs.patch" -) - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_enable v4l WEBCAM) - $(cmake-utils_use_with xmp Exempi) - $(cmake-utils_use_with scanner KSane) - $(cmake-utils_use_with cddb Kcddb) - $(cmake-utils_use_with addressbook KdepimLibs) - $(cmake-utils_use_with pdf PopplerQt4) - $(cmake-utils_use_with taglib) - $(cmake-utils_use_with yaz) - ) - - kde4-base_src_configure -} |