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 488A3138334 for ; Sat, 20 Apr 2019 22:45:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D401E0826; Sat, 20 Apr 2019 22:45:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22A95E081A for ; Sat, 20 Apr 2019 22:45:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15C713421BB for ; Sat, 20 Apr 2019 19:07:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2B75580 for ; Sat, 20 Apr 2019 19:07:06 +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: <1555787216.28bf78317cf5f57bd7e4875826a2d51d52fa7524.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: 28bf78317cf5f57bd7e4875826a2d51d52fa7524 X-VCS-Branch: master Date: Sat, 20 Apr 2019 19:07:06 +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: e1526a3c-5281-4222-bcdc-287c8d2db17b X-Archives-Hash: 94eb0a70b20b8476bbc417881bfdaa0b commit: 28bf78317cf5f57bd7e4875826a2d51d52fa7524 Author: Lars Wendler gentoo org> AuthorDate: Sat Apr 20 19:04:38 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Apr 20 19:06:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28bf7831 dev-util/geany: Bumped live ebuild top EAPI-7 replaced gnome2-utils eclass with xdg eclass Bug: https://bugs.gentoo.org/588570 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> dev-util/geany/geany-9999.ebuild | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild index f07d539b727..79034d53feb 100644 --- a/dev-util/geany/geany-9999.ebuild +++ b/dev-util/geany/geany-9999.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit gnome2-utils xdg-utils +# eutils required for strip-linguas +inherit eutils xdg LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW" NOSHORTLANGS="en_GB zh_CN zh_TW" @@ -14,6 +15,7 @@ if [[ "${PV}" = 9999* ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/geany/geany.git" else + [[ "${PV}" == *_pre* ]] && inherit autotools SRC_URI="https://download.geany.org/${P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" fi @@ -41,7 +43,7 @@ pkg_setup() { } src_prepare() { - default + xdg_src_prepare #588570 # Syntax highlighting for Portage sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \ @@ -56,7 +58,6 @@ src_configure() { local myeconfargs=( --disable-html-docs --disable-dependency-tracking - --docdir="${EPREFIX}/usr/share/doc/${PF}" $(use_enable gtk3) $(use_enable vte) ) @@ -68,14 +69,14 @@ src_install() { find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die } -pkg_preinst() { gnome2_icon_savelist; } +pkg_preinst() { + xdg_pkg_preinst +} pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst } pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postrm }