[gentoo-commits] repo/gentoo:master commit in: dev-util/geany-plugins/

[Lars Wendler]

commit:     208837e0f425af0de2ec6b29dd385f03c11127b7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 15:38:12 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <polynomial-c <AT> 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}