From 4aa81ce2c2a78998e7728c2d243914cc07ea4ab0 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Mon, 18 Jan 2021 23:05:10 -0500 Subject: [PATCH] media-sound/picard: fix Gentoo bug 760099 and cleanup. Trivial dependency fix. Old ebuilds are now throwing errors due to no supported python versions, no point keeping them around. --- media-sound/picard/Manifest | 8 +-- media-sound/picard/picard-2.0.4.ebuild | 83 -------------------------- media-sound/picard/picard-2.1.2.ebuild | 83 -------------------------- media-sound/picard/picard-2.1.3.ebuild | 83 -------------------------- media-sound/picard/picard-2.4.2.ebuild | 70 ++++++++++++++++++++++ 5 files changed, 72 insertions(+), 255 deletions(-) delete mode 100644 media-sound/picard/picard-2.0.4.ebuild delete mode 100644 media-sound/picard/picard-2.1.2.ebuild delete mode 100644 media-sound/picard/picard-2.1.3.ebuild create mode 100644 media-sound/picard/picard-2.4.2.ebuild diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest index dc3ec17..eebc80c 100644 --- a/media-sound/picard/Manifest +++ b/media-sound/picard/Manifest @@ -1,6 +1,2 @@ -DIST picard-2.0.4.tar.gz 2759058 BLAKE2B e8a2a5aed7b8c99e31c1765906481432d310fd41fa01a611c7d82b182468cf4bfeb5a5aaab74c96c0971f21af3ba690537212c29c75433296cab6a1a409edf6d SHA512 cdc5f1ddeb84705fc792fb77a6d0ba06a5baf812799054ac0fd4959dfe788009f25b6f89ad0c28720f1c7c85af61534ca4f1e9e8efd6ec3cc78578d0f0b3ab32 -DIST picard-2.1.2.tar.gz 2988580 BLAKE2B aea7d3627e72c183cdfa70a7cf1f5c35a45418ca475c995c026cd07d404991b64fb114b92cffddeaa35708494ae71c4e8ae40dc53a3336d102d01e79f4acc3de SHA512 54da8a05ab1af91400e4d03719c5de8ae8263885d124c1197ca9e013a46558f8b191e1261f40eb0101ac7de54074b6faeaf4f0a3150b6f78ec98503b2b95ea6b -DIST picard-2.1.3.tar.gz 2995390 BLAKE2B dcb81cad62aba7915aeff321775452cef70819194a76530eb96a0a7b0009f7185d7652f77d07bb795b24939a3feb56b73a59d7377574b2c8f09f406ca7a88d81 SHA512 f082216a1a669ba689725c93859116e8a56991861219adb0e7c6ed4e5d621055268652820688de762f55b8672f19ff01afe5ac1ab7f79a640ea381272de9516f -EBUILD picard-2.0.4.ebuild 2098 BLAKE2B 272f8d7e8b2f1c1c6345f32586a3ed130a09fba378b6445788d2e7121db3a7fd6ba03f6f79d6324257ea58765ec5f55b6a8862ef16d6b1e0342a715afdb8459c SHA512 2ffa8b5a5fad7ac65920ef41b5c61e59e9c5da77fc8e3eeced74c01669401a99ad6a5069b0c478d67824b2347b47bb8f3a75232883da16a05d53a1dad03d24bc -EBUILD picard-2.1.2.ebuild 2100 BLAKE2B a67d0aeec7f317dfe15642971aa85aa35a390e0fc39eda0cfa1ebdd972d63b1b608d4f863d1ee5619708e2e42dfac3e873e6b5d9de2bee0d8204a3b737b11cca SHA512 743956ead6e3b482eb9450f51633c6f6e54e3d474efa4f71aac774cee6d96024481a92eb45004795f3b36c014b62f146a158b2dc147cd6ef003b6d7cb408b9f2 -EBUILD picard-2.1.3.ebuild 2100 BLAKE2B a67d0aeec7f317dfe15642971aa85aa35a390e0fc39eda0cfa1ebdd972d63b1b608d4f863d1ee5619708e2e42dfac3e873e6b5d9de2bee0d8204a3b737b11cca SHA512 743956ead6e3b482eb9450f51633c6f6e54e3d474efa4f71aac774cee6d96024481a92eb45004795f3b36c014b62f146a158b2dc147cd6ef003b6d7cb408b9f2 +DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15 +EBUILD picard-2.4.2.ebuild 1625 BLAKE2B 7c2be47b06fa47bb929ca77a14223bc4a0b36d3bf4ada6cc0fda6225403ea7e1e34d1374e13899e762f86ad0133ca8ab9fdba7ba9187d17f8c2cf38349707d27 SHA512 078d4118194374548acbc6316a7d5b654af07e35edd3a8c0a20b37f6c8867f4dbfb3613cd15a8b1ef6bbd3e5e8d3721441eed882de1fc796c0c907a216a677e9 diff --git a/media-sound/picard/picard-2.0.4.ebuild b/media-sound/picard/picard-2.0.4.ebuild deleted file mode 100644 index 07016ca..0000000 --- a/media-sound/picard/picard-2.0.4.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright © 2018 Nick Bowler -# License GPLv2+: GNU General Public License version 2 or later. -# This is free software: you are free to change and redistribute it. -# There is NO WARRANTY, to the extent permitted by law. -# -# This a modified version of the original ebuild from Gentoo GNU/Linux, -# covered by the following copyright and permission notice: -# -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -DISTUTILS_SINGLE_IMPL=1 -DISABLE_AUTOFORMATTING=true - -inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils - -DESCRIPTION="A cross-platform music tagger" -HOMEPAGE="https://picard.musicbrainz.org" -SRC_URI="https://github.com/metabrainz/$PN/archive/release-$PV.tar.gz -> $P.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" - -RDEPEND="dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}] - >=media-libs/mutagen-1.38" -DEPEND="$RDEPEND - nls? ( dev-qt/linguist-tools:5 )" - -RESTRICT="test" # doesn't work with ebuilds - -S=$WORKDIR/picard-release-$PV - -python_compile() { - local build_args=( - --disable-autoupdate - ) - if ! use nls; then - build_args+=( --disable-locales ) - fi - distutils-r1_python_compile ${build_args[@]} -} - -python_install() { - local install_args=( - --disable-autoupdate - --skip-build - ) - if ! use nls; then - install_args+=( --disable-locales ) - fi - distutils-r1_python_install ${install_args[@]} -} - -python_install_all() { - distutils-r1_python_install_all - - local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable -calculation and lookup of AcoustID fingerprints. - -Install optional package dev-python/python-discid to enable -calculation and lookup of compact disc identifiers (disc IDs). - -If you are upgrading Picard and it does not start, try removing -Picard's settings: - rm ~/.config/MusicBrainz/Picard.conf" - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/picard/picard-2.1.2.ebuild b/media-sound/picard/picard-2.1.2.ebuild deleted file mode 100644 index e12df59..0000000 --- a/media-sound/picard/picard-2.1.2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright © 2018-2019 Nick Bowler -# License GPLv2+: GNU General Public License version 2 or later. -# This is free software: you are free to change and redistribute it. -# There is NO WARRANTY, to the extent permitted by law. -# -# This a modified version of the original ebuild from Gentoo GNU/Linux, -# covered by the following copyright and permission notice: -# -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -DISTUTILS_SINGLE_IMPL=1 -DISABLE_AUTOFORMATTING=true - -inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils - -DESCRIPTION="A cross-platform music tagger" -HOMEPAGE="https://picard.musicbrainz.org" -SRC_URI="https://github.com/metabrainz/$PN/archive/release-$PV.tar.gz -> $P.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" - -RDEPEND="dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}] - >=media-libs/mutagen-1.38" -DEPEND="$RDEPEND - nls? ( dev-qt/linguist-tools:5 )" - -RESTRICT="test" # doesn't work with ebuilds - -S=$WORKDIR/$PN-release-$PV - -python_compile() { - local build_args=( - --disable-autoupdate - ) - if ! use nls; then - build_args+=( --disable-locales ) - fi - distutils-r1_python_compile ${build_args[@]} -} - -python_install() { - local install_args=( - --disable-autoupdate - --skip-build - ) - if ! use nls; then - install_args+=( --disable-locales ) - fi - distutils-r1_python_install ${install_args[@]} -} - -python_install_all() { - distutils-r1_python_install_all - - local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable -calculation and lookup of AcoustID fingerprints. - -Install optional package dev-python/python-discid to enable -calculation and lookup of compact disc identifiers (disc IDs). - -If you are upgrading Picard and it does not start, try removing -Picard's settings: - rm ~/.config/MusicBrainz/Picard.conf" - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/picard/picard-2.1.3.ebuild b/media-sound/picard/picard-2.1.3.ebuild deleted file mode 100644 index e12df59..0000000 --- a/media-sound/picard/picard-2.1.3.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright © 2018-2019 Nick Bowler -# License GPLv2+: GNU General Public License version 2 or later. -# This is free software: you are free to change and redistribute it. -# There is NO WARRANTY, to the extent permitted by law. -# -# This a modified version of the original ebuild from Gentoo GNU/Linux, -# covered by the following copyright and permission notice: -# -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -DISTUTILS_SINGLE_IMPL=1 -DISABLE_AUTOFORMATTING=true - -inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils - -DESCRIPTION="A cross-platform music tagger" -HOMEPAGE="https://picard.musicbrainz.org" -SRC_URI="https://github.com/metabrainz/$PN/archive/release-$PV.tar.gz -> $P.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" - -RDEPEND="dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}] - >=media-libs/mutagen-1.38" -DEPEND="$RDEPEND - nls? ( dev-qt/linguist-tools:5 )" - -RESTRICT="test" # doesn't work with ebuilds - -S=$WORKDIR/$PN-release-$PV - -python_compile() { - local build_args=( - --disable-autoupdate - ) - if ! use nls; then - build_args+=( --disable-locales ) - fi - distutils-r1_python_compile ${build_args[@]} -} - -python_install() { - local install_args=( - --disable-autoupdate - --skip-build - ) - if ! use nls; then - install_args+=( --disable-locales ) - fi - distutils-r1_python_install ${install_args[@]} -} - -python_install_all() { - distutils-r1_python_install_all - - local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable -calculation and lookup of AcoustID fingerprints. - -Install optional package dev-python/python-discid to enable -calculation and lookup of compact disc identifiers (disc IDs). - -If you are upgrading Picard and it does not start, try removing -Picard's settings: - rm ~/.config/MusicBrainz/Picard.conf" - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/picard/picard-2.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild new file mode 100644 index 0000000..513e8f9 --- /dev/null +++ b/media-sound/picard/picard-2.4.2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_SINGLE_IMPL=1 +DISABLE_AUTOFORMATTING=true +inherit distutils-r1 xdg + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/metabrainz/picard" + inherit git-r3 +else + SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz" + KEYWORDS="amd64 x86" + S="${WORKDIR}/${PN}-release-${PV}" +fi + +DESCRIPTION="Cross-platform music tagger" +HOMEPAGE="https://picard.musicbrainz.org" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="discid fingerprints nls" + +BDEPEND=" + nls? ( dev-qt/linguist-tools:5 ) +" +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}] + dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] + media-libs/mutagen[${PYTHON_MULTI_USEDEP}] + discid? ( dev-python/python-discid[${PYTHON_MULTI_USEDEP}] ) + ') + dev-qt/qtgui:5 + fingerprints? ( media-libs/chromaprint[tools] ) +" + +RESTRICT="test" # doesn't work with ebuilds + +python_compile() { + local build_args=( + --disable-autoupdate + ) + if ! use nls; then + build_args+=( --disable-locales ) + fi + distutils-r1_python_compile ${build_args[@]} +} + +python_install() { + local install_args=( + --disable-autoupdate + --skip-build + ) + if ! use nls; then + install_args+=( --disable-locales ) + fi + distutils-r1_python_install ${install_args[@]} +} + +python_install_all() { + distutils-r1_python_install_all + + elog "If you are upgrading Picard and it does not start, try removing" + elog "Picard's settings:" + elog " rm ~/.config/MusicBrainz/Picard.conf" +} -- 2.43.0