| 1 |
commit: 9b2225059e74a0f9caf6081ddfa140a7613b01d0 |
| 2 |
Author: Wilson Michaels <thebitpit <AT> earthlink <DOT> net> |
| 3 |
AuthorDate: Thu Feb 20 20:10:54 2020 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 21 05:30:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b222505 |
| 7 |
|
| 8 |
media-tv/mythtv: ebuild enhancements |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/710136 |
| 11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 12 |
Signed-off-by: Wilson Michaels <thebitpit <AT> earthlink.net> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/14719 |
| 14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 15 |
|
| 16 |
media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild | 23 ++++++++++------------- |
| 17 |
1 file changed, 10 insertions(+), 13 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild |
| 20 |
index 59f2710c139..b09dc0235f9 100644 |
| 21 |
--- a/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild |
| 22 |
+++ b/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild |
| 23 |
@@ -33,7 +33,7 @@ REQUIRED_USE=" |
| 24 |
bluray? ( xml ) |
| 25 |
cdr? ( cdda ) |
| 26 |
" |
| 27 |
-COMMON=" |
| 28 |
+COMMON_DEPEND=" |
| 29 |
acct-user/mythtv |
| 30 |
dev-libs/glib:2 |
| 31 |
dev-libs/lzo |
| 32 |
@@ -110,7 +110,7 @@ COMMON=" |
| 33 |
net-dns/avahi[mdnsresponder-compat] |
| 34 |
) |
| 35 |
" |
| 36 |
-RDEPEND="${COMMON} |
| 37 |
+RDEPEND="${COMMON_DEPEND} |
| 38 |
python? ( |
| 39 |
${PYTHON_DEPS} |
| 40 |
$(python_gen_cond_dep ' |
| 41 |
@@ -134,7 +134,7 @@ RDEPEND="${COMMON} |
| 42 |
xmltv? ( >=media-tv/xmltv-0.5.43 ) |
| 43 |
" |
| 44 |
DEPEND=" |
| 45 |
- ${COMMON} |
| 46 |
+ ${COMMON_DEPEND} |
| 47 |
dev-lang/yasm |
| 48 |
x11-base/xorg-proto |
| 49 |
" |
| 50 |
@@ -348,6 +348,9 @@ src_configure() { |
| 51 |
--cxx="$(tc-getCXX)" \ |
| 52 |
--ar="$(tc-getAR)" \ |
| 53 |
--optflags="${CFLAGS}" \ |
| 54 |
+ --extra-cflags="${CFLAGS}" \ |
| 55 |
+ --extra-cxxflags="${CXXFLAGS}" \ |
| 56 |
+ --extra-ldflags="${LDFLAGS}" \ |
| 57 |
--qmake=$(qt5_get_bindir)/qmake \ |
| 58 |
"${myconf[@]}" |
| 59 |
} |
| 60 |
@@ -400,21 +403,15 @@ src_install() { |
| 61 |
newins "${FILESDIR}"/xinitrc-r1 .xinitrc |
| 62 |
fi |
| 63 |
|
| 64 |
- # Make Python files executable |
| 65 |
- find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do |
| 66 |
- if [[ ! "${file##*/}" = "__init__.py" ]]; then |
| 67 |
- chmod a+x "${file}" || die "Failed to make python file $(basename ${file}) executable" |
| 68 |
- fi |
| 69 |
- done |
| 70 |
+ # Make Python files executable but not files named "__init__.py" |
| 71 |
+ find "${ED}/usr/share/mythtv" -type f -name '*.py' -exec expr \( {} : '.*__init__.py' \) = 0 \; \ |
| 72 |
+ -exec chmod a+x {} \; || die "Failed to make python file $(basename ${file}) executable" |
| 73 |
|
| 74 |
# Ensure that Python scripts are executed by Python 2 |
| 75 |
python_fix_shebang "${ED}/usr/share/mythtv" |
| 76 |
|
| 77 |
# Make shell & perl scripts executable |
| 78 |
- find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \ |
| 79 |
- while read file; do |
| 80 |
- chmod a+x "${file}" || die |
| 81 |
- done |
| 82 |
+ find "${ED}" -type f \( -name '*.sh' -o -name '*.pl' \) -exec chmod a+x {} \; || die "Failed to make script executable" |
| 83 |
} |
| 84 |
|
| 85 |
pkg_postinst() { |
Archives