From ce5b4b49ddc677ca8f16ba93503b10ac5a1bf467 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Fri, 30 Jan 2015 21:41:46 +0000 Subject: [PATCH] Shorten pkg setup. Sort functions. Remove old. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xF3CFD2BD --- media-libs/phonon-vlc/ChangeLog | 8 +- media-libs/phonon-vlc/Manifest | 28 +++++- media-libs/phonon-vlc/phonon-vlc-0.8.1.ebuild | 94 ------------------- media-libs/phonon-vlc/phonon-vlc-0.8.2.ebuild | 20 ++-- media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 20 ++-- 5 files changed, 43 insertions(+), 127 deletions(-) delete mode 100644 media-libs/phonon-vlc/phonon-vlc-0.8.1.ebuild 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 -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/Manifest b/media-libs/phonon-vlc/Manifest index 2f533b8b2238..ff5c3deaa9e1 100644 --- a/media-libs/phonon-vlc/Manifest +++ b/media-libs/phonon-vlc/Manifest @@ -1,9 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST phonon-backend-vlc-0.7.2.tar.xz 58988 SHA256 0a788360df2e3439efefacae70b73252c1e1d4a7ad08f4d93301d77a915d95a9 SHA512 9a2b45d02ed958f82ff4fb8d3e9233eeb35047670061b59266fa7504855a149de1a401cad34871083e42c8d05620ff0e3df9f1a7a3e1f9b82ddac886c50adfce WHIRLPOOL e8130f8280fb31ccc8ec686eba8af744300100686c179e3abfd124f8892d55038a2a77887cbc3673e36c03b31829a1ec4ae686bee0a1f48048d9631b228aeb73 -DIST phonon-backend-vlc-0.8.1.tar.xz 59852 SHA256 428899161c6c033cc4c890b958fe6826352a0af9cf890dca68349be5f181cebb SHA512 b87dcaaf7c264cce14350f1820330aae507f992c18ad8d316206ba4e14dc3571a097069278ef730dcb383e114bba7e93b167de14f2924b23f33b1952ff1b28ea WHIRLPOOL ae1f425a17b5da96b90282764d1f037d208b4c979836d54140e7e9109e1e256892d9faf94f0794c6a20462514ca8df079ef949d01e612b052982bd32d184fe3c DIST phonon-backend-vlc-0.8.2.tar.xz 59832 SHA256 dab7f8edf53ee90998e5e3fcf2f6bd0a13750511b0ecde6939be0664d46bdaa3 SHA512 35f0255899e89d4b9e42a440885455367a56559090b490f1397984520c2e63c2044c8b74290d8b438fcfa388a8b06f1647e60cb6d72d4dd907fc3df9ea4c63e3 WHIRLPOOL 31804069c38cc377fbb8acf10690a6699550c1812e7d0ee64c2a03fd7efa73b7b9c24f63b56b7e6fe96f5f261e0adab897e7f4e26e6ea00163c5dd47e9d4c376 EBUILD phonon-vlc-0.7.2.ebuild 2140 SHA256 d50ae11e35c57a0b635314e1aeb2060d840a34e3643bf03424270e231c25dab4 SHA512 8c6451617c541a4398a9b62ae8e3e2fcc8740ba9ed76712e1129b0458e237a8b591017af7bca2765799745a6d2c62e677f7f74426c0d72c256a82796091ec218 WHIRLPOOL b9dd9e3547b7386646e083f50f0fccff75e72e74018463cd2cfa1666b355502f952a8c2001fa11e66f7af3103b8ebaf6cacc1df9b86b97bb58790a074c826c04 -EBUILD phonon-vlc-0.8.1.ebuild 2142 SHA256 b4839cdd84511058d54447441a1cb28f1f43075cff60ed549a430409c1be4bcb SHA512 73b337b33dc91a97499ec2e9716f84aed5ca201559cb4316066eeed3d6282bdbfe0e8dde897f4bb1cd8437180d4d9801b61f563b3a6d42255155717173e1ba67 WHIRLPOOL 298c427f569808d1271aba232fc57e2f80d8e559533c03c8db1d487fb220ac974440443a199dd0aaf82357e0f6f27cd80e61bc4edb813f64c3be15dc1776e43a -EBUILD phonon-vlc-0.8.2.ebuild 2146 SHA256 e48caf212f073190e93aa40abe7fc40a47a3a7462665d8a16f984105157d1dc4 SHA512 806a88ddd053d3691b3b4baacc5f30058491e32400060c78cdab7f04561d944490fc9e39d63b7500ae56dafb376fe8c175055382a29913e6d756fe34288b4f26 WHIRLPOOL f3cc3cb18e150d4176a05e23828be4ec2e59439f5524eb06f2b5ef434ba3535512673e3fb5a56af1c9487b48697a5d065b18cb46536311de84cb8746496957bd -EBUILD phonon-vlc-9999.ebuild 2147 SHA256 65e1cea4ad0597b46620b6b08e23bcab4a44363b05d1acb3dbd1533a69005b0f SHA512 47dfcd25c6015caf9bd50b47e498910151cbb83e2fb3d972ab0dde044cdeaa272228898fe4af3c6ebcfc14f5dc36a3c30f380063264db67d1a4ed758c2736794 WHIRLPOOL 70ff5bf160bca08301cb3634806a061ccbe209bbf26152445496b80ca82dec6b42c8bf1d7486dcf83d464a12fa0db513dd1e3bf12350c7894796a0ddd8d08135 -MISC ChangeLog 8780 SHA256 ecadd10f252cde679ecbb7ffdd9b0220eb89023010311f3db280a4f0f8028ed0 SHA512 578e9ebe3b6c7dbf0e257ba3f288d6c75176c669afabe6fc94f07da5b2b2ea62f84a44297cd51b21d436c235cc783b8258739c30a689e820471aee5dda8e7c06 WHIRLPOOL 1ac8c698424e2c9347715f94bfe5880a660173172a29bafcc9e141ecff5c0e73203678da49facd85dce2e900f5c8cedc581cc5cff63185e0cc71ccd6804522e8 +EBUILD phonon-vlc-0.8.2.ebuild 2068 SHA256 46dd248835382606314585c478bbd22ea5e99d3bb7f723c6624faf9ceffa0184 SHA512 809be5605caf4f985a0d80ae2d2f0f51a6c2ec15b721276b1c0cbfd9ea8a5dccf9d48907ce48eff20a7841314ed27f29b80ac99c4ac8ed8b94829629cf8592da WHIRLPOOL 4ab1120f746d56fe4a7c097eec68b230cf0dbfe11b8cefbf52516eaea55e0e78fc915771f1e32c11e24678e634368994b568f9da4d4f63fd2caf3b01d8959119 +EBUILD phonon-vlc-9999.ebuild 2064 SHA256 c841bffd458ac794289b06d12d376b158d90f9c7167bcca07eb6577202f3f445 SHA512 d90e3da20fefa018a282b9730fa57f23a2967437f222ade5a2b104a274fed2d3059843477acc56f77d63a8db7e9f1307f622884e40162117119cb98c00acc2dd WHIRLPOOL c8869e93d53b06b12c834fd4dbe2844496927764238319022aeabc588dd94eb8243bae5e99ad56fd040e288df9602c858b6ac71a3bbf69c18346167ef472b90b +MISC ChangeLog 8954 SHA256 2c45bd289dc6744716a60ebce98c93edf73abfd212a2235da8527514c4caf4fb SHA512 e775310eb347742aaf19e0bc0cfa5b176184188faed10fd2239e5d7365627cb996b7c88732ba160b7c26198b65c06148523f53ca81da7227996ad9499cb6b224 WHIRLPOOL 9a2e36c44b9cef9fed5c20cb5b7ad33c1177ab289249bda1081ba2870f3f038bae28e7a0c404e277e294e0e2070e4ef381dbb78ab45c6031bcc4428333098f4f MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBCAAGBQJUy/qWAAoJEGVpnaTzz9K9b6wP/RmFA0xlFChdPVjUO2FtQ/IK +HQfSxNWn36ItAHyE+EaJtK6ygfSHx/hYGS+libbtzl6uKL7YKJ6RG4RTAih+VxS9 +MeK3mD2YO1y2aNewnuG+v9yLPqMkyr9jGMMjD0DsHbEWvOf0141WDY+OvVGaCKNt +0BRLW8wTwztxXzBILT2Ca4UfpAT7L/jOg51Du6m5KeIgSmOvZved+I4m58gxPtgM +FzHAkdKe7ssCLNhPh1Jqlwqh937TS/BJBjbNVQB3Hw37/Pzvf95xsAoX4cs4XHS4 +rzvbhS2GFz6rOvQk/MbOb8q9MwcMrT1DSMUpIFtW7hvI8ZktMQvUPloSM0zWHoYH +xuI+KCAhbDNvf1y1/OHfn2/z53f6FCujr7b49Hpp4WhZDWwJNT9O+9ucWug6bCU1 +HWwNyvXbsuGG+khXEn1F7Fecj1NxbNTwue2UKhIXtV8G5m2U371tuuGmtb0lT1DW +GccKXCdRSes786mdPYTHbCwpxbNm/+q4KQqhkZaIw8C1WRydWr+MInGUpY63Nx0A +2vEImU6o/cup8hqaU/Wju16PpTKytRIoEIOLFw/KcK3JWLZzUkTY4NJ1AAvPP+CA +5iDJj+ky6LmH15ZC2Sckc/D0PFpDgWAo3cowm1sW32koGksxxJFk1ySFbjK8XIa0 +in1AWAvLp6nbha8rtYXA +=CURj +-----END PGP SIGNATURE----- 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" -- 2.26.2