diff options
55 files changed, 1343 insertions, 1392 deletions
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest index c63e503a90a2..1631bf94863a 100644 --- a/app-backup/restic/Manifest +++ b/app-backup/restic/Manifest @@ -4,3 +4,6 @@ DIST restic-0.17.0-deps.tar.xz 173393552 BLAKE2B fe5b89cabd820c43d417d768ade1f0f DIST restic-0.17.0.tar.gz 24093378 BLAKE2B 9930c1b7e27b532cfefecfd5bc8f90112e75452c5fe660015b5c31493018914f4f81fc3895fa83045a099cfd600d1bc615e689ec0cda28ecb93f4b95c6a3b075 SHA512 f9b91844f8eec7b462af05bf210c489c440ef7e8d2a5109aed4c1ead5988d722c74ca84ba770270e65c683e1c973ed0d36a3a218f2170da936d84028a264938b DIST restic-0.17.1-deps.tar.xz 173603816 BLAKE2B 45745446febd9bfcd9bbb69e1687be3ec8d3487a33bf01011fa05e8155df7e20c04416754ed28fc12e9dcb6550960e672848605cf1c0b474cb8fe301ba49ab4a SHA512 932fa4ccf71fb04da0a68440e7f79ff628ea3fab3c970c11e87b8868cf7603691c73bb6083d34caa7f7e3be12a2b18b4e6c996ccd0294d15bdc76968f30fa1d6 DIST restic-0.17.1.tar.gz 24104588 BLAKE2B cdfb89f21afe31c0f7bd881e8fbdfdeef020d3cb00910533954ff29218e2ee2ff7966e60c7e44fafb756cf0f1f7707e236b522e01816385d5db1a36f42e104ff SHA512 668b41cff65a81c7458b58c622a35bbbc4f73561e78af399440050744d18d751cab3030163a4c192091f1e21755c6988b94fbb6dd2dc47c626582fea8711f574 +DIST restic-0.17.2-deps.tar.xz 173467792 BLAKE2B 211142acd818e236bdd19709a641afd072670ebed082a914cda0a1b51c49cbd0c92877afb552abeabfa0482e51f39eee399f53a8731099851cf89a0340f06ebb SHA512 958bc3dc2af328a097b925e20f1a22ae238425fed2afc9ce382c31c54152d28a00cc64dc90a88c939e17670608dcb786a972f64fa7cba40cbcc9bf1f9964b49d +DIST restic-0.17.2.tar.gz 24107857 BLAKE2B 56bc1035a9f9721f74db9645330700489dddf18a8116dec4b5c9a0fa1192e3b015a288c6f9409e840b6d783b34b777c2d0f8aa38ffc2cee38733a984b50e068e SHA512 73d6706203cd75288633f15fb440a05f5eee8b3e352f3f3ce78a53f6397a82a431f0d53bfe6559fd302314b33d98cb1290845c25b338931f8b829bf634b2fb36 +DIST restic-0.17.2.tar.gz.asc 833 BLAKE2B 4671fb794c40412e91df91c0fc80da2a6fe382e7226b2f7cdb2f70c8c95812d4ec1dd81b58067a1cb8d12adf019b94e92f419a32dd429b30f9414cf0d9ee7ac9 SHA512 8363cf66e1251fda9d2dec7832fc9717c3da249eea87af94385dc2b69bf2acd7051c9bce4577a8ea3ccfa48f38dcf2d46be31deab9a8daa6e693aa590de78bae diff --git a/app-backup/restic/restic-0.17.2.ebuild b/app-backup/restic/restic-0.17.2.ebuild new file mode 100644 index 000000000000..ca8727ad11c3 --- /dev/null +++ b/app-backup/restic/restic-0.17.2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alexanderneumann.asc +inherit go-module shell-completion verify-sig + +DESCRIPTION="A backup program that is fast, efficient and secure" +HOMEPAGE="https://restic.github.io/" +SRC_URI=" + https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz + verify-sig? ( https://github.com/restic/restic/releases/download/v${PV}/${P}.tar.gz.asc ) +" +SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +RDEPEND="sys-fs/fuse:0" +DEPEND="${RDEPEND}" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-alexanderneumann )" + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz "${DISTDIR}"/${P}.tar.gz.asc + fi + + default +} + +src_compile() { + local mygoargs=( + -tags release + -ldflags "-X main.version=${PV}" + -asmflags "-trimpath=${S}" + -gcflags "-trimpath=${S}" + ) + + ego build "${mygoargs[@]}" -o restic ./cmd/restic +} + +src_test() { + addwrite /dev/fuse + # a number of the ./cmd/... tests fail + # ego test -timeout 30m ./cmd/... ./internal/... + RESTIC_TEST_FUSE=0 ego test -timeout 30m ./internal/... +} + +src_install() { + dobin restic + + newbashcomp doc/bash-completion.sh "${PN}" + newzshcomp doc/zsh-completion.zsh _restic + newfishcomp doc/fish-completion.fish "${PN}" + + doman doc/man/* + dodoc doc/*.rst +} diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest index 38c32c84e369..d55b1c17cf89 100644 --- a/dev-db/mydumper/Manifest +++ b/dev-db/mydumper/Manifest @@ -1 +1,2 @@ DIST mydumper-0.15.2-8.tar.gz 186389 BLAKE2B 84e08fa6460a156771f598a8a0c98c79089490f9f2fe3b90fa49efd519e2270468fe86287bab03612006489a3a1d5ab2442e76cc0f4825c8df95acec30a1c4ba SHA512 f6ca5c5756944bd2704e8a25432db1fbe14ed2a1e88b549c0799c3e0c251e524523ed39797b0b2c15c9d65c0e6e5ce3d93a60a17c77090732a8f909ab24a0126 +DIST mydumper-0.16.7-5.tar.gz 192080 BLAKE2B dac0d0700ad7a68b3bffdb13f6cb674e75b868715822ef791eb00d64ce4a41335b5f54fc4a166ee527356a4f4c5311c01aabb1c8e0c91d964b4bca5b30a546c0 SHA512 ab7f06557814318352b1a511ff06f9e094dac43d3d5638977074aa8a79c3a9b83114aa15fcafcd0a39945a8c497c725b0a8221759d55aedb424eb048f10653d8 diff --git a/dev-db/mydumper/mydumper-0.16.7.5.ebuild b/dev-db/mydumper/mydumper-0.16.7.5.ebuild new file mode 100644 index 000000000000..245b0197d96c --- /dev/null +++ b/dev-db/mydumper/mydumper-0.16.7.5.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_PV="$(ver_rs 3 -)" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL" +HOMEPAGE="https://github.com/mydumper/mydumper" +SRC_URI="https://github.com/mydumper/mydumper/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-arch/zstd + dev-db/mysql-connector-c:= + dev-libs/glib:2 + dev-libs/libpcre + dev-libs/openssl:= + sys-libs/zlib:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-0.13.1-atomic.patch" #654314 + "${FILESDIR}/${PN}-0.15-Do-not-overwrite-the-user-CFLAGS.patch" +) diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest index 1cbffb5b668d..431993362e98 100644 --- a/dev-db/sqlitebrowser/Manifest +++ b/dev-db/sqlitebrowser/Manifest @@ -1 +1,2 @@ DIST sqlitebrowser-3.13.0.tar.gz 4901507 BLAKE2B 4430944fb6f02a3e33aa6d3e5720faa8e43351314a0c21803fe8bed6d2241ca92830de7be33deb18294f0cad808c96d6c913bd9ddcd64d41a34db32349d44d88 SHA512 6261043cee7bc5c525b162e0b5d1ac38d380228ffd752e086fecb49c7f50b463a993a6128547d99addb0480ba71e4f6dd3a0c1e412a692ae86b0b183b7379610 +DIST sqlitebrowser-3.13.1.tar.gz 4923092 BLAKE2B 894790cc30b802b4aab19a8e7834aef1bf68b027bcd66b63901269d6d44b706ce5ddca1ae4ca4743d14f9a8d2a5cc6005711b6ee25cef068c55e0b01c56f8b5c SHA512 7482094823293a216e4df20105d1351a23fcc706fd9e64bca58cd1c6a46dcf639a945f919613f1a9550d0a15e60a4c2827ee5eee4f89a7b11046d8eefbf375ee diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild new file mode 100644 index 000000000000..2570150a6735 --- /dev/null +++ b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="A light GUI editor for SQLite databases" +HOMEPAGE="https://sqlitebrowser.org/" + +if [[ "${PV}" = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/sqlitebrowser/sqlitebrowser.git" +else + SRC_URI="https://github.com/sqlitebrowser/sqlitebrowser/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+ MPL-2.0" +SLOT="0" +IUSE="sqlcipher test" +RESTRICT="!test? ( test )" + +DEPEND=" + app-editors/qhexedit2 + dev-db/sqlite:3 + dev-libs/qcustomplot + >=dev-qt/qtcore-5.15.9:5 + >=dev-qt/qtgui-5.15.9:5 + >=dev-qt/qtnetwork-5.15.9:5[ssl] + >=dev-qt/qtprintsupport-5.15.9:5 + >=dev-qt/qtwidgets-5.15.9:5 + >=dev-qt/qtxml-5.15.9:5 + >=x11-libs/qscintilla-2.8.10:=[qt5(+)] + sqlcipher? ( dev-db/sqlcipher ) +" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15.9:5 + test? ( >=dev-qt/qttest-5.15.9:5 ) +" + +RDEPEND="${DEPEND}" + +DOCS=( + images/ + BUILDING.md + CHANGELOG.md + README.md +) + +src_prepare() { + cmake_src_prepare + + if ! use test; then + sed -i CMakeLists.txt \ + -e "/find_package/ s/ Test//" \ + -e "/set/ s/ Qt5::Test//" \ + || die "Cannot remove Qt Test from CMake dependencies" + fi +} + +src_configure() { + local mycmakeargs=( + -DENABLE_TESTING=$(usex test) + -DFORCE_INTERNAL_QSCINTILLA=OFF + -DFORCE_INTERNAL_QCUSTOMPLOT=OFF + -DFORCE_INTERNAL_QHEXEDIT=OFF + -Dsqlcipher=$(usex sqlcipher) + ) + + # https://bugs.gentoo.org/855254 + append-flags -fno-strict-aliasing + filter-lto + + cmake_src_configure +} + +src_install() { + cmake_src_install + + [[ "${PV}" = 9999 ]] && dodoc SECURITY.md +} diff --git a/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild index 2918a95b0493..2570150a6735 100644 --- a/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild +++ b/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild @@ -8,7 +8,7 @@ inherit cmake flag-o-matic xdg DESCRIPTION="A light GUI editor for SQLite databases" HOMEPAGE="https://sqlitebrowser.org/" -if [[ "${PV}" = *9999* ]]; then +if [[ "${PV}" = 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/sqlitebrowser/sqlitebrowser.git" else @@ -24,28 +24,13 @@ RESTRICT="!test? ( test )" DEPEND=" app-editors/qhexedit2 dev-db/sqlite:3 - dev-libs/double-conversion:= - dev-libs/icu:= - dev-libs/libpcre2:= - dev-libs/openssl:= dev-libs/qcustomplot - >=dev-qt/qtconcurrent-5.15.9:5 >=dev-qt/qtcore-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtnetwork-5.15.9:5[ssl] >=dev-qt/qtprintsupport-5.15.9:5 >=dev-qt/qtwidgets-5.15.9:5 >=dev-qt/qtxml-5.15.9:5 - media-gfx/graphite2 - media-libs/freetype:2 - media-libs/harfbuzz:= - media-libs/libglvnd - media-libs/libpng:= - sys-libs/zlib:= - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb:= - x11-libs/libXdmcp >=x11-libs/qscintilla-2.8.10:=[qt5(+)] sqlcipher? ( dev-db/sqlcipher ) " @@ -62,7 +47,6 @@ DOCS=( BUILDING.md CHANGELOG.md README.md - SECURITY.md ) src_prepare() { @@ -91,3 +75,9 @@ src_configure() { cmake_src_configure } + +src_install() { + cmake_src_install + + [[ "${PV}" = 9999 ]] && dodoc SECURITY.md +} diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index a546f80f766f..114a008b700f 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -852,19 +852,107 @@ setup_multilib_osdirnames() { sed -i "${sed_args[@]}" "${S}"/gcc/config/${config} || die } +# @FUNCTION: _get_bootstrap_gcc_info +# @USAGE: [gcc_pkg|gcc_bin_base]... +# @DESCRIPTION: +# Get some information about the gcc that would be used to build this package. +# All the variables that are passed as arguments will be set to their apropriate +# values: +# +# - bootstrap_gcc_pkg = the ${CATEGORY}/${PN} that provides the build gcc +# +# - bootstrap_gcc_bin_base = the directory up to /gcc-bin but excluding the slot, of +# the aformentioned package. +_get_bootstrap_gcc_info() { + crossp() { + tc-is-cross-compiler && echo "${2}" || echo "${1}" + } + + local arg + for arg ; do + case "${arg}" in + bootstrap_gcc_pkg) + bootstrap_gcc_pkg=$(crossp sys-devel/gcc cross-${CHOST}/gcc) + ;; + bootstrap_gcc_bin_base) + bootstrap_gcc_bin_base=${BROOT}/usr/$(crossp ${CHOST} ${CBUILD}/${CHOST})/gcc-bin + ;; + *) + die "Unknown argument '${arg}' passed to ${FUNCNAME}" + esac + done +} + +# @FUNCTION: _find_bootstrap_gcc_with +# @USAGE: <use_expression> <pretty_use_name> <minimum_slot> +# @RETURN: Shell true if a matching gcc installation was found, false otherwise +# @INTERNAL +# @DESCRIPTION: +# Check installed versions of gcc that can be used as a compiler for the current +# build for one matching a certain USE expression. The order of preference is +# checking for the same SLOT we are building, then iterate downwards until (and +# including) minimum_slot, then iterate upward starting with SLOT+1. When +# cross-compiling only SLOT is checked. +# +# If a proper installation is discovered this function will set +# ${bootstrap_gcc_bin_dir} to the full path of the directory in which +# ${CHOST}-gcc and friends are found and ${bootstrap_gcc_slot} to the slot that +# was found. If nothing was found those variables will be empty. +# +# This function is provided to aid languages like ada and d that require +# bootstraping. +_find_bootstrap_gcc_with() { + local use="${1}" + local pretty_use="${2}" + local bootstrap_gcc_pkg bootstrap_gcc_bin_base + _get_bootstrap_gcc_info bootstrap_gcc_pkg bootstrap_gcc_bin_base + + local min_slot max_slot + if tc-is-cross-compiler ; then + min_slot="${SLOT}" + max_slot="${SLOT}" + else + min_slot="${3}" + max_slot=$(best_version -b "${bootstrap_gcc_pkg}") + max_slot="${max_slot#${bootstrap_gcc_pkg}-}" + max_slot=$(ver_cut 1 ${max_slot}) + fi + + local candidate result + for candidate in ${SLOT} $(seq $((${SLOT} - 1)) -1 ${min_slot}) $(seq $((${SLOT} + 1)) ${max_slot}) ; do + has_version -b "${bootstrap_gcc_pkg}:${candidate}" || continue + + ebegin "Testing ${bootstrap_gcc_pkg}:${candidate} for ${pretty_use}" + if has_version -b "${bootstrap_gcc_pkg}:${candidate}${use}" ; then + result=${candidate} + + eend 0 + break + fi + eend 1 + done + + if [[ ${result} ]] ; then + bootstrap_gcc_bin_dir="${bootstrap_gcc_bin_base}/${result}" + bootstrap_gcc_slot=${result} + return 0 + else + bootstrap_gcc_bin_dir= + bootstrap_gcc_slot= + return 1 + fi +} + # @FUNCTION: toolchain_setup_ada # @INTERNAL # @DESCRIPTION: # Determine the most suitable GNAT (Ada compiler) for bootstrapping # and setup the environment, including wrappers, for building. toolchain_setup_ada() { - local latest_gcc=$(best_version -b "sys-devel/gcc") - latest_gcc="${latest_gcc#sys-devel/gcc-}" - latest_gcc=$(ver_cut 1 ${latest_gcc}) - local ada_bootstrap local ada_candidate local ada_bootstrap_type + local ada_bootstrap_bin_dir # GNAT can usually be built using the last major version and # the current version, at least. # @@ -872,19 +960,12 @@ toolchain_setup_ada() { # 1) Match the version being built; # 2) Iterate downwards from the version being built; # 3) Iterate upwards from the version being built to the greatest version installed. - for ada_candidate in ${SLOT} $(seq $((${SLOT} - 1)) -1 10) $(seq $((${SLOT} + 1)) ${latest_gcc}) ; do - has_version -b "sys-devel/gcc:${ada_candidate}" || continue - - ebegin "Testing sys-devel/gcc:${ada_candidate} for Ada" - if has_version -b "sys-devel/gcc:${ada_candidate}[ada(-)]" ; then - ada_bootstrap=${ada_candidate} - ada_bootstrap_type=gcc - - eend 0 - break - fi - eend 1 - done + local bootstrap_gcc_slot bootstrap_gcc_bin_dir + if _find_bootstrap_gcc_with "[ada(-)]" "Ada" 10 ; then + ada_bootstrap=${bootstrap_gcc_slot} + ada_bootstrap_type=gcc + ada_bootstrap_bin_dir="${bootstrap_gcc_bin_dir}" + fi # As a penultimate resort, try dev-lang/ada-bootstrap. if ver_test ${ada_bootstrap} -gt ${PV} || [[ -z ${ada_bootstrap} ]] ; then @@ -897,6 +978,7 @@ toolchain_setup_ada() { #latest_ada_bootstrap=$(ver_cut 1 ${latest_ada_bootstrap}) ada_bootstrap="10" ada_bootstrap_type=ada-bootstrap + ada_bootstrap_bin_dir="${BROOT}/usr/lib/ada-bootstrap/bin" eend 0 else @@ -910,6 +992,7 @@ toolchain_setup_ada() { if has_version -b "dev-lang/gnat-gpl" ; then ada_bootstrap=10 ada_bootstrap_type=gcc + ada_bootstrap_bin_dir="${BROOT}/usr/${CHOST}/gcc-bin/${ada_bootstrap}" eend 0 else eend 1 @@ -974,10 +1057,10 @@ toolchain_setup_ada() { case ${ada_bootstrap_type} in ada-bootstrap) export PATH="${BROOT}/usr/lib/ada-bootstrap/bin:${PATH}" - gnat1_path=${BROOT}/usr/lib/ada-bootstrap/libexec/gcc/${CBUILD}/${ada_bootstrap}/gnat1 + gnat1_path=${BROOT}/usr/lib/ada-bootstrap/libexec/gcc/${CHOST}/${ada_bootstrap}/gnat1 ;; *) - gnat1_path=${BROOT}/usr/libexec/gcc/${CBUILD}/${ada_bootstrap}/gnat1 + gnat1_path=${BROOT}/usr/libexec/gcc/${CHOST}/${ada_bootstrap}/gnat1 ;; esac @@ -994,7 +1077,7 @@ toolchain_setup_ada() { # work for us as the stage1 compiler doesn't necessarily have Ada # support. Substitute the Ada compiler we found earlier. local adalib - adalib=$(${CBUILD}-gcc-${ada_bootstrap} -print-libgcc-file-name || die "Finding adalib dir failed") + adalib=$("${ada_bootstrap_bin_dir}"/${CHOST}-gcc -print-libgcc-file-name || die "Finding adalib dir failed") adalib="${adalib%/*}/adalib" sed -i \ -e "s:adalib=.*:adalib=${adalib}:" \ @@ -1007,7 +1090,7 @@ toolchain_setup_ada() { for tool in gnat{,bind,chop,clean,kr,link,ls,make,name,prep} ; do cat <<-EOF > "${T}"/ada-wrappers/${tool} || die #!/bin/sh - exec $(type -P ${CBUILD}-${tool}-${ada_bootstrap}) "\$@" + exec "${ada_bootstrap_bin_dir}"/${CHOST}-${tool} "\$@" EOF export "${tool^^}"="${T}"/ada-wrappers/${tool} @@ -1024,47 +1107,20 @@ toolchain_setup_ada() { # Determine the most suitable GDC (D compiler) for bootstrapping # and setup the environment for building. toolchain_setup_d() { - local gcc_pkg gcc_bin_base - if tc-is-cross-compiler ; then - gcc_pkg=cross-${CHOST}/gcc - gcc_bin_base=${BROOT}/usr/${CBUILD}/${CHOST}/gcc-bin - else - gcc_pkg=sys-devel/gcc - gcc_bin_base=${BROOT}/usr/${CHOST}/gcc-bin - fi - - local latest_gcc=$(best_version -b "${gcc_pkg}") - latest_gcc="${latest_gcc#${gcc_pkg}-}" - latest_gcc=$(ver_cut 1 ${latest_gcc}) - - local d_bootstrap - local d_candidate - # Order of preference (descending): - # 1) Match the version being built; - # 2) Iterate downwards from the version being built; - # 3) Iterate upwards from the version being built to the greatest version installed. - for d_candidate in ${SLOT} $(seq $((${SLOT} - 1)) -1 10) $(seq $((${SLOT} + 1)) ${latest_gcc}) ; do - has_version -b "${gcc_pkg}:${d_candidate}" || continue - - ebegin "Testing ${gcc_pkg}:${d_candidate} for D" - if has_version -b "${gcc_pkg}:${d_candidate}[d(-)]" ; then - d_bootstrap=${d_candidate} - - eend 0 - break - fi - eend 1 - done + local bootstrap_gcc_slot bootstrap_gcc_bin_dir + _find_bootstrap_gcc_with "[d(-)]" "D" 11 - if [[ -z ${d_bootstrap} ]] ; then + if [[ -z ${bootstrap_gcc_bin_dir} ]] ; then if tc-is-cross-compiler ; then # We can't add cross-${CHOST}/gcc[d] to BDEPEND but we can # print a useful message to the user. - eerror "No ${gcc_pkg}[d] was found installed." + local bootstrap_gcc_pkg + _get_bootstrap_gcc_info bootstrap_gcc_pkg + eerror "No ${bootstrap_gcc_pkg}[d] was found installed." eerror "When cross-compiling GDC a bootstrap GDC is required." eerror "Either disable the d USE flag or add:" eerror "" - eerror " ${gcc_pkg} d" + eerror " ${bootstrap_gcc_pkg} d" eerror "" eerror "In your package.use and re-emerge it." eerror "" @@ -1073,7 +1129,7 @@ toolchain_setup_d() { die "Did not find any appropriate GDC compiler installed" fi - export GDC=${gcc_bin_base}/${d_bootstrap}/${CHOST}-gdc + export GDC=${bootstrap_gcc_bin_dir}/${CHOST}-gdc } #---->> src_configure <<---- diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest index c7d793a45880..264976543329 100644 --- a/games-engines/exult/Manifest +++ b/games-engines/exult/Manifest @@ -1 +1 @@ -DIST exult-1.8.tar.gz 19104130 BLAKE2B 56e127d95d3a948b7c52ca3439f8a84691728817c855b46580a8baf21ad0b8f663d5f9fb2fb855d73baa1d3cc29181d001adae1a978c75a7dfa598879b559ab4 SHA512 5422f70c00a1d5ff0606cb7613b891abda430872c50b1058999085c7df08360fd55d5bdf95cbff09616cf3b11e51dce4b11c7322c3db9a8756946e5854ef0fde +DIST exult-1.10.1.tar.gz 19688644 BLAKE2B 82f8f9c590d29844cb12cf56939d6aaea65cb42a3b0e507d4e5727febbd3e5037c81064528a4cddb8e064ca4a47622c1be64c66e7bed8afe3de48d7d9a94beb9 SHA512 fc17e4d6f0fdc121f5a201508b20902d12858f227d14413b393ad8b9cfcc72a85c2cff35b502dc9e7525f7860bf663c6daca0f6680ab15e3a9f90d4db3a7ec2c diff --git a/games-engines/exult/exult-1.8.ebuild b/games-engines/exult/exult-1.10.1.ebuild index 009f8a97d9b2..009f8a97d9b2 100644 --- a/games-engines/exult/exult-1.8.ebuild +++ b/games-engines/exult/exult-1.10.1.ebuild diff --git a/games-fps/chocolate-doom/Manifest b/games-fps/chocolate-doom/Manifest index b2cd839d0fdd..395ec4e9c217 100644 --- a/games-fps/chocolate-doom/Manifest +++ b/games-fps/chocolate-doom/Manifest @@ -1,2 +1 @@ -DIST chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch 26736 BLAKE2B 3b75eaf6ea38280eb649eb0a35cf72376fc8daafda51a79bb321e1ac9311bd7d7edc6b7740b235288c32142c01fcf346045091783912739317556a78eb07751a SHA512 64512c47d404de1a85f84948bcf780257070f5b22dce6fa7dba66ba65027a15e93e39145424be327de4abd1f1f3b994fcd936e3dcdc564f1f96238b133a3a554 -DIST chocolate-doom-3.0.1.tar.gz 2245563 BLAKE2B 0c9babfbc9e52ea7822ca00c0dbf84e471bfe6d6ec94f729d3d0f72243205b060e5a3b5f1f99728da7764e81af735b45d001bb368dd2b5796666554e3c911090 SHA512 2a81905cf619ea2def7e2f9ebe65b38543d01bd83a95e535e88d04a79f2676f8ba0da64031a650bd905e1345cda1b9d28a398ad87c10c92f2d3d50f3253ec214 +DIST chocolate-doom-3.1.0.tar.gz 2256537 BLAKE2B 4e311985e1c20d2d5bf0cc6ef3e860c78a0d1e413ca398800bcdcf86f43727e48f1306e7e9c8878e3313e9ca2e7ba3d48eddd220ef5def06230caf32fe0890fb SHA512 17f65c6f4a48dd1b0aa71bdf495d1036602739f1955d64f7de46157fce912ab4e4344a0f7ad073980f50d67e34f9f5e84402e7f2142cd6364453b71c8d5c2592 diff --git a/games-fps/chocolate-doom/chocolate-doom-3.0.1-r2.ebuild b/games-fps/chocolate-doom/chocolate-doom-3.0.1-r2.ebuild deleted file mode 100644 index e45332fa7883..000000000000 --- a/games-fps/chocolate-doom/chocolate-doom-3.0.1-r2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools prefix python-any-r1 xdg - -DESCRIPTION="A Doom source port that is minimalist and historically accurate" -HOMEPAGE="https://www.chocolate-doom.org" -SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz - https://gist.githubusercontent.com/vilhelmgray/28d4713cb6387ad62ab76cfac1443355/raw/f7600d93ca45a5102969b8f89974a3c36a3563f5/${P}-overhaul-manpages-add-parameters.patch" -S="${WORKDIR}/${PN}-${P}" -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="doc libsamplerate +midi png vorbis" - -DEPEND=" - media-libs/libsdl2[video] - media-libs/sdl2-mixer[midi?,vorbis?] - media-libs/sdl2-net - libsamplerate? ( media-libs/libsamplerate ) - png? ( media-libs/libpng:= ) -" - -RDEPEND=" - ${DEPEND} -" - -# ${PYTHON_DEPS} for bash-completion and docs. -BDEPEND=" - ${PYTHON_DEPS} -" - -PATCHES=( - "${DISTDIR}/${P}-overhaul-manpages-add-parameters.patch" - "${FILESDIR}/${P}-further-manpage-substitutions-and-fixes.patch" - "${FILESDIR}/${P}-bash-completion-run-docgen-with-z-argument.patch" - "${FILESDIR}/${P}-install-AppStream-metadata-into-the-proper-location.patch" - "${FILESDIR}/${P}-Update-AppStream-XML-files-to-current-0.11-standards.patch" - "${FILESDIR}/${P}-bash-completion-Build-from-actual-shell-script-templ.patch" - "${FILESDIR}/${P}-configure-add-AM_PROG_AR-macro.patch" - "${FILESDIR}/${P}-bash-completion-always-install-into-datadir-bash-com.patch" - "${FILESDIR}/${P}-Update-to-latest-AppStream-formerly-AppData-standard.patch" - "${FILESDIR}/${P}-use-reverse-DNS-naming-for-installing-.desktop-files.patch" - "${FILESDIR}/${P}-Remove-redundant-demoextend-definition.patch" - "${FILESDIR}/${P}-Introduce-configure-options-for-bash-completion-doc-.patch" - "${FILESDIR}/${P}-Add-support-for-usr-share-doom-IWAD-search-path.patch" - "${FILESDIR}/${P}-Update-documentation-about-usr-share-doom-IWAD-locat.patch" - "${FILESDIR}/${P}-Fix-Python-check.patch" -) - -DOCS=( - "AUTHORS" - "ChangeLog" - "NEWS.md" - "NOT-BUGS.md" - "PHILOSOPHY.md" - "README.md" - "README.Music.md" - "README.Strife.md" -) - -src_prepare() { - default - - hprefixify src/d_iwad.c - - eautoreconf -} - -src_configure() { - econf \ - --enable-bash-completion \ - $(use_enable doc) \ - --disable-fonts \ - --disable-icons \ - $(use_with libsamplerate) \ - $(use_with png libpng) -} - -src_install() { - emake DESTDIR="${D}" install - - # Remove redundant documentation files - rm -r "${ED}/usr/share/doc/"* || die - - einstalldocs -} diff --git a/games-fps/chocolate-doom/chocolate-doom-3.1.0.ebuild b/games-fps/chocolate-doom/chocolate-doom-3.1.0.ebuild new file mode 100644 index 000000000000..afb39759009b --- /dev/null +++ b/games-fps/chocolate-doom/chocolate-doom-3.1.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit autotools prefix python-any-r1 xdg + +DESCRIPTION="A Doom source port that is minimalist and historically accurate" +HOMEPAGE="https://www.chocolate-doom.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" +LICENSE="BSD GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="doc libsamplerate +midi png vorbis" + +DEPEND=" + media-libs/libsdl2[video] + media-libs/sdl2-mixer[midi?,vorbis?] + media-libs/sdl2-net + libsamplerate? ( media-libs/libsamplerate ) + png? ( media-libs/libpng:= ) +" + +RDEPEND=" + ${DEPEND} +" + +# ${PYTHON_DEPS} for bash-completion and docs. +BDEPEND=" + ${PYTHON_DEPS} +" + +DOCS=( + "AUTHORS" + "ChangeLog" + "NEWS.md" + "NOT-BUGS.md" + "PHILOSOPHY.md" + "README.md" + "README.Music.md" + "README.Strife.md" +) + +src_prepare() { + default + + hprefixify src/d_iwad.c + + eautoreconf +} + +src_configure() { + econf \ + --enable-bash-completion \ + $(use_enable doc) \ + --disable-fonts \ + --disable-icons \ + $(use_with libsamplerate) \ + $(use_with png libpng) +} + +src_install() { + emake DESTDIR="${D}" install + + # Remove redundant documentation files + rm -r "${ED}/usr/share/doc/"* || die + + einstalldocs +} diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Add-support-for-usr-share-doom-IWAD-search-path.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Add-support-for-usr-share-doom-IWAD-search-path.patch deleted file mode 100644 index 719ec12a93dc..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Add-support-for-usr-share-doom-IWAD-search-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 405662edfda15bd4ba2a6e32023eeb8c5e73646f Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray <vilhelm.gray@gmail.com> -Date: Thu, 25 Jun 2020 11:13:55 -0400 -Subject: [PATCH] Add support for /usr/share/doom IWAD search path - -Some Linux distros such as Gentoo have deprecated the /usr/share/games -directory. IWADs are typically installed under the /usr/share directory -for these distros. ---- - src/d_iwad.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/d_iwad.c b/src/d_iwad.c -index 09853a64..e112e4f4 100644 ---- a/src/d_iwad.c -+++ b/src/d_iwad.c -@@ -657,6 +657,7 @@ static void AddXdgDirs(void) - // source ports is /usr/share/games/doom - we support this through the - // XDG_DATA_DIRS mechanism, through which it can be overridden. - AddIWADPath(env, "/games/doom"); -+ AddIWADPath(env, "/doom"); - - // The convention set by RBDOOM-3-BFG is to install Doom 3: BFG - // Edition into this directory, under which includes the Doom --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Fix-Python-check.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Fix-Python-check.patch deleted file mode 100644 index 8d4f169bd03e..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Fix-Python-check.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ab1a38d8e902baebc7183fb511bd58c50e2b4571 Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray <vilhelm.gray@gmail.com> -Date: Mon, 24 Aug 2020 09:03:57 -0400 -Subject: [PATCH] Fix Python check for doc, bash-completion, fonts, and icons - options - -Fixes: cfc56fa6 ("Introduce configure options for bash-completion, doc, fonts, and icons") ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9bef517a..4dbd2db7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,7 +40,7 @@ AC_ARG_ENABLE([bash-completion], - AS_HELP_STRING([--disable-bash-completion], [Disable bash-completion]) - ) - AS_IF([test "x$enable_bash_completion" != xno], [ -- AS_IF([test HAVE_PYTHON = false], [ -+ AS_IF([test "x$HAVE_PYTHON" = xfalse], [ - AC_MSG_WARN([Building bash-completion requires Python, but Python not found]) - enable_bash_completion=no - ]) -@@ -51,7 +51,7 @@ AC_ARG_ENABLE([doc], - AS_HELP_STRING([--disable-doc], [Disable documentation]) - ) - AS_IF([test "x$enable_doc" != xno], [ -- AS_IF([test HAVE_PYTHON = false], [ -+ AS_IF([test "x$HAVE_PYTHON" = xfalse], [ - AC_MSG_WARN([Building documentation requires Python, but Python not found]) - enable_doc=no - ]) -@@ -62,7 +62,7 @@ AC_ARG_ENABLE([fonts], - AS_HELP_STRING([--disable-fonts], [Disable fonts]) - ) - AS_IF([test "x$enable_fonts" != xno], [ -- AS_IF([test HAVE_PYTHON = false], [ -+ AS_IF([test "x$HAVE_PYTHON" = xfalse], [ - AC_MSG_WARN([Building fonts require Python, but Python not found]) - enable_fonts=no - ]) -@@ -73,7 +73,7 @@ AC_ARG_ENABLE([icons], - AS_HELP_STRING([--disable-icons], [Disable icons]) - ) - AS_IF([test "x$enable_icons" != xno], [ -- AS_IF([test HAVE_PYTHON = false], [ -+ AS_IF([test "x$HAVE_PYTHON" = xfalse], [ - AC_MSG_WARN([Building icons require Python, but Python not found]) - enable_icons=no - ]) --- -2.28.0 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Introduce-configure-options-for-bash-completion-doc-.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Introduce-configure-options-for-bash-completion-doc-.patch deleted file mode 100644 index bb1e000460a5..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Introduce-configure-options-for-bash-completion-doc-.patch +++ /dev/null @@ -1,171 +0,0 @@ -From cfc56fa6a5809c2dbc7276df3579836e586d9193 Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray <vilhelm.gray@gmail.com> -Date: Tue, 23 Jun 2020 12:56:01 -0400 -Subject: [PATCH] Introduce configure options for bash-completion, doc, fonts, - and icons - -This patch introduces the --enable-bash-completion, --enable-doc, ---enable-fonts, and --enable-icons configuration options to control the -build of bash-completion, documentation, fonts, and icons respectively. -This is useful for users of systems such as Gentoo which allow custom -configuration of packages, or for package maintainers in general who -would like finer control over the components built when compiling -Chocolate Doom. ---- - Makefile.am | 2 +- - configure.ac | 49 ++++++++++++++++++++++++++++++++- - man/Makefile.am | 2 +- - man/bash-completion/Makefile.am | 2 +- - src/Makefile.am | 2 +- - src/setup/Makefile.am | 2 +- - textscreen/fonts/Makefile.am | 2 +- - 7 files changed, 54 insertions(+), 7 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 1bd91a43..70f2e5b9 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -50,7 +50,7 @@ SUBDIRS=textscreen midiproc opl pcsound data src man - - DIST_SUBDIRS=pkg $(SUBDIRS) - --if HAVE_PYTHON -+if HAVE_DOC - - INSTALL : man/INSTALL.template man/simplecpp - ./man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \ -diff --git a/configure.ac b/configure.ac -index 8e18a0e9..9bef517a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -35,6 +35,50 @@ PKG_CHECK_MODULES(SDL, [sdl2 >= 2.0.1]) - PKG_CHECK_MODULES(SDLMIXER, [SDL2_mixer >= 2.0.0]) - PKG_CHECK_MODULES(SDLNET, [SDL2_net >= 2.0.0]) - -+# Check for bash-completion. -+AC_ARG_ENABLE([bash-completion], -+AS_HELP_STRING([--disable-bash-completion], [Disable bash-completion]) -+) -+AS_IF([test "x$enable_bash_completion" != xno], [ -+ AS_IF([test HAVE_PYTHON = false], [ -+ AC_MSG_WARN([Building bash-completion requires Python, but Python not found]) -+ enable_bash_completion=no -+ ]) -+]) -+ -+# Check for doc. -+AC_ARG_ENABLE([doc], -+AS_HELP_STRING([--disable-doc], [Disable documentation]) -+) -+AS_IF([test "x$enable_doc" != xno], [ -+ AS_IF([test HAVE_PYTHON = false], [ -+ AC_MSG_WARN([Building documentation requires Python, but Python not found]) -+ enable_doc=no -+ ]) -+]) -+ -+# Check for fonts. -+AC_ARG_ENABLE([fonts], -+AS_HELP_STRING([--disable-fonts], [Disable fonts]) -+) -+AS_IF([test "x$enable_fonts" != xno], [ -+ AS_IF([test HAVE_PYTHON = false], [ -+ AC_MSG_WARN([Building fonts require Python, but Python not found]) -+ enable_fonts=no -+ ]) -+]) -+ -+# Check for icons. -+AC_ARG_ENABLE([icons], -+AS_HELP_STRING([--disable-icons], [Disable icons]) -+) -+AS_IF([test "x$enable_icons" != xno], [ -+ AS_IF([test HAVE_PYTHON = false], [ -+ AC_MSG_WARN([Building icons require Python, but Python not found]) -+ enable_icons=no -+ ]) -+]) -+ - # Check for libsamplerate. - AC_ARG_WITH([libsamplerate], - AS_HELP_STRING([--without-libsamplerate], -@@ -106,7 +150,10 @@ AS_IF([test "x$enable_werror" = "xyes"], [ - ]) - - AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "") --AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON) -+AM_CONDITIONAL(HAVE_BASH_COMPLETION, [test "x$enable_bash_completion" != xno]) -+AM_CONDITIONAL(HAVE_DOC, [test "x$enable_doc" != xno]) -+AM_CONDITIONAL(HAVE_FONTS, [test "x$enable_fonts" != xno]) -+AM_CONDITIONAL(HAVE_ICONS, [test "x$enable_icons" != xno]) - - dnl Automake v1.8.0 is required, please upgrade! - -diff --git a/man/Makefile.am b/man/Makefile.am -index 915cb206..5a886fc9 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -15,7 +15,7 @@ hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic - hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen - strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife - --if HAVE_PYTHON -+if HAVE_DOC - - GENERATED_MAN_PAGES = \ - @PROGRAM_PREFIX@doom.6 \ -diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am -index 9c1400f1..a79fe623 100644 ---- a/man/bash-completion/Makefile.am -+++ b/man/bash-completion/Makefile.am -@@ -6,7 +6,7 @@ BASH_COMPLETION_TEMPLATES = \ - hexen.template \ - strife.template - --if HAVE_PYTHON -+if HAVE_BASH_COMPLETION - - BASH_COMPLETION_SCRIPTLETS = \ - @PROGRAM_PREFIX@doom \ -diff --git a/src/Makefile.am b/src/Makefile.am -index 19a42598..698d2ce0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -271,7 +271,7 @@ CLEANFILES = $(execgames_SCRIPTS) $(app_DATA) $(screensaver_DATA) - %.o : %.rc - $(WINDRES) $< -o $@ - --if HAVE_PYTHON -+if HAVE_ICONS - - icon.c : $(top_builddir)/data/doom.png - $(top_builddir)/data/convert-icon $(top_builddir)/data/doom.png $@ -diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am -index a9dd240c..493b0b47 100644 ---- a/src/setup/Makefile.am -+++ b/src/setup/Makefile.am -@@ -33,7 +33,7 @@ CLEANFILES = $(app_DATA) - @PACKAGE_RDNS@.Setup.desktop : Setup.desktop - cp Setup.desktop $@ - --if HAVE_PYTHON -+if HAVE_ICONS - - setup_icon.c : $(top_builddir)/data/setup.png - $(top_builddir)/data/convert-icon $(top_builddir)/data/setup.png $@ -diff --git a/textscreen/fonts/Makefile.am b/textscreen/fonts/Makefile.am -index 67ae8a21..5f6ad066 100644 ---- a/textscreen/fonts/Makefile.am -+++ b/textscreen/fonts/Makefile.am -@@ -3,7 +3,7 @@ EXTRA_DIST = small.png normal.png large.png convert-font $(FONT_HDRS) - - noinst_DATA = $(FONT_HDRS) - --if HAVE_PYTHON -+if HAVE_FONTS - - small.h: small.png convert-font - ./convert-font small small.png small.h --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Remove-redundant-demoextend-definition.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Remove-redundant-demoextend-definition.patch deleted file mode 100644 index 9c087769a26c..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Remove-redundant-demoextend-definition.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a8fd4b1f563d24d4296c3e8225c8404e2724d4c2 Mon Sep 17 00:00:00 2001 -From: Jordan Christiansen <xordspar0@gmail.com> -Date: Sun, 15 Mar 2020 16:55:33 -0500 -Subject: [PATCH] Remove redundant demoextend definition - -GCC 10 enables -fno-common by default, which causes the linker to fail when -there are multple definitions of a global variable. - -See https://gcc.gnu.org/gcc-10/porting_to.html ---- - src/hexen/mn_menu.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c -index 059f45b3..a97b7fcd 100644 ---- a/src/hexen/mn_menu.c -+++ b/src/hexen/mn_menu.c -@@ -131,7 +131,6 @@ boolean MenuActive; - int InfoType; - int messageson = true; - boolean mn_SuicideConsole; --boolean demoextend; // from h2def.h - - // PRIVATE DATA DEFINITIONS ------------------------------------------------ - --- -2.28.0 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-AppStream-XML-files-to-current-0.11-standards.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-AppStream-XML-files-to-current-0.11-standards.patch deleted file mode 100644 index 7c2bfa48de29..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-AppStream-XML-files-to-current-0.11-standards.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 35827930553ca522270bd74df37a378d6b2dea8a Mon Sep 17 00:00:00 2001 -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Mon, 22 Jan 2018 20:41:16 -0800 -Subject: [PATCH] Update AppStream XML files to current (0.11) standards - -<id> tag is changed to a Reverse-DNS form, and an accommodating -PACKAGE_RDNS is set in configure.ac to use it. - -<name> and <summary> tags have been added, using existing autoconf -variable values. - -The `appstream-util validate` command will complain about some -optionally-missing tags and a strict string length limit on some of -the <caption> tags. `validate-relax` passes, and by the letter of the -AppStream specification, we should be completely valid. ---- - configure.ac | 2 ++ - src/doom.appdata.xml.in | 4 +++- - src/heretic.appdata.xml.in | 4 +++- - src/hexen.appdata.xml.in | 4 +++- - src/strife.appdata.xml.in | 4 +++- - 5 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 17299714..2190a32b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,6 +7,7 @@ PACKAGE_COPYRIGHT="Copyright (C) 1993-2017" - PACKAGE_LICENSE="GNU General Public License, version 2" - PACKAGE_MAINTAINER="Simon Howard" - PACKAGE_URL="https://www.chocolate-doom.org/" -+PACKAGE_RDNS="org.chocolate_doom" - PACKAGE_ISSUES="https://github.com/chocolate-doom/chocolate-doom/issues" - - AC_CONFIG_AUX_DIR(autotools) -@@ -142,6 +143,7 @@ AC_SUBST(PACKAGE_COPYRIGHT) - AC_SUBST(PACKAGE_LICENSE) - AC_SUBST(PACKAGE_MAINTAINER) - AC_SUBST(PACKAGE_URL) -+AC_SUBST(PACKAGE_RDNS) - AC_SUBST(PACKAGE_ISSUES) - - AC_SUBST(bashcompletiondir) -diff --git a/src/doom.appdata.xml.in b/src/doom.appdata.xml.in -index ed499f47..42747251 100644 ---- a/src/doom.appdata.xml.in -+++ b/src/doom.appdata.xml.in -@@ -1,7 +1,9 @@ - <?xml version="1.0" encoding="UTF-8"?> - - <component type="desktop"> -- <id>@PROGRAM_PREFIX@doom.desktop</id> -+ <id>@PACKAGE_RDNS@.Doom</id> -+ <name>@PACKAGE_SHORTNAME@ Doom</name> -+ <summary>@PACKAGE_SHORTDESC@</summary> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <developer_name>@PACKAGE_MAINTAINER@</developer_name> -diff --git a/src/heretic.appdata.xml.in b/src/heretic.appdata.xml.in -index 36a1739a..dc8093de 100644 ---- a/src/heretic.appdata.xml.in -+++ b/src/heretic.appdata.xml.in -@@ -1,7 +1,9 @@ - <?xml version="1.0" encoding="UTF-8"?> - - <component type="desktop"> -- <id>@PROGRAM_PREFIX@heretic.desktop</id> -+ <id>@PACKAGE_RDNS@.Heretic</id> -+ <name>@PACKAGE_SHORTNAME@ Heretic</name> -+ <summary>@PACKAGE_SHORTDESC@</summary> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <developer_name>@PACKAGE_MAINTAINER@</developer_name> -diff --git a/src/hexen.appdata.xml.in b/src/hexen.appdata.xml.in -index b5a526f2..7583cca8 100644 ---- a/src/hexen.appdata.xml.in -+++ b/src/hexen.appdata.xml.in -@@ -1,7 +1,9 @@ - <?xml version="1.0" encoding="UTF-8"?> - - <component type="desktop"> -- <id>@PROGRAM_PREFIX@hexen.desktop</id> -+ <id>@PACKAGE_RDNS@.Hexen</id> -+ <name>@PACKAGE_SHORTNAME@ Hexen</name> -+ <summary>@PACKAGE_SHORTDESC@</summary> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <developer_name>@PACKAGE_MAINTAINER@</developer_name> -diff --git a/src/strife.appdata.xml.in b/src/strife.appdata.xml.in -index 7be869c3..6db4fad4 100644 ---- a/src/strife.appdata.xml.in -+++ b/src/strife.appdata.xml.in -@@ -1,7 +1,9 @@ - <?xml version="1.0" encoding="UTF-8"?> - - <component type="desktop"> -- <id>@PROGRAM_PREFIX@strife.desktop</id> -+ <id>@PACKAGE_RDNS@.Strife</id> -+ <name>@PACKAGE_SHORTNAME@ Strife</name> -+ <summary>@PACKAGE_SHORTDESC@</summary> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <developer_name>@PACKAGE_MAINTAINER@</developer_name> --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-documentation-about-usr-share-doom-IWAD-locat.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-documentation-about-usr-share-doom-IWAD-locat.patch deleted file mode 100644 index 90cd352a5874..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-documentation-about-usr-share-doom-IWAD-locat.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: William Breathitt Gray <vilhelm.gray@gmail.com> -Date: Thu, 25 Jun 2020 11:30:42 -0400 -Subject: [PATCH] Update documentation about /usr/share/doom IWAD location - ---- - man/INSTALL.template | 2 ++ - man/iwad_paths.man | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/man/INSTALL.template b/man/INSTALL.template -index f04e98e6..9c9f7601 100644 ---- a/man/INSTALL.template -+++ b/man/INSTALL.template -@@ -199,6 +199,8 @@ do one of the following: - * Put the file into one of the following directories: - -+ /usr/share/doom - /usr/share/games/doom -+ /usr/local/share/doom - /usr/local/share/games/doom - - * Set the environment variable DOOMWADDIR to specify the path to a -diff --git a/man/iwad_paths.man b/man/iwad_paths.man -index 98058154..a41aba41 100644 ---- a/man/iwad_paths.man -+++ b/man/iwad_paths.man -@@ -35,7 +35,8 @@ Writeable directory in the user's home directory. The path can be overridden - using the \fBXDG_DATA_HOME\fR environment variable (see the XDG Base Directory - Specification). - .TP --\fB/usr/local/share/games/doom, /usr/share/games/doom\fR -+\fB/usr/local/share/doom, /usr/local/share/games/doom, /usr/share/doom, -+/usr/share/games/doom\fR - System-wide locations that can be accessed by all users. The path - \fB/usr/share/games/doom\fR is a standard path that is supported by most - Doom source ports. These paths can be overridden using the \fBXDG_DATA_DIRS\fR --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-to-latest-AppStream-formerly-AppData-standard.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-to-latest-AppStream-formerly-AppData-standard.patch deleted file mode 100644 index 39cef73483e9..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-Update-to-latest-AppStream-formerly-AppData-standard.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Sat, 7 Sep 2019 10:43:57 -0700 -Subject: [PATCH] Update to latest AppStream (formerly AppData) standards - -Install files into ${prefix}/share/metainfo rather than -${prefix}/share/appdata, name files by reverse-DNS and suffixed -.metainfo.xml. - -"appstream-util validate" still complains about a missing -update_contact tag and issues with the caption tags being either short -or long, but the specification at -https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html -says these are not errors. ---- - configure.ac | 8 +++--- - ...om.appdata.xml.in => Doom.metainfo.xml.in} | 0 - ...appdata.xml.in => Heretic.metainfo.xml.in} | 0 - ...n.appdata.xml.in => Hexen.metainfo.xml.in} | 0 - src/Makefile.am | 28 +++++++++---------- - ....appdata.xml.in => Strife.metainfo.xml.in} | 0 - 7 files changed, 19 insertions(+), 19 deletions(-) - rename src/{doom.appdata.xml.in => Doom.metainfo.xml.in} (100%) - rename src/{heretic.appdata.xml.in => Heretic.metainfo.xml.in} (100%) - rename src/{hexen.appdata.xml.in => Hexen.metainfo.xml.in} (100%) - rename src/{strife.appdata.xml.in => Strife.metainfo.xml.in} (100%) - -diff --git a/configure.ac b/configure.ac -index 5ec9dfbf..8a3e1bbc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -167,14 +167,14 @@ pkg/osx/Info.plist - rpm.spec - data/Makefile - src/Makefile --src/doom.appdata.xml -+src/Doom.metainfo.xml - src/doom.desktop - src/doom-screensaver.desktop - src/doom/Makefile --src/heretic.appdata.xml -+src/Heretic.metainfo.xml - src/heretic.desktop - src/heretic/Makefile --src/hexen.appdata.xml -+src/Hexen.metainfo.xml - src/hexen.desktop - src/hexen/Makefile - src/resource.rc -@@ -182,7 +182,7 @@ src/setup-res.rc - src/setup/Makefile - src/setup/setup.desktop - src/setup/setup-manifest.xml --src/strife.appdata.xml -+src/Strife.metainfo.xml - src/strife.desktop - src/strife/Makefile - textscreen/Makefile -diff --git a/src/doom.appdata.xml.in b/src/Doom.metainfo.xml.in -similarity index 100% -rename from src/doom.appdata.xml.in -rename to src/Doom.metainfo.xml.in -diff --git a/src/heretic.appdata.xml.in b/src/Heretic.metainfo.xml.in -similarity index 100% -rename from src/heretic.appdata.xml.in -rename to src/Heretic.metainfo.xml.in -diff --git a/src/hexen.appdata.xml.in b/src/Hexen.metainfo.xml.in -similarity index 100% -rename from src/hexen.appdata.xml.in -rename to src/Hexen.metainfo.xml.in -diff --git a/src/Makefile.am b/src/Makefile.am -index e54aeead..6880bd3c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -220,24 +220,24 @@ EXTRA_DIST = \ - doom-screensaver.desktop.in \ - manifest.xml - --appdatadir = $(prefix)/share/metainfo --appdata_DATA = \ -- @PROGRAM_PREFIX@doom.appdata.xml \ -- @PROGRAM_PREFIX@heretic.appdata.xml \ -- @PROGRAM_PREFIX@hexen.appdata.xml \ -- @PROGRAM_PREFIX@strife.appdata.xml -+metainfodir = $(prefix)/share/metainfo -+metainfo_DATA = \ -+ @PACKAGE_RDNS@.Doom.metainfo.xml \ -+ @PACKAGE_RDNS@.Heretic.metainfo.xml \ -+ @PACKAGE_RDNS@.Hexen.metainfo.xml \ -+ @PACKAGE_RDNS@.Strife.metainfo.xml - --@PROGRAM_PREFIX@doom.appdata.xml : doom.appdata.xml -- cp doom.appdata.xml $@ -+@PACKAGE_RDNS@.Doom.metainfo.xml : Doom.metainfo.xml -+ cp Doom.metainfo.xml $@ - --@PROGRAM_PREFIX@heretic.appdata.xml : heretic.appdata.xml -- cp heretic.appdata.xml $@ -+@PACKAGE_RDNS@.Heretic.metainfo.xml : Heretic.metainfo.xml -+ cp Heretic.metainfo.xml $@ - --@PROGRAM_PREFIX@hexen.appdata.xml : hexen.appdata.xml -- cp hexen.appdata.xml $@ -+@PACKAGE_RDNS@.Hexen.metainfo.xml : Hexen.metainfo.xml -+ cp Hexen.metainfo.xml $@ - --@PROGRAM_PREFIX@strife.appdata.xml : strife.appdata.xml -- cp strife.appdata.xml $@ -+@PACKAGE_RDNS@.Strife.metainfo.xml : Strife.metainfo.xml -+ cp Strife.metainfo.xml $@ - - appdir = $(prefix)/share/applications - app_DATA = \ -diff --git a/src/strife.appdata.xml.in b/src/Strife.metainfo.xml.in -similarity index 100% -rename from src/strife.appdata.xml.in -rename to src/Strife.metainfo.xml.in --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-Build-from-actual-shell-script-templ.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-Build-from-actual-shell-script-templ.patch deleted file mode 100644 index 48445cf6efc2..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-Build-from-actual-shell-script-templ.patch +++ /dev/null @@ -1,53 +0,0 @@ -From da88012088dad9f7a5d53c26aa40aa393cb5b703 Mon Sep 17 00:00:00 2001 -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Sat, 27 Jan 2018 04:49:08 -0800 -Subject: [PATCH] bash-completion: Build from actual shell script templates. - -At some point, the Makefile was inerrantly modified so that it -generated manpage sources instead of shell script, making completions -very screwed up. ---- - man/bash-completion/Makefile.am | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am -index 60e7ae9c..bb706fc7 100644 ---- a/man/bash-completion/Makefile.am -+++ b/man/bash-completion/Makefile.am -@@ -17,28 +17,27 @@ BASH_COMPLETION_SCRIPTLETS = \ - bashcompletion_DATA = $(BASH_COMPLETION_SCRIPTLETS) - CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS) - --MANDIR = $(top_srcdir)/man --DOCGEN = $(MANDIR)/docgen -+DOCGEN = $(top_srcdir)/man/docgen - DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@" - - @PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -- -g doom -b $(MANDIR)/doom.template \ -+ -g doom -b doom.template \ - $(top_srcdir)/src $(top_srcdir)/src/doom > $@ - - @PROGRAM_PREFIX@heretic: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -- -g heretic -b $(MANDIR)/heretic.template \ -+ -g heretic -b heretic.template \ - $(top_srcdir)/src $(top_srcdir)/src/heretic > $@ - - @PROGRAM_PREFIX@hexen: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -- -g hexen -b $(MANDIR)/hexen.template \ -+ -g hexen -b hexen.template \ - $(top_srcdir)/src $(top_srcdir)/src/hexen > $@ - - @PROGRAM_PREFIX@strife: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -- -g strife -b $(MANDIR)/strife.template \ -+ -g strife -b strife.template \ - $(top_srcdir)/src $(top_srcdir)/src/strife > $@ - - EXTRA_DIST = \ --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-always-install-into-datadir-bash-com.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-always-install-into-datadir-bash-com.patch deleted file mode 100644 index 3931166599f9..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-always-install-into-datadir-bash-com.patch +++ /dev/null @@ -1,61 +0,0 @@ -From b9d4c04c840321f5ec70787d8afb1256766aaa01 Mon Sep 17 00:00:00 2001 -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Tue, 6 Aug 2019 15:40:46 -0700 -Subject: [PATCH] bash-completion: always install into $datadir/bash-completion -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The bash-completion package by default searches in $HOME/.local and -/usr/local first before /usr, and we should respect local installation -locations instead of always trying to write to a path that is -accessible only to root and could conflict with a package manager. - -This removes a toggle in the configure script, which neither actually -worked properly (setting DIR didn’t work) and I believe did the wrong -thing by default anyway. ---- - configure.ac | 9 --------- - man/bash-completion/Makefile.am | 2 +- - 2 files changed, 1 insertion(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f12eae68..5ec9dfbf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -87,13 +87,6 @@ AC_CHECK_DECLS([strcasecmp, strncasecmp], [], [], [[#include <strings.h>]]) - AC_CHECK_LIB(i386, i386_iopl) - AC_CHECK_LIB(amd64, amd64_iopl) - --AC_ARG_WITH([bashcompletiondir], -- AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completion directory]), -- [], -- [AS_IF([$($PKG_CONFIG --exists bash-completion 2> /dev/null)], -- [bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)], -- [bashcompletiondir=${datadir}/bash-completion/completions])]) -- - case "$host" in - *-*-mingw* | *-*-cygwin* | *-*-msvc* ) - AC_CHECK_TOOL(WINDRES, windres, ) -@@ -153,8 +146,6 @@ AC_SUBST(PACKAGE_URL) - AC_SUBST(PACKAGE_RDNS) - AC_SUBST(PACKAGE_ISSUES) - --AC_SUBST(bashcompletiondir) -- - dnl Shut up the datarootdir warnings. - AC_DEFUN([AC_DATAROOTDIR_CHECKED]) - -diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am -index bb706fc7..9c1400f1 100644 ---- a/man/bash-completion/Makefile.am -+++ b/man/bash-completion/Makefile.am -@@ -1,4 +1,4 @@ --bashcompletiondir=@bashcompletiondir@ -+bashcompletiondir=@datadir@/bash-completion/completions - - BASH_COMPLETION_TEMPLATES = \ - doom.template \ --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-run-docgen-with-z-argument.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-run-docgen-with-z-argument.patch deleted file mode 100644 index d9df5743d765..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-bash-completion-run-docgen-with-z-argument.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ccfbd4a046de9590cadb522d1f754c78ee9f8d4e Mon Sep 17 00:00:00 2001 -From: Jonathan Dowland <jon@dow.land> -Date: Mon, 15 Jan 2018 19:10:16 +0000 -Subject: [PATCH] bash-completion: run docgen with -z argument - ---- - man/bash-completion/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am -index 801dd212..60e7ae9c 100644 ---- a/man/bash-completion/Makefile.am -+++ b/man/bash-completion/Makefile.am -@@ -19,7 +19,7 @@ CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS) - - MANDIR = $(top_srcdir)/man - DOCGEN = $(MANDIR)/docgen --DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@" - - @PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-configure-add-AM_PROG_AR-macro.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-configure-add-AM_PROG_AR-macro.patch deleted file mode 100644 index 725ddb2dba55..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-configure-add-AM_PROG_AR-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 560cdc3e4572cc84d493c5450092b6ce1694bd89 Mon Sep 17 00:00:00 2001 -From: Simon Howard <fraggle@soulsphere.org> -Date: Sun, 30 Sep 2018 23:34:52 -0400 -Subject: [PATCH] configure: add AM_PROG_AR macro. - -Some platforms (eg. Emscripten) have their own version of the ar tool, -so it is important to pick one that matches the target architecture. -Without this macro we always use the default system-installed version -of ar. ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 175d7f3b..6dfced8d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,6 +15,7 @@ AC_CANONICAL_HOST - - orig_CFLAGS="$CFLAGS" - -+AM_PROG_AR - AC_PROG_CC - AC_PROG_RANLIB - AC_CHECK_PROG(HAVE_PYTHON, python, true, false) --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-further-manpage-substitutions-and-fixes.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-further-manpage-substitutions-and-fixes.patch deleted file mode 100644 index 62fc424f42b9..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-further-manpage-substitutions-and-fixes.patch +++ /dev/null @@ -1,322 +0,0 @@ -From c1f553b92a7a4873b33026463866101e18be8e76 Mon Sep 17 00:00:00 2001 -From: Jonathan Dowland <jon@dow.land> -Date: Mon, 27 Nov 2017 22:24:04 +0000 -Subject: [PATCH] further manpage substitutions and fixes - -Convert chocolate-setup.6 into a template file and generate outputs -based on @PROGRAM_PREFIX@. - -Add @PACKAGE_SHORTNAME@ to the list of parameters handed to docgen -and make appropriate substitutions in the manpage templates. ---- - man/Makefile.am | 15 ++++++++---- - man/docgen | 30 ++++++++++++++--------- - man/heretic.template | 8 +++--- - man/hexen.template | 8 +++--- - man/{chocolate-setup.6 => setup.template} | 4 +-- - man/strife.template | 14 +++++------ - 6 files changed, 45 insertions(+), 34 deletions(-) - rename man/{chocolate-setup.6 => setup.template} (94%) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 5916edf9..f0099c79 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -30,6 +30,7 @@ GENERATED_MAN_PAGES = \ - @PROGRAM_PREFIX@strife.6 \ - strife.cfg.5 \ - @PROGRAM_PREFIX@strife.cfg.5 \ -+ @PROGRAM_PREFIX@setup.6 \ - @PROGRAM_PREFIX@server.6 - - SETUP_MAN_PAGES = \ -@@ -38,8 +39,7 @@ SETUP_MAN_PAGES = \ - @PROGRAM_PREFIX@hexen-setup.6 \ - @PROGRAM_PREFIX@strife-setup.6 - --man_MANS = chocolate-setup.6 \ -- $(GENERATED_MAN_PAGES) \ -+man_MANS = $(GENERATED_MAN_PAGES) \ - $(SETUP_MAN_PAGES) - - doomdocs_DATA = INSTALL.doom CMDLINE.doom -@@ -51,10 +51,10 @@ CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \ - $(doomdocs_DATA) $(hereticdocs_DATA) \ - $(hexendocs_DATA) $(strifedocs_DATA) - DOCGEN = $(srcdir)/docgen --DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@" - --$(SETUP_MAN_PAGES): chocolate-setup.6 -- cp $(srcdir)/chocolate-setup.6 $@ -+$(SETUP_MAN_PAGES): @PROGRAM_PREFIX@setup.6 -+ cp $(srcdir)/@PROGRAM_PREFIX@setup.6 $@ - - @PROGRAM_PREFIX@doom.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES) - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -@@ -138,6 +138,11 @@ INSTALL.hexen: INSTALL.template - -g server -m $(srcdir)/server.template \ - $(top_srcdir)/src > $@ - -+@PROGRAM_PREFIX@setup.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES) -+ $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ -+ -g setup -m $(srcdir)/setup.template \ -+ $(top_srcdir)/src > $@ -+ - strife.cfg.5: $(top_srcdir)/src default.cfg.template - $(DOCGEN) $(DOCGEN_COMMON_ARGS) \ - -g strife -m $(srcdir)/default.cfg.template \ -diff --git a/man/docgen b/man/docgen -index defb9060..1c8a2471 100755 ---- a/man/docgen -+++ b/man/docgen -@@ -430,7 +430,7 @@ def process_files(path): - - process_file(path) - --def print_template(template_file, program_prefix, package_name, content): -+def print_template(template_file, program_prefix, package_name, package_shortname, content): - f = io.open(template_file, encoding='UTF-8') - - try: -@@ -440,16 +440,18 @@ def print_template(template_file, program_prefix, package_name, content): - filename = match.group(1) - filename = os.path.join(os.path.dirname(template_file), - filename) -- print_template(filename, program_prefix, package_name, content) -+ print_template(filename, program_prefix, package_name, package_shortname, content) - else: - line = line.replace("@content", content) - line = line.replace("@PROGRAM_SPREFIX@", program_prefix) -- line = line.replace("@PACKAGE_SHORTNAME@", package_name) -+ line = line.replace("@PACKAGE_NAME@", package_name) -+ if package_shortname: -+ line = line.replace("@PACKAGE_SHORTNAME@", package_shortname) - stdout(line.rstrip().encode('UTF-8') + b'\n') - finally: - f.close() - --def manpage_output(targets, program_prefix, package_name, template_file): -+def manpage_output(targets, program_prefix, package_name, package_shortname, template_file): - - content = "" - -@@ -458,7 +460,7 @@ def manpage_output(targets, program_prefix, package_name, template_file): - - content = content.replace("-", "\\-") - -- print_template(template_file, program_prefix, package_name, content) -+ print_template(template_file, program_prefix, package_name, package_shortname, content) - - def wiki_output(targets, template): - read_wikipages() -@@ -466,30 +468,31 @@ def wiki_output(targets, template): - for t in targets: - stdout(t.wiki_output().encode('UTF-8') + b'\n') - --def plaintext_output(targets, program_prefix, package_name, template_file): -+def plaintext_output(targets, program_prefix, package_name, package_shortname, template_file): - - content = "" - - for t in targets: - content += t.plaintext_output() + "\n" - -- print_template(template_file, program_prefix, package_name, content) -+ print_template(template_file, program_prefix, package_name, package_shortname, content) - --def completion_output(targets, program_prefix, package_name, template_file): -+def completion_output(targets, program_prefix, package_name, package_shortname, template_file): - - content = "" - - for t in targets: - content += t.completion_output() + "\n" - -- print_template(template_file, program_prefix, package_name, content) -+ print_template(template_file, program_prefix, package_name, package_shortname, content) - - def usage(): -- print("Usage: %s [-V] [-c tag] [-g game] -n name ( -m | -w | -p ) <dir>..." \ -+ print("Usage: %s [-V] [-c tag] [-g game] -n program_name -s package_name [ -z shortname ] ( -m | -w | -p ) <dir>..." \ - % sys.argv[0]) - print(" -c : Provide documentation for the specified configuration file") - print(" (matches the given tag name in the source file)") - print(" -s : Package name (for substitution)") -+ print(" -z : Package short-name (for substitution)") - print(" -n : Program name (for substitution)") - print(" -m : Manpage output") - print(" -w : Wikitext output") -@@ -501,7 +504,7 @@ def usage(): - - # Parse command line - --opts, args = getopt.getopt(sys.argv[1:], "n:s:m:wp:b:c:g:V") -+opts, args = getopt.getopt(sys.argv[1:], "n:s:z:m:wp:b:c:g:V") - - output_function = None - template = None -@@ -509,12 +512,15 @@ doc_config_file = None - match_game = None - program_prefix = None - package_name = None -+package_shortname = None - - for opt in opts: - if opt[0] == "-n": - program_prefix = opt[1] - if opt[0] == "-s": - package_name = opt[1] -+ if opt[0] == "-z": -+ package_shortname = opt[1] - if opt[0] == "-m": - output_function = manpage_output - template = opt[1] -@@ -556,5 +562,5 @@ else: - - # Generate the output - -- output_function(documentation_targets, program_prefix, package_name, template) -+ output_function(documentation_targets, program_prefix, package_name, package_shortname, template) - -diff --git a/man/heretic.template b/man/heretic.template -index c078c7c6..3fa4ce1d 100644 ---- a/man/heretic.template -+++ b/man/heretic.template -@@ -6,7 +6,7 @@ - [\fIOPTIONS\fR] - .SH DESCRIPTION - .PP --Chocolate Heretic is a port of Raven Software's 1994 game "Heretic" that -+@PACKAGE_SHORTNAME@ Heretic is a port of Raven Software's 1994 game "Heretic" that - aims to behave as similar to the original DOS version of Heretic as - possible. - .br -@@ -14,16 +14,16 @@ possible. - .SH IWAD SEARCH PATHS - @include iwad_paths.man - .SH ENVIRONMENT --This section describes environment variables that control Chocolate Heretic's -+This section describes environment variables that control @PACKAGE_SHORTNAME@ Heretic's - behavior. - @include environ.man - .SH FILES - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/heretic.cfg\fR --The main configuration file for Chocolate Heretic. See \fBheretic.cfg\fR(5). -+The main configuration file for @PACKAGE_SHORTNAME@ Heretic. See \fBheretic.cfg\fR(5). - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-heretic.cfg\fR --Extra configuration values that are specific to Chocolate Heretic and not -+Extra configuration values that are specific to @PACKAGE_SHORTNAME@ Heretic and not - present in Vanilla Heretic. See \fB@PROGRAM_SPREFIX@\-heretic.cfg\fR(5). - .SH SEE ALSO - \fB@PROGRAM_SPREFIX@\-doom\fR(6), -diff --git a/man/hexen.template b/man/hexen.template -index 9184a27e..fc953edf 100644 ---- a/man/hexen.template -+++ b/man/hexen.template -@@ -6,7 +6,7 @@ - [\fIOPTIONS\fR] - .SH DESCRIPTION - .PP --Chocolate Hexen is a port of Raven Software's 1995 game "Hexen" that -+@PACKAGE_SHORTNAME@ Hexen is a port of Raven Software's 1995 game "Hexen" that - aims to behave as similar to the original DOS version of Hexen as - possible. - .br -@@ -14,16 +14,16 @@ possible. - .SH IWAD SEARCH PATHS - @include iwad_paths.man - .SH ENVIRONMENT --This section describes environment variables that control Chocolate Hexen's -+This section describes environment variables that control @PACKAGE_SHORTNAME@ Hexen's - behavior. - @include environ.man - .SH FILES - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/hexen.cfg\fR --The main configuration file for Chocolate Hexen. See \fBhexen.cfg\fR(5). -+The main configuration file for @PACKAGE_SHORTNAME@ Hexen. See \fBhexen.cfg\fR(5). - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-hexen.cfg\fR --Extra configuration values that are specific to Chocolate Hexen and not -+Extra configuration values that are specific to @PACKAGE_SHORTNAME@ Hexen and not - present in Vanilla Hexen. See \fB@PROGRAM_SPREFIX@\-hexen.cfg\fR(5). - .SH SEE ALSO - \fB@PROGRAM_SPREFIX@\-doom\fR(6), -diff --git a/man/chocolate-setup.6 b/man/setup.template -similarity index 94% -rename from man/chocolate-setup.6 -rename to man/setup.template -index 64f65937..2b5a45ea 100644 ---- a/man/chocolate-setup.6 -+++ b/man/setup.template -@@ -25,9 +25,9 @@ Load configuration from the specified file, instead of default.cfg. - \fB-extraconfig <file>\fR - Load extra configuration from the specified file, instead of @PROGRAM_SPREFIX@\-doom.cfg. - .SH SEE ALSO --\fB@CHOCOLATE_SPREFIX@\-doom\fR(6), -+\fB@PROGRAM_SPREFIX@\-doom\fR(6), - \fBdefault.cfg\fR(5), --\fB@CHOCOLATE_SPREFIX@\-doom.cfg\fR(5) -+\fB@PROGRAM_SPREFIX@\-doom.cfg\fR(5) - .SH AUTHOR - Chocolate Doom is written and maintained by Simon Howard. - .PP -diff --git a/man/strife.template b/man/strife.template -index 9ca7f14e..b82c39d4 100644 ---- a/man/strife.template -+++ b/man/strife.template -@@ -6,7 +6,7 @@ - [\fIOPTIONS\fR] - .SH DESCRIPTION - .PP --Chocolate Strife is an accurate and complete recreation of Rogue -+@PACKAGE_SHORTNAME@ Strife is an accurate and complete recreation of Rogue - Entertainment's "Strife: Quest for the Sigil". It was created through - more than two years of reverse engineering effort with the blessings - of the original programmers of the game (see the section HISTORY below). -@@ -16,17 +16,17 @@ of the original programmers of the game (see the section HISTORY below). - .SH IWAD SEARCH PATHS - @include iwad_paths.man - .SH ENVIRONMENT --This section describes environment variables that control Chocolate Strife's -+This section describes environment variables that control @PACKAGE_SHORTNAME@ Strife's - behavior. - @include environ.man - - .SH FILES - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/strife.cfg\fR --The main configuration file for Chocolate Strife. See \fBstrife.cfg\fR(5). -+The main configuration file for @PACKAGE_SHORTNAME@ Strife. See \fBstrife.cfg\fR(5). - .TP - \fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-strife.cfg\fR --Extra configuration values that are specific to Chocolate Strife and not -+Extra configuration values that are specific to @PACKAGE_SHORTNAME@ Strife and not - present in Vanilla Strife. See \fB@PROGRAM_SPREFIX@\-strife.cfg\fR(5). - .SH SEE ALSO - \fB@PROGRAM_SPREFIX@\-doom\fR(6), -@@ -57,15 +57,15 @@ and neither Rogue nor their publisher, Velocity, Inc., exist any longer as - legal entities, this is effectively legal permission. - - .SH BUGS --Chocolate Strife is almost, but not entirely perfect, in recreating the -+@PACKAGE_SHORTNAME@ Strife is almost, but not entirely perfect, in recreating the - behavior of Vanilla Strife. Help us by reporting any discrepancies you - might notice between this executable and the vanilla DOS program. - - However, do *not* report any glitch that you can replicate in the vanilla EXE --as a bug. The point of Chocolate Strife, like Chocolate Doom before it, is to -+as a bug. The point of @PACKAGE_SHORTNAME Strife, like Chocolate Doom before it, is to - be as bug-compatible with the original game as possible. Also be aware that - some glitches are impossible to compatibly recreate, and wherever this is the --case, Chocolate Strife has erred on the side of not crashing the program, -+case, @PACKAGE_SHORTNAME@ Strife has erred on the side of not crashing the program, - for example by initializing pointers to NULL rather than using them without - setting a value first. - --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-install-AppStream-metadata-into-the-proper-location.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-install-AppStream-metadata-into-the-proper-location.patch deleted file mode 100644 index 025ccf0ad179..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-install-AppStream-metadata-into-the-proper-location.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 12d69a4ee62094b48b37f550d31113e84cca0043 Mon Sep 17 00:00:00 2001 -From: Fabian Greffrath <fabian@greffrath.com> -Date: Mon, 22 Jan 2018 17:24:41 +0100 -Subject: [PATCH] install AppStream metadata into the proper location - -AppStream metadata is to be placed in the /usr/share/metainfo/ directory, /usr/share/appdata is a legacy location. ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index e3bc7bb1..04474ab3 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -212,7 +212,7 @@ EXTRA_DIST = \ - doom-screensaver.desktop.in \ - manifest.xml - --appdatadir = $(prefix)/share/appdata -+appdatadir = $(prefix)/share/metainfo - appdata_DATA = \ - @PROGRAM_PREFIX@doom.appdata.xml \ - @PROGRAM_PREFIX@heretic.appdata.xml \ --- -2.26.2 - diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-use-reverse-DNS-naming-for-installing-.desktop-files.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-use-reverse-DNS-naming-for-installing-.desktop-files.patch deleted file mode 100644 index ceed45834ff0..000000000000 --- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-use-reverse-DNS-naming-for-installing-.desktop-files.patch +++ /dev/null @@ -1,162 +0,0 @@ -From bc50bd123e2b43ff404599b2a017a98261a66e47 Mon Sep 17 00:00:00 2001 -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Sat, 7 Sep 2019 10:57:50 -0700 -Subject: [PATCH] use reverse-DNS naming for installing *.desktop files - -This is similar to and consistent with the previous commit, and the -desktop entry specification recommends doing this as well. ---- - configure.ac | 12 +++---- - src/{doom.desktop.in => Doom.desktop.in} | 0 - ...desktop.in => Doom_Screensaver.desktop.in} | 0 - ...{heretic.desktop.in => Heretic.desktop.in} | 0 - src/{hexen.desktop.in => Hexen.desktop.in} | 0 - src/Makefile.am | 32 +++++++++---------- - src/{strife.desktop.in => Strife.desktop.in} | 0 - src/setup/Makefile.am | 6 ++-- - .../{setup.desktop.in => Setup.desktop.in} | 0 - 9 files changed, 25 insertions(+), 25 deletions(-) - rename src/{doom.desktop.in => Doom.desktop.in} (100%) - rename src/{doom-screensaver.desktop.in => Doom_Screensaver.desktop.in} (100%) - rename src/{heretic.desktop.in => Heretic.desktop.in} (100%) - rename src/{hexen.desktop.in => Hexen.desktop.in} (100%) - rename src/{strife.desktop.in => Strife.desktop.in} (100%) - rename src/setup/{setup.desktop.in => Setup.desktop.in} (100%) - -diff --git a/configure.ac b/configure.ac -index 8a3e1bbc..032a8be2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -168,22 +168,22 @@ rpm.spec - data/Makefile - src/Makefile - src/Doom.metainfo.xml --src/doom.desktop --src/doom-screensaver.desktop -+src/Doom.desktop -+src/Doom_Screensaver.desktop - src/doom/Makefile - src/Heretic.metainfo.xml --src/heretic.desktop -+src/Heretic.desktop - src/heretic/Makefile - src/Hexen.metainfo.xml --src/hexen.desktop -+src/Hexen.desktop - src/hexen/Makefile - src/resource.rc - src/setup-res.rc - src/setup/Makefile --src/setup/setup.desktop -+src/setup/Setup.desktop - src/setup/setup-manifest.xml - src/Strife.metainfo.xml --src/strife.desktop -+src/Strife.desktop - src/strife/Makefile - textscreen/Makefile - textscreen/examples/Makefile -diff --git a/src/doom.desktop.in b/src/Doom.desktop.in -similarity index 100% -rename from src/doom.desktop.in -rename to src/Doom.desktop.in -diff --git a/src/doom-screensaver.desktop.in b/src/Doom_Screensaver.desktop.in -similarity index 100% -rename from src/doom-screensaver.desktop.in -rename to src/Doom_Screensaver.desktop.in -diff --git a/src/heretic.desktop.in b/src/Heretic.desktop.in -similarity index 100% -rename from src/heretic.desktop.in -rename to src/Heretic.desktop.in -diff --git a/src/hexen.desktop.in b/src/Hexen.desktop.in -similarity index 100% -rename from src/hexen.desktop.in -rename to src/Hexen.desktop.in -diff --git a/src/Makefile.am b/src/Makefile.am -index 6880bd3c..19a42598 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -217,7 +217,7 @@ endif - EXTRA_DIST = \ - CMakeLists.txt \ - icon.c \ -- doom-screensaver.desktop.in \ -+ Doom_Screensaver.desktop.in \ - manifest.xml - - metainfodir = $(prefix)/share/metainfo -@@ -241,28 +241,28 @@ metainfo_DATA = \ - - appdir = $(prefix)/share/applications - app_DATA = \ -- @PROGRAM_PREFIX@doom.desktop \ -- @PROGRAM_PREFIX@heretic.desktop \ -- @PROGRAM_PREFIX@hexen.desktop \ -- @PROGRAM_PREFIX@strife.desktop -+ @PACKAGE_RDNS@.Doom.desktop \ -+ @PACKAGE_RDNS@.Heretic.desktop \ -+ @PACKAGE_RDNS@.Hexen.desktop \ -+ @PACKAGE_RDNS@.Strife.desktop - --@PROGRAM_PREFIX@doom.desktop : doom.desktop -- cp doom.desktop $@ -+@PACKAGE_RDNS@.Doom.desktop : Doom.desktop -+ cp Doom.desktop $@ - --@PROGRAM_PREFIX@heretic.desktop : heretic.desktop -- cp heretic.desktop $@ -+@PACKAGE_RDNS@.Heretic.desktop : Heretic.desktop -+ cp Heretic.desktop $@ - --@PROGRAM_PREFIX@hexen.desktop : hexen.desktop -- cp hexen.desktop $@ -+@PACKAGE_RDNS@.Hexen.desktop : Hexen.desktop -+ cp Hexen.desktop $@ - --@PROGRAM_PREFIX@strife.desktop : strife.desktop -- cp strife.desktop $@ -+@PACKAGE_RDNS@.Strife.desktop : Strife.desktop -+ cp Strife.desktop $@ - - screensaverdir = $(prefix)/share/applications/screensavers --screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop -+screensaver_DATA = @PACKAGE_RDNS@.Doom_Screensaver.desktop - --@PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop -- cp doom-screensaver.desktop $@ -+@PACKAGE_RDNS@.Doom_Screensaver.desktop: Doom_Screensaver.desktop -+ cp Doom_Screensaver.desktop $@ - - CLEANFILES = $(execgames_SCRIPTS) $(app_DATA) $(screensaver_DATA) - -diff --git a/src/strife.desktop.in b/src/Strife.desktop.in -similarity index 100% -rename from src/strife.desktop.in -rename to src/Strife.desktop.in -diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am -index 76db29cf..a9dd240c 100644 ---- a/src/setup/Makefile.am -+++ b/src/setup/Makefile.am -@@ -26,12 +26,12 @@ EXTRA_DIST= \ - setup_icon.c - - appdir = $(prefix)/share/applications --app_DATA = @PROGRAM_PREFIX@setup.desktop -+app_DATA = @PACKAGE_RDNS@.Setup.desktop - - CLEANFILES = $(app_DATA) - --@PROGRAM_PREFIX@setup.desktop : setup.desktop -- cp setup.desktop $@ -+@PACKAGE_RDNS@.Setup.desktop : Setup.desktop -+ cp Setup.desktop $@ - - if HAVE_PYTHON - -diff --git a/src/setup/setup.desktop.in b/src/setup/Setup.desktop.in -similarity index 100% -rename from src/setup/setup.desktop.in -rename to src/setup/Setup.desktop.in --- -2.26.2 - diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest index 71010ab94cfb..ac6dbb73f725 100644 --- a/games-fps/sauerbraten/Manifest +++ b/games-fps/sauerbraten/Manifest @@ -1 +1 @@ -DIST sauerbraten_2020_12_27_linux.tar.bz2 985815649 BLAKE2B 4ec9caf705766aed76153a8631b1990c6432db8c816d579e891263b36adf0e7ed4831d2fee010b7692f6457989c0acea552f72c95e0924e97182d2a03dc947f2 SHA512 60487e0493478b9dd8940a9239834d8f3f6b6ca529f3c5b718f91caf5116073942ca6908d7fff26ab37b7ec590114ab07f24cdcea5c355288d3c2706d626ea28 +DIST sauerbraten_2020_12_29_linux.tar.bz2 985823440 BLAKE2B 8d3cb9a26b65fecd6596211af58504cf8a2f5f95486785e15fb2faa8398046d80f7548727dff96683a1d6dcd713ec175bbd9ca47852a8c88d872d954d02ab2c0 SHA512 fd2106e4ed3d48352b5cc2f9d4037933a486e6200ef89bf9e3f31952f4a27ef565f7740d45c32bb9b22da0e17e6542257169134f216bc51a6a465ff311f9bae9 diff --git a/games-fps/sauerbraten/files/sauerbraten-2020.12.29-includefix.patch b/games-fps/sauerbraten/files/sauerbraten-2020.12.29-includefix.patch new file mode 100644 index 000000000000..422d6b1b3963 --- /dev/null +++ b/games-fps/sauerbraten/files/sauerbraten-2020.12.29-includefix.patch @@ -0,0 +1,39 @@ +diff --git a/movie.cpp b/movie.cpp +index 25cb491..7f7536c 100644 +--- a/src/engine/movie.cpp ++++ b/src/engine/movie.cpp +@@ -8,7 +8,7 @@ + // kino - ok + + #include "engine.h" +-#include "SDL_mixer.h" ++#include <SDL2/SDL_mixer.h> + + VAR(dbgmovie, 0, 0, 1); + +diff --git a/sound.cpp b/sound.cpp +index 38ff025..a0ed5db 100644 +--- a/src/engine/sound.cpp ++++ b/src/engine/sound.cpp +@@ -1,7 +1,7 @@ + // sound.cpp: basic positional sound using sdl_mixer + + #include "engine.h" +-#include "SDL_mixer.h" ++#include <SDL2/SDL_mixer.h> + + bool nosound = true; + +diff --git a/texture.cpp b/texture.cpp +index 964d39d..f76b9b1 100644 +--- a/src/engine/texture.cpp ++++ b/src/engine/texture.cpp +@@ -1,7 +1,7 @@ + // texture.cpp: texture slot management + + #include "engine.h" +-#include "SDL_image.h" ++#include <SDL2/SDL_image.h> + + #ifndef SDL_IMAGE_VERSION_ATLEAST + #define SDL_IMAGE_VERSION_ATLEAST(X, Y, Z) \ diff --git a/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild b/games-fps/sauerbraten/sauerbraten-2020.12.29.ebuild index 586071487332..ca0be0265bc5 100644 --- a/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild +++ b/games-fps/sauerbraten/sauerbraten-2020.12.29.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop flag-o-matic toolchain-funcs wrapper xdg @@ -43,6 +43,8 @@ PATCHES=( # Don't use freetype-config, it's obsolete "${FILESDIR}"/${PN}-2020.12.27-use-pkg-config-for-freetype2.patch + # More sensible ways of including SDL_mixer and SDL_image. Game doesn't build w/o this. + "${FILESDIR}"/${PN}-2020.12.29-includefix.patch ) src_prepare() { diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest index 77ae018e7a78..3f17d16169e1 100644 --- a/net-dns/getdns/Manifest +++ b/net-dns/getdns/Manifest @@ -1 +1,2 @@ DIST getdns-1.7.2.tar.gz 702969 BLAKE2B 668a754200b816790f39a772d89c28e14bc5dbd041e07d9e53605ad44d63d6637078b66881c35dda62ed61622142797cc8f0041522e076cf551651fca688053a SHA512 6c4a75a4696c46ec8bd9e9659a93fd81f3490b43da28a4c95f99a766027c7588fc493a8ac51563afb8f975c0e5b77d5ea67014d80e78ee2bb17fba1d1073d19f +DIST getdns-1.7.3.tar.gz 703262 BLAKE2B 830063fc6f882a624fb7a6bb36fcb4f049a83ddd4515a906152a76d0247f4397b1e12ace7ce07053e7a42432c4f3683fe999ff36d8ede13a005ebecd14a78326 SHA512 d5725a24378b6fe0018daefdaba5565d2d4d51109ef66609fc34270a0a69accb95f5f895d0cdfc5caca51d2ec586db126f367439f05aed12507395af26739e2f diff --git a/net-dns/getdns/files/getdns-1.7.3-cmake-linking.patch b/net-dns/getdns/files/getdns-1.7.3-cmake-linking.patch new file mode 100644 index 000000000000..18e9e51d3285 --- /dev/null +++ b/net-dns/getdns/files/getdns-1.7.3-cmake-linking.patch @@ -0,0 +1,40 @@ +diff -ur a/cmake/modules/FindGnuTLS.cmake b/cmake/modules/FindGnuTLS.cmake +--- a/cmake/modules/FindGnuTLS.cmake 2024-10-16 21:33:11.113665484 +0200 ++++ b/cmake/modules/FindGnuTLS.cmake 2024-10-16 21:33:40.923835214 +0200 +@@ -38,8 +38,8 @@ + + if (PkgGnuTLS_FOUND AND PkgGnuTLSDane_FOUND) + set(GNUTLS_INCLUDE_DIR ${PkgGnuTLS_INCLUDE_DIRS} $PkgGnuTLSDane_INCLUDE_DIRS} CACHE FILEPATH "GnuTLS include path") +- set(NETTLE_LIBRARIES ${PkgGnuTLS_LIBRARIES} ${PkgGnuTLSDane_LIBRARIES} CACHE STRING "GnuTLS libraries") +- set(NETTLE_VERSION ${PkgGnuTLS_VERSION}) ++ set(GNUTLS_LIBRARIES ${PkgGnuTLS_LIBRARIES} ${PkgGnuTLSDane_LIBRARIES} CACHE STRING "GnuTLS libraries") ++ set(GNUTLS_VERSION ${PkgGnuTLS_VERSION}) + add_library(GnuTLS::GnuTLS ALIAS PkgConfig::PkgGnuTLS) + add_library(GnuTLS::Dane ALIAS PkgConfig::PkgGnuTLSDane) + set(GnuTLS_FOUND ON) +diff -ur a/cmake/modules/FindNettle.cmake b/cmake/modules/FindNettle.cmake +--- a/cmake/modules/FindNettle.cmake 2024-10-16 21:05:17.521591723 +0200 ++++ b/cmake/modules/FindNettle.cmake 2024-10-16 21:50:42.414650647 +0200 +@@ -34,12 +34,20 @@ + if(PKG_CONFIG_FOUND) + pkg_check_modules(PkgNettle IMPORTED_TARGET GLOBAL nettle) + pkg_check_modules(PkgHogweed IMPORTED_TARGET GLOBAL QUIET hogweed) ++ if (UNIX) ++ pkg_check_modules(PkgGmp IMPORTED_TARGET GLOBAL QUIET gmp) ++ endif () + endif() + +-if(PkgNettle_FOUND AND PkHogweed_FOUND) ++if(PkgNettle_FOUND AND PkgHogweed_FOUND) + set(NETTLE_INCLUDE_DIR ${PkgNettle_INCLUDE_DIRS} ${PkgHogweed_INCLUDE_DIRS} CACHE FILEPATH "Nettle include path") +- set(NETTLE_LIBRARIES ${PkgNettle_LIBRARIES} ${PkgHogweed_LIBRARIES} CACHE STRING "Nettle libraries") ++ if (PkgGmp_FOUND) ++ set(NETTLE_LIBRARIES ${PkgNettle_LIBRARIES} ${PkgHogweed_LIBRARIES} ${PkgGmp_LIBRARIES} CACHE STRING "Nettle libraries") ++ else () ++ set(NETTLE_LIBRARIES ${PkgNettle_LIBRARIES} ${PkgHogweed_LIBRARIES} CACHE STRING "Nettle libraries") ++ endif () + set(NETTLE_VERSION ${PkgNettle_VERSION}) ++ set_target_properties(PkgConfig::PkgNettle PROPERTIES INTERFACE_LINK_LIBRARIES "${NETTLE_LIBRARIES}") + add_library(Nettle::Nettle ALIAS PkgConfig::PkgNettle) + add_library(Nettle::Hogweed ALIAS PkgConfig::PkgHogweed) + set(Nettle_FOUND ON) diff --git a/net-dns/getdns/files/stubby-0.4.3-install-dir.patch b/net-dns/getdns/files/stubby-0.4.3-install-dir.patch new file mode 100644 index 000000000000..51f846e3aa95 --- /dev/null +++ b/net-dns/getdns/files/stubby-0.4.3-install-dir.patch @@ -0,0 +1,28 @@ +diff -ur a/stubby/CMakeLists.txt b/stubby/CMakeLists.txt +--- a/stubby/CMakeLists.txt 2024-10-14 20:08:06.950985143 +0200 ++++ b/stubby/CMakeLists.txt 2024-10-14 20:09:29.408454887 +0200 +@@ -58,13 +58,6 @@ + else () + set(RUNSTATEDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run") + endif () +-install(DIRECTORY +- DESTINATION ${RUNSTATEDIR} +- DIRECTORY_PERMISSIONS +- OWNER_READ OWNER_WRITE OWNER_EXECUTE +- GROUP_READ GROUP_EXECUTE +- WORLD_READ WORLD_EXECUTE +- ) + set(STUBBYCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/stubby") + + find_package(Libyaml REQUIRED) +@@ -187,8 +180,8 @@ + if (ENABLE_WINDOWS_SERVICE) + install(TARGETS stubres LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif () +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/stubby.1 DESTINATION share/man/man1) +-install(FILES AUTHORS COPYING ChangeLog NEWS README.md DESTINATION share/doc/stubby) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/stubby.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) ++install(FILES AUTHORS COPYING ChangeLog NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR}/stubby) + + # Ensure the file gets CRLF line endings on Windows. + file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stubby.yml INPUT ${CMAKE_CURRENT_SOURCE_DIR}/stubby.yml.example) diff --git a/net-dns/getdns/getdns-1.7.3.ebuild b/net-dns/getdns/getdns-1.7.3.ebuild new file mode 100644 index 000000000000..e86d32e2ef54 --- /dev/null +++ b/net-dns/getdns/getdns-1.7.3.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +_SRCURI_P="${P/%_beta1/-beta.1}" + +inherit cmake fcaps systemd tmpfiles + +DESCRIPTION="Modern asynchronous DNS API" +HOMEPAGE="https://getdnsapi.net/" +SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv minimal static-libs stubby test +unbound" + +S="${WORKDIR}/${_SRCURI_P}" + +# https://bugs.gentoo.org/661760 +# https://github.com/getdnsapi/getdns/issues/407 +# (As of 1.7.0, seems to need network) +RESTRICT="test" +#RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/libbsd + dev-libs/libyaml + dev-libs/openssl:= + idn? ( net-dns/libidn2:= ) + gnutls? ( + net-libs/gnutls:0=[dane,openssl] + dev-libs/nettle:0= + ) + libev? ( dev-libs/libev:= ) + libevent? ( dev-libs/libevent:= ) + libuv? ( dev-libs/libuv:= ) + test? ( dev-libs/check ) + !minimal? ( >=net-dns/unbound-1.5.9:= ) +" +RDEPEND=" + ${DEPEND} + stubby? ( + acct-group/stubby + acct-user/stubby + sys-libs/libcap + ) +" +BDEPEND=" + doc? ( app-text/doxygen ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" + "${FILESDIR}/${PN}-1.7.3-cmake-linking.patch" + "${FILESDIR}/stubby-0.4.3-install-dir.patch" +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_RUNSTATEDIR=/var/run/stubby + -DBUILD_DOXYGEN=$(usex doc) + -DBUILD_GETDNS_QUERY=$(usex getdns-query) + -DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon) + -DBUILD_STUBBY=$(usex stubby) + -DENABLE_STATIC=$(usex static-libs) + -DBUILD_TESTING:BOOL=$(usex test) + -DENABLE_UNBOUND_EVENT_API=$(usex unbound) + -DENABLE_STUB_ONLY=$(usex minimal) + -DUSE_GNUTLS=$(usex gnutls) + -DUSE_LIBEV=$(usex libev) + -DUSE_LIBEVENT2=$(usex libevent) + -DUSE_LIBIDN2=$(usex idn) + -DUSE_LIBUV=$(usex libuv) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + if use stubby; then + newinitd "${FILESDIR}"/stubby.initd-r2 stubby + newconfd "${FILESDIR}"/stubby.confd-r1 stubby + insinto /etc/logrotate.d + newins "${FILESDIR}"/stubby.logrotate stubby + systemd_dounit "${S}"/stubby/systemd/stubby.service + dotmpfiles "${S}"/stubby/systemd/stubby.conf + fi +} + +pkg_postinst() { + if use stubby; then + fcaps cap_net_bind_service=ei usr/bin/stubby + tmpfiles_process stubby.conf + fi +} diff --git a/net-dns/getdns/metadata.xml b/net-dns/getdns/metadata.xml index 115e5fa205a5..9e9856efb041 100644 --- a/net-dns/getdns/metadata.xml +++ b/net-dns/getdns/metadata.xml @@ -10,5 +10,6 @@ <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> support</flag> <flag name="libev">Enable <pkg>dev-libs/libev</pkg> support</flag> <flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag> + <flag name="minimal">Only build stub resolution mode</flag> </use> </pkgmetadata> diff --git a/net-libs/libndp/libndp-1.9-r1.ebuild b/net-libs/libndp/libndp-1.9-r1.ebuild index f4c71a816625..2e171087a18e 100644 --- a/net-libs/libndp/libndp-1.9-r1.ebuild +++ b/net-libs/libndp/libndp-1.9-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://libndp.org/files/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" PATCHES=( # https://github.com/jpirko/libndp/issues/25 diff --git a/net-misc/networkmanager/networkmanager-1.48.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.48.10-r1.ebuild index 37997347f0d0..1130d26e9dfb 100644 --- a/net-misc/networkmanager/networkmanager-1.48.10-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-1.48.10-r1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/NetworkManager/NetworkManager" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" RESTRICT="!test? ( test )" diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest index e5eb2fbdd600..c11d09e3eae3 100644 --- a/net-misc/oidc-agent/Manifest +++ b/net-misc/oidc-agent/Manifest @@ -2,3 +2,4 @@ DIST oidc-agent-4.5.2.tar.gz 1766905 BLAKE2B 0558778a5162fbbbe29be9a476838d745ab DIST oidc-agent-5.0.1.tar.gz 1802435 BLAKE2B 75bc66bb2c6cc89293c7ad155d35b7a7adb73ad7f8a5aadeb029b43a095e2a80f0fc4505737a0c53c60e6f601acbcab990ad4b572b659050fe36e5dd2e7c4092 SHA512 caffa9d7733690917472d2d48ca58092ab722c5f049750de37169dc0a76ccbe374ae3fb5e56b8c578465e84a2f40795eaa26018281b4f851f7a7c94571d2a124 DIST oidc-agent-5.1.0.tar.gz 1803314 BLAKE2B 8ce1de7ec6dffa3155200664a93433db4f4a116325d8ce60ffff885d534b3d2367e40577b6b22987e817d92f0020fea97e2224947b27ba10847bb0c347dcdf3a SHA512 f3ecda4445478ea02e833b0b9ed75a517c1ff91f5b0c2cb258cc3a7eacb62cb75b56697e15fa755d9cf45e7a0293c8bd2f6ab8d998dd8680726c4143b1e011bc DIST oidc-agent-5.2.2.tar.gz 1812670 BLAKE2B f17c8ef8d95e509f12ab3cf9a6a3bf4b3550f9f119070843ec40adad1ef959c870caacd74c4a144936b214212671227125eb268d8808261c4cf5f242fa87d036 SHA512 1953c465f0918d005d39ef93a6d792aea1287ac87f337d7d33ce8296920f457a8e420afcdd18343f255c97f504c5e58446a16d683a559952654491e78ed2c5a8 +DIST oidc-agent-5.2.3.tar.gz 1813729 BLAKE2B ab5f3130686783c444a60e764471203ba04f3b10c690e1f42cc7b41d9b98fc0f01e17f24fc262cf6fa905f235f1baec30a5f2c91959edf46736ed9062eb52d6e SHA512 91486dfd866f9a5840a2f1aabf3f7c2b6f0470fe218ec9c93c2f6cc9e8163e8033a9fda9e02b07b34acd13f570c970f9cbfcbce386e7eb933504577f0308ac0f diff --git a/net-misc/oidc-agent/oidc-agent-5.2.3.ebuild b/net-misc/oidc-agent/oidc-agent-5.2.3.ebuild new file mode 100644 index 000000000000..1066f0d838dc --- /dev/null +++ b/net-misc/oidc-agent/oidc-agent-5.2.3.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tmpfiles xdg-utils + +DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" +HOMEPAGE="https://github.com/indigo-dc/oidc-agent" +SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="test" + +DEPEND="app-crypt/libsecret + dev-libs/cJSON + dev-libs/glib:2 + dev-libs/libsodium:= + media-gfx/qrencode:= + net-libs/libmicrohttpd:= + net-libs/webkit-gtk:4.1 + net-misc/curl + x11-libs/gtk+:3 + elibc_musl? ( sys-libs/argp-standalone )" +RDEPEND="${DEPEND}" +BDEPEND="sys-apps/help2man + test? ( dev-libs/check )" + +RESTRICT="!test? ( test )" + +src_prepare() { + xdg_environment_reset + default + sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" +} + +oidc_emake() { + local mymakeargs=( + USE_CJSON_SO=1 + USE_LIST_SO=0 + USE_MUSTACHE_SO=0 + USE_ARGP_SO=$(usex elibc_musl 1 0) + CONFIG_AFTER_INST_PATH="${EPREFIX}"/etc + BIN_AFTER_INST_PATH="${EPREFIX}"/usr + ) + + emake "${mymakeargs[@]}" $@ +} + +src_compile() { + oidc_emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157 + oidc_emake +} + +src_install() { + oidc_emake \ + PREFIX="${ED}" \ + BIN_AFTER_INST_PATH="/usr" \ + INCLUDE_PATH="${ED}"/usr/include \ + LIB_PATH="${ED}"/usr/$(get_libdir) \ + install + + # This file is not compatible with Gentoo and in any case, we generally + # let the users load such agents themselves. + rm "${ED}"/etc/X11/Xsession.d/91${PN} || die +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf + + xdg_desktop_database_update + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog + elog "You should use oidc-gen to initially generate your account configuration" + elog "before it can be loaded into oidc-agent using oidc-add. For details, please" + elog "consult the man page of oidc-gen, or full documentation at" + elog " https://indigo-dc.gitbooks.io/oidc-agent/" + elog + else + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if [[ $(ver_cut 1 ${old_ver}) != 5 ]]; then + ewarn "${PN} 5 is a major release with quite some usability improvements but unfortunately also some breaking changes." + ewarn "Please consult" + ewarn " https://indigo-dc.gitbook.io/oidc-agent/oidc-agent5" + ewarn "for instructions on how to upgrade your configuration to this version" + ewarn + ewarn "Furthermore, please restart any running instances of ${PN}" + ewarn "to make sure they are compatible with the updated clients." + ewarn + break + fi + done + fi +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest index 9cbfb11d26b7..b9e9a77609d0 100644 --- a/net-misc/youtube-viewer/Manifest +++ b/net-misc/youtube-viewer/Manifest @@ -1 +1,2 @@ DIST youtube-viewer-3.11.2.tar.gz 268972 BLAKE2B f4312bf82ef977374abe9f0366dc38fccf0fc2571796dfb6eeb7e42fdf2ed4a879ee35fa5ec43c37d6e2bbd38ef4f8080476c57a31cfa5139cf0438f661e64cc SHA512 8640fff8bf87d00d8a7649f0ff5c602fd2513ffd28cf741b9a29b6b0292fff733cde70382ef36810c9c3f6431371f6f3ddea34aaba1ac9064782aec1b315650e +DIST youtube-viewer-3.11.3.tar.gz 269693 BLAKE2B a304bd0905e694f2bdf67607391dd0ec2be823c5bb0c256395fd05e7ef48654da80d4eb0c96a4102d4d1fdb6f0bf1371a8c5c0ebb10b1516025399a453beb1ad SHA512 1dea38a3d445227fd5ddc6655df970262e4ffcf209a74f35ee4e68585591f3619f67ca2e4cb9ab7e48e26a2b898d2a43d64932a78335224f5d0dc6e78333d8aa diff --git a/net-misc/youtube-viewer/youtube-viewer-3.11.3.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.11.3.ebuild new file mode 100644 index 000000000000..bbdbd05ff1c1 --- /dev/null +++ b/net-misc/youtube-viewer/youtube-viewer-3.11.3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DIST_TEST="do" +inherit desktop optfeature perl-module xdg-utils + +DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer" +HOMEPAGE="https://github.com/trizen/youtube-viewer" +SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( Artistic-2 GPL-1+ )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk" + +RDEPEND=" + dev-perl/Data-Dump + dev-perl/JSON + dev-perl/libwww-perl[ssl] + dev-perl/LWP-Protocol-https + dev-perl/Term-ReadLine-Gnu + virtual/perl-Encode + virtual/perl-File-Path + virtual/perl-File-Spec + virtual/perl-Getopt-Long + virtual/perl-Scalar-List-Utils + virtual/perl-Term-ANSIColor + virtual/perl-Term-ReadLine + virtual/perl-Text-ParseWords + virtual/perl-Text-Tabs+Wrap + gtk? ( + dev-perl/Gtk3 + dev-perl/File-ShareDir + virtual/freedesktop-icon-theme + x11-libs/gdk-pixbuf:2[jpeg] + ) + || ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] ) + || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )" +DEPEND="${RDEPEND}" +BDEPEND="dev-perl/Module-Build" + +src_configure() { + local myconf + if use gtk; then + myconf="--gtk3" + fi + + perl-module_src_configure +} + +src_install() { + perl-module_src_install + + if use gtk; then + domenu share/gtk-youtube-viewer.desktop + doicon share/icons/gtk-youtube-viewer.png + fi +} + +pkg_postinst() { + use gtk && xdg_icon_cache_update + optfeature "local cache support" dev-perl/LWP-UserAgent-Cached + optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS + optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth + optfeature "live streams support" net-misc/yt-dlp + elog + elog "Check the configuration file in ~/.config/youtube-viewer/" + elog "and configure your video player backend." + elog + ewarn "Starting with version 3.7.4, youtube-viewer requires the user to" + ewarn "get their own API key to function. Please refer to README.md or" + ewarn "https://github.com/trizen/youtube-viewer#logging-in for details!" +} + +pkg_postrm() { + use gtk && xdg_icon_cache_update +} diff --git a/sci-electronics/gtkwave/Manifest b/sci-electronics/gtkwave/Manifest index 35b040d142ab..e1f254eb565b 100644 --- a/sci-electronics/gtkwave/Manifest +++ b/sci-electronics/gtkwave/Manifest @@ -1,2 +1,3 @@ DIST gtkwave-3.3.106.tar.gz 3507185 BLAKE2B 89389c6eef2fb80b82b048fc94248cf6b30ec0d8fea1260189f2ea1f143123e0294d00f93a0c25f777b6e2c188041af16f4e26e5206e0c65fe23c1f058b19186 SHA512 4deec8dc88210ae542b8066763265450530756d34babf10c7820fe27b23d01e6d2f084ec74b7b0730a645fcb667ba3c0d2dcfb4111e702a523805041dc96768a DIST gtkwave-gtk3-3.3.111.tar.gz 3329907 BLAKE2B 523c5b3cb75581d9828d6a1e61df66a0a85ccc41415c9971affaf347948bc7a3b7850cf8abe4f3e57dab56d2f54722a121a8d3b757993d008e1598e4f2ce8843 SHA512 407c1ca87d9645940201c876846e7e6f5e4af67b919a4f63061adc017b2797be5ba10bb9bf132f1b86dff111a64b774e41b8b1630fc99997b5270622eda44c0c +DIST gtkwave-gtk3-3.3.121.tar.gz 3367669 BLAKE2B 42a015de4d569bd41ac54972d1c4998abb753049e3f28d270c693f8108d5c2d56322494c899cc33121c8fcb01bdace90678fb014f039553284dc317a3dbb190c SHA512 d440a3553125490800f801d5f23461c0745e511c518e0eedd346a2fe2a087c4362488f4a018cba0b22af694e433b070fef882453b9c49e6d9fbe2e1b44966d26 diff --git a/sci-electronics/gtkwave/gtkwave-3.3.121.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.121.ebuild new file mode 100644 index 000000000000..c66619b0084d --- /dev/null +++ b/sci-electronics/gtkwave/gtkwave-3.3.121.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs xdg + +DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files" +HOMEPAGE="http://gtkwave.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-gtk3-${PV}.tar.gz" + +LICENSE="GPL-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples fasttree judy lzma packed tcl" + +RDEPEND=" + dev-libs/glib:2 + sys-libs/zlib + x11-libs/pango + x11-libs/gtk+:3 + judy? ( dev-libs/judy ) + tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) + lzma? ( app-arch/xz-utils )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/gperf + virtual/pkgconfig" + +# Add '-gtk3-' to the pacakge name +S="${WORKDIR}/${PN}-gtk3-${PV}" + +src_prepare() { + default + + # do not install doc and examples by default + sed -i -e 's/doc examples//' Makefile.in || die +} + +src_configure() { + econf \ + --disable-mime-update \ + --enable-largefile \ + --enable-gtk3 \ + $(use_enable packed struct-pack) \ + $(use_enable tcl) \ + $(use_enable lzma xz) \ + $(use_enable fasttree) \ + $(use_enable judy) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + + use doc && dodoc doc/${PN}.odt + if use examples; then + rm examples/Makefile* || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest index 8cdb55d9e36c..e112eb71c247 100644 --- a/sci-electronics/ngspice/Manifest +++ b/sci-electronics/ngspice/Manifest @@ -1,2 +1,4 @@ DIST ngspice-40-manual.pdf 2462604 BLAKE2B a0d680cd76f8acb1be18e94953d70784aaf79e1bcc4bc3995a1221d81e27c13e577d182e7cbacb8430a068db7d86681f22ec4f3537b5704faacb8e982588617f SHA512 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 DIST ngspice-40.tar.gz 9431981 BLAKE2B e45d5d7a9e8d9d3fdae4eb076090a588680055a74cc24ba9ca3d93a7c42b95ee29073101d5791f8069cb27b3049aa1a451476f1df6460477fb156336602678fd SHA512 dab422cc8677e6f4bb92e06be0ce695a53d3e9abbe533c7bb91540d55d2a13514b0b166c8ccafcc17699799a846a35e260dddc400664c6e1137e1b18504e9954 +DIST ngspice-43-manual.pdf 2559027 BLAKE2B 71c86d4325025900db0d7ae961134111f1004490f827be64322cf1109e3781630f4ad7f70006a5e086914b6ec1b8a82bfc013219237d52838cb9dcbd4ece52bb SHA512 01bd68983c10ca8ef2a399354290032a0e9a9881159a3781459c576e662efa91af403ef191e846694ef418a8aec3e867d8e916d8a41a6d616d3169daf22be444 +DIST ngspice-43.tar.gz 10279606 BLAKE2B a866866dfe6dec238241406fe323baa22fd4145e7bda9e234cee507690fe224938663423ffc3fc37bf86093a982151ad96a5ba53fe292161f901297eef1cf892 SHA512 ad938e6ea8f9874c04d1033599bf39d3728e763fbd42ba77bd036b6c00271600695b3656f3f34547c39153382f55e7d7d5d6cb732f272d149cdbe21988c0d636 diff --git a/sci-electronics/ngspice/metadata.xml b/sci-electronics/ngspice/metadata.xml index f145a23291ff..22f3ebfaa0e5 100644 --- a/sci-electronics/ngspice/metadata.xml +++ b/sci-electronics/ngspice/metadata.xml @@ -11,6 +11,7 @@ </longdescription> <use> <flag name="deprecated">Build old and deprecated apps</flag> + <flag name="klu">Add support for KLU (embedded version of suitesparse)</flag> <flag name="shared">Build ngspice as a shared library</flag> </use> <upstream> diff --git a/sci-electronics/ngspice/ngspice-43.ebuild b/sci-electronics/ngspice/ngspice-43.ebuild new file mode 100644 index 000000000000..be5b137533cd --- /dev/null +++ b/sci-electronics/ngspice/ngspice-43.ebuild @@ -0,0 +1,216 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multibuild toolchain-funcs virtualx + +DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)" +HOMEPAGE="http://ngspice.sourceforge.net" +SRC_URI=" + https://downloads.sourceforge.net/ngspice/${P}.tar.gz + doc? ( https://downloads.sourceforge.net/ngspice/${P}-manual.pdf ) +" + +LICENSE="BSD GPL-2 MPL-2.0" +SLOT="0" +IUSE="X debug deprecated doc examples fftw +klu openmp +readline +shared tcl" +KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~x64-macos" +RESTRICT="!test? ( test )" + +DEPEND=" + sys-libs/ncurses:= + X? ( + x11-libs/libXaw + x11-libs/libXt + x11-libs/libX11 + ) + fftw? ( sci-libs/fftw:3.0= ) + readline? ( sys-libs/readline:= ) + tcl? ( + dev-lang/tcl:= + dev-tcltk/blt + ) +" +RDEPEND="${DEPEND}" + +DOCS=( + ANALYSES + AUTHORS + BUGS + ChangeLog + DEVICES + FAQ + NEWS + README + README.vdmos + Stuarts_Poly_Notes +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + MULTIBUILD_VARIANTS=( "binaries" ) + use shared && MULTIBUILD_VARIANTS+=( "shared" ) + use tcl && MULTIBUILD_VARIANTS+=( "tcl" ) +} + +src_prepare() { + default + + if use tcl; then + if use examples; then + find examples/tclspice -type f -iname \*tcl -or -iname \*.sh | + while read s + do + sed -i -e 's@../../../src/.libs/libspice.so@libspice.so@g' \ + -e 's@package require BLT@package require Tk\npackage require BLT@g' \ + -e "s@spice::codemodel \(.*\)/\(.*\).cm@spice::codemodel /usr/$(get_libdir)/ngspice/\2.cm@g" \ + "${s}" || die "sed failed" + done + fi + fi + + eautoreconf + multibuild_copy_sources +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862513 + # https://sourceforge.net/p/ngspice/bugs/665/ + filter-lto + + multibuild_foreach_variant ngspice_configure +} + +ngspice_configure() { + local myeconfargs + + pushd "${BUILD_DIR}" &>/dev/null || die + + if use debug; then + myeconfargs=( + --enable-debug + --enable-ftedebug + --enable-cpdebug + --enable-sensdebug + --enable-asdebug + --enable-stepdebug + --enable-pzdebug + ) + else + myeconfargs=( + --disable-debug + --disable-ftedebug + --disable-cpdebug + --disable-sensdebug + --disable-asdebug + --disable-stepdebug + --disable-pzdebug + ) + fi + + # As of March 2021, these do not compile + myeconfargs+=( + --disable-blktmsdebug + --disable-smltmsdebug + ) + + myeconfargs+=( + --enable-xspice + --enable-cider + --disable-rpath + $(use_enable klu) + $(use_enable openmp) + $(use_with fftw fftw3) + $(use_with readline) + ) + + if [[ "${MULTIBUILD_VARIANT}" == "shared" ]]; then + myeconfargs+=( --with-ngshared ) + elif [[ "${MULTIBUILD_VARIANT}" == "tcl" ]]; then + myeconfargs+=( --with-tcl="${EPREFIX}/usr/$(get_libdir)" ) + else + myeconfargs+=( + $(use_enable deprecated oldapps) + $(use_with X x) + ) + fi + + econf "${myeconfargs[@]}" + + popd &>/dev/null || die +} + +src_compile() { + multibuild_foreach_variant ngspice_compile +} + +ngspice_compile() { + pushd "${BUILD_DIR}" &>/dev/null || die + default + popd &>/dev/null || die +} + +src_test() { + if ! use debug; then + # tests can be only executed for the binaries variant + pushd "${WORKDIR}/${P}-binaries" &>/dev/null || die + echo "set ngbehavior=mc" > "${HOME}"/.spiceinit || die "Failed to configure ${PN} for running the test suite" + virtx default + popd &>/dev/null || die + else + # https://sourceforge.net/p/ngspice/bugs/353/ + ewarn + ewarn "Skipping tests because they are known to fail in debug mode" + ewarn + fi +} + +src_install() { + multibuild_foreach_variant ngspice_install + + # merge the installations of all variants + local v + for v in "${MULTIBUILD_VARIANTS[@]}" ; do + cp -a "${ED}/tmp/${v}"/* "${ED}" || die "Failed to combine multibuild installations" + done + rm -rf "${ED}/tmp" || die + + use tcl && DOCS+=( README.tcl ) + use shared && DOCS+=( README.shared-xspice ) + use doc && DOCS+=( "${DISTDIR}"/${P}-manual.pdf ) + + default + + if use examples; then + if ! use tcl; then + rm -rf examples/tclspice || die + fi + + insinto /usr/share/${PN} + doins -r examples + fi +} + +ngspice_install() { + pushd "${BUILD_DIR}" &>/dev/null || die + + emake DESTDIR="${ED}/tmp/${MULTIBUILD_VARIANT}" install + + # Strip shared-library and Tcl-module builds to the bare minimum; + # all the support files will have been handled by the 'binaries' build. + if [[ "${MULTIBUILD_VARIANT}" != "binaries" ]]; then + rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/bin{,.debug} || die + rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/share || die + rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la || die + rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug} || die + fi + + popd &>/dev/null || die +} diff --git a/sec-keys/openpgp-keys-alexanderneumann/Manifest b/sec-keys/openpgp-keys-alexanderneumann/Manifest new file mode 100644 index 000000000000..a3befb09fd17 --- /dev/null +++ b/sec-keys/openpgp-keys-alexanderneumann/Manifest @@ -0,0 +1 @@ +DIST openpgp-keys-alexanderneumann-20241028.asc 33940 BLAKE2B 418b74d03045d48a1836e68df1db0988126aa558d309a2906eaa431313b7ea5fa162526be0c10b7fb1783be19720fc0cf917e989362bceeacc01f8bc84c095e4 SHA512 2b72105873652c42b37ba3bb3cf7d82e0a0a1a0b1e295da839b61e29e812a5201aa39a22a447ab29e08a687322e8d09c84178dd700d3b0602b198f39305b487a diff --git a/sec-keys/openpgp-keys-alexanderneumann/metadata.xml b/sec-keys/openpgp-keys-alexanderneumann/metadata.xml new file mode 100644 index 000000000000..9708173b83e5 --- /dev/null +++ b/sec-keys/openpgp-keys-alexanderneumann/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>davidroman96@gmail.com</email> + <name>David Roman</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <stabilize-allarches/> +</pkgmetadata> diff --git a/sec-keys/openpgp-keys-alexanderneumann/openpgp-keys-alexanderneumann-20241028.ebuild b/sec-keys/openpgp-keys-alexanderneumann/openpgp-keys-alexanderneumann-20241028.ebuild new file mode 100644 index 000000000000..5390fb04f360 --- /dev/null +++ b/sec-keys/openpgp-keys-alexanderneumann/openpgp-keys-alexanderneumann-20241028.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="OpenPGP keys used by Alexander Neumann" +HOMEPAGE="https://github.com/fd0" +SRC_URI="https://restic.net/gpg-key-alex.asc -> ${P}.asc" +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +src_install() { + local files=( ${A} ) + + insinto /usr/share/openpgp-keys + newins - alexanderneumann.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die) +} diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest index 391e8cc91436..eb76ee1fc0e9 100644 --- a/sys-apps/pcsc-lite/Manifest +++ b/sys-apps/pcsc-lite/Manifest @@ -1 +1,2 @@ DIST pcsc-lite-2.0.1.tar.bz2 815103 BLAKE2B a9eea4a4da1a78fc22797b17c128889b2f7caf8c4aa02dd77f4ac79e4ec458fb0162578b5422552545cd39303750d5396f3687f8cfee7603fad8d60cb54ee1e8 SHA512 af007f00f43e8d897710580f6f27814c9e7d3ca489ff01edf2e3b979e46267915aa04d9c15f225a420fa681de936e42a1d4779d962717cf9a9f4a3d1ca31502b +DIST pcsc-lite-2.3.0.tar.xz 209064 BLAKE2B 48fc1a513a217ff499e8da63e026ce6adcd37987c878a0dda50756cfac5cc64245c95715df40df14e29883410c3d55670432ba0c658eff84add25b76c1828b11 SHA512 194c175ba7cf4610f09c08d463edf12f63e8e6a694938049988efb10c91e15b05d91747d58013f2f35452427996e8fe2ffb3706806d17ee278dc4896eab901c0 diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-2.2.3-change-setup-spy-script-location.patch b/sys-apps/pcsc-lite/files/pcsc-lite-2.2.3-change-setup-spy-script-location.patch new file mode 100644 index 000000000000..035c49b653a7 --- /dev/null +++ b/sys-apps/pcsc-lite/files/pcsc-lite-2.2.3-change-setup-spy-script-location.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index acb51ddf..0c7b3a8f 100644 +--- a/meson.build ++++ b/meson.build +@@ -202,7 +202,7 @@ install_data('src/spy/pcsc-spy', + install_dir : get_option('bindir')) + + install_data('src/spy/setup_spy.sh', +- install_dir : 'share/doc/pcsc-lite') ++ install_dir : get_option('datadir') / 'doc' / meson.project_name()+'-'+meson.project_version()) + + run_command('pod2man', + ['--date=2024-01-01', 'src/spy/pcsc-spy.pod', 'pcsc-spy.1'], diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild new file mode 100644 index 000000000000..5b9b77db7340 --- /dev/null +++ b/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit meson-multilib python-single-r1 tmpfiles udev + +DESCRIPTION="PC/SC Architecture smartcard middleware library" +HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC" +SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.xz" + +# GPL-2 is there for the init script; everything else comes from +# upstream. +LICENSE="BSD GPL-3+ BSD-2 ISC GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +# This is called libusb so that it doesn't fool people in thinking that +# it is _required_ for USB support. Otherwise they'll disable udev and +# that's going to be worse. +IUSE="doc embedded libusb policykit selinux systemd +udev" +REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}" + +# No dependencies need the MULTILIB_DEPS because the libraries are actually +# standalone, the deps are only needed for the daemon itself. +DEPEND=" + libusb? ( virtual/libusb:1 ) + udev? ( virtual/libudev:= ) + policykit? ( >=sys-auth/polkit-0.111 ) + acct-group/openct + acct-group/pcscd + acct-user/pcscd + ${PYTHON_DEPS}" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-pcscd )" +BDEPEND=" + app-alternatives/lex + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch + "${FILESDIR}"/${PN}-1.9.8-systemd-user.patch + "${FILESDIR}"/${PN}-2.2.3-change-setup-spy-script-location.patch +) + +multilib_src_configure() { + local emesonargs=( + -Dusbdropdir="${EPREFIX}"/usr/$(get_libdir)/readers/usb + -Dipcdir=/run/pcscd + -Dsystemdunit=system + $(meson_native_use_bool embedded) + $(meson_native_use_bool systemd libsystemd) + $(meson_native_use_bool udev libudev) + $(meson_native_use_bool libusb) + $(meson_native_use_bool policykit polkit) + ) + + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + dodoc HELP SECURITY + + newinitd "${FILESDIR}"/pcscd-init.7 pcscd + dotmpfiles "${FILESDIR}"/pcscd.conf + + if use udev; then + exeinto "$(get_udevdir)" + newexe "${FILESDIR}"/pcscd-udev pcscd.sh + + insinto "$(get_udevdir)"/rules.d + newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules + fi + + python_fix_shebang "${ED}"/usr/bin/pcsc-spy + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in" + elog "the pcscd group, to avoid running as root." + elog + elog "This also means you need the newest drivers available so that the" + elog "devices get the proper owner." + elog + elog "Furthermore, a conf.d file is no longer installed by default, as" + elog "the default configuration does not require one. If you need to" + elog "pass further options to pcscd, create a file and set the" + elog "EXTRA_OPTS variable." + elog + + if use udev; then + elog "Hotplug support is provided by udev rules." + elog "When using OpenRC you additionally need to tell it to hotplug" + elog "pcscd by setting this variable in /etc/rc.conf:" + elog + elog " rc_hotplug=\"pcscd\"" + fi + + tmpfiles_process pcscd.conf + + use udev && udev_reload +} + +pkg_postrm() { + use udev && udev_reload +} diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest index fbf1cffc7c4f..8d5e87be1090 100644 --- a/www-apache/mod_security/Manifest +++ b/www-apache/mod_security/Manifest @@ -1 +1,2 @@ DIST modsecurity-2.9.7.tar.gz 4320766 BLAKE2B 2e0c62ae4f6fcef0b41bf1f74ab5acbae485e728f35bf621a96e622d86e2256c7e052d3a452ff49a4c4cb824243e71a706f9a5868bb3f77e37191a1dfe1b371b SHA512 a333d142f0dedf332a3cccca8267ccf9193cd4ad5a026b3cdbe0713dd1f3edde33739eae8baced2c63409cc0b220001e0a226ea032874a97c08e4065eb1fbdd5 +DIST modsecurity-v2.9.8.tar.gz 4341347 BLAKE2B 27563e06bbf86c8c84f851b20c3e281798fbcb3056abe6097493cca510b58a13f059bd510b5c7c1f75cd3347872ba2a93db2ed93d67c094637ae532860135812 SHA512 73d7965e501db0d59e25398360cb33fa34ddd6095e0dbc2df50ace7bbb5b4ad554fbc9b324cc117a82c67ad144b8477a8d55081eaee5d5a8ad692a42761fd367 diff --git a/www-apache/mod_security/metadata.xml b/www-apache/mod_security/metadata.xml index b17d41d2886d..b68c6fe191ce 100644 --- a/www-apache/mod_security/metadata.xml +++ b/www-apache/mod_security/metadata.xml @@ -34,6 +34,6 @@ </use> <upstream> - <remote-id type="github">SpiderLabs/ModSecurity</remote-id> + <remote-id type="github">owasp-modsecurity/ModSecurity</remote-id> </upstream> </pkgmetadata> diff --git a/www-apache/mod_security/mod_security-2.9.8.ebuild b/www-apache/mod_security/mod_security-2.9.8.ebuild new file mode 100644 index 000000000000..4138f6a327b8 --- /dev/null +++ b/www-apache/mod_security/mod_security-2.9.8.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..3} ) + +inherit autotools apache-module lua-single + +MY_PN=modsecurity +MY_P=${MY_PN}-v${PV} + +DESCRIPTION="Application firewall and intrusion detection for Apache" +HOMEPAGE="https://github.com/owasp-modsecurity/ModSecurity" +SRC_URI="https://github.com/owasp-modsecurity/ModSecurity/releases/download/v${PV}/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc fuzzyhash geoip jit json lua mlogc pcre2" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +DEPEND="dev-libs/apr:1= + dev-libs/apr-util:1[openssl] + dev-libs/expat + dev-libs/libxml2 + dev-libs/libpcre[jit?] + net-misc/curl + sys-apps/util-linux + sys-libs/gdbm:= + virtual/libcrypt:= + fuzzyhash? ( app-crypt/ssdeep ) + json? ( dev-libs/yajl ) + lua? ( ${LUA_DEPS} ) + mlogc? ( net-misc/curl ) + pcre2? ( dev-libs/libpcre2:= ) + www-servers/apache[apache2_modules_unique_id]" +BDEPEND="doc? ( app-text/doxygen )" +RDEPEND="${DEPEND} + geoip? ( dev-libs/geoip ) + mlogc? ( dev-lang/perl )" +PDEPEND=">=www-apache/modsecurity-crs-3.3.2" + +S="${WORKDIR}/${MY_P}" + +APACHE2_MOD_FILE="apache2/.libs/${PN}2.so" +APACHE2_MOD_CONF="79_${PN}" +APACHE2_MOD_DEFINE="SECURITY" + +# Tests require symbols only defined within the Apache binary. +RESTRICT=test + +PATCHES=( + "${FILESDIR}"/${PN}-2.9.3-autoconf_lua_package_name.patch +) + +need_apache2 + +pkg_setup() { + _init_apache2 + _init_apache2_late + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + --enable-request-early + --with-apxs="${APXS}" + --with-pic + $(use_enable doc docs) + $(use_enable jit pcre-jit) + $(use_enable lua lua-cache) + $(use_enable mlogc) + $(use_with fuzzyhash ssdeep) + $(use_with json yajl) + $(use_with lua) + $(use_with pcre2) + ) + + econf ${myconf[@]} +} + +src_compile() { + default +} + +src_install() { + apache-module_src_install + + dodoc CHANGES README.md modsecurity.conf-recommended unicode.mapping + + if use doc; then + dodoc -r doc/apache/html + fi + + if use mlogc; then + insinto /etc/ + newins mlogc/mlogc-default.conf mlogc.conf + dobin mlogc/mlogc + dobin mlogc/mlogc-batch-load.pl + newdoc mlogc/INSTALL INSTALL-mlogc + fi + + # Use /var/lib instead of /var/cache. This stuff is "persistent," + # and isn't a cached copy of something that we can recreate. + # Bug 605496. + keepdir /var/lib/modsecurity + fowners apache:apache /var/lib/modsecurity + fperms 0750 /var/lib/modsecurity + for dir in data tmp upload; do + keepdir "/var/lib/modsecurity/${dir}" + fowners apache:apache "/var/lib/modsecurity/${dir}" + fperms 0750 "/var/lib/modsecurity/${dir}" + done +} + +pkg_postinst() { + elog "The base configuration file has been renamed ${APACHE2_MOD_CONF}" + elog "so that you can put your own configuration in (for example)" + elog "90_modsecurity_local.conf." + elog "" + elog "That would be the correct place for site-global security rules." + elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs" +} |