Browse Source

Sync with portage [Thu Jul 22 09:42:40 MSK 2021].

tags/2025
root 2 months ago
parent
commit
044beb6682
100 changed files with 1498 additions and 540 deletions
  1. BIN
      Manifest.files.gz
  2. BIN
      acct-user/Manifest.gz
  3. +0
    -0
      acct-user/grok_exporter/Manifest
  4. +12
    -0
      acct-user/grok_exporter/grok_exporter-0.ebuild
  5. +8
    -0
      acct-user/grok_exporter/metadata.xml
  6. BIN
      app-admin/Manifest.gz
  7. +1
    -1
      app-admin/sudo/sudo-1.9.7_p1-r1.ebuild
  8. +1
    -1
      app-admin/sudo/sudo-9999.ebuild
  9. BIN
      app-backup/Manifest.gz
  10. +1
    -1
      app-backup/borgmatic/borgmatic-1.5.15.ebuild
  11. BIN
      app-editors/Manifest.gz
  12. +0
    -1
      app-editors/gummi/Manifest
  13. +0
    -46
      app-editors/gummi/gummi-0.8.1.ebuild
  14. BIN
      app-emulation/Manifest.gz
  15. +1
    -1
      app-emulation/docker-compose/docker-compose-1.29.2.ebuild
  16. +1
    -1
      app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild
  17. +1
    -1
      app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild
  18. +1
    -1
      app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
  19. +2
    -2
      app-emulation/wine-staging/Manifest
  20. +4
    -4
      app-emulation/wine-staging/wine-staging-6.13.ebuild
  21. +1
    -1
      app-emulation/wine-vanilla/Manifest
  22. +2
    -1
      app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild
  23. BIN
      app-forensics/Manifest.gz
  24. +1
    -0
      app-forensics/aflplusplus/Manifest
  25. +1
    -1
      app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild
  26. +99
    -0
      app-forensics/aflplusplus/aflplusplus-3.14c-r1.ebuild
  27. BIN
      app-misc/Manifest.gz
  28. +1
    -1
      app-misc/rpick/rpick-0.8.4.ebuild
  29. +2
    -2
      app-misc/uptimed/uptimed-0.4.2.ebuild
  30. +2
    -2
      app-misc/uptimed/uptimed-0.4.3.ebuild
  31. BIN
      app-office/Manifest.gz
  32. +1
    -1
      app-office/calligra/calligra-3.2.1-r3.ebuild
  33. +1
    -1
      app-office/texmacs/Manifest
  34. +0
    -19
      app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch
  35. +0
    -23
      app-office/texmacs/files/texmacs-1.99.2-desktop.patch
  36. +0
    -21
      app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
  37. +0
    -15
      app-office/texmacs/files/texmacs-1.99.6-math_util.patch
  38. +0
    -295
      app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch
  39. +7
    -20
      app-office/texmacs/texmacs-2.1.ebuild
  40. BIN
      app-shells/Manifest.gz
  41. +1
    -1
      app-shells/bash-completion/bash-completion-2.11.ebuild
  42. +2
    -2
      app-shells/fzy/fzy-1.0-r1.ebuild
  43. +2
    -2
      app-shells/fzy/fzy-9999.ebuild
  44. +1
    -1
      app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
  45. BIN
      dev-db/Manifest.gz
  46. +3
    -0
      dev-db/redis/Manifest
  47. +160
    -0
      dev-db/redis/redis-5.0.13.ebuild
  48. +187
    -0
      dev-db/redis/redis-6.0.15.ebuild
  49. +187
    -0
      dev-db/redis/redis-6.2.5.ebuild
  50. BIN
      dev-lang/Manifest.gz
  51. +2
    -0
      dev-lang/cfortran/Manifest
  52. +57
    -0
      dev-lang/cfortran/cfortran-20110621.ebuild
  53. +2
    -1
      dev-lang/go/go-1.16.6.ebuild
  54. +4
    -0
      dev-lang/maude/Manifest
  55. +22
    -0
      dev-lang/maude/files/maude-3.1-prll.patch
  56. +65
    -0
      dev-lang/maude/maude-3.1.ebuild
  57. +1
    -1
      dev-lang/ruby/ruby-2.7.4.ebuild
  58. +1
    -1
      dev-lang/ruby/ruby-3.0.2.ebuild
  59. BIN
      dev-libs/Manifest.gz
  60. +1
    -1
      dev-libs/imath/Manifest
  61. +161
    -0
      dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
  62. +20
    -15
      dev-libs/imath/imath-3.0.5.ebuild
  63. +1
    -1
      dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
  64. +25
    -0
      dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch
  65. +2
    -0
      dev-libs/libnest2d/libnest2d-0.4-r2.ebuild
  66. BIN
      dev-ml/Manifest.gz
  67. +1
    -0
      dev-ml/dune-configurator/Manifest
  68. +117
    -0
      dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
  69. +1
    -0
      dev-ml/dune-private-libs/Manifest
  70. +119
    -0
      dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild
  71. +1
    -0
      dev-ml/dune/Manifest
  72. +47
    -0
      dev-ml/dune/dune-2.9.0.ebuild
  73. BIN
      dev-perl/Manifest.gz
  74. +1
    -1
      dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild
  75. BIN
      dev-python/Manifest.gz
  76. +1
    -1
      dev-python/pillow/pillow-8.3.0.ebuild
  77. +1
    -1
      dev-python/pooch/Manifest
  78. +1
    -1
      dev-python/tomli/tomli-1.0.4.ebuild
  79. BIN
      dev-ruby/Manifest.gz
  80. +1
    -2
      dev-ruby/rbs/Manifest
  81. +0
    -36
      dev-ruby/rbs/rbs-1.0.6.ebuild
  82. +1
    -1
      dev-ruby/rbs/rbs-1.2.1.ebuild
  83. +2
    -2
      dev-ruby/rbs/rbs-1.3.1.ebuild
  84. +1
    -1
      dev-ruby/rexml/rexml-3.2.5.ebuild
  85. +1
    -1
      dev-ruby/rss/rss-0.2.9.ebuild
  86. +1
    -0
      dev-ruby/typeprof/Manifest
  87. +1
    -1
      dev-ruby/typeprof/typeprof-0.14.1.ebuild
  88. +32
    -0
      dev-ruby/typeprof/typeprof-0.15.0.ebuild
  89. BIN
      dev-util/Manifest.gz
  90. +1
    -0
      dev-util/cucumber-create-meta/Manifest
  91. +26
    -0
      dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild
  92. +1
    -0
      dev-util/cucumber-html-formatter/Manifest
  93. +27
    -0
      dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1.ebuild
  94. +1
    -0
      dev-util/cucumber-rails/Manifest
  95. +51
    -0
      dev-util/cucumber-rails/cucumber-rails-2.4.0.ebuild
  96. +1
    -1
      dev-util/meson/meson-0.58.1.ebuild
  97. BIN
      dev-vcs/Manifest.gz
  98. +1
    -1
      dev-vcs/tig/tig-2.5.4-r1.ebuild
  99. +1
    -1
      dev-vcs/tig/tig-9999.ebuild
  100. BIN
      eclass/Manifest.gz

BIN
Manifest.files.gz View File


BIN
acct-user/Manifest.gz View File


+ 0
- 0
acct-user/grok_exporter/Manifest View File


+ 12
- 0
acct-user/grok_exporter/grok_exporter-0.ebuild View File

@@ -0,0 +1,12 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7
inherit acct-user

DESCRIPTION="A user for app-metrics/grok_exporter"

ACCT_USER_ID=104
ACCT_USER_GROUPS=( grok_exporter )

acct-user_add_deps

+ 8
- 0
acct-user/grok_exporter/metadata.xml View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
</pkgmetadata>

BIN
app-admin/Manifest.gz View File


+ 1
- 1
app-admin/sudo/sudo-1.9.7_p1-r1.ebuild View File

@@ -22,7 +22,7 @@ else
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
fi
fi



+ 1
- 1
app-admin/sudo/sudo-9999.ebuild View File

@@ -22,7 +22,7 @@ else
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
fi
fi



BIN
app-backup/Manifest.gz View File


+ 1
- 1
app-backup/borgmatic/borgmatic-1.5.15.ebuild View File

@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
KEYWORDS="amd64 ~arm ~arm64 ~riscv"

# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
RESTRICT="test"


BIN
app-editors/Manifest.gz View File


+ 0
- 1
app-editors/gummi/Manifest View File

@@ -1,2 +1 @@
DIST gummi-0.8.1.tar.gz 580887 BLAKE2B ce06df4e85e2dfd510e39aeab785d1289335802fd24fa0b25eb9a0b920849d7ab2b89d62509e91ddb41c8f4c601544f3da8819f69ff3e38fc59dbde0aa3e789d SHA512 dccef28f6ceb2743a5a44c5224cce7326e9bb9e6f1baccb51c23d801ce595914d1b960fe11d230dcad5f041d80fe57b46c0e5aa9c6abd881dd2e32db373d329a
DIST gummi-0.8.2.tar.gz 595733 BLAKE2B 9c7366df2b8fe40f7876f065a1156eb4992048b3eaec5dde332c50ccb98ef2a5d8d2cbe73ebb56eb3736bbce49f3168f165db82f562ee7265ce0859952801a2c SHA512 3882f1e2779b94348cc0cc243c3968a78165c16de41029f9fcb8ba2fa942d329c43f5ecc8ba8327590e14343556ca472a51d1e824ce0985a415ab92aa2cbbc42

+ 0
- 46
app-editors/gummi/gummi-0.8.1.ebuild View File

@@ -1,46 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

inherit xdg-utils

