gentoo resync : 31.12.2017 (final resync this year)

3 files changed, 37 insertions, 29 deletions

diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 21ec833fc161..8349e3840919 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -4,9 +4,9 @@ AUX mythbackend.init-r2 2050 BLAKE2B d3646ebdb703d094c6340226907739f7b84d1fb48b3
 AUX mythbackend.service-28 2689 BLAKE2B 1141975d442d5308700d05710030114cc4c428879eaed030b065a7dc4a0d23f839f26cba0e6b660c938e15faf9e9ac3f5b36a979226068d0989f4b044e73ccee SHA512 945cd721c7114e7c9a334063c6f85de40c2dd8a40271b1755b31881ae2c067b67d34685e1cb2d9b09fdaa9bf58ea2763e4e314b288e53f8bfcef7b6942ce5dd1
 AUX mythfrontend.conf 474 BLAKE2B d81e2e91bb4a8afef746268ec832129ac6b02c27d0e7414a912a04ac2edec69ca59367d24fa8d80d5f6c8d6b0f462cb022d4307070a267e970405a9cf0448d64 SHA512 8b3967f5e7d719fefe50b8868dc1b974c3f6337335e7e65799ddb331abe07df0fadb4cb619758fefeaa0c4d0d1dac6f00e0982736cab5acac993bdaced0051c2
 AUX mythfrontend.wrapper 794 BLAKE2B f4f8cf24665f75d38d932551534c14d3d93673384719cd494abc77a308bbc1c5842965c39540ff6bdfe5fed660594acd9f9e2767fba8fa7c782ba525eb287d33 SHA512 d69676d3b981c76988bbe60277f74028668c851db7db3c37a60ecc95ae18d9f77cd38511fcd3deb95d1f87bf659d7b0bcd7f1dd469801950d28f7b3f6f6947e3
-AUX mythtv-0.28.1-glibc225.patch 927 BLAKE2B 6afb4f04387170de3b5dc1478fcd788b213869ea06d4d8a3c0374837f10a15b099a779df6d472809155cba56850351d80c4968671ef4873ad91d8fd55a407c77 SHA512 626e1f80ea2ffd5774a3df5919ddb618ee6fc5b5c12133891d3c9cbf0068c5e349508d0f3c90e3ca1e49afa9df92a4243950fa51a0c9b8ca26d9e19e463cfe36
+AUX mythtv-0.28.1-glibc225.patch 927 BLAKE2B 58189108a9c823c559c5ec15caa8792ca18663e9155df5bb60ffc09e5b19cd0e6f37812dabbe0e7ced4c03d179993bd3296dff69bed4d111412b2b85ee6c14a0 SHA512 33f80de1044cd8130dfd56f3ea6478c3667cc1698953244b7427a8ee055ffac2051f0f81dacc193271ddcc705c351f6fad86fc0b107accd1c949f8aaa7275a7b
 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-0.28.1.tar.gz 104477892 BLAKE2B bdecfc5723ec3495ab6e49c72caaa5c2dc62c75a11ce7524d3fd5cb8daec82b53b415591b6198eab00322bbbcaff2de7d4f1b7a165d449007f4c3742a69d304b SHA512 67a81858cd19b90f519113b234119ecc248366d8545c862d887755f256cddf04d9ca16a7bf67f63e06f7628730e7dbde2a2099ca8aaeb9061b2e55a5a0b7d5e7
-EBUILD mythtv-0.28.1-r3.ebuild 10080 BLAKE2B 1ccc5ccf7c8b7e9dd9369480c60e6ebf66e95cce9c318b04b2a128657e0cffb4ef675b1ea1b9f4cd482fde8820e413200ed9a1b4d754eff25b04ffda80170688 SHA512 6a5414caf07f24be96a86d399c861d26a05676e365758b4fa148e28ae5c2968f17b03c9a8c2cafb9f13834d79b25d30d9e54c5725e68d8f92f5f31a4393c1959
+EBUILD mythtv-0.28.1-r4.ebuild 10154 BLAKE2B 800d3005c2158028f5b9229aa05d52e68f9987991bfa83f62bf5f09318920dc8d6b03526cf7b44f37092d06fd284cfc8052ec8564e7e1aea50a59766a01c75c7 SHA512 fbc93bd51fb06d9d18c9f9af7296008cf3787f59a36af07c6886f6bcd5b0bc43f4869e8da6e6d8d7aba324c8971f7ade4b5e647ff89ad153841556d3de3276a0
 MISC metadata.xml 2986 BLAKE2B 8bfeb791c20052690820b02f03859a72e1de4ccba6303eee36d05bfee3b04ac204f5dc6ebd24741b39868a0e0b8fcf7875fcfb5aaaf8d855bb06be9a0d03df98 SHA512 a57d539f1f083bb69aaa0e85622862408e5afbc1eb27bfdf13b319b8104909971698ad7f51cc8978b9f5e5e4ab9e9d73b7907c61d65aba7c21867da7bfb36084
diff --git a/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch b/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch
index 343a808076e6..9e4543e86b16 100644
--- a/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch
+++ b/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch
@@ -13,8 +13,8 @@ On BSD platforms they remain defined in <sys/types.h>
 
 diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
 index 97618adc80..09dd95073d 100644
