From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 85016139085 for ; Mon, 6 Feb 2017 02:16:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 327B021C1BF; Mon, 6 Feb 2017 02:16:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F106721C1BF for ; Mon, 6 Feb 2017 02:16:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B816C340C9D for ; Mon, 6 Feb 2017 02:16:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C3A553B9F for ; Mon, 6 Feb 2017 02:16:27 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1486347356.56450f4e204e7ee194a72dcc78c58d8d8352f21d.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/licq/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/licq/licq-1.8.2.ebuild X-VCS-Directories: net-im/licq/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 56450f4e204e7ee194a72dcc78c58d8d8352f21d X-VCS-Branch: master Date: Mon, 6 Feb 2017 02:16:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4c84bf64-37f7-424f-9984-12e94312e917 X-Archives-Hash: cab78c00a0de4713d904ea1945953685 commit: 56450f4e204e7ee194a72dcc78c58d8d8352f21d Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 6 02:15:56 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 6 02:15:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56450f4e net-im/licq: Fixced RDEPEND (bug #608008). EAPI-6 bump. Ebuild overhaul and cleanup. Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-im/licq/licq-1.8.2.ebuild | 72 ++++++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/net-im/licq/licq-1.8.2.ebuild b/net-im/licq/licq-1.8.2.ebuild index 88a4311..b1aeafd 100644 --- a/net-im/licq/licq-1.8.2.ebuild +++ b/net-im/licq/licq-1.8.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit cmake-utils eutils flag-o-matic @@ -13,34 +13,49 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="2" KEYWORDS="alpha amd64 ia64 ppc sparc x86" -IUSE="debug doc linguas_he nls socks5 ssl xosd aosd xmpp qt4 msn" +IUSE="debug doc l10n_he nls socks5 ssl xosd aosd xmpp qt4 msn" -RDEPEND=">=app-crypt/gpgme-1 +RDEPEND=" + >=app-crypt/gpgme-1 + app-text/hunspell dev-libs/boost:= + x11-libs/libXScrnSaver xmpp? ( net-libs/gloox ) qt4? ( dev-qt/qtgui:4 ) socks5? ( net-proxy/dante ) ssl? ( >=dev-libs/openssl-0.9.5a:0= ) xosd? ( x11-libs/xosd ) - aosd? ( x11-libs/libaosd )" -DEPEND="${RDEPEND} + aosd? ( x11-libs/libaosd ) +" +DEPEND=" + ${RDEPEND} doc? ( app-doc/doxygen[dot] ) - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" src_prepare() { - local licq_plugins="auto-reply icq rms" - use msn && licq_plugins+=" msn" - use xosd && licq_plugins+=" osd" - use aosd && licq_plugins+=" aosd" - use xmpp && licq_plugins+=" jabber" - use qt4 && licq_plugins+=" qt4-gui" - - local plugins="" x - for x in ${licq_plugins}; do - plugins+=" ${x}\/CMakeLists.txt" + default + + local licq_plugins=( + auto-reply + icq + rms + $(usex aosd aosd '') + $(usex msn msn '') + $(usex qt4 qt4-gui '') + $(usex xmpp jabber '') + $(usex xosd osd '') + ) + + local plugins=() x + for x in ${licq_plugins[@]} ; do + plugins+=( ${x}/CMakeLists.txt ) done - sed -i -e "s/file(GLOB cmake_plugins.*$/set(cmake_plugins ${plugins})/" plugins/CMakeLists.txt + # somehow sed doesn't like an array variable + x="${plugins[@]}" + sed -e "s|file(GLOB cmake_plugins.*$|set(cmake_plugins ${x})|" \ + -i plugins/CMakeLists.txt || die } pkg_setup() { @@ -49,23 +64,24 @@ pkg_setup() { } src_configure() { - local myopts="-DCMAKE_BUILD_TYPE=$(use debug && echo 'Debug' || echo 'Release')" - mycmakeargs="$myopts - $(cmake-utils_use doc USE_DOXYGEN) - $(cmake-utils_use linguas_he USE_HEBREW) - $(cmake-utils_use nls ENABLE_NLS) - $(cmake-utils_use socks5 USE_SOCKS5) - $(cmake-utils_use ssl USE_OPENSSL) - -DUSE_FIFO=ON + mycmakeargs=( -DBUILD_PLUGINS=ON - -DBUILD_TESTS=OFF" + -DBUILD_TESTS=OFF + -DCMAKE_BUILD_TYPE="$(usex debug 'Debug' 'Release')" + -DENABLE_NLS="$(usex nls)" + -DUSE_DOXYGEN="$(usex doc)" + -DUSE_FIFO=ON + -DUSE_HEBREW="$(usex l10n_he)" + -DUSE_OPENSSL="$(usex ssl)" + -DUSE_SOCKS5="$(usex socks5)" + ) cmake-utils_src_configure } src_install() { + local DOCS=( README ) cmake-utils_src_install - dodoc README docinto doc dodoc doc/*