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 0E73A13832E for ; Thu, 18 Aug 2016 15:38:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F814E0B36; Thu, 18 Aug 2016 15:38: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 603DFE0B2D for ; Thu, 18 Aug 2016 15:38:36 +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 8879D340739 for ; Thu, 18 Aug 2016 15:38:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58593245F for ; Thu, 18 Aug 2016 15:38:34 +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: <1471534710.208837e0f425af0de2ec6b29dd385f03c11127b7.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/geany-plugins/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/geany-plugins/geany-plugins-1.28.ebuild X-VCS-Directories: dev-util/geany-plugins/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 208837e0f425af0de2ec6b29dd385f03c11127b7 X-VCS-Branch: master Date: Thu, 18 Aug 2016 15:38:34 +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: 8eb5e3d5-efe1-4edd-8a86-34f98f620fe5 X-Archives-Hash: 840ca869752f020a7b9f475e22c5b9e0 commit: 208837e0f425af0de2ec6b29dd385f03c11127b7 Author: Lars Wendler gentoo org> AuthorDate: Thu Aug 18 15:38:12 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Aug 18 15:38:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=208837e0 dev-util/geany-plugins: Simplified ebuild a bit. Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler gentoo.org> dev-util/geany-plugins/geany-plugins-1.28.ebuild | 46 +++++++++++------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/dev-util/geany-plugins/geany-plugins-1.28.ebuild b/dev-util/geany-plugins/geany-plugins-1.28.ebuild index b2203e2..dae5ab5 100644 --- a/dev-util/geany-plugins/geany-plugins-1.28.ebuild +++ b/dev-util/geany-plugins/geany-plugins-1.28.ebuild @@ -19,14 +19,26 @@ IUSE="gtk3 +autoclose +automark +commander ctags debugger +defineformat devhelp REQUIRED_USE="gtk3? ( !debugger !devhelp !multiterm !python !scope ) python? ( ${PYTHON_REQUIRED_USE} )" -COMMON_DEPEND=">=dev-util/geany-1.26[!gtk3?] +GTK_COMMON_DEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 )" + +WEBKIT_COMMON_DEPEND="gtk3? ( + net-libs/webkit-gtk:3 + x11-libs/gtk+:3 + ) + !gtk3? ( + net-libs/webkit-gtk:2 + x11-libs/gtk+:2 + )" + +COMMON_DEPEND=">=dev-util/geany-1.26[gtk3?] dev-libs/glib:2 dev-libs/libxml2:2 - autoclose? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) - commander? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) + autoclose? ( ${GTK_COMMON_DEPEND} ) + commander? ( ${GTK_COMMON_DEPEND} ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) - defineformat? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) + defineformat? ( ${GTK_COMMON_DEPEND} ) devhelp? ( gnome-base/gconf:2 net-libs/webkit-gtk:2 @@ -37,24 +49,13 @@ COMMON_DEPEND=">=dev-util/geany-1.26[!gtk3?] git? ( dev-libs/libgit2 ) gpg? ( app-crypt/gpgme ) gtkspell? ( - gtk3? ( - app-text/gtkspell:3 - ) - !gtk3? ( - app-text/gtkspell:2 - ) + gtk3? ( app-text/gtkspell:3 ) + !gtk3? ( app-text/gtkspell:2 ) ) lua? ( =dev-lang/lua-5.1*:= ) markdown? ( app-text/discount - gtk3? ( - net-libs/webkit-gtk:3 - x11-libs/gtk+:3 - ) - !gtk3? ( - net-libs/webkit-gtk:2 - x11-libs/gtk+:2 - ) + ${WEBKIT_COMMON_DEPEND} ) multiterm? ( $(vala_depend) @@ -68,14 +69,7 @@ COMMON_DEPEND=">=dev-util/geany-1.26[!gtk3?] scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( - gtk3? ( - net-libs/webkit-gtk:3 - x11-libs/gtk+:3 - ) - !gtk3? ( - net-libs/webkit-gtk:2 - x11-libs/gtk+:2 - ) + ${WEBKIT_COMMON_DEPEND} x11-libs/gdk-pixbuf:2 )" RDEPEND="${COMMON_DEPEND}