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 746791381F3 for ; Thu, 11 Jun 2020 08:03:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7166E0959; Thu, 11 Jun 2020 08:03:38 +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 7B9E3E0959 for ; Thu, 11 Jun 2020 08:03:38 +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 67B7934EB5D for ; Thu, 11 Jun 2020 08:03:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D7F4275 for ; Thu, 11 Jun 2020 08:03:36 +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: <1591862604.c17aaf2b83f3df0b6eb39dda373e4d62827c919d.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/mythplugins/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/mythplugins/Manifest media-plugins/mythplugins/mythplugins-30.0-r2.ebuild media-plugins/mythplugins/mythplugins-31.0.ebuild X-VCS-Directories: media-plugins/mythplugins/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: c17aaf2b83f3df0b6eb39dda373e4d62827c919d X-VCS-Branch: master Date: Thu, 11 Jun 2020 08:03:36 +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: 49a0a3d1-f0ee-4276-9d13-6c68495bfb58 X-Archives-Hash: 363e467d174f1c905aa6ff1e2cb4f190 commit: c17aaf2b83f3df0b6eb39dda373e4d62827c919d Author: Wilson Michaels earthlink net> AuthorDate: Tue Jun 9 16:53:34 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Jun 11 08:03:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17aaf2b media-plugins/mythplugins: Bump version 31.0 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Wilson Michaels earthlink.net> Signed-off-by: Joonas Niilola gentoo.org> media-plugins/mythplugins/Manifest | 1 + .../mythplugins/mythplugins-30.0-r2.ebuild | 5 +- ...gins-30.0-r2.ebuild => mythplugins-31.0.ebuild} | 121 ++++++++++----------- 3 files changed, 61 insertions(+), 66 deletions(-) diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest index 73e6f46179c..d57a33a0701 100644 --- a/media-plugins/mythplugins/Manifest +++ b/media-plugins/mythplugins/Manifest @@ -1 +1,2 @@ DIST mythplugins-30.0.tar.gz 101169041 BLAKE2B 0125c6234c168b9b24110b817e9e9a632187743c9ca44a46a8d464be6c330067f31da6fb252ed2a5fd770756229f2d95a746bd5d0e03be1e97fecc0de86603be SHA512 a29125ca33b1b100f51feb7a2ccff16d62928e474a393f11fc4b4fb77d0a85d9d4dd138acf757b527c0f936f3ff2e7d3eddcacef183d642429e36bc3e44ecbf4 +DIST mythplugins-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e diff --git a/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild b/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild index d47df1ea18e..efbc5d121ca 100644 --- a/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild +++ b/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild @@ -3,6 +3,9 @@ EAPI=7 +# Grab only the major version number. +MAJOR_PV=${PV%%.*} + PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="xml" BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079" @@ -53,7 +56,7 @@ DEPEND=" >=sys-libs/libraw1394-1.2.0 ) libass? ( >=media-libs/libass-0.9.11:= ) - =media-tv/mythtv-${PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid] + =media-tv/mythtv-${MAJOR_PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid] mytharchive? ( app-cdr/dvd+rw-tools $(python_gen_cond_dep ' diff --git a/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild b/media-plugins/mythplugins/mythplugins-31.0.ebuild similarity index 57% copy from media-plugins/mythplugins/mythplugins-30.0-r2.ebuild copy to media-plugins/mythplugins/mythplugins-31.0.ebuild index d47df1ea18e..ad77fcfcd4b 100644 --- a/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild +++ b/media-plugins/mythplugins/mythplugins-31.0.ebuild @@ -3,36 +3,46 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 ) +# Grab only the major version number. +MAJOR_PV=${PV%%.*} + +PYTHON_COMPAT=( python2_7 python3_{6,7} ) PYTHON_REQ_USE="xml" -BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079" + +#BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079" MY_P=${P%_p*} inherit python-single-r1 readme.gentoo-r1 -DESCRIPTION="Official WMythTV plugins" -HOMEPAGE="https://www.mythtv.org" +DESCRIPTION="Official MythTV plugins" +HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv" # mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" KEYWORDS="~amd64 ~x86" SLOT="0" -MYTHPLUGINS="mytharchive +mythbrowser +mythgallery mythgame \ -mythmusic +mythnetvision +mythnews +mythweather mythzmserver mythzoneminder" +MYTHPLUGINS="mytharchive +mythbrowser mythgame \ +mythmusic mythnetvision +mythnews +mythweather mythzmserver mythzoneminder" IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid" -DEPEND=" - ${PYTHON_DEPS} +# Mythnetvision temporarily disabled by upstream - should be fixed soon. +REQUIRED_USE=" + !mythnetvision + mytharchive? ( ${PYTHON_REQUIRED_USE} ) + mythnetvision? ( ${PYTHON_REQUIRED_USE} ) + mythmusic? ( vorbis ) + mythnews? ( mythbrowser ) +" +RDEPEND=" dev-libs/glib:2 - dev-libs/openssl:0= + dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 - media-libs/libpng:0= - sys-apps/util-linux + media-libs/libpng:= virtual/libudev:= x11-libs/libX11 x11-libs/libXext @@ -40,58 +50,57 @@ DEPEND=" x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm - alsa? ( >=media-libs/alsa-lib-1.0.24 ) + alsa? ( media-libs/alsa-lib ) hls? ( media-libs/faac media-libs/libvpx:= - >=media-libs/x264-0.0.20111220:= - >=media-sound/lame-3.93.1 + media-libs/x264:= + media-sound/lame ) ieee1394? ( - >=media-libs/libiec61883-1.0.0 - >=sys-libs/libavc1394-0.5.3 - >=sys-libs/libraw1394-1.2.0 + media-libs/libiec61883 + sys-libs/libavc1394 + sys-libs/libraw1394 ) - libass? ( >=media-libs/libass-0.9.11:= ) - =media-tv/mythtv-${PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid] + libass? ( media-libs/libass:= ) + =media-tv/mythtv-${MAJOR_PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( + ${PYTHON_DEPS} app-cdr/dvd+rw-tools - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_MULTI_USEDEP}] - ') + dev-python/pillow + dev-python/mysqlclient + =media-tv/mythtv-${MAJOR_PV}*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) - mythgallery? ( - media-libs/tiff:0 - opengl? ( virtual/opengl:= ) - exif? ( >media-libs/libexif-0.6.9:= ) - raw? ( media-gfx/dcraw ) + mythgame? ( + sys-libs/zlib[minizip] + dev-perl/XML-Twig ) - mythgame? ( sys-libs/zlib[minizip] ) mythmusic? ( - >=media-libs/flac-1.1.2 + media-libs/flac media-libs/libogg - >=media-libs/libvorbis-1.0 - >=media-libs/taglib-1.6 - >=media-sound/lame-3.93.1 + media-libs/libvorbis + media-libs/taglib + media-sound/lame fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( + media-sound/cdparanoia dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( - $(python_gen_cond_dep ' - dev-python/pycurl[${PYTHON_MULTI_USEDEP}] - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}] - dev-python/oauth[${PYTHON_MULTI_USEDEP}] - ') + ${PYTHON_DEPS} + dev-python/lxml + dev-python/oauth + dev-python/pycurl + dev-python/urllib3 + =media-tv/mythtv-${MAJOR_PV}*[python] ) mythweather? ( dev-perl/Date-Manip @@ -102,44 +111,27 @@ DEPEND=" dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON + =media-tv/mythtv-${MAJOR_PV}*[perl] ) - mythzmserver? ( dev-db/mysql-connector-c:0/18 ) + mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) - xml? ( >=dev-libs/libxml2-2.6.0:= ) - xvid? ( >=media-libs/xvid-1.1.0 ) -" -RDEPEND="${DEPEND} - !media-plugins/mytharchive - !media-plugins/mythbrowser - !media-plugins/mythgallery - !media-plugins/mythgame - !media-plugins/mythmovies - !media-plugins/mythmusic - !media-plugins/mythnetvision - !media-plugins/mythnews - !media-plugins/mythweather - !media-plugins/mythzmserver - !media-plugins/mythzoneminder -" -REQUIRED_USE=" - mythmusic? ( vorbis ) - mythnetvision? ( ${PYTHON_REQUIRED_USE} ) - mythnews? ( mythbrowser ) + xml? ( dev-libs/libxml2:= ) + xvid? ( media-libs/xvid ) " +DEPEND=${RDEPEND} # mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository S="${WORKDIR}/mythtv-${PV}/mythplugins" DOC_CONTENTS=" +Mythgallery code moved to mythtv and is no longer a plugin in version 31.0. +As of 3/23/2020, MythNetVision is disabled, work in progress. + Common plugins are installed by default. Disable unneeded plugins individually with USE flags: --mythbrowser -mythgallery -mythmusic -mythnetvision -mythnews -mythweather +-mythbrowser -mythmusic -mythnetvision -mythnews -mythweather Additional plugins may be installed with USE flags mytharchive mythgame mythzmserver mythzoneminder " -src_prepare() { - default -} - src_configure() { econf \ --python=${EPYTHON} \ @@ -152,7 +144,6 @@ src_configure() { $(use_enable raw dcraw) \ $(use_enable mytharchive) \ $(use_enable mythbrowser) \ - $(use_enable mythgallery) \ $(use_enable mythgame) \ $(use_enable mythmusic) \ $(use_enable mythnetvision) \