From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-897552-garchives=archives.gentoo.org@lists.gentoo.org>
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 ACA4413832E
for <garchives@archives.gentoo.org>; 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 C0574E0B2D;
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 E5539E0B2D
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Aug 2016 15:38:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 DA852340815
for <gentoo-commits@lists.gentoo.org>; 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 45FB12452
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Aug 2016 15:38:34 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
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" <polynomial-c@gentoo.org>
Message-ID: <1471534707.b59afd6f8944dd34631b4e8e1b8284faf70771b5.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/Manifest dev-util/geany-plugins/geany-plugins-1.28.ebuild dev-util/geany-plugins/metadata.xml
X-VCS-Directories: dev-util/geany-plugins/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: b59afd6f8944dd34631b4e8e1b8284faf70771b5
X-VCS-Branch: master
Date: Thu, 18 Aug 2016 15:38:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: dffd93f9-bee0-4bd0-a9ae-bc9022256574
X-Archives-Hash: 5f09a5924b00dfd72a4bc4530d70ec4a
commit: b59afd6f8944dd34631b4e8e1b8284faf70771b5
Author: Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 18:36:09 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 15:38:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b59afd6f
dev-util/geany-plugins: Bump to 1.28 and add gtk3 USE flag
configure decides to build for GTK+ 2 or 3 based on installed geany
using pkg-config.
- Ensure geany and geany-plugins are in step with a gtk3 USE flag (this
adds unnecessary work for a user not installing any GTK+ using
plugins, but does no harm)
- Fix GTK+ dependencies to reflect the SLOT that will be used
- Block selection of GTK+ 2 only plugins for gtk3 with REQUIRED_USE
- Explicitly enable all plugins
- Honour LINGUAS, makes it and nl available
- Fix metadata for gtkspell, it is the spellchecker for GeanyVC
- geany-1.26 is the minimum since 1.27
- Prune .la files
- Move to EAPI6, remove use of autotools-utils and versionator, tidy
Gentoo-Bug: https://bugs.gentoo.org/586162
Gentoo-Bug: https://bugs.gentoo.org/566214
Gentoo-Bug: https://bugs.gentoo.org/556840
Closes: https://github.com/gentoo/gentoo/pull/2063
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-util/geany-plugins/Manifest | 1 +
dev-util/geany-plugins/geany-plugins-1.28.ebuild | 178 +++++++++++++++++++++++
dev-util/geany-plugins/metadata.xml | 3 +-
3 files changed, 181 insertions(+), 1 deletion(-)
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 6721f68..8b6706d 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -2,3 +2,4 @@ DIST geany-plugins-1.23.tar.gz 3642803 SHA256 b0e79c1cd679a5b5f02632922920478a10
DIST geany-plugins-1.24.tar.gz 4037065 SHA256 2e5fa09afe7710cdc2eebae3656d56561429d5df8898c6b5dc91915f15aec0fc SHA512 947bdf8bd602ae5576d3298029d7249ac40881c13cb3676123c92f4b183be200126d0e19e5c0697c237e5a8d3d9f2d7d715b0cd562f98a059af9fa5d4f3e611e WHIRLPOOL 4386cedfef05c5f4b0bb218122b20a84167bc0b2e43b06bf080ac21dd111b57d9fbf770af78d16394d0ee01592849fae8466e8467bc05176fafd331ba0f7d2a7
DIST geany-plugins-1.25.tar.gz 4425813 SHA256 0114042ed82feacbc1ad8c9e88dfaf6d109d01470429193c6f973079871b4615 SHA512 c0a9100e212fcf804e3013fec70a46cb925f48d3a88c4aea3ca50ddeeeacb3ec7b175d89dd041a47be2d4c5d84f31564da19d0c383a40b2811530113d061e761 WHIRLPOOL 1daa0e2b45470bf0dc30053b5e4d1da2a2dde26ffd073d8dbe806256172c39d3f60686944bca1789555330574895eb388cfcbccee461b58b80cb28c33b905f88
DIST geany-plugins-1.26.tar.gz 4429565 SHA256 da55e8dd5d6918de3014aaeb7ca8473d0a818ed064f77e3fa5b6aedef781b85b SHA512 3714e7c3aa2720cb91630ba26ee6018a57dfce304d556934bd6a88e4d25e9666868eeb5592a4132e7e481d42db850a0266dba6cbc2439cb0e824a3040c45850b WHIRLPOOL c006e318e107af847910489050d9d55b4a7e856c4409605f159c97717e82436eccb4d486d5bcfa044c3b88a14c8b78de2680a097b3e77c5b9c99c3c72206ba6e
+DIST geany-plugins-1.28.tar.gz 4453038 SHA256 918f644053ea205fdf0f2185ac3b8e21339764e0e761a38583f2dda7de7fdb97 SHA512 027fc5923d405a8246786e48e0d36c5da8f580b9f18510933063cc4c452ee5aaa68af4568ee20d640c1dd2bcb29a9361b8558a81a5a83f46b5d99c9ff639306d WHIRLPOOL a328557ccd899ce56ba2cb12875836ecbf5939492a1e19a61e5e2db15a5b10969e1cbf0eb912d551c75e9fa7c49e65fa8a48f7e2e2ebfd4477b4c88b4e6857ea
diff --git a/dev-util/geany-plugins/geany-plugins-1.28.ebuild b/dev-util/geany-plugins/geany-plugins-1.28.ebuild
new file mode 100644
index 0000000..b2203e2
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.28.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 vala
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk3 +autoclose +automark +commander ctags debugger +defineformat devhelp enchant git gpg gtkspell lua markdown multiterm nls +overview python scope soup webkit"
+REQUIRED_USE="gtk3? ( !debugger !devhelp !multiterm !python !scope )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+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 ) )
+ ctags? ( dev-util/ctags )
+ debugger? ( x11-libs/vte:0 )
+ defineformat? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
+ devhelp? (
+ gnome-base/gconf:2
+ net-libs/webkit-gtk:2
+ x11-libs/gtk+:2
+ x11-libs/libwnck:1
+ )
+ enchant? ( app-text/enchant )
+ git? ( dev-libs/libgit2 )
+ gpg? ( app-crypt/gpgme )
+ gtkspell? (
+ 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
+ )
+ )
+ multiterm? (
+ $(vala_depend)
+ x11-libs/gtk+:2
+ >=x11-libs/vte-0.28:0
+ )
+ python? (
+ dev-python/pygtk[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )
+ 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
+ )
+ x11-libs/gdk-pixbuf:2
+ )"
+RDEPEND="${COMMON_DEPEND}
+ scope? ( sys-devel/gdb )"
+DEPEND="${COMMON_DEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # bundled lib buster
+ rm markdown/peg-markdown/markdown_lib.c || die
+ # devhelp plugin bundles devhelp
+
+ default
+
+ use multiterm && vala_src_prepare
+
+ # make fails if LINGUAS contains a language which is not translated
+ local po_linguas=""
+ for lang in $LINGUAS; do
+ if [[ -e "$S/po/$lang.po" ]]; then
+ po_linguas="${po_linguas} $lang"
+ fi
+ done
+ # only filter LINGUAS if defined
+ if [[ -n "${LINGUAS+x}" ]]; then
+ LINGUAS=$po_linguas
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-cppcheck
+ --disable-extra-c-warnings
+ $(use_enable !gtk3 geanydoc)
+ # GeanyGenDoc requires ctpl which isn’t yet in portage
+ --disable-geanygendoc
+ # peg-markdown is bundled, use app-text/discount instead
+ --disable-peg-markdown
+ --enable-addons
+ --enable-codenav
+ --enable-geanyextrasel
+ --enable-geanyinsertnum
+ --enable-geanylatex
+ --enable-geanylipsum
+ --enable-geanymacro
+ --enable-geanynumberedbookmarks
+ --enable-geanyprj
+ --enable-geanyvc
+ --enable-lineoperations
+ --enable-pairtaghighlighter
+ --enable-pohelper
+ --enable-pretty-printer
+ --enable-projectorganizer
+ --enable-sendmail
+ --enable-shiftcolumn
+ --enable-tableconvert
+ --enable-treebrowser
+ --enable-xmlsnippets
+ $(use_enable autoclose)
+ $(use_enable automark)
+ $(use_enable commander)
+ $(use_enable ctags geanyctags)
+ $(use_enable debugger)
+ $(use_enable defineformat)
+ $(use_enable devhelp)
+ $(use_enable enchant spellcheck)
+ $(use_enable git gitchangebar)
+ $(use_enable gpg geanypg)
+ $(use_enable gtkspell)
+ $(use_enable markdown)
+ $(use_enable multiterm)
+ $(use_enable lua geanylua)
+ $(use_enable nls)
+ $(use_enable overview)
+ $(use_enable python geanypy)
+ $(use_enable scope)
+ # Having updatechecker… when you’re using a package manager?
+ $(use_enable soup updatechecker)
+ $(use_enable soup geniuspaste)
+ $(use_enable webkit webhelper)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ prune_libtool_files --modules
+
+ # make installs all translations if LINGUAS is empty
+ if [[ -n "${LINGUAS+x}" && -z "$LINGUAS" ]]; then
+ rm -r "${D}/usr/share/locale/" || die
+ fi
+}
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index abc4e84..698feea 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -2,6 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<use>
+ <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
<flag name="autoclose">Enable the autoclose plugin.</flag>
<flag name="automark">Enable the automark plugin</flag>
<flag name="commander">Enable the commander plugin which provides a command panel for rapid access to any action.</flag>
@@ -11,7 +12,7 @@
<flag name="devhelp">Enable the devhelp plugin which integrates <pkg>dev-util/devhelp</pkg></flag>
<flag name="enchant">Enable spell checking using enchant</flag>
<flag name="gpg">Enable geanypg plugin which integrates GPG using <pkg>app-crypt/gpgme</pkg></flag>
- <flag name="gtkspell">Use gtkspell for dictionary support</flag>
+ <flag name="gtkspell">Use gtkspell for dictionary support in GeanyVC</flag>
<flag name="markdown">Enable the markdown plugin which uses <pkg>app-text/discount</pkg> and <pkg>net-libs/webkit-gtk</pkg> to display a realtime preview markdown.</flag>
<flag name="multiterm">Enable the multiterm plugin</flag>
<flag name="overview">Enable overview plugin</flag>