From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 66E0158973 for ; Thu, 21 Jan 2016 17:40:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA9D221C01F; Thu, 21 Jan 2016 17:40:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EEFF921C01F for ; Thu, 21 Jan 2016 17:40:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A9B663408E5 for ; Thu, 21 Jan 2016 17:40:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68B2CE5F for ; Thu, 21 Jan 2016 17:40:34 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1453398022.3f90e1264b45f393ef53d92c98e352df80721ae7.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtmultimedia/metadata.xml dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild X-VCS-Directories: dev-qt/qtmultimedia/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 3f90e1264b45f393ef53d92c98e352df80721ae7 X-VCS-Branch: master Date: Thu, 21 Jan 2016 17:40:34 +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-Archives-Salt: 85e7b632-48ad-4da4-876e-aaabadf24453 X-Archives-Hash: fdc48a118844b3669878c2ce01a9d168 commit: 3f90e1264b45f393ef53d92c98e352df80721ae7 Author: Davide Pesavento gentoo org> AuthorDate: Thu Jan 21 17:40:02 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Jan 21 17:40:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f90e126 dev-qt/qtmultimedia: remove old Package-Manager: portage-2.2.27 dev-qt/qtmultimedia/metadata.xml | 1 - dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild | 78 ------------------------ dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild | 78 ------------------------ 3 files changed, 157 deletions(-) diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index b275b67..536277f 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -3,7 +3,6 @@ qt - Enable EGL integration Add support for exceptions - like catching them inside the event loop (recommended by upstream) Enable EGL/GLES2 integration diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild deleted file mode 100644 index 765a5b3..0000000 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit qt5-build - -DESCRIPTION="The Multimedia module for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" -fi - -IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets" -REQUIRED_USE="?? ( gstreamer gstreamer010 )" - -RDEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - alsa? ( media-libs/alsa-lib ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0 - ) - gstreamer010? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-bad:0.10 - media-libs/gst-plugins-base:0.10 - ) - pulseaudio? ( media-sound/pulseaudio ) - qml? ( - ~dev-qt/qtdeclarative-${PV} - gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] ) - !gles2? ( ~dev-qt/qtgui-${PV}[-egl] ) - openal? ( media-libs/openal ) - ) - widgets? ( - ~dev-qt/qtopengl-${PV} - ~dev-qt/qtwidgets-${PV} - ) -" -DEPEND="${RDEPEND} - gstreamer? ( x11-proto/videoproto ) -" - -src_prepare() { - # do not rely on qtbase configuration - sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \ - qtmultimedia.pro || die - - qt_use_compile_test alsa - qt_use_compile_test gstreamer - qt_use_compile_test openal - qt_use_compile_test pulseaudio - - qt_use_disable_mod qml quick \ - src/src.pro \ - src/plugins/plugins.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/gsttools/gsttools.pro \ - src/plugins/gstreamer/common.pri - - qt5-build_src_prepare -} - -src_configure() { - local myqmakeargs=( - $(usex gstreamer 'GST_VERSION=1.0' '') - $(usex gstreamer010 'GST_VERSION=0.10' '') - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild deleted file mode 100644 index 1b51234..0000000 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit qt5-build - -DESCRIPTION="The Multimedia module for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" -fi - -IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets" -REQUIRED_USE="?? ( gstreamer gstreamer010 )" - -RDEPEND=" - >=dev-qt/qtcore-${PV}:5 - >=dev-qt/qtgui-${PV}:5 - >=dev-qt/qtnetwork-${PV}:5 - alsa? ( media-libs/alsa-lib ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0 - ) - gstreamer010? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-bad:0.10 - media-libs/gst-plugins-base:0.10 - ) - pulseaudio? ( media-sound/pulseaudio ) - qml? ( - >=dev-qt/qtdeclarative-${PV}:5 - egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] ) - !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] ) - openal? ( media-libs/openal ) - ) - widgets? ( - >=dev-qt/qtopengl-${PV}:5 - >=dev-qt/qtwidgets-${PV}:5 - ) -" -DEPEND="${RDEPEND} - gstreamer? ( x11-proto/videoproto ) -" - -src_prepare() { - # do not rely on qtbase configuration - sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \ - qtmultimedia.pro || die - - qt_use_compile_test alsa - qt_use_compile_test gstreamer - qt_use_compile_test openal - qt_use_compile_test pulseaudio - - qt_use_disable_mod qml quick \ - src/src.pro \ - src/plugins/plugins.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/gsttools/gsttools.pro \ - src/plugins/gstreamer/common.pri - - qt5-build_src_prepare -} - -src_configure() { - local myqmakeargs=( - $(usex gstreamer 'GST_VERSION=1.0' '') - $(usex gstreamer010 'GST_VERSION=0.10' '') - ) - qt5-build_src_configure -}