commit:     00926829aaa9dbaef29f922a7a64ac9fbb87632a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 09:37:57 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 09:38:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00926829

media-sound/csound: bump to 6.17.0, eapi8, added python 3.10 & 3.11, updated 
live

Bug: https://bugs.gentoo.org/855431
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/csound/Manifest                                  |  3 +++
 .../csound/{csound-9999.ebuild => csound-6.17.0.ebuild}      | 12 ++++++++++--
 media-sound/csound/csound-9999.ebuild                        |  5 +++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index ecc8f5175a93..8b3eb36dbfbb 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,6 @@
 DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 
3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb
 SHA512 
e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
 DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 
7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754
 SHA512 
18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
+DIST Csound6.17.0_manual_html.zip 25897263 BLAKE2B 
3148a60a398d49d6932864d84b2ee37ddf86d5389b91c99443b2c64f7c3b270d040b83ac88b80ebc772c198223682452da1618391fcc8963fe63151b7837037e
 SHA512 
ff2098828e51e78aa80b10736ea162d90c0b1bef3265e469951a5df63250d283e852490cb2a6599dcb1b8a5c185cf4f0b9534f501e4cb755b9da67ecfb1f4ba6
+DIST Csound6.17.0_manual_pdf.zip 9930889 BLAKE2B 
c0210f2fb97a6707ae6cd0a0cf38cd374f4d4c973b188ee8d418a7efd5c98dc1d4e61867de021ed2859bd8264cc0876b46deb565c358b6efea42f471d39671a9
 SHA512 
bf664bab1dec073b48853ccf7519086c55ad74af33db86ac7f95746231c18fb10d46a485047788050094e412d27bbd0df65e238d31b01b435989f2fd734189a6
 DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B 
f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d
 SHA512 
b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
+DIST csound-6.17.0-distributable.tar.xz 25231984 BLAKE2B 
9767aae3368f33340d80abb84c573e6ceb91bb16448e961f62c679742377e62f611b36341ce7dfb32a2daafc9440c3dff84fe031c9d52b7d86491c383cf79d61
 SHA512 
b7c5b2f70e82d9dc37074cb217bc146d66293cfea2d69ffd3b0eab9aca302e431eb82b906c8d6494969374988edd6a9c7d04d7676efd085a2dce235988400caa

diff --git a/media-sound/csound/csound-9999.ebuild 
b/media-sound/csound/csound-6.17.0.ebuild
similarity index 93%
copy from media-sound/csound/csound-9999.ebuild
copy to media-sound/csound/csound-6.17.0.ebuild
index 0486ace1f63d..6e52221543fd 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-6.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -8,7 +8,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake lua-single python-single-r1
 
@@ -44,6 +44,7 @@ BDEPEND="
        sys-devel/bison
        sys-devel/flex
        virtual/yacc
+       doc? ( media-libs/libpng )
        lua? ( dev-lang/swig )
        nls? ( sys-devel/gettext )
        test? (
@@ -103,6 +104,13 @@ src_prepare() {
        sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
                -e '/-O3/d' \
                -i CMakeLists.txt || die
+
+       if use doc; then
+               local png="${WORKDIR}/html/images/delayk.png"
+               pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help 
for exit codes
+               [[ $? -gt 15 ]] && die "Failed to fix ${png}"
+               mv -f ${png/.png/fixed.png} ${png} || die
+       fi
 }
 
 src_configure() {

diff --git a/media-sound/csound/csound-9999.ebuild 
b/media-sound/csound/csound-9999.ebuild
index 0486ace1f63d..ae7b8aae361e 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -8,7 +8,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake lua-single python-single-r1
 
@@ -44,6 +44,7 @@ BDEPEND="
        sys-devel/bison
        sys-devel/flex
        virtual/yacc
+       doc? ( media-libs/libpng )
        lua? ( dev-lang/swig )
        nls? ( sys-devel/gettext )
        test? (

Reply via email to