DESCRIPTION="Simple LaTeX editor for GTK+ users"
HOMEPAGE="https://github.com/alexandervdm/gummi"
SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.gz"

LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
IUSE=""

RDEPEND="
app-text/gtkspell:3
app-text/poppler[cairo]
dev-libs/glib:2
dev-texlive/texlive-latex
dev-texlive/texlive-latexextra
x11-libs/gtk+:3
x11-libs/gtksourceview:3.0
x11-libs/pango
"
DEPEND="
${RDEPEND}
"
BDEPEND="
dev-util/intltool
sys-devel/gettext
virtual/pkgconfig
"

pkg_postinst() {
xdg_desktop_database_update

elog "Gummi supports spell-checking through gtkspell. Support for"
elog "additional languages can be added by installing myspell-**-"
elog "packages for your language of choice."
}

pkg_postrm() {
xdg_desktop_database_update
}

BIN
app-emulation/Manifest.gz View File


+ 1
- 1
app-emulation/docker-compose/docker-compose-1.29.2.ebuild View File

@@ -15,7 +15,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.g

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
KEYWORDS="amd64 ~arm64"
IUSE="test"
RESTRICT="!test? ( test )"



app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild → app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild View File

@@ -25,7 +25,7 @@ SLOT="0"
# Steam's Proton.

