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 4BC3E138331 for ; Fri, 16 Feb 2018 16:12:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97829E0A9A; Fri, 16 Feb 2018 16:12:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 64DDBE0A9A for ; Fri, 16 Feb 2018 16:12:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 71BC4335C2A for ; Fri, 16 Feb 2018 16:12:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 00E611FE for ; Fri, 16 Feb 2018 16:12:36 +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: <1518797549.c24fd42d313be1ee5a1eddf23a91002387bf66a5.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: c24fd42d313be1ee5a1eddf23a91002387bf66a5 X-VCS-Branch: master Date: Fri, 16 Feb 2018 16:12:36 +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: a9cd7404-82a1-4d9c-aa47-42da279b795a X-Archives-Hash: db3e648f8764fbbe6c9ca5e585a01e14 commit: c24fd42d313be1ee5a1eddf23a91002387bf66a5 Author: Lars Wendler gentoo org> AuthorDate: Fri Feb 16 16:11:52 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Feb 16 16:12:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24fd42d dev-util/geany: Some adjustments to the live ebuild. Closes: https://bugs.gentoo.org/638068 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-util/geany/geany-9999.ebuild | 42 ++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild index f74cd0df1a9..dc57933d71f 100644 --- a/dev-util/geany/geany-9999.ebuild +++ b/dev-util/geany/geany-9999.ebuild @@ -1,21 +1,25 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils fdo-mime gnome2-utils + +inherit gnome2-utils xdg-utils 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" DESCRIPTION="GTK+ based fast and lightweight IDE" HOMEPAGE="http://www.geany.org" -EGIT_REPO_URI="https://github.com/geany/geany.git" -inherit git-r3 -SRC_URI="" +if [[ "${PV}" = 9999* ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/geany/geany.git" +else + SRC_URI="http://download.geany.org/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +fi LICENSE="GPL-2+ HPND" SLOT="0" -KEYWORDS="" IUSE="gtk3 +vte" RDEPEND=">=dev-libs/glib-2.32:2 @@ -38,15 +42,25 @@ pkg_setup() { src_prepare() { default - [[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf + + # Syntax highlighting for Portage + sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \ + data/filetype_extensions.conf || die + + if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then + eautoreconf + fi } + src_configure() { - econf \ - --disable-html-docs \ - --disable-dependency-tracking \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable gtk3) \ + local myeconfargs=( + --disable-html-docs + --disable-dependency-tracking + --docdir="${EPREFIX}/usr/share/doc/${PF}" + $(use_enable gtk3) $(use_enable vte) + ) + econf "${myeconfargs[@]}" } src_install() { @@ -58,10 +72,10 @@ pkg_preinst() { gnome2_icon_savelist; } pkg_postinst() { fdo-mime_desktop_database_update - gnome2_icon_cache_update + xdg_desktop_database_update } pkg_postrm() { - fdo-mime_desktop_database_update gnome2_icon_cache_update + xdg_desktop_database_update }