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 B287E138350 for ; Fri, 21 Feb 2020 06:08:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB983E0827; Fri, 21 Feb 2020 06:08:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 3BCEDE0819 for ; Fri, 21 Feb 2020 06:08:53 +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 DCB3434EEDF for ; Fri, 21 Feb 2020 06:08:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FDC8145 for ; Fri, 21 Feb 2020 06:08:49 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1582263003.9b2225059e74a0f9caf6081ddfa140a7613b01d0.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/mythtv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild X-VCS-Directories: media-tv/mythtv/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 9b2225059e74a0f9caf6081ddfa140a7613b01d0 X-VCS-Branch: master Date: Fri, 21 Feb 2020 06:08:49 +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: 3e22dcc3-8402-40ec-9c06-a3fd2d0efce7 X-Archives-Hash: 4ebdd807a36eea4fd381191ec1ca2a1d commit: 9b2225059e74a0f9caf6081ddfa140a7613b01d0 Author: Wilson Michaels earthlink net> AuthorDate: Thu Feb 20 20:10:54 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Feb 21 05:30:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b222505 media-tv/mythtv: ebuild enhancements Closes: https://bugs.gentoo.org/710136 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Wilson Michaels earthlink.net> Closes: https://github.com/gentoo/gentoo/pull/14719 Signed-off-by: Joonas Niilola gentoo.org> media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild index 59f2710c139..b09dc0235f9 100644 --- a/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild +++ b/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild @@ -33,7 +33,7 @@ REQUIRED_USE=" bluray? ( xml ) cdr? ( cdda ) " -COMMON=" +COMMON_DEPEND=" acct-user/mythtv dev-libs/glib:2 dev-libs/lzo @@ -110,7 +110,7 @@ COMMON=" net-dns/avahi[mdnsresponder-compat] ) " -RDEPEND="${COMMON} +RDEPEND="${COMMON_DEPEND} python? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' @@ -134,7 +134,7 @@ RDEPEND="${COMMON} xmltv? ( >=media-tv/xmltv-0.5.43 ) " DEPEND=" - ${COMMON} + ${COMMON_DEPEND} dev-lang/yasm x11-base/xorg-proto " @@ -348,6 +348,9 @@ src_configure() { --cxx="$(tc-getCXX)" \ --ar="$(tc-getAR)" \ --optflags="${CFLAGS}" \ + --extra-cflags="${CFLAGS}" \ + --extra-cxxflags="${CXXFLAGS}" \ + --extra-ldflags="${LDFLAGS}" \ --qmake=$(qt5_get_bindir)/qmake \ "${myconf[@]}" } @@ -400,21 +403,15 @@ src_install() { newins "${FILESDIR}"/xinitrc-r1 .xinitrc fi - # Make Python files executable - find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do - if [[ ! "${file##*/}" = "__init__.py" ]]; then - chmod a+x "${file}" || die "Failed to make python file $(basename ${file}) executable" - fi - done + # Make Python files executable but not files named "__init__.py" + find "${ED}/usr/share/mythtv" -type f -name '*.py' -exec expr \( {} : '.*__init__.py' \) = 0 \; \ + -exec chmod a+x {} \; || die "Failed to make python file $(basename ${file}) executable" # Ensure that Python scripts are executed by Python 2 python_fix_shebang "${ED}/usr/share/mythtv" # Make shell & perl scripts executable - find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \ - while read file; do - chmod a+x "${file}" || die - done + find "${ED}" -type f \( -name '*.sh' -o -name '*.pl' \) -exec chmod a+x {} \; || die "Failed to make script executable" } pkg_postinst() {