diff options
7 files changed, 114 insertions, 75 deletions
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest index 243c9d8a275..fae582530ef 100644 --- a/kde-base/kdeplasma-addons/Manifest +++ b/kde-base/kdeplasma-addons/Manifest @@ -1,8 +1,7 @@ -AUX kdeplasma-addons-4.4.3-cmake.patch 2142 RMD160 1de9bd609e7fa1b249d20194198afee5a8596868 SHA1 5fe6044165e6588fc3be329021f3bcd83cf9dd74 SHA256 d05c47e88d22db5a28e59f87f2a3b19aff1c7e6de9c8577cef6c587734b2894e -DIST kdeplasma-addons-4.4.3.tar.bz2 1645196 RMD160 3d37024d414c0be4f1c762af7e6752ee51fd50e9 SHA1 8041118514589d09df30de6e771d83b5d1c5e77b SHA256 275d60b32ffa878be97ccd34070ee23e89c6642ba39a4dd4b11c210c3a39f902 +AUX kdeplasma-addons-4.4.3-cmake.patch 2142 RMD160 42e9dab676b617686ef159752b4643491e0dfdd7 SHA1 2e1e74e01e64f277636b099af2b292af091ec33b SHA256 a19a933f282f1be4ab67949c1de9a4ead8e05d2ff78dafbdd600682f3c8e59b9 +AUX kdeplasma-addons-4.4.74-cmake.patch 2623 RMD160 dd1fc6913c715184fdb4e0681507ad46207f25c5 SHA1 67809abb832d8f4e3f5c521be54bf8eacbd9c0c5 SHA256 d2e3ea559e422cc0fd822f9a014bf2d4621525deb40e86181be65ddc51a1d745 DIST kdeplasma-addons-4.4.74.tar.xz 1457524 RMD160 e0d8c0efa6049f78d3b1a485e5a49ec9660ab308 SHA1 d0f1ef4f8fc189985229753819e2c0bb7e4e5f63 SHA256 1d5fc8d3c5dd09a0d77e48f5867ed81b264b9a839b8d5bd0ee045923f571ff75 -EBUILD kdeplasma-addons-4.4.3.ebuild 1984 RMD160 c692b62a308e7e399fa32eaf6037fd891b410c6b SHA1 9b5e7b5546ad17593f2d4d321b637b68fc197d91 SHA256 60f258fb80fd7d74f6a11a1e8aee16b11e3c15199fdf183661f7ec4697a23e4d -EBUILD kdeplasma-addons-4.4.74.ebuild 1921 RMD160 7683f6a0f68f2c0e50a2944d8b3415d4a7a1e224 SHA1 8d1b03a09bc2ddb7069df0fdecf7b96ed009aa3a SHA256 cf1d3f873b8fbe19b70844fb65c59be14a11c0029901ac88fa206f667f2d5e44 -EBUILD kdeplasma-addons-4.4.9999.ebuild 1911 RMD160 baf25c0c622795de631c2bcee094a2709afa17db SHA1 7d06e129a0a803d2c1118d3fb2c880d3a97b9e67 SHA256 69d37696486b0155f2635cc4e03561874353e191e307ddd0ee1d5b88828f5fd7 -EBUILD kdeplasma-addons-9999.ebuild 1848 RMD160 d032350b863d1a16efcd13d3190f0ba615363239 SHA1 93d346b7eb80fba05fa8c22e9642ea51680ab6dd SHA256 685de4e312d3c202aef078b66945f73205c649b3d2db2b1e3f9e57ab4a35e439 +EBUILD kdeplasma-addons-4.4.74.ebuild 1974 RMD160 591d4fa8284099e9579cb6f88b3357d54a5703f8 SHA1 40658cbc421c10923d62c60c894bbf8625ef5b57 SHA256 1533cad44e49693627ff53dda4b0c981875f63f0e502fa991efc8ac186c41522 +EBUILD kdeplasma-addons-4.4.9999.ebuild 1963 RMD160 f576a97c143d8c13762b258e9a58d3e2b8ea8b07 SHA1 d4bf5dd64fc846558b9923d686245c622d58746a SHA256 f9967e337fb2b9a5c27d9c589c067950978f75c2ff9c8f73d002cdd9e63f22b6 +EBUILD kdeplasma-addons-9999.ebuild 1901 RMD160 b12f8231a5801a754bcf05a7699905dd9b4ef82b SHA1 770b314c03cf44c38b2e71bd4a6205e6718b5602 SHA256 6ecc773ed0aa9a47bd7f34b89c9fbe6c9516b03c3f631942efa7eeb3b93a1409 MISC metadata.xml 513 RMD160 c7aded626277a79aa0a0b879476ecb5377f97f86 SHA1 cd2f44eccf545b4232bf77415d6aa5b79015e702 SHA256 f682111bd3c2ed82effd027c8fe51d56704be560452a101db8e3557ef0e0a572 diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch index 97085b4b6da..589954b9613 100644 --- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch +++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch @@ -1,6 +1,6 @@ Index: applets/CMakeLists.txt =================================================================== ---- applets/CMakeLists.txt (revision 1122325) +--- applets/CMakeLists.txt (revision 1122757) +++ applets/CMakeLists.txt (working copy) @@ -15,6 +15,7 @@ add_subdirectory(calculator) @@ -47,7 +47,7 @@ Index: applets/CMakeLists.txt endif(PHONON_FOUND) Index: runners/CMakeLists.txt =================================================================== ---- runners/CMakeLists.txt (revision 1122325) +--- runners/CMakeLists.txt (revision 1122757) +++ runners/CMakeLists.txt (working copy) @@ -8,10 +8,9 @@ add_subdirectory(spellchecker) @@ -64,7 +64,7 @@ Index: runners/CMakeLists.txt - Index: runners/contacts/CMakeLists.txt =================================================================== ---- runners/contacts/CMakeLists.txt (revision 1122325) +--- runners/contacts/CMakeLists.txt (revision 1122757) +++ runners/contacts/CMakeLists.txt (working copy) @@ -5,7 +5,7 @@ diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.74-cmake.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.74-cmake.patch new file mode 100644 index 00000000000..56a1e78b3d9 --- /dev/null +++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.74-cmake.patch @@ -0,0 +1,94 @@ +Index: applets/CMakeLists.txt +=================================================================== +--- applets/CMakeLists.txt (revision 1122904) ++++ applets/CMakeLists.txt (working copy) +@@ -16,6 +16,7 @@ + add_subdirectory(calculator) + add_subdirectory(charselect) + add_subdirectory(comic) ++add_subdirectory(dict) + add_subdirectory(fifteenPuzzle) + add_subdirectory(fileWatcher) + add_subdirectory(frame) +@@ -30,14 +31,21 @@ + add_subdirectory(microblog) + add_subdirectory(notes) + add_subdirectory(nowplaying) ++ + if(LIBATTICA_FOUND) + add_subdirectory(community) + add_subdirectory(social-news) + endif(LIBATTICA_FOUND) ++ + add_subdirectory(pastebin) + add_subdirectory(previewer) + add_subdirectory(rememberthemilk) +-add_subdirectory(rssnow) ++ ++if(KDEPIMLIBS_FOUND) ++ add_subdirectory(news) ++ add_subdirectory(rssnow) ++endif(KDEPIMLIBS_FOUND) ++ + add_subdirectory(spellcheck) + add_subdirectory(showdashboard) + add_subdirectory(timer) +@@ -48,11 +56,6 @@ + add_subdirectory(weatherstation) + add_subdirectory(weather) + +-if(QT_QTWEBKIT_FOUND) +- add_subdirectory(dict) +- add_subdirectory(news) +-endif(QT_QTWEBKIT_FOUND) +- + if(PHONON_FOUND) + add_subdirectory(mediaplayer) + endif(PHONON_FOUND) +Index: libs/lancelot-datamodels/CMakeLists.txt +=================================================================== +--- libs/lancelot-datamodels/CMakeLists.txt (revision 1122904) ++++ libs/lancelot-datamodels/CMakeLists.txt (working copy) +@@ -23,10 +23,8 @@ + + set (ADDITIONAL_LINK_LIBRARIES + ${ADDITIONAL_LINK_LIBRARIES} +- ${KDE4_AKONADI_LIBS} +- ) +- +- ++ ${KDEPIMLIBS_AKONADI_LIBS} ++ ) + endif(KDEPIMLIBS_FOUND) + + macro_log_feature(LANCELOT_DATAMODELS_HAS_PIMLIBS +Index: runners/CMakeLists.txt +=================================================================== +--- runners/CMakeLists.txt (revision 1122904) ++++ runners/CMakeLists.txt (working copy) +@@ -9,10 +9,9 @@ + add_subdirectory(characters) + + if(KDEPIMLIBS_FOUND) +-add_subdirectory(contacts) ++ add_subdirectory(contacts) + endif(KDEPIMLIBS_FOUND) + + if(NOT WIN32) +- add_subdirectory(konsolesessions) ++ add_subdirectory(konsolesessions) + endif(NOT WIN32) +- +Index: runners/contacts/CMakeLists.txt +=================================================================== +--- runners/contacts/CMakeLists.txt (revision 1122904) ++++ runners/contacts/CMakeLists.txt (working copy) +@@ -5,7 +5,7 @@ + + kde4_add_plugin(krunner_contacts ${krunner_contacts_SRCS}) + target_link_libraries(krunner_contacts ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS} +-${KDE4_KABC_LIBS}) ++${KDEPIMLIBS_KABC_LIBS}) + + install(TARGETS krunner_contacts DESTINATION ${PLUGIN_INSTALL_DIR} ) + diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild deleted file mode 100644 index f2c76e4ecfc..00000000000 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -KMNAME="kdeplasma-addons" -WEBKIT_REQUIRED="always" -inherit kde4-base - -DESCRIPTION="Extra Plasma applets and engines." -HOMEPAGE="http://www.kde.org/" -LICENSE="GPL-2 LGPL-2" - -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="debug desktopglobe exif qalculate qwt rss scim semantic-desktop" - -# krunner is only needed to generate dbus interface for lancelot -COMMON_DEPEND=" - dev-libs/libattica - $(add_kdebase_dep kdelibs 'semantic-desktop?') - $(add_kdebase_dep krunner) - $(add_kdebase_dep plasma-workspace 'rss?') - x11-misc/shared-mime-info - desktopglobe? ( $(add_kdebase_dep marble) ) - exif? ( $(add_kdebase_dep libkexiv2) ) - qalculate? ( sci-libs/libqalculate ) - qwt? ( x11-libs/qwt:5 ) - rss? ( $(add_kdebase_dep kdepimlibs 'akonadi') ) - scim? ( app-i18n/scim ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:2 -" -# kde-misc/plasmaboard: moved here in 4.3.65 -RDEPEND="${COMMON_DEPEND} - !kdeprefix? ( !kde-misc/plasmaboard ) -" - -# kdebase-data: some svg icons moved from data directly here. -add_blocker kdebase-data '<4.2.88' - -src_prepare() { - sed -e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \ - -e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \ - -e 's/${KDE4WORKSPACE_TASKMANAGER_LIBRARY}/taskmanager/g' \ - -i {libs/plasmaweather,applets/{binary-clock,fuzzy-clock,weather,weatherstation,lancelot/app/src}}/CMakeLists.txt \ - || die "Failed to patch CMake files" - - kde4-base_src_prepare -} - -src_configure() { - mycmakeargs=( - -DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/" - $(cmake-utils_use_with desktopglobe Marble) - $(cmake-utils_use_with exif Kexiv2) - $(cmake-utils_use_with qalculate) - $(cmake-utils_use_with qwt) - $(cmake-utils_use_with rss KdepimLibs) - $(cmake-utils_use_with semantic-desktop Nepomuk) - $(cmake-utils_use_with scim) - ) - - kde4-base_src_configure -} diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.74.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.74.ebuild index b0d7e7fbb9a..04bcaa06eec 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.74.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.74.ebuild @@ -40,6 +40,10 @@ RDEPEND="${COMMON_DEPEND} # kdebase-data: some svg icons moved from data directly here. add_blocker kdebase-data '<4.2.88' +PATCHES=( + "${FILESDIR}/${PN}-4.4.74-cmake.patch" +) + src_prepare() { find "${S}" -name CMakeLists.txt | \ xargs sed -i \ diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.9999.ebuild index 675a36e3ecc..d8a0262aa50 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.9999.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.9999.ebuild @@ -40,6 +40,10 @@ RDEPEND="${COMMON_DEPEND} # kdebase-data: some svg icons moved from data directly here. add_blocker kdebase-data '<4.2.88' +PATCHES=( + "${FILESDIR}/${PN}-4.4.3-cmake.patch" +) + src_prepare() { sed -e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \ -e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \ diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild index 668164173f9..785050e7110 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild @@ -40,6 +40,10 @@ RDEPEND="${COMMON_DEPEND} # kdebase-data: some svg icons moved from data directly here. add_blocker kdebase-data '<4.2.88' +PATCHES=( + "${FILESDIR}/${PN}-4.4.74-cmake.patch" +) + src_prepare() { find "${S}" -name CMakeLists.txt | \ xargs sed -i \ |