diff --git a/main/scons/APKBUILD b/main/scons/APKBUILD index d6d700b95fd..7c440a3860b 100644 --- a/main/scons/APKBUILD +++ b/main/scons/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Nicolas Lorin # Maintainer: Natanael Copa pkgname=scons -pkgver=4.7.0 -pkgrel=1 +pkgver=4.8.0 +pkgrel=0 pkgdesc="Software construction system" url="https://scons.org/" arch="noarch" @@ -16,7 +16,6 @@ subpackages="$pkgname-pyc $pkgname-doc" # building the scons manpages requires working scons install... source="https://github.com/SCons/scons/archive/$pkgver/scons-$pkgver.tar.gz https://downloads.sourceforge.net/project/scons/scons/$pkgver/SCons-$pkgver.tar.gz - dont-install-manpages.patch " # tests need py3-psutil from community @@ -47,15 +46,11 @@ package() { # find and remove directories containing docbook files find "$pkgdir" -name 'docbook' -type d -exec rm -rf {} + - install -Dm644 \ - "$srcdir"/SCons-$pkgver/scons.1 \ - "$srcdir"/SCons-$pkgver/scons-time.1 \ - "$srcdir"/SCons-$pkgver/sconsign.1 \ + install -Dm644 scons.1 scons-time.1 sconsign.1 \ -t "$pkgdir"/usr/share/man/man1/ } sha512sums=" -8be4d611c375c13467a1a437e0d47873f973584d9a1be0d1cbbd345685a8f477fc19fa59ab01bca1ab7be8af0034d5cfda360090ee4b347c41f7bfea363bfe6c scons-4.7.0.tar.gz -d08fba3e7f058eb2eeee4a129d10b55affada6b192932f069271fcbc28fd8216b2bf7e94285d9c448235a3965a789d3a91db9ebae1945aa73306788009dd2e77 SCons-4.7.0.tar.gz -286dbd5230119237b2ef2ece572d70c8b22d78ac71c5ac7a7a23e1c8597ca6379f324293560276777b608eb7b7af070374e8df91b593e6c656d81e13367efccd dont-install-manpages.patch +056bc7f5308e73e202a96ce6e56efee4df278cd77455dc42278d63470ff2ea05163124c2f971a87416766d098103f85cfc0a0340bd9d0aa9209d200890197af9 scons-4.8.0.tar.gz +6f1ab01b25752f1f43a1796fb68fb0508105b372cf082a57477af4685399f8b83372466d65070d5c928d81c9fd4bdf1e8ba357c72537f32c50f77121f52415fb SCons-4.8.0.tar.gz " diff --git a/main/scons/dont-install-manpages.patch b/main/scons/dont-install-manpages.patch deleted file mode 100644 index 0d56f3b5d93..00000000000 --- a/main/scons/dont-install-manpages.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Patrycja Rosa -Date: Fri, 11 Feb 2022 19:02:34 +0100 -Subject: Don't install manpages with setup.py - -They're not in the correct place when using the GitHub release -and from what I can see, they get installed to /usr anyway - -diff --git a/setup.cfg b/setup.cfg ---- a/setup.cfg -+++ b/setup.cfg -@@ -67,6 +67,0 @@ -- --[options.data_files] --. = scons.1 -- scons-time.1 -- sconsign.1 --