RDEPEND="
media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
media-libs/mesa[d3d9,X(+),${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
"

app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8.ebuild → app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild View File

@@ -25,7 +25,7 @@ SLOT="0"
# Steam's Proton.

RDEPEND="
media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
media-libs/mesa[d3d9,X(+),${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
"

+ 1
- 1
app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild View File

@@ -25,7 +25,7 @@ SLOT="0"
# Steam's Proton.

RDEPEND="
media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
media-libs/mesa[d3d9,X(+),${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
"


+ 2
- 2
app-emulation/wine-staging/Manifest View File

@@ -2,8 +2,8 @@ DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c809562
DIST wine-6.10.tar.xz 24562432 BLAKE2B aeb4efc6fcbdbbbfa71a99112224c77e1da10468e47d49de87ecf06556008e83d6e3d8655fa4439293820663910897d512a77bb78ab771632f893b46745915af SHA512 f0e8f0bdab09c979772965d167d687e88998f3fd6537a592e201a2dc9097552e03b1c413516cc8c82665a8bf17580777f48bd1ed9033641f04e7ef7f0b29cc60
DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812699f3d804bd3a7d939d099c88c4b19cf8d8e0bbe2463298abe398528c132443350f3d5eba0d23e7a3a2889c SHA512 d041ad99b6311f99df6ef40a64bc393acdc77ad4bf5f28111ebb88c133c3d338aff18f129fb30ae38cca24bf579834d4e6c7d252d5391f35b1ee81a91cc70c21
DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
DIST wine-6.9.tar.xz 24526724 BLAKE2B 9e39bbc84380f7f40a9f41e1dbd1728ae8833eab4fe977eaf9386a92b9f089cf63147e35093b084d3a61e5c7209b405caea9cee2a4bebb294b77c65fc3551d66 SHA512 e9dc4da8cd6553db4227f09b5734513939d7e361449f52472a1f51ae569377a2931a0ab6f402aef751587ff1fa50f10f222b4479aba44f862db320931eeff363
DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee
DIST wine-staging-6.10.tar.gz 9673740 BLAKE2B 3ec1dcc96dcf583f061408b7bdf4adf14fddf6bf0dcefbb9a060a63de7ea87c3df0a5a76c14e01b248c9b21c1ed25379867f9e4d392b251f56deb93a78b2752a SHA512 9ba4fb7451f675fd9ad3e872adada708e9e7e8875f69567d9f2bef2cc8024667112538a385769eac2fd4b3c157266488458e76a1abc92d0a76109ca032103bcf
DIST wine-staging-6.11.tar.gz 9672754 BLAKE2B a2d77fcfe198f9c474bb754b02c3e279faec73a30678b899aeaab53cba38b74bf43724d5b1f3d46dfa7a502b0ce637d5908dea09b386009acb937d1033445d99 SHA512 b9b6f206d7a37699887a9bd65c30b9d2fc333b507461dbd532fe17db881db1e79ef5620ce2421cdde8548411924fabba0f98123342f30c8d93a019b3a2125303
DIST wine-staging-6.12.1.tar.gz 9658943 BLAKE2B 9ea46ef75f2fd42790da35631893d63471980794238862fab23f06433ecb6adbdd204de49b61f33e7600020d9b3156889709bcd58810f2f332ee890cbb17bd03 SHA512 d92f4e8e3cc81e9ede21135f35679d1b2de07bf75f4fd3878551cae74cdf5165c62573fd9e143458535565e21e8888f7f61cc413fdcef24f8958ac2de366a10a
DIST wine-staging-6.9.tar.gz 9687986 BLAKE2B 72cf53616a619638fdc91d7501c8fcc2bb9c102a1a445a9c58dd23fbb5bccc27fcf2f9635ec65b23d93839514d8aa9ede29d84d6737e49776a1d99b716295ea4 SHA512 09732ce6fe5e5460ef5f30ab3dd5581c94b27e1d2c228bc395b1defd32fc5e908ab32eb2a56e489b154e1d0f638ad792c80a64d82d90a33c943102b379bef937
DIST wine-staging-6.13.tar.gz 9658122 BLAKE2B cce777895de69df8c659f010e432ee1d1f1e13c79d5453f4460e63e2572aaa7a9c92786170707c5616a8d182138822c0c6e27897706f919daf5597f6b595e478 SHA512 83a40b5a344db334541d94d58d287a1b8ff616114051129db20ac6b0365004a8753ec8d77a16da54ac26400eaa3e2d147d50a5ac8e17203898eb61cb06ff1f0c

app-emulation/wine-staging/wine-staging-6.9.ebuild → app-emulation/wine-staging/wine-staging-6.13.ebuild View File

@@ -134,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:6.1.1 )
mono? ( app-emulation/wine-mono:6.2.0 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -172,6 +172,7 @@ PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
"${FILESDIR}/wine-staging-6.12-winegcc-equals-args.patch" #800809
)
PATCHES_BIN=()

@@ -528,10 +529,9 @@ multilib_src_configure() {
$(use_with vaapi va)
)

local PKG_CONFIG AR RANLIB
local PKG_CONFIG
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
# set AR and RANLIB to make QA scripts happy; #483342
tc-export PKG_CONFIG AR RANLIB
tc-export PKG_CONFIG

if use amd64; then
if [[ ${ABI} == amd64 ]]; then

+ 1
- 1
app-emulation/wine-vanilla/Manifest View File

@@ -4,4 +4,4 @@ DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb4421
DIST wine-6.10.tar.xz 24562432 BLAKE2B aeb4efc6fcbdbbbfa71a99112224c77e1da10468e47d49de87ecf06556008e83d6e3d8655fa4439293820663910897d512a77bb78ab771632f893b46745915af SHA512 f0e8f0bdab09c979772965d167d687e88998f3fd6537a592e201a2dc9097552e03b1c413516cc8c82665a8bf17580777f48bd1ed9033641f04e7ef7f0b29cc60
DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812699f3d804bd3a7d939d099c88c4b19cf8d8e0bbe2463298abe398528c132443350f3d5eba0d23e7a3a2889c SHA512 d041ad99b6311f99df6ef40a64bc393acdc77ad4bf5f28111ebb88c133c3d338aff18f129fb30ae38cca24bf579834d4e6c7d252d5391f35b1ee81a91cc70c21
DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
DIST wine-6.9.tar.xz 24526724 BLAKE2B 9e39bbc84380f7f40a9f41e1dbd1728ae8833eab4fe977eaf9386a92b9f089cf63147e35093b084d3a61e5c7209b405caea9cee2a4bebb294b77c65fc3551d66 SHA512 e9dc4da8cd6553db4227f09b5734513939d7e361449f52472a1f51ae569377a2931a0ab6f402aef751587ff1fa50f10f222b4479aba44f862db320931eeff363
DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee

app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild → app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild View File

@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:6.1.1 )
mono? ( app-emulation/wine-mono:6.2.0 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -144,6 +144,7 @@ PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
"${FILESDIR}/wine-vanilla-6.12-winegcc-equals-args.patch" #800809
)
PATCHES_BIN=()


BIN
app-forensics/Manifest.gz View File


+ 1
- 0
app-forensics/aflplusplus/Manifest View File

@@ -1,2 +1,3 @@
DIST aflplusplus-3.12c.tar.gz 2065569 BLAKE2B ff7a87eb02f7731b5ce8e1a3016239c6fd1cd1bfeb0b9c0fb69f72bdbf079e7700cdb32abe64f64853e5ff82f1c0ecd86d2cadb892e7c40be6bb2a7b089f7387 SHA512 a814d61298b60d99388289e742dbedf2ed1ab454a5e1ea20d48bb2f18b36c01553ab1f097a06f733439d67e804d48cb823a82ff249c404fb0b83a281564f3040
DIST aflplusplus-3.13c.tar.gz 2128787 BLAKE2B 40fa65654468dc1de7f6e1b63d2266915a40d145b7cb91b8b95488bc975804f70887bc1c3718fbd12c76872a0126f3bcc36134eb55ef729060b5efcf93dad424 SHA512 916a714deaf67969c9ac6e90bd2d8015a1e5188c8a8122f4d5d64ce4b841822de65458e469a47d4244358fab5e31ef4e52b8ec1432dcbd60d29aedf15e4c36fe
DIST aflplusplus-3.14c.tar.gz 2162934 BLAKE2B 0830b320cea65b9bdd048a08a388c7145164f6b7f4dc140a2f4268a3aa22dc608a771169c830e2196e7a0d543e6f3da49f39736f3b2514c559b986ce929d43c4 SHA512 318607cff40b5f2fc94938747e2ac6b8f400767138eb39edf4daf320afbdab417d0d97a80a1c9db8bb557ad4b7b62f887ae6e692c376f5d5673a493bd23bb811

+ 1
- 1
app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild View File

@@ -14,7 +14,7 @@ S="${WORKDIR}/AFLplusplus-${PV}"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
KEYWORDS="amd64 ~arm64"
IUSE="test"

REQUIRED_USE="${PYTHON_REQUIRED_USE}"


+ 99
- 0
app-forensics/aflplusplus/aflplusplus-3.14c-r1.ebuild View File

@@ -0,0 +1,99 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

PYTHON_COMPAT=( python3_{8,9,10} )
LLVM_MAX_SLOT=13
inherit toolchain-funcs llvm optfeature python-single-r1

DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/AFLplusplus-${PV}"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
IUSE="test"

REQUIRED_USE="${PYTHON_REQUIRED_USE}"

# Tests involve heavy use of LD_PRELOAD in some cases
# This isn't compatible with sandbox
RESTRICT="test"

# It turns out we need Clang too
RDEPEND="
${PYTHON_DEPS}
>=sys-devel/llvm-10:=
|| (
sys-devel/clang:10
sys-devel/clang:11
sys-devel/clang:12
sys-devel/clang:13
)
!app-forensics/afl
"
DEPEND="
${RDEPEND}
test? ( dev-util/cmocka )
"

QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"

PATCHES=(
"${FILESDIR}/${PN}-3.0c-LDFLAGS.patch"
"${FILESDIR}/${PN}-3.13c-CFLAGS.patch"
)

llvm_check_deps() {
has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
has_version -b "sys-devel/llvm:${LLVM_SLOT}"
}

pkg_setup() {
llvm_pkg_setup
python-single-r1_pkg_setup
}

src_prepare() {
default

sed -i -e 's/-O3 -fno-unroll-loops//' GNUmakefile || die
}

src_compile() {
emake \
CC="$(tc-getCC)" \
CXX="$(tc-getCXX)" \
CFLAGS_FLTO="" \
PREFIX="${EPREFIX}/usr" \
HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
MAN_PATH="${EPREFIX}/usr/share/man/man8"
}

src_test() {
emake \
CC="$(tc-getCC)" \
CXX="$(tc-getCXX)"
}

src_install() {
emake \
CC="$(tc-getCC)" \
CXX="$(tc-getCXX)" \
DESTDIR="${D}" \
PREFIX="${EPREFIX}/usr" \
HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
MAN_PATH="${EPREFIX}/usr/share/man/man8" \
install
}

pkg_postinst() {
# TODO: Any others?
optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
}

BIN
app-misc/Manifest.gz View File


+ 1
- 1
app-misc/rpick/rpick-0.8.4.ebuild View File

@@ -121,7 +121,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
# use cargo-license for a more accurate license picture
LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
KEYWORDS="amd64 ~ppc64 x86"

# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
QA_FLAGS_IGNORED="usr/bin/rpick"


+ 2
- 2
app-misc/uptimed/uptimed-0.4.2.ebuild View File

@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
IUSE="static-libs"

RDEPEND="


+ 2
- 2
app-misc/uptimed/uptimed-0.4.3.ebuild View File

@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="static-libs"

RDEPEND="


BIN
app-office/Manifest.gz View File


app-office/calligra/calligra-3.2.1-r2.ebuild → app-office/calligra/calligra-3.2.1-r3.ebuild View File

@@ -91,7 +91,7 @@ COMMON_DEPEND="
media-libs/lcms:2
)
okular? ( kde-apps/okular:5 )
openexr? ( media-libs/openexr )
openexr? ( <media-libs/openexr-3.0.0:0= )
pdf? ( app-text/poppler:=[qt5] )
phonon? ( >=media-libs/phonon-4.11.0 )
spacenav? ( dev-libs/libspnav )

+ 1
- 1
app-office/texmacs/Manifest View File

@@ -1 +1 @@
DIST TeXmacs-1.99.11-src.tar.gz 32798336 BLAKE2B 352e333b51fbf27589377f638dda4f4fa09ca6aee6d0016a103ef3b4ba71b766930b7202f6fc3d060f72e4ccbbf311f438975317844587461880f99c7dff596d SHA512 3f3481834baeeee93afc2c2de1666297b8c02d7dc5223b00ee93120e175503c91bdcc3d9ff4d8df498033064b2e67b12ffd47af9e8b95ad5eee12b47ec076855
DIST TeXmacs-2.1-src.tar.gz 35851289 BLAKE2B e29cf78d4c0f8b9d8bf89fd448775979efceaecd409c407bf66622cfa0e0aa166fe9a0abc146a282d71d989cdf03b21a8e17545a93196b868190ecb5fff3e993 SHA512 9e33bfb0a74ca6f6947cfa632adc162776083ae5e5ab46bc85fc8dac5e531457a2f888da5e552d6da39db16e543849a7b86f0fc6918b62e911d35ff725e47a2b

+ 0
- 19
app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch View File

@@ -1,19 +0,0 @@
Remove new/delete declarations, which cause problems with recent GCC versions:
* /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4/new:135:41: error: declaration of ‘void operator delete [](void*) throw ()’ has a different exception specifier

See also: https://bugs.gentoo.org/show_bug.cgi?id=590002

--- TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp
+++ TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp
@@ -384,11 +384,6 @@
void operator delete (register void* ptr) throw();
void* operator new[] (register size_t s) throw(std::bad_alloc);
void operator delete[] (register void* ptr) throw();
-#else
-void* operator new (register size_t s);
-void operator delete (register void* ptr);
-void* operator new[] (register size_t s);
-void operator delete[] (register void* ptr);
#endif
#endif // not defined NO_FAST_ALLOC

+ 0
- 23
app-office/texmacs/files/texmacs-1.99.2-desktop.patch View File

@@ -1,23 +0,0 @@
TeXmacs/misc/mime/texmacs.desktop | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/TeXmacs/misc/mime/texmacs.desktop b/TeXmacs/misc/mime/texmacs.desktop
index 493103c..cfd66b3 100644
--- a/TeXmacs/misc/mime/texmacs.desktop
+++ b/TeXmacs/misc/mime/texmacs.desktop
@@ -1,14 +1,9 @@
[Desktop Entry]
Name=GNU TeXmacs
Comment=A structured wysiwyg scientific text editor
-BinaryPattern=texmacs
-Protocols=
MimeType=text/x-texmacs;text/plain;text/x-tex;
Exec=texmacs %f
Icon=TeXmacs
-TerminalOptions=
-Path=
Type=Application
-Terminal=0
-MapNotify=false
+Terminal=false
Categories=Education;Science;Math;

+ 0
- 21
app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch View File

@@ -1,21 +0,0 @@
C compiler compiles this code for bot int-based and size_t-based
guile. C++ compiler does not (and is what used by texmacs).

https://bugs.gentoo.org/652054
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37e9e87..5de2711 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -274,11 +274,11 @@ SET(CMAKE_REQUIRED_FLAGS "-Werror ${Guile_CFLAGS}")
SET(CMAKE_REQUIRED_INCLUDES ${Guile_INCLUDE_DIRS})
SET(CMAKE_REQUIRED_LIBRARIES ${Guile_LIBRARIES})
MESSAGE(STATUS "Checking the size_t of guile strings")
-CHECK_C_SOURCE_COMPILES( "#include <guile/gh.h>
+CHECK_CXX_SOURCE_COMPILES( "#include <guile/gh.h>
#include <libguile.h>
void print_string (SCM s) {
int len_r;
char* r= gh_scm2newstr (s, &len_r); } int main() { return 0; }
" _guile_str_size_test)

+ 0
- 15
app-office/texmacs/files/texmacs-1.99.6-math_util.patch View File

@@ -1,15 +0,0 @@
diff -r -U2 TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp
--- TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp 2017-12-22 03:27:43.000000000 +0700
+++ TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp 2017-12-22 16:44:35.052378917 +0700
@@ -24,11 +24,4 @@
inline int sign (double x) { return x>0?1:x<0?-1:0; }
inline bool fnull (double x, double approx) { return norm(x) <= approx; }
-#ifndef __SUNPRO_CC
-inline double pow (double x, int n) {
- double r= 1.0;
- while (n > 0) { r *= x; n--; }
- return r; }
-#endif
-
#endif // defined MATH_UTIL_H

+ 0
- 295
app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch View File

@@ -1,295 +0,0 @@
diff -Naruw TeXmacs-1.99.9-src.orig/CMakeLists.txt TeXmacs-1.99.9-src/CMakeLists.txt
--- TeXmacs-1.99.9-src.orig/CMakeLists.txt 2019-02-01 04:33:32.000000000 -0500
+++ TeXmacs-1.99.9-src/CMakeLists.txt 2019-06-02 17:13:47.980498170 -0400
@@ -274,7 +274,6 @@
elseif(Guile_VERSION_STRING VERSION_LESS 3.0)
set(CONFIG_GUILE_SERIAL "D")
set(GUILE_D 1)
- set(SCM_SIZET size_t)
else(Guile_VERSION_STRING VERSION_LESS 1.6)
message(ERROR "Not Guile serial A,B,C or D???")
endif(Guile_VERSION_STRING VERSION_LESS 1.6)
@@ -286,7 +285,7 @@
MESSAGE(STATUS "Checking the size_t of guile strings")
-CHECK_C_SOURCE_COMPILES( "#include <guile/gh.h>
+CHECK_CXX_SOURCE_COMPILES( "#include <guile/gh.h>
#include <libguile.h>
void print_string (SCM s) {
int len_r;
diff -Naruw TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.orig TeXmacs-1.99.9-src/src/CMakeLists.txt.orig
--- TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.orig 1969-12-31 19:00:00.000000000 -0500
+++ TeXmacs-1.99.9-src/src/CMakeLists.txt.orig 2019-06-02 17:12:44.654011478 -0400
@@ -0,0 +1,32 @@
+
+add_library(texmacs_body STATIC ${TeXmacs_All_SRCS})
+
+add_executable (${TeXmacs_binary_name}
+ ./Texmacs/Texmacs/texmacs.cpp
+)
+
+target_link_libraries (${TeXmacs_binary_name}
+ texmacs_body
+ ${TeXmacs_Libraries}
+)
+
+if (APPLE)
+ set(MACOSX_BUNDLE_DISPLAY_NAME TeXmacs)
+ set_target_properties (${TeXmacs_binary_name}
+ PROPERTIES
+ MACOSX_BUNDLE TRUE
+ MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in
+ DEBUG_OUTPUT_NAME ${TeXmacs_binary_name}${EXE_DEBUG_EXTENSION}
+ RELEASE_OUTPUT_NAME ${TeXmacs_binary_name}
+ RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
+ )
+else (APPLE)
+ set_target_properties (${TeXmacs_binary_name}
+ PROPERTIES
+ DEBUG_OUTPUT_NAME ${TeXmacs_binary_name}${EXE_DEBUG_EXTENSION}
+ RELEASE_OUTPUT_NAME ${TeXmacs_binary_name}
+ RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
+ )
+ install (TARGETS ${TeXmacs_binary_name} DESTINATION lib/texmacs/TeXmacs/bin)
+endif (APPLE)
+
diff -Naruw TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.rej TeXmacs-1.99.9-src/src/CMakeLists.txt.rej
--- TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.rej 1969-12-31 19:00:00.000000000 -0500
+++ TeXmacs-1.99.9-src/src/CMakeLists.txt.rej 2019-06-02 17:12:44.654011478 -0400
@@ -0,0 +1,19 @@
+--- CMakeLists.txt (revision 11761)
++++ CMakeLists.txt (working copy)
+@@ -274,7 +274,6 @@
+ elseif (Guile_VERSION_STRING VERSION_LESS 3.0)
+ set (CONFIG_GUILE_SERIAL "D")
+ set (GUILE_D 1)
+- set (SCM_SIZET size_t)
+ else (Guile_VERSION_STRING VERSION_LESS 1.6)
+ message (ERROR "Not Guile serial A,B,C or D???")
+ endif (Guile_VERSION_STRING VERSION_LESS 1.6)
+@@ -286,7 +285,7 @@
+
+ message (STATUS "Checking the size_t of guile strings")
+
+-check_c_source_compiles ("
++check_cxx_source_compiles ("
+ #include <guile/gh.h>
+ #include <libguile.h>
+ void print_string (SCM s) {
diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.cpp TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.cpp
--- TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.cpp 2018-03-23 08:44:53.000000000 -0400
+++ TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.cpp 2019-06-02 17:13:10.420604916 -0400
@@ -85,19 +85,34 @@
#ifndef DEBUG_ON
static SCM
TeXmacs_lazy_eval_file (char *file) {
+#if (defined(GUILE_A) || defined(GUILE_B))
return scm_internal_lazy_catch (SCM_BOOL_T,
(scm_t_catch_body) scm_c_primitive_load, file,
(scm_t_catch_handler) TeXmacs_lazy_catcher, file);
+#else
+ return scm_c_with_throw_handler (SCM_BOOL_T,
+ (scm_t_catch_body) scm_c_primitive_load, file,
+ (scm_t_catch_handler) TeXmacs_lazy_catcher,
+ file, 0);
+#endif
}
#endif
static SCM
TeXmacs_eval_file (char *file) {
#ifndef DEBUG_ON
+#if (defined(GUILE_A) || defined(GUILE_B))
return scm_internal_catch (SCM_BOOL_T,
(scm_t_catch_body) TeXmacs_lazy_eval_file, file,
(scm_t_catch_handler) TeXmacs_catcher, file);
#else
+ return scm_c_catch (SCM_BOOL_T,
+ (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
+ (scm_t_catch_handler) TeXmacs_catcher, file, NULL, NULL);
+
+#endif
+
+#else
return scm_c_primitive_load (file);
#endif
}
@@ -121,19 +136,33 @@
#ifndef DEBUG_ON
static SCM
TeXmacs_lazy_eval_string (char *s) {
+#if (defined(GUILE_A) || defined(GUILE_B))
return scm_internal_lazy_catch (SCM_BOOL_T,
(scm_t_catch_body) scm_c_eval_string, s,
(scm_t_catch_handler) TeXmacs_lazy_catcher, s);
+#else
+ return scm_c_with_throw_handler (SCM_BOOL_T,
+ (scm_t_catch_body) scm_c_eval_string, s,
+ (scm_t_catch_handler) TeXmacs_lazy_catcher,
+ s, 0);
+#endif
}
#endif
static SCM
TeXmacs_eval_string (char *s) {
#ifndef DEBUG_ON
+#if (defined(GUILE_A) || defined(GUILE_B))
return scm_internal_catch (SCM_BOOL_T,
(scm_t_catch_body) TeXmacs_lazy_eval_string, s,
(scm_t_catch_handler) TeXmacs_catcher, s);
#else
+ return scm_c_catch (SCM_BOOL_T,
+ (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
+ (scm_t_catch_handler) TeXmacs_catcher, s, NULL, NULL);
+
+#endif
+#else
return scm_c_eval_string(s);
#endif
}
@@ -180,19 +209,35 @@
#ifndef DEBUG_ON
static SCM
TeXmacs_lazy_call_scm (arg_list* args) {
+#if (defined(GUILE_A) || defined(GUILE_B))
return scm_internal_lazy_catch (SCM_BOOL_T,
(scm_t_catch_body) TeXmacs_call, (void*) args,
- (scm_t_catch_handler) TeXmacs_lazy_catcher, (void*) args);
+ (scm_t_catch_handler) TeXmacs_lazy_catcher,
+ (void*) args);
+#else
+ return scm_c_with_throw_handler (SCM_BOOL_T,
+ (scm_t_catch_body) TeXmacs_call, (void*) args,
+ (scm_t_catch_handler) TeXmacs_lazy_catcher,
+ (void*) args, 0);
+
+#endif
}
#endif
static SCM
TeXmacs_call_scm (arg_list *args) {
#ifndef DEBUG_ON
+#if (defined(GUILE_A) || defined(GUILE_B))
return scm_internal_catch (SCM_BOOL_T,
(scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
(scm_t_catch_handler) TeXmacs_catcher, (void*) args);
#else
+ return scm_c_catch (SCM_BOOL_T,
+ (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
+ (scm_t_catch_handler) TeXmacs_catcher, (void*) args,
+ NULL, NULL);
+#endif
+#else
return TeXmacs_call(args);
#endif
}
@@ -443,7 +488,11 @@
return SCM_BOOL_F;
}
+#ifdef GUILE_A
static scm_sizet
+#else
+static size_t
+#endif
free_blackbox (SCM blackbox_smob) {
blackbox *ptr = (blackbox *) SCM_CDR (blackbox_smob);
#ifdef DEBUG_ON
diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.hpp TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.hpp
--- TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.hpp 2018-06-28 04:13:37.000000000 -0400
+++ TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.hpp 2019-06-02 17:13:22.220571381 -0400
@@ -83,8 +83,8 @@
#define scm_is_double scm_is_real
#define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,(scm_t_subr)r)
#define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
-#define scm_long2scm scm_long2num
-#define scm_scm2long(x) scm_num2long(x,SCM_ARG1,"scm2long")
+#define scm_long2scm scm_from_long
+#define scm_scm2long(x) scm_to_long(x,SCM_ARG1,"scm2long")
#define scm_double2scm scm_from_double
#define scm_scm2double scm_to_double
#define scm_str2scm scm_from_locale_stringn
@@ -103,8 +103,8 @@
#define scm_is_double scm_is_real
#define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,r)
#define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
-#define scm_long2scm scm_long2num
-#define scm_scm2long(x) scm_num2long(x,SCM_ARG1,"scm2long")
+#define scm_long2scm scm_from_long
+#define scm_scm2long(x) scm_to_long(x,SCM_ARG1,"scm2long")
#define scm_double2scm scm_from_double
#define scm_scm2double scm_to_double
#define scm_str2scm scm_from_locale_stringn
diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Tiny/tinyscheme_tm.cpp TeXmacs-1.99.9-src/src/Scheme/Tiny/tinyscheme_tm.cpp
--- TeXmacs-1.99.9-src.orig/src/Scheme/Tiny/tinyscheme_tm.cpp 2017-09-28 09:44:11.000000000 -0400
+++ TeXmacs-1.99.9-src/src/Scheme/Tiny/tinyscheme_tm.cpp 2019-06-02 17:13:27.543889585 -0400
@@ -139,22 +139,6 @@
/******************************************************************************
* Evaluation of files
******************************************************************************/
-#if 0
-static scm
-TeXmacs_lazy_eval_file (char *file) {
-
- return scm_internal_lazy_catch (scm_BOOL_T,
- (scm_t_catch_body) scm_c_primitive_load, file,
- (scm_t_catch_handler) TeXmacs_lazy_catcher, file);
-}
-
-static scm
-TeXmacs_eval_file (char *file) {
- return scm_internal_catch (scm_BOOL_T,
- (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
- (scm_t_catch_handler) TeXmacs_catcher, file);
-}
-#endif
scm
eval_scheme_file (string file) {
//static int cumul= 0;
@@ -172,21 +156,6 @@
/******************************************************************************
* Evaluation of strings
******************************************************************************/
-#if 0
-static scm
-TeXmacs_lazy_eval_string (char *s) {
- return scm_internal_lazy_catch (scm_BOOL_T,
- (scm_t_catch_body) scm_c_eval_string, s,
- (scm_t_catch_handler) TeXmacs_lazy_catcher, s);
-}
-
-static scm
-TeXmacs_eval_string (char *s) {
- return scm_internal_catch (scm_BOOL_T,
- (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
- (scm_t_catch_handler) TeXmacs_catcher, s);
-}
-#endif
scm
eval_scheme (string s) {
// cout << "Eval] " << s << "\n";
@@ -214,21 +183,7 @@
}
}
}
-#if 0
-static scm
-TeXmacs_lazy_call_scm (arg_list* args) {
- return scm_internal_lazy_catch (scm_BOOL_T,
- (scm_t_catch_body) TeXmacs_call, (void*) args,
- (scm_t_catch_handler) TeXmacs_lazy_catcher, (void*) args);
-}
-static scm
-TeXmacs_call_scm (arg_list *args) {
- return scm_internal_catch (scm_BOOL_T,
- (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
- (scm_t_catch_handler) TeXmacs_catcher, (void*) args);
-}
-#endif
scm
call_scheme (scm fun) {
scm a[]= { fun }; arg_list args= { 0, a };

app-office/texmacs/texmacs-1.99.11.ebuild → app-office/texmacs/texmacs-2.1.ebuild View File

@@ -1,15 +1,15 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6
EAPI=7

inherit cmake-utils xdg-utils
inherit cmake xdg-utils

MY_P=${P/tex/TeX}-src

DESCRIPTION="Wysiwyg text processor with high-quality maths"
HOMEPAGE="http://www.texmacs.org/"
SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
SRC_URI="http://www.texmacs.org/Download/ftp/tmftp/source/${MY_P}.tar.gz"

LICENSE="GPL-3"
SLOT="0"
@@ -33,30 +33,17 @@ RDEPEND="
spell? ( app-text/aspell )
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
DEPEND="${RDEPEND}"
BDEPEND="x11-base/xorg-proto"

S="${WORKDIR}/${MY_P}"

PATCHES=(
"${FILESDIR}"/${PN}-1.99.2-desktop.patch

# remove new/delete declarations, bug 590002
"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch

"${FILESDIR}"/${PN}-1.99.6-math_util.patch

# fix build failure on 32-bit systems, bug #652054
# "${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch
#"${FILESDIR}"/${PN}-1.99.9-guile-remove-deprecated.patch
)

src_configure() {
local mycmakeargs=(
-DUSE_SQLITE3=$(usex sqlite 1 0)
-DDEBUG_ASSERT=$(usex debug 1 0)
)
cmake-utils_src_configure
cmake_src_configure
}

pkg_postinst() {

BIN
app-shells/Manifest.gz View File


+ 1
- 1
app-shells/bash-completion/bash-completion-2.11.ebuild View File

@@ -15,7 +15,7 @@ SRC_URI="

LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
IUSE="+eselect test"
RESTRICT="!test? ( test )"



+ 2
- 2
app-shells/fzy/fzy-1.0-r1.ebuild View File

@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
else
SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
KEYWORDS="amd64 arm arm64 ppc64 x86"
KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
fi

DESCRIPTION="Fuzzy text selector (interactive grep) for console"


+ 2
- 2
app-shells/fzy/fzy-9999.ebuild View File

@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
else
SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
KEYWORDS="amd64 ~arm ~arm64 x86"
KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
fi

DESCRIPTION="Fuzzy text selector (interactive grep) for console"


+ 1
- 1
app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild View File

@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"

src_install() {
emake DESTDIR="${D}" install \


BIN
dev-db/Manifest.gz View File


+ 3
- 0
dev-db/redis/Manifest View File

@@ -1,3 +1,6 @@
DIST redis-5.0.12.tar.gz 1995069 BLAKE2B 03bb5956fb1206ecfa7f621b22b3101d1ebad62c40ce52157fb802ecfa5c32ca493ff03a1cf909a1b0f1acdac83b3a939ab2042fbf092fea983cabe35d00f4c3 SHA512 f0ab161762006926064ba2176ea63bb2fa416fa386b44ca55a8edad9169627fcd1c4bd9c699fec585aefc68506deb0796f6a89844c21e74d2bdb19ca1638bbe7
DIST redis-5.0.13.tar.gz 1995566 BLAKE2B 1020b26162d212f980fd07bfe1879120306c7e796cde7e48dfcc1c3aa555a0a25299c17ad65515cc54be3c354bff58cefe67bba5dfc26f6b24d56a46debfa267 SHA512 9784193a53b459a2e4937e8f0d18652a0677d29746e359e5f8ffddeea4cea305f10c8eeae9007e49c0ba9ebedb9b603aced61592ba3302e5b64be78020b3b4bf
DIST redis-6.0.14.tar.gz 2277029 BLAKE2B 1eeeae5243ca380e354dfe5c8ad5b869669dc94b9570c8151033f89a23025bf027267eea00549f411e019b3c79ffa5d2e29eacff660e9f4b614953b023824c04 SHA512 a1de2131420bc11f831ff48607be2cf4a7775702fcc4fc777e09ebdc36277f1b468b22a1d35758338c0b44f9b3ae7b119139a79eb2419d40acbbf49d8c4a7e77
DIST redis-6.0.15.tar.gz 2282471 BLAKE2B b7f37a76d2a16e0f84f51a737e2c23ebc27750ece790cf800a0f70bfd481db01d82dc68511f80e5935dc73d70f02716a4f9005d4d177ecf3f2a0c5290ecd41ff SHA512 e7ba123798a11e1c68dd6d3ebb0586bed4f2bb33755871f1577f7e0229f826b468c2130c31bcc85a64ce7ff54e280df0a7c60e0882f3ed2a11d43e7819fe8b9e
DIST redis-6.2.4.tar.gz 2457940 BLAKE2B 3e89e404a624db6f739fdab72b8b7f7f92b6e96b01e33c63b6f5fa2f80fc72d8b8eaca4ecb7c57cdaf127956ba1a580ec851012b57426ebe7bb4cba890e1dcae SHA512 22db5b64de20a4823fd219b559c05f329e37fc86ce32099c64655dc50e60228706c99bffeae8d7080d8689910879318ec6621388bde23bf1486aefb881f33cb0
DIST redis-6.2.5.tar.gz 2465302 BLAKE2B 51cc672ab432bb87560151521289d04e8fefb8e4df820f58a9b742131a0f1960c0019dec42a601bad827ec2a172375b88b6cf32a19aef42964e18f5a7a911c40 SHA512 8c54451032cbb627ec2827251556cba2010e56544baca7ea117b5afd2c2add484acbedd3baf21bdb8fd10672602cf52294a4e26b135c1406d7a723c048275e3a

+ 160
- 0
dev-db/redis/redis-5.0.13.ebuild View File

@@ -0,0 +1,160 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

inherit autotools flag-o-matic systemd toolchain-funcs tmpfiles

DESCRIPTION="A persistent caching system, key-value and data structures database"
HOMEPAGE="https://redis.io"
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"

LICENSE="BSD"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+jemalloc tcmalloc luajit test"
RESTRICT="!test? ( test )"
SLOT="0"

# Redis does NOT build with Lua 5.2 or newer at this time.
COMMON_DEPEND="
luajit? ( dev-lang/luajit:2 )
!luajit? ( dev-lang/lua:5.1 )
tcmalloc? ( dev-util/google-perftools )
jemalloc? ( >=dev-libs/jemalloc-5.1:= )"

RDEPEND="
${COMMON_DEPEND}
acct-group/redis
acct-user/redis"

BDEPEND="
${COMMON_DEPEND}
virtual/pkgconfig"

# Tcl is only needed in the CHOST test env
DEPEND="
${COMMON_DEPEND}
test? ( dev-lang/tcl:0= )"

REQUIRED_USE="?? ( tcmalloc jemalloc )"

PATCHES=(
"${FILESDIR}"/${PN}-3.2.3-config.patch
"${FILESDIR}"/${PN}-5.0-shared.patch
"${FILESDIR}"/${PN}-5.0-sharedlua.patch
"${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch
"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
)

src_prepare() {
default

# don't call ar directly
sed -e '/^STLIB_MAKE_CMD/s/ar/$(AR)/g' \
-i deps/hiredis/Makefile || die

# Copy lua modules into build dir
cp deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c src/ || die
cp deps/lua/src/{fpconv,strbuf}.h src/ || die
# Append cflag for lua_cjson
# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
append-cflags "-DENABLE_CJSON_GLOBAL"

# now we will rewrite present Makefiles
local makefiles="" MKF
for MKF in $(find -name 'Makefile' | cut -b 3-); do
mv "${MKF}" "${MKF}.in"
sed -i -e 's:$(CC):@CC@:g' \
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-e 's: $(DEBUG)::g' \
-e 's:$(OBJARCH)::g' \
-e 's:ARCH:TARCH:g' \
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
"${MKF}.in" \
|| die "Sed failed for ${MKF}"
makefiles+=" ${MKF}"
done
# autodetection of compiler and settings; generates the modified Makefiles
cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die

# Use the correct pkgconfig name for Lua
if false && has_version 'dev-lang/lua:5.3'; then
# Lua5.3 gives:
#lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
LUAPKGCONFIG=lua5.3
elif false && has_version 'dev-lang/lua:5.2'; then
# Lua5.2 fails with:
# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
# Because lua_open because lua_newstate in 5.2
LUAPKGCONFIG=lua5.2
elif has_version 'dev-lang/lua:5.1'; then
LUAPKGCONFIG=lua5.1
else
LUAPKGCONFIG=lua
fi
# The upstream configure script handles luajit specially, and is not
# effected by these changes.
einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}"
sed -i \
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
configure.ac || die "Sed failed for configure.ac"
eautoreconf
}

src_configure() {
econf $(use_with luajit)

# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
# also, don't define ANSI/c99 for lua twice
sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
}

src_compile() {
local myconf=""

if use tcmalloc; then
myconf="${myconf} USE_TCMALLOC=yes"
elif use jemalloc; then
myconf="${myconf} JEMALLOC_SHARED=yes"
else
myconf="${myconf} MALLOC=yes"
fi

tc-export AR CC RANLIB
emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
}

src_install() {
insinto /etc/
doins redis.conf sentinel.conf
use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
fperms 0644 /etc/{redis,sentinel}.conf

newconfd "${FILESDIR}/redis.confd-r1" redis
newinitd "${FILESDIR}/redis.initd-5" redis

systemd_newunit "${FILESDIR}/redis.service-3" redis.service
newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf

newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel

insinto /etc/logrotate.d/
newins "${FILESDIR}/${PN}.logrotate" ${PN}

dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md

dobin src/redis-cli
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
fperms 0750 /usr/sbin/redis-benchmark
dosym redis-server /usr/sbin/redis-sentinel

if use prefix; then
diropts -m0750
else
diropts -m0750 -o redis -g redis
fi
keepdir /var/{log,lib}/redis
}

+ 187
- 0
dev-db/redis/redis-6.0.15.ebuild View File

@@ -0,0 +1,187 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# Redis does NOT build with Lua 5.2 or newer at this time:
# - 5.3 and 5.4 give:
# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
# - 5.2 fails with:
# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
# because lua_open became lua_newstate in 5.2
LUA_COMPAT=( lua5-1 luajit )

inherit autotools flag-o-matic lua-single systemd toolchain-funcs tmpfiles

DESCRIPTION="A persistent caching system, key-value and data structures database"
HOMEPAGE="https://redis.io"
SRC_URI="https://download.redis.io/releases/${P}.tar.gz"

LICENSE="BSD"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+jemalloc ssl systemd tcmalloc test"
RESTRICT="!test? ( test )"
SLOT="0"

COMMON_DEPEND="
${LUA_DEPS}
jemalloc? ( >=dev-libs/jemalloc-5.1:= )
ssl? ( dev-libs/openssl:0= )
systemd? ( sys-apps/systemd:= )
tcmalloc? ( dev-util/google-perftools )
"

RDEPEND="
${COMMON_DEPEND}
acct-group/redis
acct-user/redis
"

BDEPEND="
${COMMON_DEPEND}
virtual/pkgconfig
"

# Tcl is only needed in the CHOST test env
DEPEND="
${COMMON_DEPEND}
test? (
dev-lang/tcl:0=
ssl? ( dev-tcltk/tls )
)"

REQUIRED_USE="?? ( jemalloc tcmalloc )
${LUA_REQUIRED_USE}"

PATCHES=(
"${FILESDIR}"/${PN}-3.2.3-config.patch
"${FILESDIR}"/${PN}-5.0-shared.patch
"${FILESDIR}"/${PN}-6.0.12-sharedlua.patch
"${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch
"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
)

src_prepare() {
default

# unstable on jemalloc
> tests/unit/memefficiency.tcl || die

# Copy lua modules into build dir
cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
# Append cflag for lua_cjson
# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
append-cflags "-DENABLE_CJSON_GLOBAL"

# now we will rewrite present Makefiles
local makefiles="" MKF
for MKF in $(find -name 'Makefile' | cut -b 3-); do
mv "${MKF}" "${MKF}.in"
sed -i -e 's:$(CC):@CC@:g' \
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-e 's: $(DEBUG)::g' \
-e 's:$(OBJARCH)::g' \
-e 's:ARCH:TARCH:g' \
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
"${MKF}.in" \
|| die "Sed failed for ${MKF}"
makefiles+=" ${MKF}"
done
# autodetection of compiler and settings; generates the modified Makefiles
cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die

# Use the correct pkgconfig name for Lua.
# The upstream configure script handles luajit specially, and is not
# effected by these changes.
sed -i \
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
configure.ac || die "Sed failed for configure.ac"
eautoreconf
}

src_configure() {
econf $(use_with lua_single_target_luajit luajit)

# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
# also, don't define ANSI/c99 for lua twice
sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
}

src_compile() {
local myconf=""

if use jemalloc; then
myconf+="MALLOC=jemalloc"
elif use tcmalloc; then
myconf+="MALLOC=tcmalloc"
else
myconf+="MALLOC=libc"
fi

if use ssl; then
myconf+=" BUILD_TLS=yes"
fi

export USE_SYSTEMD=$(usex systemd)

tc-export AR CC RANLIB
emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
}

src_test() {
# Known to fail with FEATURES=usersandbox
if has usersandbox ${FEATURES}; then
ewarn "You are emerging ${P} with 'usersandbox' enabled." \
"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
fi

if use ssl; then
./utils/gen-test-certs.sh
./runtest --tls
else
./runtest
fi
}

src_install() {
insinto /etc/redis
doins redis.conf sentinel.conf
use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
fperms 0750 /etc/redis
fperms 0644 /etc/redis/{redis,sentinel}.conf

newconfd "${FILESDIR}/redis.confd-r2" redis
newinitd "${FILESDIR}/redis.initd-6" redis

systemd_newunit "${FILESDIR}/redis.service-4" redis.service
newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf

newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel

insinto /etc/logrotate.d/
newins "${FILESDIR}/${PN}.logrotate" ${PN}

dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md

dobin src/redis-cli
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
fperms 0750 /usr/sbin/redis-benchmark
dosym redis-server /usr/sbin/redis-sentinel

if use prefix; then
diropts -m0750
else
diropts -m0750 -o redis -g redis
fi
keepdir /var/{log,lib}/redis
}

pkg_postinst() {
ewarn "The default redis configuration file location changed to:"
ewarn " /etc/redis/{redis,sentinel}.conf"
ewarn "Please apply your changes to the new configuration files."
}

+ 187
- 0
dev-db/redis/redis-6.2.5.ebuild View File

@@ -0,0 +1,187 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# Redis does NOT build with Lua 5.2 or newer at this time:
# - 5.3 and 5.4 give:
# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
# - 5.2 fails with:
# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
# because lua_open became lua_newstate in 5.2
LUA_COMPAT=( lua5-1 luajit )

inherit autotools flag-o-matic lua-single systemd toolchain-funcs tmpfiles

DESCRIPTION="A persistent caching system, key-value and data structures database"
HOMEPAGE="https://redis.io"
SRC_URI="https://download.redis.io/releases/${P}.tar.gz"

LICENSE="BSD"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+jemalloc ssl systemd tcmalloc test"
RESTRICT="!test? ( test )"
SLOT="0"

COMMON_DEPEND="
${LUA_DEPS}
jemalloc? ( >=dev-libs/jemalloc-5.1:= )
ssl? ( dev-libs/openssl:0= )
systemd? ( sys-apps/systemd:= )
tcmalloc? ( dev-util/google-perftools )
"

RDEPEND="
${COMMON_DEPEND}
acct-group/redis
acct-user/redis
"

BDEPEND="
${COMMON_DEPEND}
virtual/pkgconfig
"

# Tcl is only needed in the CHOST test env
DEPEND="
${COMMON_DEPEND}
test? (
dev-lang/tcl:0=
ssl? ( dev-tcltk/tls )
)"

REQUIRED_USE="?? ( jemalloc tcmalloc )
${LUA_REQUIRED_USE}"

PATCHES=(
"${FILESDIR}"/${PN}-6.2.1-config.patch
"${FILESDIR}"/${PN}-5.0-shared.patch
"${FILESDIR}"/${PN}-6.2.1-sharedlua.patch
"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
)

src_prepare() {
default

# unstable on jemalloc
> tests/unit/memefficiency.tcl || die

# Copy lua modules into build dir
cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
# Append cflag for lua_cjson
# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
append-cflags "-DENABLE_CJSON_GLOBAL"

# now we will rewrite present Makefiles
local makefiles="" MKF
for MKF in $(find -name 'Makefile' | cut -b 3-); do
mv "${MKF}" "${MKF}.in"
sed -i -e 's:$(CC):@CC@:g' \
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-e 's: $(DEBUG)::g' \
-e 's:$(OBJARCH)::g' \
-e 's:ARCH:TARCH:g' \
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
"${MKF}.in" \
|| die "Sed failed for ${MKF}"
makefiles+=" ${MKF}"
done
# autodetection of compiler and settings; generates the modified Makefiles
cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die

# Use the correct pkgconfig name for Lua.
# The upstream configure script handles luajit specially, and is not
# effected by these changes.
sed -i \
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
configure.ac || die "Sed failed for configure.ac"
eautoreconf
}

src_configure() {
econf $(use_with lua_single_target_luajit luajit)

# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
# also, don't define ANSI/c99 for lua twice
sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
}

src_compile() {
local myconf=""

if use jemalloc; then
myconf+="MALLOC=jemalloc"
elif use tcmalloc; then
myconf+="MALLOC=tcmalloc"
else
myconf+="MALLOC=libc"
fi

if use ssl; then
myconf+=" BUILD_TLS=yes"
fi

export USE_SYSTEMD=$(usex systemd)

tc-export AR CC RANLIB
emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
}

src_test() {
# Known to fail with FEATURES=usersandbox
if has usersandbox ${FEATURES}; then
ewarn "You are emerging ${P} with 'usersandbox' enabled." \
"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
fi

if use ssl; then
./utils/gen-test-certs.sh
./runtest --tls
else
./runtest
fi
}

src_install() {
insinto /etc/redis
doins redis.conf sentinel.conf
use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
fperms 0750 /etc/redis
fperms 0644 /etc/redis/{redis,sentinel}.conf

newconfd "${FILESDIR}/redis.confd-r2" redis
newinitd "${FILESDIR}/redis.initd-6" redis

systemd_newunit "${FILESDIR}/redis.service-4" redis.service
newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf

newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel

insinto /etc/logrotate.d/
newins "${FILESDIR}/${PN}.logrotate" ${PN}

dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md

dobin src/redis-cli
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
fperms 0750 /usr/sbin/redis-benchmark
dosym redis-server /usr/sbin/redis-sentinel

if use prefix; then
diropts -m0750
else
diropts -m0750 -o redis -g redis
fi
keepdir /var/{log,lib}/redis
}

pkg_postinst() {
ewarn "The default redis configuration file location changed to:"
ewarn " /etc/redis/{redis,sentinel}.conf"
ewarn "Please apply your changes to the new configuration files."
}

BIN
dev-lang/Manifest.gz View File


+ 2
- 0
dev-lang/cfortran/Manifest View File

@@ -1,2 +1,4 @@
DIST cfortran_20110621-1.debian.tar.xz 13352 BLAKE2B 0039dd4b5973e5cd13a136c51e8719ffa8e104db0d716cbd247fe440643dfce5308767d182abbcbafbd1de791e8cb4384c479660fe8b592477968d40c54078e8 SHA512 51387a17e4f69e5f5e53e188b5397a08d578aba42fdc446d4901e59be32bb0e5f07d871daa809e9de6051b4d9213b4312e25f70970db9173e4f33a0e66b4b44b
DIST cfortran_20110621.orig.tar.gz 129061 BLAKE2B 16c0cae1675923c1f6f13fe5a2a65ff86a2a80e4b3c3956c04cbc2df562dad8426b90c8a3a34919c28a7bee29f7430ffe8b415e28a484421aa8f58430456b934 SHA512 59b4285bb5392916880503bdd1cead5602944ebbf615d3c40bb7232770d6a74d3138a0b2abbab4fed9ea9bd2a56b2d3097d9609833c07d773dc43b8be0a3258a
DIST cfortran_4.4-14.diff.gz 23084 BLAKE2B 8e760b3697869c12e94925c4781318fbe7640f0563a2464bf5d9f51a4afcb4bf9c281bab189542f2342d6dbc6f5524b4a48d9f844459d190e9182a96ebefbf9b SHA512 1e0b267efc17c2ba30ca1108d59ef87d1a401e6b88bea2c7045458f8cfad6ec9a05f6bf4a08c1d6cb314c790a4969a1f0fdf0c7b6abc28bae544928aad5b0218
DIST cfortran_4.4.orig.tar.gz 120119 BLAKE2B df4e0650e2718ed0c2009fb1b85330266308b0b584fcdc85e08cad0913bf063ab38824724b43a005a63a6e6bd5152b35115a68659487a992b96d0d38792e6d0a SHA512 969d0db566ecd7ed7945cac7f8ceea1cbd94ab427734ba83882acf97022c83b1417e32515d847fee89144137f58f7041cf5164fc397f3d7526f3aa958f8b038c

+ 57
- 0
dev-lang/cfortran/cfortran-20110621.ebuild View File

@@ -0,0 +1,57 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

FORTRAN_NEEDED=test

inherit autotools fortran-2

DEB_PR="1"

DESCRIPTION="Header file allowing to call Fortran routines from C and C++"
HOMEPAGE="https://www-zeus.desy.de/~burow/cfortran/"
SRC_URI="
mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz
mirror://debian/pool/main/c/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.xz"

SLOT="0"
LICENSE="LGPL-2"
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"

RESTRICT="!test? ( test )"

DOCS=( cfortran.doc )

src_prepare() {
eapply "${WORKDIR}"/debian/patches/*.patch
default
eautoreconf

if use examples; then
# The examples are also used as tests and it's tricky to clean up
# afterwards, just save a clean copy (sans Makefiles, as they only
# cover the test phase) before the tests are run.
cp -ar eg eg_src || die "Failed to preserve a clean copy of examples"
rm -f eg_src/Makefile{,.am,.in}
fi
}

src_install() {
default

# For compatibility with older versions
dodir /usr/include/cfortran
dosym -r /usr/include/cfortran.h /usr/include/cfortran/cfortran.h

docinto debian
dodoc "${WORKDIR}"/debian/{NEWS,changelog,copyright}
docinto html
dodoc cfortran.html index.htm

if use examples; then
docinto examples
dodoc -r cfortest.c cfortex.f eg_src/*
fi
}

+ 2
- 1
dev-lang/go/go-1.16.6.ebuild View File

@@ -21,7 +21,7 @@ case ${PV} in
case ${PV} in
*_beta*|*_rc*) ;;
*)
KEYWORDS="-* amd64 arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
KEYWORDS="-* amd64 arm arm64 ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
;;
esac
esac
@@ -63,6 +63,7 @@ go_arch() {
x86) echo 386;;
x64-*) echo amd64;;
ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
riscv) echo riscv64 ;;
s390) echo s390x ;;
*) echo "${portage_arch}";;
esac


+ 4
- 0
dev-lang/maude/Manifest View File

@@ -1,2 +1,6 @@
DIST Full-Maude-3.1.zip 161211 BLAKE2B 2aad284e1f2bc6e701154bd72c6eff1433fd040fd0f97252485c954b5e1fb33f71555c5587ceec2f3f3e44c8d7b760c9f62f40f53577f19c4cc51a2159b01674 SHA512 fb0c0e30d3df830b60ece67c2fc5655c5e3f1377a269ce8acfc45fdfa0d42f3fe3fbf4038758b35598d82e7f47af5f24507b3ebe2a30dcb8722e61e6315248c3
DIST Maude-2.7.tar.gz 1663708 BLAKE2B 5fd87cbd7ef2f86f4a7095334fd996109c72caaed44a894138803b76220325400920654924cb8645ed846b4d997dd2cf827d489ef7c4eef73ee22cb4e6e5a5dc SHA512 eb5225a7ec75df5f79d1e9c0d78c33427c0cf07bea83dae9e559d6d4cfc85fb03985596daf0c9c8794b34859510482f93b855254c1a3c650ee7520a3530a2070
DIST Maude-3.1-manual-book-examples.zip 267629 BLAKE2B cb4c5d067b8b6787a575ec1e00bfdbfb846c787f4c48b207d9609db57c968acdd97f431110103aa16d764e8e1b59f0eb1f66df53d3b78562cf430f3a57b5541c SHA512 69980145a41afd49e4a2c77a596d7fa91ed8e5acca049d799cdb0f265d95f1c3215776edb3a3ae94d84309c94735c7a187f681c2a2d3aa2fe0a7563634d34efa
DIST Maude-3.1-manual.pdf 2916925 BLAKE2B da7f0d5bef8bff2e1f1afecd4bc7d062992d6a27e5437f488a50d35bce144a3ddb029bed3271d9696a36e6ab13b5a4f815e1a257a81005eb65d2927526630a29 SHA512 8b4b9bff8d266fad7b42b37c79cd72e4b642483298631f35a52b8bd669f318654382232b0da62485dc198789215fd5a364b583320789754eac9159d4cc2689ca
DIST Maude-3.1.tar.gz 2335693 BLAKE2B 3bc9744d95448e4dfc2f818944ab66dad84b026ad18a4324b25eafc82f6c2c637b81fa73d03da61ee7f3753bb3c650e1838b56c502c85c91e2507a697bcfbbc0 SHA512 34dba3c3b7eed48d0c82c6d5e4dade08bd11dc57b436f04e94842000809b9b6086f8077bccbfac0313e4a4f361b03c3ef3d56e6df6242ae42427dd674566a3bc
DIST maude-2.6-extras.tar.xz 3157004 BLAKE2B d735366071194eb7fd22c11628672aba38cc8c7f4460e4ec8806e27c2e1416e1a2a5fa93efd01c305bf36e0ce799578688c5ac87b5459e979323df6f60305902 SHA512 0533f0f226057d2668052f360245f296d36129ec242ff0bfa91fada9db5bc347d276d3468c86fbac92f019f3a2f152c7cb4e58a7f1265c1fb5a8b1b496fac5cd

+ 22
- 0
dev-lang/maude/files/maude-3.1-prll.patch View File

@@ -0,0 +1,22 @@
--- a/src/Mixfix/Makefile.am
+++ b/src/Mixfix/Makefile.am
@@ -82,7 +82,7 @@
EXTRA_libmixfix_a_SOURCES = \
compiler.cc
-BUILT_SOURCES = surface.yy surface.cc surface.h lexer.cc tokenizer.cc
+BUILT_SOURCES = surface.cc lexer.cc tokenizer.cc
CLEANFILES = surface.yy surface.cc surface.h lexer.cc tokenizer.cc
surface.yy: \
@@ -97,7 +97,9 @@
$(srcdir)/bottom.yy \
> surface.yy
-surface.cc surface.h: surface.yy
+surface.h: surface.yy
+
+surface.cc: surface.h
$(BISON) -dv surface.yy -o surface.c
mv surface.c surface.cc

+ 65
- 0
dev-lang/maude/maude-3.1.ebuild View File

@@ -0,0 +1,65 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

inherit autotools

MY_P="${P^}"

DESCRIPTION="High-level specification language for equational and logic programming"
HOMEPAGE="https://maude.cs.uiuc.edu/"
SRC_URI="
https://maude.cs.illinois.edu/w/images/d/d3/${MY_P}.tar.gz
https://maude.cs.illinois.edu/w/images/0/0a/Full-${MY_P}.zip
doc? ( https://maude.cs.illinois.edu/w/images/6/62/${MY_P}-manual.pdf )
examples? ( https://maude.cs.illinois.edu/w/images/4/4f/${MY_P}-manual-book-examples.zip )"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"

RDEPEND="
dev-libs/gmp:0=[cxx(+)]
dev-libs/libsigsegv
dev-libs/libtecla
sci-libs/buddy"
DEPEND="${RDEPEND}"
BDEPEND="app-arch/unzip
sys-devel/bison
sys-devel/flex"

PATCHES=(
"${FILESDIR}/${PN}-2.6-search-datadir.patch"
"${FILESDIR}/${PN}-2.7-AR.patch"
"${FILESDIR}/${PN}-3.1-prll.patch"
)

src_prepare() {
default
eautoreconf
}

src_configure() {
local myconf=(
--datadir="${EPREFIX}/usr/share/${PN}"
--without-yices2
)
econf "${myconf[@]}"
}

src_install() {
default

# install full maude
insinto /usr/share/${PN}
newins "${WORKDIR}"/full-maude${PV//./}.maude full-maude.maude

# install docs and examples
use doc && dodoc "${DISTDIR}"/${MY_P}-manual.pdf
if use examples; then
dodoc -r "${WORKDIR}"/examples
docompress -x /usr/share/doc/${PF}/examples
fi
}

+ 1
- 1
dev-lang/ruby/ruby-2.7.4.ebuild View File

@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"

LICENSE="|| ( Ruby-BSD BSD-2 )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"

RDEPEND="


+ 1
- 1
dev-lang/ruby/ruby-3.0.2.ebuild View File

@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"

LICENSE="|| ( Ruby-BSD BSD-2 )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"

RDEPEND="


BIN
dev-libs/Manifest.gz View File


+ 1
- 1
dev-libs/imath/Manifest View File

@@ -1 +1 @@
DIST imath-3.0.1.tar.gz 527715 BLAKE2B 45d8f6524fd2505bdb3318f571c44228c9baf6df869d194d4b90a9c045f1dbb8f905253aeaf6b6a9254e4b0c0c19d753b7e4ae068732f0367fc936d4a111520d SHA512 40cdae81d624636b3dd7eb456e6e205e5b7adf7aed17f6e9168374f8830f1b5755dcd32ac790f94e768513d06ab96d94a2bc57ec80a079e4ac94a3857e5e3988
DIST imath-3.0.5.tar.gz 528503 BLAKE2B c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6 SHA512 df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2

+ 161
- 0
dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch View File

@@ -0,0 +1,161 @@
From: Bernd Waibel <waebbl-gentoo@posteo.net>
Date: Tue, 20 Jul 2021 19:18:20 +0200
Subject: [PATCH] changes needed for proper slotting

Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---
config/CMakeLists.txt | 6 +++---
config/Imath.pc.in | 4 ++--
config/LibraryDefine.cmake | 8 ++++----
src/python/PyImath.pc.in | 4 ++--
src/python/PyImathNumpy/CMakeLists.txt | 2 +-
src/python/config/CMakeLists.txt | 4 ++--
src/python/config/ModuleDefine.cmake | 6 +++---
7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index d51c25b..63cc98d 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
configure_package_config_file(ImathConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
)
write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
)
install(EXPORT ${PROJECT_NAME}
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
FILE ${PROJECT_NAME}Targets.cmake
NAMESPACE ${PROJECT_NAME}::
EXPORT_LINK_INTERFACE_LIBRARIES
diff --git a/config/Imath.pc.in b/config/Imath.pc.in
index df11cfd..6eb4f40 100644
--- a/config/Imath.pc.in
+++ b/config/Imath.pc.in
@@ -5,7 +5,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
includedir=@includedir@
libsuffix=@LIB_SUFFIX_DASH@
Name: Imath
@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
Requires:
Conflicts:
Libs: -L${libdir} -lImath${libsuffix}
-Cflags: -I${includedir} -I${includedir}/Imath
+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake
index e9ff904..00e5176 100644
--- a/config/LibraryDefine.cmake
+++ b/config/LibraryDefine.cmake
@@ -74,8 +74,8 @@ function(IMATH_DEFINE_LIBRARY libname)
install(TARGETS ${libname}
EXPORT ${PROJECT_NAME}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
PUBLIC_HEADER
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
@@ -88,8 +88,8 @@ function(IMATH_DEFINE_LIBRARY libname)
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
else()
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+ install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
endif()
set(verlibname)
set(baselibname)
diff --git a/src/python/PyImath.pc.in b/src/python/PyImath.pc.in
index 8e8de6f..1902660 100644
--- a/src/python/PyImath.pc.in
+++ b/src/python/PyImath.pc.in
@@ -5,7 +5,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
includedir=@includedir@
libsuffix=@LIB_SUFFIX_DASH@
@@ -13,4 +13,4 @@ Name: PyImath
Description: Python bindings for the Imath libraries
Version: @IMATH_VERSION@
Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix}
-Cflags: -I${includedir} -I${includedir}/Imath
+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
diff --git a/src/python/PyImathNumpy/CMakeLists.txt b/src/python/PyImathNumpy/CMakeLists.txt
index 7b4f6b2..8f7fd70 100644
--- a/src/python/PyImathNumpy/CMakeLists.txt
+++ b/src/python/PyImathNumpy/CMakeLists.txt
@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND
LIBRARY_OUTPUT_NAME "imathnumpy"
DEBUG_POSTFIX ""
)
- install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
+ install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
endif()
diff --git a/src/python/config/CMakeLists.txt b/src/python/config/CMakeLists.txt
index 4f796df..15d7026 100644
--- a/src/python/config/CMakeLists.txt
+++ b/src/python/config/CMakeLists.txt
@@ -41,10 +41,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
COMPATIBILITY SameMajorVersion
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
)
install(EXPORT ${PROJECT_NAME}
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
FILE ${PROJECT_NAME}Config.cmake
NAMESPACE ${PROJECT_NAME}::
EXPORT_LINK_INTERFACE_LIBRARIES
diff --git a/src/python/config/ModuleDefine.cmake b/src/python/config/ModuleDefine.cmake
index d9a8907..ebe1a95 100644
--- a/src/python/config/ModuleDefine.cmake
+++ b/src/python/config/ModuleDefine.cmake
@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname)
install(TARGETS ${libname}
EXPORT ${PROJECT_NAME}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
)
endfunction()
@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname)
LIBRARY_OUTPUT_NAME "${modname}"
DEBUG_POSTFIX ""
)
- install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
+ install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
endif()
endif()
endfunction()
--
2.32.0


dev-libs/imath/imath-3.0.1.ebuild → dev-libs/imath/imath-3.0.5.ebuild View File

@@ -3,35 +3,31 @@

EAPI=7

PYTHON_COMPAT=( python3_{8,9} )
PYTHON_COMPAT=( python3_{8..10} )

inherit cmake python-single-r1

MY_PN=Imath
MY_PN="${PN^}"

DESCRIPTION="Imath basic math package"
HOMEPAGE="https://imath.readthedocs.io"
SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
# re-keywording needed for (according to ilmbase keywords):
# ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x64-macos ~x86-solaris
# ~arm ~arm64 ~mips ~x64-macos ~x86-solaris
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_PN}-${PV}"

LICENSE="BSD"
SLOT="0/27"
SLOT="3/28"
IUSE="doc large-stack python static-libs test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"

# libImath.so conflicts with ilmbase
RDEPEND="
!media-libs/ilmbase
sys-libs/zlib
python? (
!dev-python/pyilmbase
${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-libs/boost:=[python?,${PYTHON_USEDEP}]
dev-libs/boost:=[python,${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
')
)
@@ -43,22 +39,31 @@ BDEPEND="
python? ( ${PYTHON_DEPS} )
"

PATCHES=(
"${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch
)
DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )

S="${WORKDIR}/${MY_PN}-${PV}"

pkg_setup() {
use python && python-single-r1_pkg_setup
}

src_configure() {
local majorver=$(ver_cut 1)

local mycmakeargs=(
-DBUILD_SHARED_LIBS=$(usex !static-libs)
-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
-DIMATH_INSTALL_PKG_CONFIG=ON
-DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}"
-DIMATH_USE_CLANG_TIDY=OFF
)

if use python; then
mycmakeargs+=(
# temp. disable for finding libboost_python310, #803032
#-DBoost_NO_BOOST_CMAKE=OFF
-DPYTHON=ON
-DPython3_EXECUTABLE="${PYTHON}"
-DPython3_INCLUDE_DIR=$(python_get_includedir)
@@ -81,10 +86,10 @@ src_compile() {
}

src_install() {
use doc && HTML_DOCS=( "${S}/docs/_build/html/." )
cmake_src_install

if use doc; then
HTML_DOCS=( "${S}/docs/_build/html/." )
einstalldocs
fi
# if use python; then
# rm "${ED}"/usr/$(get_libdir)/cmake/${MY_PN}/${MY_PN}Config-gentoo.cmake || die
# fi
}

+ 1
- 1
dev-libs/keybinder/keybinder-0.3.2-r300.ebuild View File

@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}

LICENSE="MIT"
SLOT="3"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"