commit: 98e05db324830a18e8abc20b1766e0966bc14300 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Nov 20 19:54:30 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Nov 20 19:55:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e05db3
media-libs/libde265: Drop USE=qt4,tools, unnecessary REQUIRED_USE Bug: https://bugs.gentoo.org/600726 Closes: https://bugs.gentoo.org/631810 Package-Manager: Portage-2.3.13, Repoman-2.3.4 media-libs/libde265/Manifest | 1 - media-libs/libde265/libde265-1.0.2.ebuild | 17 +++++++++-------- media-libs/libde265/libde265-9999.ebuild | 15 ++++++++------- media-libs/libde265/metadata.xml | 3 --- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest index c16d81a90d8..4dba2d1bb4b 100644 --- a/media-libs/libde265/Manifest +++ b/media-libs/libde265/Manifest @@ -1,2 +1 @@ -DIST libde265-0.9.tar.gz 258887 SHA256 226856358b1cb7aa54d3f3e1bc9bb9f062b867c6de58ab1ee94cfcb8a111cda2 SHA512 1e519cea8447bffd14dd1b78d9ab07f3e558e5f3731e26a3d5c3bd8c4a67e05c1ab228f1f82d671d64442ca78e6ead9305edd19bb17fa62c27253616ff6a84d2 WHIRLPOOL 0c0ee2cc844c2551ae1effa1305d6413a5a4a81406f1957f4d48fe74d9e1c912e424106d4c3290100b15c2d8277833cc07931fb30c4e14e827e86e785ff7f3d3 DIST libde265-1.0.2.tar.gz 381737 SHA256 c9769a621d568bf5d1e687453cb5d996d7a813476813edb4752ce0fea437fca8 SHA512 714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3 WHIRLPOOL 39daca6fc9d6b68cf69c696467343f780d3e1333e0ff0b94ff942e893deb3898a2d91070d07c64b7c7a5eb24d4097c4bf55b7466327110566bfa4fc87fa9073a diff --git a/media-libs/libde265/libde265-1.0.2.ebuild b/media-libs/libde265/libde265-1.0.2.ebuild index 13bc0edd3cf..59318a1ef2c 100644 --- a/media-libs/libde265/libde265-1.0.2.ebuild +++ b/media-libs/libde265/libde265-1.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,18 +14,19 @@ SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="debug qt4 qt5 static-libs cpu_flags_x86_sse tools" +IUSE="debug qt5 static-libs cpu_flags_x86_sse" DEPEND=" - qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) - qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) media-libs/libsdl virtual/ffmpeg + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) " RDEPEND="${DEPEND}" -REQUIRED_USE="tools? ( || ( qt4 qt5 ) )" - src_prepare() { sed -ri 's/(PIX_FMT_)/AV_\1/g' sherlock265/VideoDecoder.cc || die autotools-multilib_src_prepare @@ -38,8 +39,8 @@ src_configure() { $(use_enable debug log-info) $(use_enable debug log-debug) $(use_enable debug log-trace) - $(use_enable tools dec265) - $(use_enable tools sherlock265) + $(use_enable qt5 dec265) + $(use_enable qt5 sherlock265) --disable-silent-rules --enable-log-error ) diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild index 157c06d8171..6fd9decdd8c 100644 --- a/media-libs/libde265/libde265-9999.ebuild +++ b/media-libs/libde265/libde265-9999.ebuild @@ -14,18 +14,19 @@ EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"; LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="debug qt4 qt5 static-libs cpu_flags_x86_sse tools" +IUSE="debug qt5 static-libs cpu_flags_x86_sse" DEPEND=" - qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) - qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) media-libs/libsdl virtual/ffmpeg + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) " RDEPEND="${DEPEND}" -REQUIRED_USE="tools? ( || ( qt4 qt5 ) )" - src_configure() { local myeconfargs=( $(use_enable cpu_flags_x86_sse sse) @@ -33,8 +34,8 @@ src_configure() { $(use_enable debug log-info) $(use_enable debug log-debug) $(use_enable debug log-trace) - $(use_enable tools dec265) - $(use_enable tools sherlock265) + $(use_enable qt5 dec265) + $(use_enable qt5 sherlock265) --disable-silent-rules --enable-log-error ) diff --git a/media-libs/libde265/metadata.xml b/media-libs/libde265/metadata.xml index d1960a1dd91..37489247c5c 100644 --- a/media-libs/libde265/metadata.xml +++ b/media-libs/libde265/metadata.xml @@ -4,9 +4,6 @@ <maintainer type="project"> <email>media-vi...@gentoo.org</email> </maintainer> - <use> - <flag name="tools">Install addtional tools, require USE=qt4 or qt5</flag> - </use> <upstream> <remote-id type="github">strukturag/libde265</remote-id> </upstream>
