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 E8E74158086 for ; Sun, 10 Oct 2021 14:27:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41A58E088F; Sun, 10 Oct 2021 14:27:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 26ECDE088F for ; Sun, 10 Oct 2021 14:27:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 563DA343003 for ; Sun, 10 Oct 2021 14:27:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B205A12F for ; Sun, 10 Oct 2021 14:27:24 +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: <1633876034.65a984e523f04d19c5d97343ab1a501779716bf2.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/geany/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/geany/geany-9999.ebuild X-VCS-Directories: dev-util/geany/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 65a984e523f04d19c5d97343ab1a501779716bf2 X-VCS-Branch: master Date: Sun, 10 Oct 2021 14:27:24 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d8726c61-c544-4f5b-8434-ae2780334b2f X-Archives-Hash: 2fcd45c7c272f7963180c3579bf909ea commit: 65a984e523f04d19c5d97343ab1a501779716bf2 Author: Lars Wendler gentoo org> AuthorDate: Sun Oct 10 14:23:02 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Oct 10 14:27:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65a984e5 dev-util/geany: Synced live ebuild Signed-off-by: Lars Wendler gentoo.org> dev-util/geany/geany-9999.ebuild | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild index 9a342036c79..067b8c015b2 100644 --- a/dev-util/geany/geany-9999.ebuild +++ b/dev-util/geany/geany-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit strip-linguas xdg @@ -21,28 +21,27 @@ fi LICENSE="GPL-2+ HPND" SLOT="0" -IUSE="gtk2 +vte" +IUSE="+vte" BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/glib-2.32:2 - gtk2? ( - >=x11-libs/gtk+-2.24:2 - vte? ( x11-libs/vte:0 ) - ) - !gtk2? ( - >=x11-libs/gtk+-3.0:3 - vte? ( x11-libs/vte:2.91 ) - )" -DEPEND="${RDEPEND} +RDEPEND=" + >=dev-libs/glib-2.32:2 + >=x11-libs/gtk+-3.0:3 + vte? ( x11-libs/vte:2.91 ) +" +DEPEND=" + ${RDEPEND} dev-util/intltool - sys-devel/gettext" + sys-devel/gettext +" pkg_setup() { strip-linguas ${LANGS} } src_prepare() { - xdg_src_prepare #588570 + xdg_environment_reset #588570 + default # Syntax highlighting for Portage sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \ @@ -58,7 +57,6 @@ src_configure() { --disable-html-docs --disable-pdf-docs --disable-static - $(use_enable gtk2) $(use_enable vte) ) econf "${myeconfargs[@]}" @@ -66,7 +64,7 @@ src_configure() { src_install() { emake DESTDIR="${D}" install - find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die + find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die } pkg_preinst() {