From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q7Ff8-0007L8-F4 for garchives@archives.gentoo.org; Tue, 05 Apr 2011 23:27:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A4A21C110; Tue, 5 Apr 2011 23:27:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3B0D11C110 for ; Tue, 5 Apr 2011 23:27:46 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ACB911B40C1 for ; Tue, 5 Apr 2011 23:27:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 122948006D for ; Tue, 5 Apr 2011 23:27:45 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <5ba7ba8fb50debd33fc32f878c55c58ce6853a82.scarabeus@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/akonadi-server/akonadi-server-9999.ebuild X-VCS-Directories: app-office/akonadi-server/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 5ba7ba8fb50debd33fc32f878c55c58ce6853a82 Date: Tue, 5 Apr 2011 23:27:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5efc69877e32655c505923b0b776ac45 commit: 5ba7ba8fb50debd33fc32f878c55c58ce6853a82 Author: Tomas Chvatal gentoo org> AuthorDate: Tue Apr 5 23:27:22 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Tue Apr 5 23:27:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D5ba7ba8f [app-office/akonadi-server] Cleanup the ebuild. --- .../akonadi-server/akonadi-server-9999.ebuild | 35 ++++++++------= ----- 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-o= ffice/akonadi-server/akonadi-server-9999.ebuild index 3535345..1638c23 100644 --- a/app-office/akonadi-server/akonadi-server-9999.ebuild +++ b/app-office/akonadi-server/akonadi-server-9999.ebuild @@ -13,7 +13,7 @@ EGIT_REPO_URI=3D"git://anongit.kde.org/akonadi" LICENSE=3D"LGPL-2.1" KEYWORDS=3D"" SLOT=3D"0" -IUSE=3D"mysql postgres +sqlite +server" +IUSE=3D"mysql postgres +sqlite" =20 CDEPEND=3D" dev-libs/boost @@ -28,27 +28,22 @@ DEPEND=3D"${CDEPEND} >=3Ddev-util/automoc-0.9.88 " RDEPEND=3D"${CDEPEND} - server? ( - postgres? ( dev-db/postgresql-server ) - ) + postgres? ( dev-db/postgresql-server ) " =20 -REQUIRED_USE=3D"^^ ( sqlite mysql postgres )" +REQUIRED_USE=3D"|| ( sqlite mysql postgres )" =20 pkg_setup() { # Set default storage backend in order: SQLite, MySQL, PostgreSQL - local available if use sqlite; then - driver=3D"QSQLITE3" - available+=3D" ${driver}" - fi - if use mysql; then - driver=3D"QMYSQL" - available+=3D" ${driver}" - fi - if use postgres; then - driver=3D"QPSQL" - available+=3D" ${driver}" + DRIVER=3D"QSQLITE3" + AVAILABLE+=3D" ${driver}" + elif use mysql; then + DRIVER=3D"QMYSQL" + AVAILABLE+=3D" ${driver}" + elif use postgres; then + DRIVER=3D"QPSQL" + AVAILABLE+=3D" ${driver}" fi =20 # Notify about driver name change @@ -65,7 +60,7 @@ pkg_setup() { ewarn "If you intend to use it, please enable mysql USE flag and reins= tall" ewarn "${CATEGORY}/${PN}." ewarn "Otherwise select different driver in your ~/.config/akonadi/ako= nadiserverrc." - ewarn "Available drivers are:${available}" + ewarn "Available drivers are:${AVAILABLE}" fi } =20 @@ -73,7 +68,7 @@ src_install() { # Who knows, maybe it accidentally fixes our permission issues cat <<-EOF > "${T}"/akonadiserverrc [%General] -Driver=3D${driver} +Driver=3D${DRIVER} EOF insinto /usr/share/config/akonadi doins "${T}"/akonadiserverrc || die "doins failed" @@ -83,7 +78,7 @@ EOF =20 pkg_postinst() { echo - elog "${driver} has been set as your default akonadi storage backend." + 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: QMYSQL, QPSQL, QSQLITE3" + elog "Available drivers are: ${AVAILABLE}" }