From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Sep 2020 14:09:07 +0100 Subject: gentoo resync : 02.09.2020 --- media-sound/mixxx/Manifest | 6 +- media-sound/mixxx/mixxx-2.2.3-r2.ebuild | 137 -------------------------------- media-sound/mixxx/mixxx-2.2.4.ebuild | 20 ++--- media-sound/mixxx/mixxx-9999.ebuild | 18 ++--- 4 files changed, 21 insertions(+), 160 deletions(-) delete mode 100644 media-sound/mixxx/mixxx-2.2.3-r2.ebuild (limited to 'media-sound/mixxx') diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest index 8e2d73c024e7..27208dec03df 100644 --- a/media-sound/mixxx/Manifest +++ b/media-sound/mixxx/Manifest @@ -1,9 +1,7 @@ AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59 AUX mixxx-2.2.3-qt-5.14.patch 17550 BLAKE2B 3f5c16106bbda8e45f1180ef6f2323a3786ddb11f9a355fac57c545d71a1f5080ef39665011d41b4500643a4e33340851bb3d849d381874e4abf9ac42a18e85f SHA512 677d8e832aab28f21c2641b1a94fce6fa43d652ba76b580a8a7cb7911dc5e5fb788cdcf7825906e7894d90198433f96e421531af4e65bd7d16a8b16fcb68fb54 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8 -DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35 SHA512 dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa -EBUILD mixxx-2.2.3-r2.ebuild 3152 BLAKE2B 48a5c3b9d7513a6ae4c47c6f67d0f7577234ae92ba9bbc8d6792ac4f5a62898d77e175d372ee0362e07b347ad6215433e2c857b829d47cead9d5cc677dc7c9d6 SHA512 b84b0fe2b0d40c4a17b2df624e856b36b8fd3dc899fa6b9f2f0cb834db607aa4da2bd024a5eeb75b0a3dbba8241a73ad19a545289e30da0dba17e7cbed4e67b7 -EBUILD mixxx-2.2.4.ebuild 3203 BLAKE2B 14f1574307c91b3e074aa9b223e28569ffd45f5a0dd80a9e91868b9ab04fe0963e8b2ff23b305e3d2e88814a381f434477b61eacb376d41b5eecf0d249bcaa1f SHA512 582cd886f335c7985909455db11a844ce1b7c15ec418049586bacacb46ec62ee2ee5fd4ccb1fdd050e76f2080bce39ed506e51fd361695a29ab0d3ebb815b133 -EBUILD mixxx-9999.ebuild 3104 BLAKE2B cb83684c0b11f73ee9fcfdae56f6201ed53593c26325f251784b69a2fdffe1ed14025016d67dcc3c62a1e5e23993f77c55057162d4e52e73ecea680d93aba085 SHA512 1c4074ef483feac78a36575b1dee2c6a7dc6e01429bbee5877706996712f14ac8c3bf2326b9e765f1c3ca559943ff0dd5184694889bd723efc31f39e909bf0f7 +EBUILD mixxx-2.2.4.ebuild 3188 BLAKE2B 59e459ec2bcfb09bfade6a0ec095f7b581b18282065e41ebff8f95846365d65f0ff60bc8da41c0cd9f378b23f1f1c3b369be0ad2e701138b89c768333d8ffc21 SHA512 97935365e69d8b78ab9c7d9bdb583ab53411b2c61f57bb6fe39ee2985603dd38cfdaa988051a92a4958521a6a8039f51b953ef50319c95f44435a20eb7b23ed4 +EBUILD mixxx-9999.ebuild 3091 BLAKE2B 7f20e035c9936eebf1d48becc5f941dd85cc06ed903a7a0182dd0e767598e39137043c9da2068e09fcfc900b92ef57fcc7476eff3aebb8e2ba0d46fdc98e71ff SHA512 3865bf5ccbba5f712ca1e91958dda74438f1dd70b77079293429a43876dc658a7f25007aadf2a87333053f494f8e26f4b398293c168e6dd8f61faf67ae29882b MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f diff --git a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild b/media-sound/mixxx/mixxx-2.2.3-r2.ebuild deleted file mode 100644 index a0feed265b7d..000000000000 --- a/media-sound/mixxx/mixxx-2.2.3-r2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic scons-utils toolchain-funcs - -DESCRIPTION="Advanced Digital DJ tool based on Qt" -HOMEPAGE="https://www.mixxx.org/" -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git" -else - #SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz" - SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-release-${PV}" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack" - -# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this -# got fixed -RDEPEND=" - dev-db/sqlite - dev-libs/glib:2 - dev-libs/protobuf:0= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtscript:5[scripttools] - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - media-libs/chromaprint - media-libs/flac - media-libs/libid3tag - media-libs/libogg - media-libs/libsndfile - >=media-libs/libsoundtouch-1.5 - media-libs/libvorbis - >=media-libs/portaudio-19_pre - media-libs/portmidi - media-libs/rubberband - media-libs/taglib - media-libs/vamp-plugin-sdk - sci-libs/fftw:3.0= - sys-power/upower - virtual/glu - virtual/libusb:1 - virtual/opengl - x11-libs/libX11 - aac? ( - media-libs/faad2 - media-libs/libmp4v2:0 - ) - hid? ( dev-libs/hidapi ) - lv2? ( >=media-libs/lilv-0.24.2-r3 ) - mp3? ( media-libs/libmad ) - mp4? ( media-libs/libmp4v2:= ) - opus? ( media-libs/opusfile ) - shout? ( media-libs/libshout ) - wavpack? ( media-sound/wavpack ) - ffmpeg? ( media-video/ffmpeg:0= ) -" -# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0 -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-qt/qttest:5 - dev-qt/qtxmlpatterns:5 -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.0-docs.patch - "${FILESDIR}"/${P}-qt-5.14.patch -) - -src_prepare() { - # use multilib compatible directory for plugins - sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die - - default -} - -src_configure() { - local myoptimize=0 - - # Required for >=qt-5.7.0 (bug #590690) - append-cxxflags -std=c++11 - - # Try to get cpu type based on CFLAGS. - # Bug #591968 - for i in $(get-flag mcpu) $(get-flag march) ; do - if [[ ${i} = native ]] ; then - myoptimize="native" - break - fi - done - - myesconsargs=( - prefix="${EPREFIX}/usr" - qtdir="${EPREFIX}/usr/$(get_libdir)/qt5" - faad="$(usex aac 1 0)" - ffmpeg="$(usex ffmpeg 1 0)" - hid="$(usex hid 1 0)" - hifieq=1 - lilv="$(usex lv2 1 0)" - m4a="$(usex mp4 1 0)" - mad="$(usex mp3 1 0)" - optimize="${myoptimize}" - opus="$(usex opus 1 0)" - qt5=1 - shoutcast="$(usex shout 1 0)" - vinylcontrol=1 - wv="$(usex wavpack 1 0)" - ) -} - -src_compile() { - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} -} - -src_install() { - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \ - install_root="${ED%/}"/usr install - - dodoc README Mixxx-Manual.pdf -} diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild index 070c9470c18f..931b5e47cce9 100644 --- a/media-sound/mixxx/mixxx-2.2.4.ebuild +++ b/media-sound/mixxx/mixxx-2.2.4.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit flag-o-matic scons-utils toolchain-funcs +PYTHON_COMPAT=( python2_7 python3_{6,7,8}) + +inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs DESCRIPTION="Advanced Digital DJ tool based on Qt" HOMEPAGE="https://www.mixxx.org/" @@ -14,7 +16,7 @@ else #SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz" SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-release-${PV}" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="GPL-2" @@ -75,6 +77,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 + ${PYTHON_DEPS} " PATCHES=( @@ -93,9 +96,6 @@ src_prepare() { src_configure() { local myoptimize=0 - # Required for >=qt-5.7.0 (bug #590690) - append-cxxflags -std=c++11 - # Try to get cpu type based on CFLAGS. # Bug #591968 for i in $(get-flag mcpu) $(get-flag march) ; do @@ -105,7 +105,7 @@ src_configure() { fi done - myesconsargs=( + MYSCONS=( prefix="${EPREFIX}/usr" qtdir="${EPREFIX}/usr/$(get_libdir)/qt5" faad="$(usex aac 1 0)" @@ -126,13 +126,13 @@ src_configure() { src_compile() { CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} + LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} } src_install() { CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \ - install_root="${ED%/}"/usr install + LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \ + install_root="${ED}"/usr install dodoc README Mixxx-Manual.pdf } diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild index cac6bd5d4fe2..7656de621cec 100644 --- a/media-sound/mixxx/mixxx-9999.ebuild +++ b/media-sound/mixxx/mixxx-9999.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit flag-o-matic scons-utils toolchain-funcs +PYTHON_COMPAT=( python2_7 python3_{6,7,8}) + +inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs DESCRIPTION="Advanced Digital DJ tool based on Qt" HOMEPAGE="https://www.mixxx.org/" @@ -75,6 +77,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 + ${PYTHON_DEPS} " src_prepare() { @@ -87,9 +90,6 @@ src_prepare() { src_configure() { local myoptimize=0 - # Required for >=qt-5.7.0 (bug #590690) - append-cxxflags -std=c++11 - # Try to get cpu type based on CFLAGS. # Bug #591968 for i in $(get-flag mcpu) $(get-flag march) ; do @@ -99,7 +99,7 @@ src_configure() { fi done - myesconsargs=( + MYSCONS=( prefix="${EPREFIX}/usr" qtdir="${EPREFIX}/usr/$(get_libdir)/qt5" faad="$(usex aac 1 0)" @@ -120,13 +120,13 @@ src_configure() { src_compile() { CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} + LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} } src_install() { CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \ - install_root="${ED%/}"/usr install + LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${MYSCONS[@]} \ + install_root="${ED}"/usr install dodoc README Mixxx-Manual.pdf } -- cgit v1.2.3