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 BA3BE1396D0 for ; Sat, 2 Sep 2017 10:09:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08D56E07F6; Sat, 2 Sep 2017 10:09:58 +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 D8CF4E07F6 for ; Sat, 2 Sep 2017 10:09:57 +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 17BA334165C for ; Sat, 2 Sep 2017 10:09:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D696C8B2F for ; Sat, 2 Sep 2017 10:09:55 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1504346976.c2233d0ee27d116713793e5a7b0704665047ce0d.eva@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/gedit/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/gedit/gedit-3.22.0.ebuild app-editors/gedit/gedit-3.22.1.ebuild X-VCS-Directories: app-editors/gedit/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: c2233d0ee27d116713793e5a7b0704665047ce0d X-VCS-Branch: master Date: Sat, 2 Sep 2017 10:09:55 +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: df13514a-fb5c-425f-9eb5-b7558d14d3fb X-Archives-Hash: 93d6bff0e36cc363a26e28404e8e3d0d commit: c2233d0ee27d116713793e5a7b0704665047ce0d Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Sep 2 09:30:54 2017 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Sep 2 10:09:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2233d0e app-editors/gedit: remove redundant MERGE_TYPE check The eclass does this already. Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-editors/gedit/gedit-3.22.0.ebuild | 2 +- app-editors/gedit/gedit-3.22.1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-editors/gedit/gedit-3.22.0.ebuild b/app-editors/gedit/gedit-3.22.0.ebuild index 3e3bc39dedf..5524763def0 100644 --- a/app-editors/gedit/gedit-3.22.0.ebuild +++ b/app-editors/gedit/gedit-3.22.0.ebuild @@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND} # yelp-tools, gnome-common needed to eautoreconf pkg_setup() { - use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup + use python && python-single-r1_pkg_setup } src_prepare() { diff --git a/app-editors/gedit/gedit-3.22.1.ebuild b/app-editors/gedit/gedit-3.22.1.ebuild index 4484dab3984..e931e8b99a0 100644 --- a/app-editors/gedit/gedit-3.22.1.ebuild +++ b/app-editors/gedit/gedit-3.22.1.ebuild @@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND} # yelp-tools, gnome-common needed to eautoreconf pkg_setup() { - use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup + use python && python-single-r1_pkg_setup } src_prepare() {