From: Maciej Mrozowski Date: Fri, 30 Sep 2011 21:41:27 +0000 (+0000) Subject: Update deps, bug 385009, by Bartosz Brachaczek. Favor media-libs/phonon over outdated... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1413c9b57a3e7d3b80ae35507b544a5d611063a2;p=gentoo.git Update deps, bug 385009, by Bartosz Brachaczek. Favor media-libs/phonon over outdated x11-libs/qt-phonon. Add sdk USE flag. Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64 --- diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog index e55c279f2207..b0636f72f16b 100644 --- a/net-im/kadu/ChangeLog +++ b/net-im/kadu/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-im/kadu # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.109 2011/09/29 20:37:27 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.110 2011/09/30 21:41:27 reavertm Exp $ + +*kadu-0.10.0-r1 (30 Sep 2011) + + 30 Sep 2011; Maciej Mrozowski +kadu-0.10.0-r1.ebuild, + +files/kadu-0.10.0-sdk-cmake.patch, metadata.xml: + Update deps, bug 385009, by Bartosz Brachaczek. Favor media-libs/phonon over + outdated x11-libs/qt-phonon. Add sdk USE flag. *kadu-0.10.0 (29 Sep 2011) diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest index 88762ec9d3f5..2189908f0129 100644 --- a/net-im/kadu/Manifest +++ b/net-im/kadu/Manifest @@ -2,20 +2,22 @@ Hash: SHA1 AUX kadu-0.10.0-cmake.patch 6629 RMD160 6c539996d78c14ee5fcea9594dd0581c2030395a SHA1 cd462e486690463a1fbb892fc3536d8ccbe944f8 SHA256 6756eb78fb220e5796a35602ef8c30df70d5b2a816c2ee792591be6c75e45df2 +AUX kadu-0.10.0-sdk-cmake.patch 2020 RMD160 8f1d1ccc94e4466145ee6d087464745f61b35ced SHA1 8773ff5b3c733a0232480d7ab6411d7db03597d8 SHA256 54bea8d50b4670a3d7b5453158e8039e00647dab0c13ff36e11de9e94d594ad2 AUX kadu-0.6.5.4-glibc211.patch 376 RMD160 e7d71e8592553cdc83994692c4592c4ed04e7820 SHA1 b56f37160e5eb2a0a67af787b7a8d059f67c01aa SHA256 8b971a5706593c59e20e777321509682850fae45cd885b4e46eb61da17db7b0f AUX libgsm-ugly-code.patch 314 RMD160 5c613b7b4eb261d1116fcbd76a6c46b0cc0c3bb3 SHA1 b008af1a900b135b28530fc49a2be11b318f269b SHA256 17c671fe35813ae9b8c72ca7c3563a22a0894e15ddc02aba0a6f56b00e20bad2 DIST kadu-0.10.0.tar.bz2 5713074 RMD160 fa521ae2eef3bb969a0edce021dcdf84ecfea2c0 SHA1 1150f86bee44383094ac2ca39c6e714f6082193d SHA256 25a510dd3a89ec07b463d934afe3cab46f7762cd3acc7c0dda15ff6d3cea2d0d DIST kadu-0.6.5.4.tar.bz2 1774602 RMD160 5656b87e02952e6d47159996c86919d5d16973e4 SHA1 afd5b7d6c1568a3db03328d58d5ba6506dfa410f SHA256 9decd7b9de6d91095b4f6b47bebbbbc5ca56b9ba6e8f6ee80d8ad172ba676d25 DIST kadu-0.9.2.tar.bz2 6436856 RMD160 2d1bf5ba24032c5bbdc3e664c80e96f7d4782b23 SHA1 012a36a1c8d0fcc157475d7b3ffe37094aeb2c4c SHA256 0b8cbd7cc2b313faf7792baed699a94478f5288f3a0b03c9dea83725eae99716 +EBUILD kadu-0.10.0-r1.ebuild 2735 RMD160 700154ebb075bdfdceaa800fb92e2257885b30a8 SHA1 e47f1d87a2d06ba1ccccc894731c8a623121ff12 SHA256 a6e7ec8821559cfd574379805858639344bb565b0689cbebd5c75343efc9c2b1 EBUILD kadu-0.10.0.ebuild 2759 RMD160 556036f23a39da783fb8afe26967519e815b9b9f SHA1 25209f6c7de53426bcdcfdbc4db9aefc4c895a97 SHA256 ec590d08018878b7afcdff2cc378095fbd51179a001e528e3ba8ca37873661dd EBUILD kadu-0.6.5.4.ebuild 5156 RMD160 be80321ce958631fddafce129875361d97089872 SHA1 e43377d6a2ca8269ea25b1ff45425de6c26088b3 SHA256 48fa8fbaa0990bebe3e7e02619a0f14d1d3bef5fed1a05ad5da9e2275e9b25a6 EBUILD kadu-0.9.2.ebuild 5535 RMD160 9f931edf21dee9a84a5c9bdaaf7cc0a45e53a826 SHA1 442279b4b826e37519b8775b5af00f9b5a8aade3 SHA256 db5e915286b21107e23dad68a8c43e03d3b1627ef2e079b188f84992f7a6c676 -MISC ChangeLog 16187 RMD160 675484af32888c3e2fbb2a02e50a54988f0462d9 SHA1 a6a58b795b0a2024433434d3655b5816883800a9 SHA256 de9890f9cd6efbb3533532203dc35e9aaaa0ed114ee4ac1b54d9586aeae9492f -MISC metadata.xml 662 RMD160 ba957000702ae65a1db860904344047ef52f6800 SHA1 874612b87290c369bfcb7ad7922d2496881882b9 SHA256 398900459ab65852271cd7f6d486b90b9e54c6f758c273ef7ce86c8f67374a79 +MISC ChangeLog 16477 RMD160 5fa13af7c1bf690021fdbc6b5d7453cb17a9fd73 SHA1 a4885da69f93181d1d88cc6cd7193a8e059000af SHA256 4226f9f841788d329f4a36c5edbdda3389c3d64fdbd24d90aeaabcb55eba4e2f +MISC metadata.xml 658 RMD160 04f2dbd3c2c84b07ffe8359550ce30181ccec699 SHA1 5ff2de27121716eccaac6ba0727736f8e8510961 SHA256 cc87f9b34df5f514bd5e9a4d94c32436baec1f5f47a86d8f4058da6dbb542911 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6E1wsACgkQFuHa/bHpVdtlPgCfaNPWf2QKPBHH1EGpf6QTSjIa -KPAAnRrUrmZFnfmf3igzlosP9D07eLY3 -=BPrE +iEYEARECAAYFAk6GN4sACgkQFuHa/bHpVdswEACfee3hzUlj9PjTyyhl+7n49oMY +9oIAniCVkmFpL8TcqZYnLCaRhsV7xNRx +=Aspk -----END PGP SIGNATURE----- diff --git a/net-im/kadu/files/kadu-0.10.0-sdk-cmake.patch b/net-im/kadu/files/kadu-0.10.0-sdk-cmake.patch new file mode 100644 index 000000000000..64855367b5ad --- /dev/null +++ b/net-im/kadu/files/kadu-0.10.0-sdk-cmake.patch @@ -0,0 +1,46 @@ +diff -ruN kadu-0.10.0/cmake/FindKadu.cmake new/cmake/FindKadu.cmake +--- kadu-0.10.0/cmake/FindKadu.cmake 2011-08-24 08:43:41.000000000 +0200 ++++ new/cmake/FindKadu.cmake 2011-09-30 23:26:39.043004993 +0200 +@@ -133,10 +133,12 @@ + set (KADU_PLUGINS_DIR ${KADU_DATA_DIR}/plugins) + + macro (kadu_api_directories INCLUDE_DIR) +- foreach (ARG ${ARGN}) +- file (GLOB API_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/${ARG}/*.h) +- install (FILES ${API_HEADERS} DESTINATION ${KADU_INSTALL_INCLUDE_DIR}/kadu/${INCLUDE_DIR}/${ARG}) +- endforeach (ARG) ++ if (INSTALL_SDK) ++ foreach (ARG ${ARGN}) ++ file (GLOB API_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/${ARG}/*.h) ++ install (FILES ${API_HEADERS} DESTINATION ${KADU_INSTALL_INCLUDE_DIR}/kadu/${INCLUDE_DIR}/${ARG}) ++ endforeach (ARG) ++ endif (INSTALL_SDK) + endmacro (kadu_api_directories) + + macro (kadu_configuration) +diff -ruN kadu-0.10.0/CMakeLists.txt new/CMakeLists.txt +--- kadu-0.10.0/CMakeLists.txt 2011-08-24 08:43:41.000000000 +0200 ++++ new/CMakeLists.txt 2011-09-30 23:28:24.979005031 +0200 +@@ -7,7 +7,7 @@ + option (BUILD_PLUGINS "Switch to Off if you do not want to build plugins" ON) + + # configuration +-option (INSTALL_CMAKE_MODULE "Install cmake modules" ON) ++option (INSTALL_SDK "Install SDK (API headers, cmake modules)" ON) + if (UNIX) + option (SIG_HANDLING_ENABLED "Define if you want system signals handling" ON) + if (UNIX AND NOT APPLE) +@@ -105,11 +105,11 @@ + include (cmake/FindKadu.cmake) + include_directories (${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/kadu-core ${QT_INCLUDES}) + +-if (INSTALL_CMAKE_MODULE) ++if (INSTALL_SDK) + install (FILES cmake/FindKadu.cmake DESTINATION ${KADU_CMAKE_MODULES_DIR}) + install (PROGRAMS translations/plugintsupdate.sh DESTINATION ${KADU_PLUGINS_DIR}/sdk) + install (FILES translations/configuration-ui.xsl DESTINATION ${KADU_PLUGINS_DIR}/sdk) +-endif (INSTALL_CMAKE_MODULE) ++endif (INSTALL_SDK) + + # build + configure_file (${CMAKE_SOURCE_DIR}/kadu-config.h.cmake ${CMAKE_BINARY_DIR}/kadu-config.h) diff --git a/net-im/kadu/kadu-0.10.0-r1.ebuild b/net-im/kadu/kadu-0.10.0-r1.ebuild new file mode 100644 index 000000000000..ab926f2bc157 --- /dev/null +++ b/net-im/kadu/kadu-0.10.0-r1.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.10.0-r1.ebuild,v 1.1 2011/09/30 21:41:27 reavertm Exp $ + +EAPI="4" + +inherit base cmake-utils flag-o-matic + +MY_P="${P/_/-}" + +DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client." +HOMEPAGE="http://www.kadu.net" +SRC_URI="http://download.kadu.im/stable/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" +SLOT="0" +IUSE="+gadu phonon sdk speech spell +ssl xmpp" +REQUIRED_USE=" + || ( + gadu + xmpp + ) +" +COMMON_DEPEND=" + >=app-crypt/qca-2.0.0-r2 + >=media-libs/libsndfile-1.0 + >=net-libs/libgadu-1.11.0[threads] + x11-libs/libXfixes + x11-libs/libXScrnSaver + >=x11-libs/qt-dbus-4.7.0:4 + >=x11-libs/qt-gui-4.7.0:4 + >=x11-libs/qt-script-4.7.0:4 + >=x11-libs/qt-sql-4.7.0:4[sqlite] + >=x11-libs/qt-svg-4.7.0:4 + >=x11-libs/qt-webkit-4.7.0:4 + gadu? ( >=x11-libs/qt-xmlpatterns-4.7.0:4 ) + phonon? ( + media-libs/phonon + >=x11-libs/qt-phonon-4.7.0:4 + ) + spell? ( app-text/enchant ) + xmpp? ( + net-dns/libidn + sys-libs/zlib + ) +" +DEPEND="${COMMON_DEPEND} + x11-proto/fixesproto + x11-proto/scrnsaverproto +" +RDEPEND="${COMMON_DEPEND} + speech? ( app-accessibility/powiedz ) + ssl? ( app-crypt/qca-ossl:2 ) +" + +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-sdk-cmake.patch" +) + +PLUGINS='amarok1_mediaplayer antistring auto_hide autoaway autoresponder +autostatus cenzor chat_notify config_wizard desktop_docking docking exec_notify +ext_sound falf_mediaplayer filedesc firewall freedesktop_notify hints history +idle imagelink last_seen mediaplayer mprisplayer_mediaplayer pcspeaker qt4_docking +qt4_docking_notify screenshot simpleview single_window sms sound sql_history tabs +word_fix' + +src_configure() { + # Filter out dangerous flags + filter-flags -fno-rtti + strip-unsupported-flags + + # Ensure -DQT_NO_DEBUG is added + append-cppflags -DQT_NO_DEBUG + + # Plugin selection + if use gadu; then + PLUGINS+=' gadu_protocol history_migration profiles_import' + fi + + use xmpp && PLUGINS+=' jabber_protocol' + use phonon && PLUGINS+=' phonon_sound' + use speech && PLUGINS+=' speech' + use spell && PLUGINS+=' spellchecker' + + if use ssl; then + PLUGINS+=' encryption_ng encryption_ng_simlite' + fi + + # COMPILE_PLUGINS isn't the most flexible.. + local compile_plugins= + for plugin in ${PLUGINS}; do + [[ -n ${compile_plugins} ]] && compile_plugins+=',' + compile_plugins+="${plugin}" + done + unset PLUGINS + + # Configure package + local mycmakeargs=( + -DBUILD_DESCRIPTION='Gentoo Linux' + -DCOMPILE_PLUGINS="${compile_plugins}" + $(cmake-utils_use sdk INSTALL_SDK) + $(cmake-utils_use_with spell ENCHANT) + ) + unset compile_plugins + + cmake-utils_src_configure +} diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml index a3fa976cd08c..bbeb09ed84fc 100644 --- a/net-im/kadu/metadata.xml +++ b/net-im/kadu/metadata.xml @@ -14,7 +14,7 @@ Enables Gadu communication protocol Enables phonon audio plugin + Install Kadu SDK (cmake module, API headers) Enables speech module -