johu 15/06/26 22:30:31 Modified: akonadi-server-1.13.0.ebuild ChangeLog Added: akonadi-server-1.13.0-r1.ebuild Log: Revision bump adds patch by Brian Evans <[email protected]>, fixes a crash with dev-db/mysql-5.6m bug #530012. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xFDF4F788)
Revision Changes Path 1.10 app-office/akonadi-server/akonadi-server-1.13.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild?r1=1.9&r2=1.10 Index: akonadi-server-1.13.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- akonadi-server-1.13.0.ebuild 28 Dec 2014 14:53:20 -0000 1.9 +++ akonadi-server-1.13.0.ebuild 26 Jun 2015 22:30:31 -0000 1.10 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.9 2014/12/28 14:53:20 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.10 2015/06/26 22:30:31 johu Exp $ EAPI=5 1.156 app-office/akonadi-server/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/ChangeLog?rev=1.156&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/ChangeLog?rev=1.156&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/ChangeLog?r1=1.155&r2=1.156 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- ChangeLog 28 Dec 2014 14:53:20 -0000 1.155 +++ ChangeLog 26 Jun 2015 22:30:31 -0000 1.156 @@ -1,6 +1,15 @@ # ChangeLog for app-office/akonadi-server -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.155 2014/12/28 14:53:20 titanofold Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.156 2015/06/26 22:30:31 johu Exp $ + +*akonadi-server-1.13.0-r1 (26 Jun 2015) + + 26 Jun 2015; Johannes Huber <[email protected]> + +akonadi-server-1.13.0-r1.ebuild, + +files/akonadi-server-1.13.0-mysql56-crash.patch, + akonadi-server-1.13.0.ebuild: + Revision bump adds patch by Brian Evans <[email protected]>, fixes a crash + with dev-db/mysql-5.6m bug #530012. 28 Dec 2014; Aaron W. Swenson <[email protected]> akonadi-server-1.13.0.ebuild: 1.1 app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild?rev=1.1&content-type=text/plain Index: akonadi-server-1.13.0-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild,v 1.1 2015/06/26 22:30:31 johu Exp $ EAPI=5 if [[ $PV = *9999* ]]; then scm_eclass=git-r3 EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" ) SRC_URI="" KEYWORDS="" else SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" S="${WORKDIR}/${P/-server/}" fi inherit cmake-utils ${scm_eclass} DESCRIPTION="The server part of Akonadi" HOMEPAGE="http://pim.kde.org/akonadi"; LICENSE="LGPL-2.1" SLOT="0" IUSE="+mysql postgres +qt4 qt5 soprano sqlite test" REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )" CDEPEND=" dev-libs/boost:= x11-misc/shared-mime-info qt4? ( >=dev-qt/qtcore-4.8.5:4 >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?] >=dev-qt/qttest-4.8.5:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[mysql?,postgres?] dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 soprano? ( dev-libs/soprano[-qt4,qt5] ) ) soprano? ( dev-libs/soprano ) sqlite? ( dev-db/sqlite:3 ) " DEPEND="${CDEPEND} dev-libs/libxslt >=dev-util/automoc-0.9.88 test? ( sys-apps/dbus ) " RDEPEND="${CDEPEND} postgres? ( dev-db/postgresql[server] ) " RESTRICT="test" PATCHES=( "${FILESDIR}/${P}-mysql56-crash.patch" ) pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then [[ $(gcc-major-version) -lt 4 ]] || \ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \ && die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)." fi } pkg_setup() { # Set default storage backend in order: MySQL, SQLite PostgreSQL # reverse driver check to keep the order if use postgres; then DRIVER="QPSQL" AVAILABLE+=" ${DRIVER}" fi if use sqlite; then DRIVER="QSQLITE3" AVAILABLE+=" ${DRIVER}" fi if use mysql; then DRIVER="QMYSQL" AVAILABLE+=" ${DRIVER}" fi # Notify about MySQL is recommend by upstream if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then ewarn ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" ewarn "user configuration. This is the backend recommended by KDE upstream." ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite" ewarn "backend anymore." ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." ewarn "Available drivers are:${AVAILABLE}" ewarn fi } src_configure() { local mycmakeargs=( -DINSTALL_QSQLITE_IN_QT_PREFIX=ON $(cmake-utils_use test AKONADI_BUILD_TESTS) $(cmake-utils_use_with soprano) $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE) $(cmake-utils_use qt5 QT5_BUILD) ) cmake-utils_src_configure } src_test() { export $(dbus-launch) cmake-utils_src_test } src_install() { # Who knows, maybe it accidentally fixes our permission issues cat <<-EOF > "${T}"/akonadiserverrc [%General] Driver=${DRIVER} EOF insinto /usr/share/config/akonadi doins "${T}"/akonadiserverrc cmake-utils_src_install } pkg_postinst() { elog "${DRIVER} has been set as your default akonadi storage backend." elog "You can override it in your ~/.config/akonadi/akonadiserverrc." elog "Available drivers are: ${AVAILABLE}" }
