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 A39E6138350 for ; Sat, 29 Feb 2020 20:50:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E963E0C02; Sat, 29 Feb 2020 20:48:14 +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 E28AEE0C02 for ; Sat, 29 Feb 2020 20:48:13 +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 BB22234F033 for ; Sat, 29 Feb 2020 20:48:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CDE8CF for ; Sat, 29 Feb 2020 20:48:10 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1583009284.0af2edab5cb973d98e612c98f7145c721fa1aa19.leio@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/glib/glib-9999.ebuild X-VCS-Directories: dev-libs/glib/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 0af2edab5cb973d98e612c98f7145c721fa1aa19 X-VCS-Branch: master Date: Sat, 29 Feb 2020 20:48:10 +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: 08e9f44a-63d6-480b-a814-5334879623b5 X-Archives-Hash: 1c6d4b16804f19b5acb1b58f54fecc93 commit: 0af2edab5cb973d98e612c98f7145c721fa1aa19 Author: Mart Raudsepp gentoo org> AuthorDate: Sat Feb 29 20:47:49 2020 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sat Feb 29 20:48:04 2020 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0af2edab dev-libs/glib: drop epunt-cxx makes no sense with meson and this live ebuild needs a huge sync with in-tree version, but fix the global scope inherit failure at least for now. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> dev-libs/glib/glib-9999.ebuild | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild index e5bfef19..a34029ba 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then @@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 ) # Completely useless with or without USE static-libs, people need to use pkg-config GNOME2_LA_PUNT="yes" -inherit bash-completion-r1 epunt-cxx flag-o-matic gnome-meson libtool linux-info \ +inherit bash-completion-r1 flag-o-matic gnome-meson libtool linux-info \ multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx if [[ ${PV} = 9999 ]]; then @@ -142,8 +142,6 @@ src_prepare() { -i glib/Makefile.{am,in} || die gnome-meson_src_prepare - - epunt_cxx } multilib_src_configure() {