diff options
author | Johannes Huber <johu@gentoo.org> | 2015-01-30 21:41:38 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2015-01-30 21:41:38 +0000 |
commit | 366fef10713fa963e4873d38c2ea19528c6b67a0 (patch) | |
tree | 388a4b28f16db1db9ee504f49df0695baa1f87e4 /media-libs | |
parent | Shorten pkg setup. (diff) | |
download | gentoo-2-366fef10713fa963e4873d38c2ea19528c6b67a0.tar.gz gentoo-2-366fef10713fa963e4873d38c2ea19528c6b67a0.tar.bz2 gentoo-2-366fef10713fa963e4873d38c2ea19528c6b67a0.zip |
Shorten pkg setup. Sort functions. Remove old.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/phonon-vlc/ChangeLog | 8 | ||||
-rw-r--r-- | media-libs/phonon-vlc/phonon-vlc-0.8.1.ebuild | 94 | ||||
-rw-r--r-- | media-libs/phonon-vlc/phonon-vlc-0.8.2.ebuild | 20 | ||||
-rw-r--r-- | media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 20 |
4 files changed, 20 insertions, 122 deletions
diff --git a/media-libs/phonon-vlc/ChangeLog b/media-libs/phonon-vlc/ChangeLog index ca5578af7df1..ae042f5c0232 100644 --- a/media-libs/phonon-vlc/ChangeLog +++ b/media-libs/phonon-vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/phonon-vlc -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/ChangeLog,v 1.53 2014/12/11 12:14:06 mrueg Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/ChangeLog,v 1.54 2015/01/30 21:41:38 johu Exp $ + + 30 Jan 2015; Johannes Huber <johu@gentoo.org> -phonon-vlc-0.8.1.ebuild, + phonon-vlc-0.8.2.ebuild, phonon-vlc-9999.ebuild: + Shorten pkg setup. Sort functions. Remove old. *phonon-vlc-0.8.2 (11 Dec 2014) diff --git a/media-libs/phonon-vlc/phonon-vlc-0.8.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.8.1.ebuild deleted file mode 100644 index 8bedfe4b1e28..000000000000 --- a/media-libs/phonon-vlc/phonon-vlc-0.8.1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.8.1.ebuild,v 1.1 2014/11/04 10:16:03 mrueg Exp $ - -EAPI=5 - -MY_PN="phonon-backend-vlc" -MY_P="${MY_PN}-${PV}" -EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) -[[ ${PV} == 9999 ]] && git_eclass=git-r3 -inherit cmake-utils multibuild ${git_eclass} -unset git_eclass - -DESCRIPTION="Phonon VLC backend" -HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc" -[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz" - -LICENSE="LGPL-2.1" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == 9999 ]] || \ -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd" - -SLOT="0" -IUSE="debug +qt4 qt5" -REQUIRED_USE="|| ( qt4 qt5 )" - -RDEPEND=" - >=media-libs/phonon-4.8.0[qt4=,qt5=] - >=media-video/vlc-2.0.1:=[dbus,ogg,vorbis] - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - qt4? ( >=dev-util/automoc-0.9.87 ) -" - -[[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS ) - -pkg_setup() { - MULTIBUILD_VARIANTS=() - if use qt4; then - MULTIBUILD_VARIANTS+=(qt4) - fi - if use qt5; then - MULTIBUILD_VARIANTS+=(qt5) - fi -} - -src_configure() { - myconfigure() { - local mycmakeargs=() - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF) - fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON) - fi - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} - -src_test() { - multibuild_foreach_variant cmake-utils_src_test -} - -pkg_postinst() { - elog "For more verbose debug information, export the following variables:" - elog "PHONON_DEBUG=1" - elog "" - elog "To make KDE detect the new backend without reboot, run:" - elog "kbuildsycoca4 --noincremental" -} diff --git a/media-libs/phonon-vlc/phonon-vlc-0.8.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.8.2.ebuild index d01dae07ff7a..dfc729703c39 100644 --- a/media-libs/phonon-vlc/phonon-vlc-0.8.2.ebuild +++ b/media-libs/phonon-vlc/phonon-vlc-0.8.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.8.2.ebuild,v 1.1 2014/12/11 12:14:06 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.8.2.ebuild,v 1.2 2015/01/30 21:41:38 johu Exp $ EAPI=5 @@ -49,13 +49,7 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ) pkg_setup() { - MULTIBUILD_VARIANTS=() - if use qt4; then - MULTIBUILD_VARIANTS+=(qt4) - fi - if use qt5; then - MULTIBUILD_VARIANTS+=(qt5) - fi + MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) } src_configure() { @@ -77,14 +71,14 @@ src_compile() { multibuild_foreach_variant cmake-utils_src_compile } -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} - src_test() { multibuild_foreach_variant cmake-utils_src_test } +src_install() { + multibuild_foreach_variant cmake-utils_src_install +} + pkg_postinst() { elog "For more verbose debug information, export the following variables:" elog "PHONON_DEBUG=1" diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild index f770196a5a59..80232e362d01 100644 --- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild +++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-9999.ebuild,v 1.16 2014/09/09 17:18:15 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-9999.ebuild,v 1.17 2015/01/30 21:41:38 johu Exp $ EAPI=5 @@ -49,13 +49,7 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ) pkg_setup() { - MULTIBUILD_VARIANTS=() - if use qt4; then - MULTIBUILD_VARIANTS+=(qt4) - fi - if use qt5; then - MULTIBUILD_VARIANTS+=(qt5) - fi + MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) } src_configure() { @@ -77,14 +71,14 @@ src_compile() { multibuild_foreach_variant cmake-utils_src_compile } -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} - src_test() { multibuild_foreach_variant cmake-utils_src_test } +src_install() { + multibuild_foreach_variant cmake-utils_src_install +} + pkg_postinst() { elog "For more verbose debug information, export the following variables:" elog "PHONON_DEBUG=1" |