Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-02-08 18:03:26 +00:00
10 changed files with 185 additions and 196 deletions

View File

@@ -1,2 +1 @@
DIST vice-3.7.1.tar.gz 13444946 BLAKE2B 64ac82c118cd1e515d7677d3f60d3b19dbf19319d8505321c46c2adb92414193784a036e2f6fa0ce5f55f1e4f425f45026ce152ee866b72ad6557531faaf5797 SHA512 80f81dd4d163cc5030eee2908b274bce4f3f21a3adb6d01559f4695d58b27ebc7b7570d8896718dfe74b2f2e4983ed3f9c4919b6e81934063d344b543b081f30
DIST vice-3.8.tar.gz 13564021 BLAKE2B 709fd6eda874de542e5770a328b0c0308d04f755e3bf1fceba5147156eb894a95ce6f14e9f8848ca6992d4f958082f83a198d2176c1fe54e87027c7dfac8849c SHA512 fe644667736c32386b62af53314a95bf510c75d476eaab14b4c37693f2f57d6815126ab3db2f0cb11300c1a4a07c29b3f25210800ce97a673a0460ab59d0ebba

View File

@@ -1,189 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit multibuild toolchain-funcs xdg
DESCRIPTION="Versatile Commodore Emulator"
HOMEPAGE="https://vice-emu.sourceforge.io/"
SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="
alsa debug doc ethernet ffmpeg flac gif +gtk headless lame mpg123
ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
REQUIRED_USE="
|| ( gtk headless sdl )
gtk? ( zlib )"
# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
# (see bug #834359 for the ffmpeg upper bound)
RDEPEND="
virtual/libintl
alsa? ( media-libs/alsa-lib )
ethernet? (
net-libs/libpcap
sys-libs/libcap
)
ffmpeg? ( <media-video/ffmpeg-5:= )
flac? ( media-libs/flac:= )
gif? ( media-libs/giflib:= )
gtk? (
>=app-accessibility/at-spi2-core-2.46:2
dev-libs/glib:2
media-libs/fontconfig:1.0
media-libs/glew:0=
sys-libs/readline:=
virtual/opengl
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3[X]
x11-libs/libX11
x11-libs/pango
)
lame? ( media-sound/lame )
mpg123? ( media-sound/mpg123 )
ogg? (
media-libs/libogg
media-libs/libvorbis
)
parport? ( sys-libs/libieee1284 )
pci? ( sys-apps/pciutils )
png? ( media-libs/libpng:= )
portaudio? ( media-libs/portaudio )
pulseaudio? ( media-libs/libpulse )
sdl? (
media-libs/libsdl2[video]
media-libs/sdl2-image
sys-libs/readline:=
)
zlib? ( sys-libs/zlib:= )"
DEPEND="
${RDEPEND}
x11-base/xorg-proto"
BDEPEND="
app-arch/unzip
app-text/dos2unix
dev-embedded/xa
dev-lang/perl
sys-apps/texinfo
app-alternatives/lex
sys-devel/gettext
virtual/pkgconfig
app-alternatives/yacc
doc? ( virtual/texi2dvi )
gtk? ( x11-misc/xdg-utils )"
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_prepare() {
default
# Strip the predefined C(XX)FLAGS.
sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
MULTIBUILD_VARIANTS=(
$(usev gtk)
$(usev headless)
$(usev sdl)
)
# Debug build currently broken without copy sources.
multibuild_copy_sources
}
src_configure() {
tc-export AR
multibuild_foreach_variant run_in_build_dir multibuild_src_configure
}
multibuild_src_configure() {
# Append ".variant" to x* programs if building multiple variants.
local xform
(( ${#MULTIBUILD_VARIANTS[@]} > 1 )) &&
xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
vice-multi_enable() {
if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
echo --enable-${2}
else
echo --disable-${2}
fi
}
local econfargs=(
--program-transform-name="${xform}"
$(vice-multi_enable gtk desktop-files)
$(vice-multi_enable gtk gtk3ui)
$(vice-multi_enable headless headlessui)
$(vice-multi_enable sdl sdl2ui)
$(usex debug $(vice-multi_enable gtk debug-gtk3ui) --disable-debug-gtk3ui)
$(use_enable debug)
$(use_enable doc pdf-docs)
$(use_enable ethernet)
$(use_enable ffmpeg)
$(use_enable lame)
$(use_enable openmp)
$(use_enable parport libieee1284)
$(use_enable parport parsid)
$(use_enable portaudio)
$(use_with alsa)
$(use_with flac)
$(use_with gif)
$(use_with mpg123)
$(use_with ogg vorbis)
$(use_with oss)
$(use_with png)
$(use_with pulseaudio pulse)
$(use_with zlib)
$(usex alsa --enable-midi $(use_enable oss midi))
$(usev !pci ac_cv_header_pci_pci_h=no)
--disable-arch
--disable-sdl1ui
ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif
# $(use_with curl libcurl) # new in 3.6 but is a unused placeholder
# --enable-io-simulation # likewise
)
econf "${econfargs[@]}"
}
src_compile() {
multibuild_foreach_variant run_in_build_dir emake
}
src_install() {
# Get xdg-desktop-menu to play nicely while doing the install.
dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
XDG_UTILS_INSTALL_MODE=system \
XDG_DATA_DIRS="${ED}"/usr/share \
XDG_CONFIG_DIRS="${ED}"/etc/xdg \
multibuild_foreach_variant run_in_build_dir default
rm -f "${ED}"/usr/share/applications/*.cache || die
vice-install_extras() {
docinto html
dodoc doc/html/*.{html,css}
dodoc -r doc/html/images
insinto /usr/share/vim/vimfiles/ftdetect
doins doc/vim/ftdetect/*.vim
insinto /usr/share/vim/vimfiles/syntax
doins doc/vim/syntax/*.vim
}
multibuild_for_best_variant run_in_build_dir vice-install_extras
}

View File

@@ -157,7 +157,8 @@ multibuild_src_configure() {
}
src_compile() {
multibuild_foreach_variant run_in_build_dir emake
# bug #924116 wrt SHELL
multibuild_foreach_variant run_in_build_dir emake SHELL="${BASH}"
}
src_install() {

View File

@@ -1,2 +1,3 @@
DIST slim-5.1.1.gem 100864 BLAKE2B ea5c469702dca808bdc0555044a8d6a5a0b34e8d5b03a9c97e6e31ccb169725be6f76fc1f252d14673e92a53ac1a42caf023a3d1bacb66c4091710f8e9772c1a SHA512 935d488ad11478b28d51125ddbf7f0cb81f7791587bb69c7ead434eacf44c309958459dcff7228b6562b8972d6cb7125f3d451d21bfa2ded2f7ee1b55703d1f4
DIST slim-5.2.0.gem 101376 BLAKE2B 19039b0f6d4a789564ff00df90bee214ccdb1827349d0f95b658d06fedd593cae6abbc50cf5e5438691d15c8d660964b38217f700f2d2c726c7670104c10af0f SHA512 85fd367460296eba9d4244832b1225b41f052f05b17ec9e38cc5db6accae1a5cd551bd61290a0c6885a42970f8219d5d00c0fd229616f3369e0f5575b6df72ea
DIST slim-5.2.1.gem 101376 BLAKE2B 4c713440daa74461818be56ed263a3574b7022f17055a27219525fe79d3e80eeb5618d6e450ae1019265b514f0deb65e48d33fff9c3b593fbb2e0f3bf82db22b SHA512 bfe0f45bc928aa73604961b5e1253303c30e0c8e87935dc01f44b7014a34ed5661fb55a0dcfb21fbf355f366adb0aa476a327bca2d74f59bb6fcd7e630cc3e68

View File

@@ -0,0 +1,70 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
USE_RUBY="ruby31 ruby32"
RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_RECIPE_DOC="rake"
RUBY_FAKEGEM_TASK_DOC="yard"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
inherit ruby-fakegem
DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
HOMEPAGE="https://slim-template.github.io/"
LICENSE="MIT"
SLOT="4"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
IUSE="doc test"
ruby_add_rdepend "
!dev-ruby/slim:5
>=dev-ruby/tilt-2.1.0:*
>=dev-ruby/temple-0.10.0:0.7
"
# sass tests are currently disabled:
# https://github.com/slim-template/slim/commit/bd9d4601cd8142aa9fdbc0d87c9f9132a9a56cda
ruby_add_bdepend "
doc? (
dev-ruby/yard
dev-ruby/redcarpet
)
test? (
dev-ruby/minitest:5
dev-ruby/kramdown:2
dev-ruby/redcarpet
dev-ruby/sassc
>=dev-ruby/test-unit-3.5
)
"
all_ruby_prepare() {
sed -i -e '/bundler/I s:^:#:' Rakefile || die
# This sinatra code expects tests to be installed but we strip those.
sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
sed -i -e '/test_wip_render_with_asciidoc/,/^ end/ s:^:#:' \
-e '/test_render_with_wiki/,/^ end/ s:^:#:' \
-e '/test_render_with_creole/,/^ end/ s:^:#:' \
-e '/test_render_with_builder/,/^ end/ s:^:#:' \
-e '/test_render_with_org/,/^ end/ s:^:#:' test/core/test_embedded_engines.rb || die
# Avoid test failing due to tilt providing yet another markdown implementation
sed -i -e '/test_render_with_markdown/askip "new tilt version"' test/core/test_embedded_engines.rb || die
sed -i -e '/test_no_translation_of_embedded/askip "new tilt version"' test/translator/test_translator.rb || die
sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
}
each_ruby_prepare() {
sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
}

View File

@@ -1,3 +1,4 @@
DIST typeprof-0.21.10.tar.gz 1035767 BLAKE2B a36dd2a4cc607740294926f53364f67ce2f09fe9f5cb2a5e73f39d9f431fda1d9d7447d2c7e7f0205e25583e4ff935c52fc3a7cb50c7c9ff991d2a0ea5b3e919 SHA512 03eccb6717adfeaa6434fc2fc0e766a38e527830c828d54905fc8bce48f6994ef2c9b10af3ec77b3f5b1c0b2c4cd52336cb9618656dad3b43b991406c1854308
DIST typeprof-0.21.7.tar.gz 1036834 BLAKE2B c0a8a1ed3a0592f72489eb342cbaf132e647d11ef5f3eef003b4208e512f581aacd586cac137c9b405d59f71e1b9e2cbc9903a9c1b4791db0ad0a64485247eea SHA512 0dd149da7873ec4422a03fa31a828a8efafa5faff0c23dffde74650b71e14d472f1bb0c36d28a48e0538a761538504937ad4e0f8a711a9f5c2b52ac4128a8f37
DIST typeprof-0.21.8.tar.gz 1035592 BLAKE2B 8fe8749e802ddc6dc94212f433acbd86bf2e9ddb96a62f1591606cde9748a52aff6287bac9139de4d4e6f55e85b03b309938329b1b0f3206b822ed9f073301b5 SHA512 1c4e7ba04b3342d688976cd03e8c0181d94035284d8bb2a8b35aabad07252938d4ce4d4118128d6647bda2b36c01d4a14465859e1d79e8a3804fb7307d6d0fb9
DIST typeprof-0.21.9.tar.gz 1035626 BLAKE2B 20582ec0591ed4f375e68960e304f22515cbd28ad00bbe6001a0fc32ad19e03f41b54dff8cb03e9b1220417aa12ae2807d193d891b74b47e54130d277d1afb3a SHA512 53182db1fe2187d2ab0fda1a07d40c6767e485d15588b101384beabbdcacddaa8044587b59fc166e03d2b768c549938b0e9893557c4854b3431694d6e3f4bc45

View File

@@ -0,0 +1,32 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
USE_RUBY="ruby31 ruby32 ruby33"
RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_EXTRADOC="README.md"
RUBY_FAKEGEM_BINDIR="exe"
RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
inherit ruby-fakegem
DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
HOMEPAGE="https://github.com/ruby/typeprof"
SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
SLOT="0"
IUSE="test"
ruby_add_rdepend ">=dev-ruby/rbs-1.8.1"
all_ruby_prepare() {
# Avoid tests that download live code using git
rm -r test/typeprof/diff-lcs_test.rb || die
sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
}

View File

@@ -2,6 +2,8 @@ DIST aho-corasick-1.0.5.crate 172064 BLAKE2B bab7767070b959e8e4c054bf505b9423d7f
DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
DIST breezy-3.3.4.tar.gz 9446061 BLAKE2B 242963a42e5ca03db6b5765d73ea6888bf33dfed777a27d8d629bf70411bc43b83de09c6fc21c9f96a8ca1bf442077ea7c2f8a7fefbb1d8dd348d824d8b17f34 SHA512 7619c31acbfdf8cd8193db4a87851ac41376bff3e4a9eb130d7d940fb458a6d064a0fb089888368ddd654e4b965772dd657553cdda20a91e32ab43760b0897b4
DIST breezy-3.3.5-crates.tar.xz 3894068 BLAKE2B 4ea9de19a602d5e5040d3bd4a0196156b7185a371dbf36cfd99e069efc3ee2a9b3d4d308afbdf715132601ba5a6a2fe2863cc852236bc17f5543bd2d6b35c9a6 SHA512 af6819ada768beac65c23599638d291510a474f56fd46f1f16540f9fe8b0c509371740c38b61b0d3d4a60d5b8552fd2f2b8fc42c6cf9d1a7e39ab69614cdc8a1
DIST breezy-3.3.5.tar.gz 10393262 BLAKE2B 32563b74fb639888265b1a6af7650f73a2e11750be7d7cb62861aafae1c08998bffc666727fcd4ee31dcc741232b4aeb518ef2023bcf1d8138563724b63672f8 SHA512 daff16f4df9b2f89fd6bef335af0b30d2567c8f1e4fa9b02ba2a528f0c56daedc58c83af92297148001fb9eb177115875d02a2969b9847387058edcae0db104b
DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8

View File

@@ -0,0 +1,77 @@
# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_EXT=1
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_SINGLE_IMPL=1
PYTHON_COMPAT=( python3_{10..12} )
CRATES="
"
inherit cargo distutils-r1 optfeature
DESCRIPTION="Distributed Version Control System with a Friendly UI"
HOMEPAGE="https://www.breezy-vcs.org/ https://github.com/breezy-team/breezy"
SRC_URI="https://launchpad.net/brz/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz
${CARGO_CRATE_URIS}"
if [[ ${PKGBUMPING} != ${PVR} ]]; then
SRC_URI+="https://dev.gentoo.org/~arthurzam/distfiles/dev-vcs/${PN}/${P}-crates.tar.xz"
fi
LICENSE="GPL-2+"
# Dependent crate licenses
LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
# I've got tired of all the test failures. It definitely mostly works.
# We have ~29000 tests successfully passing from ~30000 tests.
RESTRICT="test"
RDEPEND="
$(python_gen_cond_dep '
dev-python/configobj[${PYTHON_USEDEP}]
dev-python/fastbencode[${PYTHON_USEDEP}]
dev-python/patiencediff[${PYTHON_USEDEP}]
dev-python/merge3[${PYTHON_USEDEP}]
dev-python/dulwich[${PYTHON_USEDEP}]
dev-python/urllib3[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
')
!dev-vcs/bzr
"
BDEPEND="
$(python_gen_cond_dep '
dev-python/cython[${PYTHON_USEDEP}]
dev-python/setuptools-gettext[${PYTHON_USEDEP}]
dev-python/setuptools-rust[${PYTHON_USEDEP}]
')
"
QA_FLAGS_IGNORED="
usr/lib.*/py.*/site-packages/breezy/.*.so
usr/bin/brz
"
src_prepare() {
sed -e 's@man/man1@share/&@' \
-e 's@, strip=Strip\.All@@' \
-i setup.py || die
distutils-r1_src_prepare
}
src_install() {
distutils-r1_src_install
# Symlink original bzr's bin names to new names
dosym brz /usr/bin/bzr
}
pkg_postinst() {
optfeature "access branches over sftp" "dev-python/pycryptodome dev-python/paramiko"
optfeature "PGP sign and verify commits" "app-crypt/gpgme[python]"
}

View File

@@ -226,11 +226,6 @@ net-libs/gnutls test-full
# Requires php:7.0 and ruby:2.2 being stable
>=dev-libs/Ice-3.6.3 php ruby
# Pacho Ramos <pacho@gentoo.org> (2015-05-15)
# Version compatible with current ffmpeg is not ready to be stabilized
# bug #539212
app-emulation/vice ffmpeg
# Ben de Groot <yngwin@gentoo.org>
# Mask experimental feature on stable. This also needs not yet stable mupdf.
app-text/qpdfview fitz