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 665D8138336 for ; Sun, 10 Jun 2018 08:25:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70878E0841; Sun, 10 Jun 2018 08:25:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 2F161E0841 for ; Sun, 10 Jun 2018 08:25:56 +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 87E30335C9F for ; Sun, 10 Jun 2018 08:25:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 480E82C8 for ; Sun, 10 Jun 2018 08:25:52 +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: <1528619119.f3e63d6637a47cf00fc6684e431c92ba0ece7a86.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/glib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/glib/glib-2.54.3-r5.ebuild X-VCS-Directories: dev-libs/glib/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: f3e63d6637a47cf00fc6684e431c92ba0ece7a86 X-VCS-Branch: master Date: Sun, 10 Jun 2018 08:25:52 +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: d17f241a-b59a-43c8-80c4-94fcbe3430e1 X-Archives-Hash: b07b0d9494d7a7c1f3194b1f2e991bcb commit: f3e63d6637a47cf00fc6684e431c92ba0ece7a86 Author: Mart Raudsepp gentoo org> AuthorDate: Sun Jun 10 06:35:07 2018 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Jun 10 08:25:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e63d66 dev-libs/glib-2.54: handle py glib-{mkenums,genmarshal} more properly glib-2.54 ported glib-mkenums and glib-genmarshal to python. Handle them more properly via python_replicate_script and PYTHON_DEPS, so we actually ensure that the deps are in place for the tools to work. This is meant to be temporary and not a stable candidate until at least these python tools are moved out into a separate package, like gdbus-codegen is. But we are delayed in providing a newer glib for ~arch long enough now, so go with the simpler way to start with, as separate package would involve consumer transition as well, including addition of the new package into various packages DEPEND, which is hard to know when it's needed (probably requiring some sort of QA check). Bug: https://bugs.gentoo.org/651830 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/glib/glib-2.54.3-r5.ebuild | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-libs/glib/glib-2.54.3-r5.ebuild b/dev-libs/glib/glib-2.54.3-r5.ebuild index ba26e66bb6b..31c751756ab 100644 --- a/dev-libs/glib/glib-2.54.3-r5.ebuild +++ b/dev-libs/glib/glib-2.54.3-r5.ebuild @@ -6,7 +6,7 @@ # then to be think very closely. EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) # Completely useless with or without USE static-libs, people need to use # pkg-config GNOME2_LA_PUNT="yes" @@ -23,9 +23,9 @@ LICENSE="LGPL-2.1+" SLOT="2" IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" REQUIRED_USE=" - utils? ( ${PYTHON_REQUIRED_USE} ) + ${PYTHON_REQUIRED_USE} test? ( ${PYTHON_REQUIRED_USE} ) -" +" # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" @@ -44,8 +44,8 @@ RDEPEND=" selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) + ${PYTHON_DEPS} utils? ( - ${PYTHON_DEPS} >=dev-util/gdbus-codegen-${PV} virtual/libelf:0= ) @@ -123,8 +123,6 @@ src_prepare() { # Leave python shebang alone - handled by python_replicate_script # We could call python_setup and give configure a valid --with-python # arg, but that would mean a build dep on python when USE=utils. - sed -e '/${PYTHON}/d' \ - -i glib/Makefile.{am,in} || die sed -e 's:@PYTHON@:python:' \ -i gobject/glib-{genmarshal.in,mkenums.in} || die # Also needed to prevent cross-compile failures, see bug #267603 @@ -224,12 +222,14 @@ multilib_src_install() { multilib_src_install_all() { einstalldocs - if use utils ; then - python_replicate_script "${ED}"/usr/bin/gtester-report - else - rm "${ED}usr/bin/gtester-report" - rm "${ED}usr/share/man/man1/gtester-report.1" - fi + # FIXME: Move python deps that are only required at build time of other packages to a split package + python_replicate_script "${ED}"/usr/bin/glib-mkenums + python_replicate_script "${ED}"/usr/bin/glib-genmarshal + + # gtester-report works only with python2 and is heavily deprecated - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4 + # Remove it instead of bothering with making it work with python3 in PYTHON_COMPAT + rm "${ED}usr/bin/gtester-report" + rm "${ED}usr/share/man/man1/gtester-report.1" # Do not install charset.alias even if generated, leave it to libiconv rm -f "${ED}/usr/lib/charset.alias"