---- a/mythtv/libs/libmythtv/videosource.cpp
-+++ b/mythtv/libs/libmythtv/videosource.cpp
+--- mythtv/libs/libmythtv/videosource.cpp.old
++++ mythtv/libs/libmythtv/videosource.cpp
 @@ -3,7 +3,11 @@
  // Standard UNIX C headers
  #include <unistd.h>
diff --git a/media-tv/mythtv/mythtv-0.28.1-r3.ebuild b/media-tv/mythtv/mythtv-0.28.1-r4.ebuild
index eb2f4161dfb1..c030c6623d2f 100644
--- a/media-tv/mythtv/mythtv-0.28.1-r3.ebuild
+++ b/media-tv/mythtv/mythtv-0.28.1-r4.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 # git diff --relative=mythtv v0.27.6.. > ~/mythtv-0.27.6/patches/mythtv.patch
@@ -10,7 +9,7 @@ BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
 MY_P=${P%_p*}
 MY_PV=${PV%_p*}
 
-inherit flag-o-matic multilib eutils python-single-r1 qmake-utils user systemd vcs-snapshot
+inherit flag-o-matic python-single-r1 qmake-utils user readme.gentoo-r1 systemd vcs-snapshot
 
 MYTHTV_BRANCH="fixes/0.28"
 
@@ -23,10 +22,9 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0/${PV}"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec autostart bluray cec crystalhd debug dvd egl fftw +hls \
-ieee1394 jack lcd libass lirc +mythlogserver perl pulseaudio python systemd +theora \
-vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf ${IUSE_INPUT_DEVICES}"
-
+IUSE="alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls \
+	ieee1394 jack lcd libass lirc +mythlogserver perl pulseaudio python systemd +theora \
+	vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf ${IUSE_INPUT_DEVICES}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluray? ( xml )
 	theora? ( vorbis )"
@@ -64,6 +62,9 @@ COMMON="
 		sys-fs/udisks:2
 	)
 	cec? ( dev-libs/libcec )
+	dvb? (
+		virtual/linuxtv-dvb-headers
+	)
 	dvd? (
 		dev-libs/libcdio:=
 		sys-fs/udisks:2
@@ -134,6 +135,23 @@ DEPEND="${COMMON}
 
 S="${WORKDIR}/${P}/mythtv"
 
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+To have this machine operate as recording host for MythTV,
+mythbackend must be running. Run the following:
+rc-update add mythbackend default
+
+Your recordings folder must be owned 'mythtv'. e.g.
+chown -R mythtv /var/lib/mythtv
+
+Want mythfrontend to start automatically?
+Set USE=autostart. Details can be found at:
+https://dev.gentoo.org/~cardoe/mythtv/autostart.html
+
+Note that the systemd unit now restarts by default and logs
+to journald via the console at the notice verbosity.
+"
+
 MYTHTV_GROUPS="video,audio,tty,uucp"
 
 pkg_setup() {
@@ -143,6 +161,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# Perl bits need to go into vender_perl and not site_perl
 	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
 		-i "${S}"/bindings/perl/Makefile
@@ -155,8 +175,7 @@ src_prepare() {
 
 	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
 
-	epatch "${FILESDIR}/${P}-glibc225.patch"
-	epatch_user
+	eapply "${FILESDIR}/${P}-glibc225.patch"
 }
 
 src_configure() {
@@ -174,7 +193,7 @@ src_configure() {
 	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
 
 	use altivec    || myconf="${myconf} --disable-altivec"
-	myconf="${myconf} --disable-dvb"
+	myconf="${myconf} $(use_enable dvb)"
 	myconf="${myconf} $(use_enable ieee1394 firewire)"
 	myconf="${myconf} $(use_enable lirc)"
 	myconf="${myconf} $(use_enable xvid libxvid)"
@@ -216,7 +235,7 @@ src_configure() {
 	else
 		myconf="${myconf} --compile-type=release"
 		#myconf="${myconf} --enable-debug" does nothing per sphery
-		#myconf="${myconf} --disable-stripping" does nothing per sphery
+		myconf="${myconf} --disable-stripping" # FIXME: does not disable for all files, only for some
 	fi
 
 	# Video
@@ -265,8 +284,9 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die "install failed"
+	emake STRIP="true" INSTALL_ROOT="${D}" install
 	dodoc AUTHORS UPGRADING README
+	readme.gentoo_create_doc
 
 	insinto /usr/share/mythtv/database
 	doins database/*
@@ -331,19 +351,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	elog "To have this machine operate as recording host for MythTV, "
-	elog "mythbackend must be running. Run the following:"
-	elog "rc-update add mythbackend default"
-	elog
-	elog "Your recordings folder must be owned 'mythtv'. e.g."
-	elog "chown -R mythtv /var/lib/mythtv"
-
-	elog "Want mythfrontend to start automatically?"
-	elog "Set USE=autostart. Details can be found at:"
-	elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
-	elog
-	elog "Note that the systemd unit now restarts by default and logs"
-	elog "to journald via the console at the notice verbosity."
+	readme.gentoo_print_elog
 }
 
 pkg_info() {