From: Andreas Hüttel Date: Mon, 17 Oct 2011 21:53:18 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a9a25df539bea8697c0fa03986214a47b50e39c8;p=gentoo.git Version bump Package-Manager: portage-2.1.10.28/cvs/Linux x86_64 --- diff --git a/kde-misc/tellico/ChangeLog b/kde-misc/tellico/ChangeLog index 47b3a21c479b..4e234e235af0 100644 --- a/kde-misc/tellico/ChangeLog +++ b/kde-misc/tellico/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-misc/tellico # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.100 2011/07/31 17:45:10 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.101 2011/10/17 21:53:18 dilfridge Exp $ + +*tellico-2.3.4 (17 Oct 2011) + + 17 Oct 2011; Andreas K. Huettel +tellico-2.3.4.ebuild, + +files/tellico-2.3.4-kdepimlibs.patch: + Version bump 31 Jul 2011; Andreas K. Huettel tellico-2.3.3.ebuild, +files/tellico-2.3.3-tests.patch: diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest index c7bc095dc9dc..46c27ded1b20 100644 --- a/kde-misc/tellico/Manifest +++ b/kde-misc/tellico/Manifest @@ -2,26 +2,29 @@ Hash: SHA512 AUX tellico-2.3.3-tests.patch 3802 RMD160 25d45649977f2dd012a00a1b3edd19fe9cc12ad8 SHA1 ff4ff9b76da90fcab0df3787ac20a27d6c67c16e SHA256 57ba165c50385941cbe163ba15ca74dcb1028d703a9c207c155d03824ba2a8f0 +AUX tellico-2.3.4-kdepimlibs.patch 2349 RMD160 e1551a103df587bb0991e1422b2d4002d6d52d48 SHA1 1a706626d14eb0acd3027794f0e9c0d0925d8bcc SHA256 4d3486cfe04ed6e9a2d1fc8341081877b23eae02d6c6e679f901bbe95aeecc40 DIST tellico-2.3.2.tar.bz2 2821066 RMD160 4e322bdb4618445e7cbb6a36a55b401440c15f9a SHA1 ff07a5ee1be84a863ea7b971058d64d90bb3bdb9 SHA256 aeade154506617a9c70406b07ec7e3d638eccebbec27176b80bc3d81267d8804 DIST tellico-2.3.3.tar.bz2 2814801 RMD160 d7a75f33c82c1947fe9df73fe88f8c01a756753f SHA1 f738f93eafa6291b0a88d55ace62051a69f0c9a0 SHA256 60ca7d5d0ec4504389bc21a16f0b78d4717940f3798643f0ba84038688a15aa0 +DIST tellico-2.3.4.tar.bz2 2910721 RMD160 b33578911b77eee9205007852ee2964afe4ada92 SHA1 7e753d99d701d01aea6c89eb8405150daa8ddcfc SHA256 376d8e8db8fcf19f77300e10921991d67d3d99e1abb88eda97900932c6e486fd EBUILD tellico-2.3.2.ebuild 1701 RMD160 f092d80653906d7c26864c8ecbc77fd340eac2dd SHA1 1711bffeecf88dcb9f3625b268d7b6560347c633 SHA256 d2758e7411b652c36b2f7d21ed5208c4ab71d053508d1dc322b477829b82f3a7 EBUILD tellico-2.3.3.ebuild 1739 RMD160 f49571b95ad50f42a7cb1b048969b9bca48ddaee SHA1 2ae63a47db887a8d326b6148728b7b4eca93cbcf SHA256 2f6eaa8f43d72644db0eec6d3f775949e0f6994642d5e00fcf2bf00a6ba82121 -MISC ChangeLog 12604 RMD160 f23f47030d14a0eadd746392d5f2762c47ee0d9e SHA1 9f4dada51513875fe7b631de3087e3da6288164c SHA256 29bbc6766c8be3894da08d62f1021bace64a5ee8bfa19068276e893355c69b62 +EBUILD tellico-2.3.4.ebuild 1760 RMD160 8204f46bd6e01b039171529d25a984c17208bdee SHA1 4cfa26e1384cdaf0f82bdc16b2ee777f0b3a52aa SHA256 d89ecb2ab24487de4b7687d9aa56b9f662fbfbfc0bf2c7c1e5869076f4e24a21 +MISC ChangeLog 12771 RMD160 b4189faf8f7dbb931a0d53ef1eb38d4c30fd3572 SHA1 8214394b5e0d844ef7f044472503c9e98294354b SHA256 fc1991fa7cb1e8ec98f559c88517d0a9716f8cb9d5b0d832a456ba5f1a986471 MISC metadata.xml 497 RMD160 e3a18c1a432a4809f8d888d9199d54fc12715934 SHA1 b036fc7e7c2e9cfd1dd9171abd7d1bf0b1a97e28 SHA256 d97e6f40107c07f33255592d4105a346b321fca57155db4c6b9301af659b7ffc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJONZS2AAoJENwGBM22xffe+68P/2fgCkLDax0VfKXQFySYg+8r -aPOPa7F8N7ilOlT1oL1h6N9znKdVxvfrWLc2WW1R4gE+U/Fn1VRacy2SI162yGB9 -RNaml/sTRPZBz9yA8BFyN6BfMGwDYp5n8XVdFKuNtllmIsDjFKWe/bHsuuXTnXTR -lATdioir+LIazcJSvPyeSKUOUJNFEKfqvT9CZ+pbvessAFonVboFDFiEANz+Q9AA -7kdtkfum0QtcFSz5/dFjA5PfRyTipd9xNX8Grd8ShYX91tW5xXdr3eV7WOpM7R49 -v2ZVaZygvOBQhW/Mq7EB4Tn6U2MCtM6SnHWucj17y8c5NjUsDGenGh2QQ9rCpVAa -aCZucW0+GcnwcJRtTvYtIzVbeyk4jbVDf7NjzhGPmrlgyjju0bqF/6F3zvWkz1+M -MZJGXNcdoSkcpM2ubTfguJtNmZCst2NiFgYpQUq3dqJN3sp0N8nLdfoj+BZJD8wg -tbNsbx7NYPq+9p2gi0FP9DZLM98VJ1BhkcEdEDov6ZZdqoY1Bo2dPSm92y7UqeoZ -Vdl2IuD1djANTf+I5g8XrwAd7EUlQH2WruSyQaxTGSi+S0vGZp+CmCLwBxz+MfOZ -iSG6BeO4KRN30VHjImp9FYe0NWBAlx5j0c0AWA6WWXSFce6QVMmummD2HUCCHidr -wxBei9m0wLfRXB8Y0B9E -=nXKn +iQIcBAEBCgAGBQJOnKPXAAoJENwGBM22xffeobcP/0c5LDM1vn3umc9izTbKzJ6e +70ABXWD4iUeo+WEvFosfmz8rt5dkizK75FArQbXuwayk9NHCRnGkNbmcXlCWAckE +ep6kC8rLTVtusLHwReqr2+QrWqJ4JqLV6uqD8TufTYtgT8dwsh4oKc5FJLxS3iqn +BKyw0MCZWRTHnqZdD0N/kfqH9TcaC0rk0FBtfGelJyjajLjKmTNf4N18AExfH+lm +WgvuHWVEJ7bmGykukU7VJjDRZt8F+23dLhk3tU3/RKZC2msOhtSblgQsFEJkdDz9 +zvS8SwJ2JHLp3ygwSNH433cZIPq2kS/RDE7UByazwTZlLaZW4KMx509j0Yt6UTM0 +ZcbegufzdxnMJhVK7ZN3fldp7G4Mh9Tdpbqx3y8KQKpegjvLPkWsMAGKJBhM9Qo5 +mVKFXqH59TmDCz8RW9B/zgMHH3kEKlC03sfPTnLAvPhy4I0ZDHwCWOwTYknK8uP6 +wWPoMevQrGeEytSLscmNqQc1WK1tM52aOh+DweKQek84/RsS2NrE+VR+nhP6qM6y +s22upxqU4kfzNKlcoQFa0V3KOPFRA0Gz/t0MkfNW0+vAIzuFtklTCp7OGCUMO2Kl +qD+8WTfXApQyUXnpnnU5tEwVjkS2cnper1lJSbYqq3giE519GREsxrdKlmNEv7JM +jznkek7HldxtAcUU/T/k +=2cge -----END PGP SIGNATURE----- diff --git a/kde-misc/tellico/files/tellico-2.3.4-kdepimlibs.patch b/kde-misc/tellico/files/tellico-2.3.4-kdepimlibs.patch new file mode 100644 index 000000000000..226c4d93a586 --- /dev/null +++ b/kde-misc/tellico/files/tellico-2.3.4-kdepimlibs.patch @@ -0,0 +1,71 @@ +From: Robby Stephenson +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 +-#if KDE_IS_VERSION(4,7,0) ++#if defined(HAVE_KXMLRPC) && KDE_IS_VERSION(4,7,0) + #include + #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 new file mode 100644 index 000000000000..8c70b38c4c57 --- /dev/null +++ b/kde-misc/tellico/tellico-2.3.4.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2011 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.1 2011/10/17 21:53:18 dilfridge 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 musicbrainz 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] ) + musicbrainz? ( >=media-libs/musicbrainz-2.1.5 ) + 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}" + +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 +}