diff options
Diffstat (limited to 'app-backup/btrbk')
| -rw-r--r-- | app-backup/btrbk/Manifest | 7 | ||||
| -rw-r--r-- | app-backup/btrbk/btrbk-0.31.3.ebuild | 77 | ||||
| -rw-r--r-- | app-backup/btrbk/btrbk-0.32.0.ebuild | 77 | ||||
| -rw-r--r-- | app-backup/btrbk/btrbk-0.32.1.ebuild | 77 | ||||
| -rw-r--r-- | app-backup/btrbk/btrbk-0.32.3.ebuild | 77 | ||||
| -rw-r--r-- | app-backup/btrbk/btrbk-0.32.6-r1.ebuild (renamed from app-backup/btrbk/btrbk-0.31.2.ebuild) | 9 | ||||
| -rw-r--r-- | app-backup/btrbk/btrbk-0.32.6-r2.ebuild (renamed from app-backup/btrbk/btrbk-0.32.2.ebuild) | 30 | ||||
| -rw-r--r-- | app-backup/btrbk/btrbk-9999.ebuild | 24 | ||||
| -rw-r--r-- | app-backup/btrbk/files/btrbk-0.32.6-support-asciidoc.patch | 58 | ||||
| -rw-r--r-- | app-backup/btrbk/metadata.xml | 2 |
10 files changed, 107 insertions, 331 deletions
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest index 038d4d13e3fe..b9bf643e7418 100644 --- a/app-backup/btrbk/Manifest +++ b/app-backup/btrbk/Manifest @@ -1,6 +1 @@ -DIST btrbk-0.31.2.tar.xz 107124 BLAKE2B a05ef8a665d50b0f9637b1bc7026f0ca0f8364377b4165dae09cd27790dc139aaea1096a54719d948adda5050f91580650bf58db70a086cfdd14b73559fad9f3 SHA512 f953fe1a231f7a28c2d98cf124e3d52cc6d0810e6cb1673b90f335e07cd7473d0302ec227361f902c40a36dab5c075c675d2ee0543a23c37cb1e4baaf74efea0 -DIST btrbk-0.31.3.tar.xz 109884 BLAKE2B 7f78d00815259e42bb3fd16ee48272717fe57913b7af83ca8a98f1dfd0de715cbf8b07177ea60b5b8bdcb9793ee0d5829b90b8327cd4810f6275611276a6e707 SHA512 62dee5430635b6a31edcdc9bed1829f549b60074ea09bb6f1fcd56d242d4215339846c8c2dbcd4bee05cd2a0cb32c1237ce7311d2b887885373c13fa15a6f476 -DIST btrbk-0.32.0.tar.xz 110408 BLAKE2B d9627d0f0a258bba9412b37707c3e79ca8a65870148aa27f38e615c90d0e26adfc5ecf697cc34052916127a0a26be850f5874ff52ab6cb193093d591cb05dab1 SHA512 201dde5ea9bf459e5a837b520d3e76ef1077a1769ed2e06b9754e34a93e2abd513a0da2b18abbe13c09fc3a945117a4b022ad423f805056b62a2b2be9c0f768a -DIST btrbk-0.32.1.tar.xz 110364 BLAKE2B 5d2860e182701ba6c407b9d0f41e476442bdf0ebc8491c3fa944860228d087d6bbe13084a4e950a24fc6ea1e251e2c4c6cbf17e9e3a4cb4f3f9b7ea9b85b2c11 SHA512 a44c1a50696793661fa6a06fafc6a7682ba5db57b511666a9b77d2df79b724855e91187e4d13e1dfe340077f550b0aced8923c6dec955d25ce46f7644ed802f3 -DIST btrbk-0.32.2.tar.xz 111044 BLAKE2B f06e563d0a3f6a7096426b205c56446c8cba34767a0a2cd092f1d0d2661c1a38d88adfae0cd2046d2f43623fb236e9a2d7ef7281938a37b410f2cf842f5df83c SHA512 204bd48605b369909b1cb586bfa75dda5ee57b833c71a9d39699020f05f7305e2bc932c76face5aa0e435c1df46e13a566cbb2042c86975f6f8cd65c82ddcccf -DIST btrbk-0.32.3.tar.xz 110724 BLAKE2B f0e389891bfdfa961187505548ec5139aa8967932d2fcca43c151c8ca25664c30af96f0f52531507e7c838ca3df16f371f7419df226283734fee23f6af56b3cf SHA512 8503ddb47a54b02abc03b160c296f9e5d2d71cc9705f4891f99732c36a62bb0bf81caa5cbe793d7e070c68ab461de995b442aa3a140d6aa68fe2a3b8a9cafb20 +DIST btrbk-0.32.6.tar.xz 111804 BLAKE2B f23e5f60e63bb1a9d5cc2f1339ac3e40a9cae5c0e3f626f1ad0e7396b8f9ebb00bce319835c9c708cdfe3c1cad3ef4e90985cb9c633be7091ffdbde93a10412c SHA512 5a21b3728aded1610ef9106d0460db12b07bbc6d62be199081baba92413b30ba0f7b4a77612d0bbb0910863be85f2c68eab3d02fabf1ea5a7f5fb22aeb1f7a38 diff --git a/app-backup/btrbk/btrbk-0.31.3.ebuild b/app-backup/btrbk/btrbk-0.31.3.ebuild deleted file mode 100644 index f301c70cd559..000000000000 --- a/app-backup/btrbk/btrbk-0.31.3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+mbuffer +doc +lsbtr" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh - mbuffer? ( >=sys-block/mbuffer-20180505 ) - >=sys-fs/btrfs-progs-4.12" - -src_compile() { - emake clean - use doc && emake -C doc -} -src_install() { - local targets="install-bin install-etc install-share install-systemd" - use doc && targets="${targets} install-man install-doc" - use lsbtr && targets="${targets} install-bin-links" - emake \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}" \ - SYSTEMDDIR="$(systemd_get_systemunitdir)" \ - ${targets} -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.32.0.ebuild b/app-backup/btrbk/btrbk-0.32.0.ebuild deleted file mode 100644 index 29b1c6d3fc78..000000000000 --- a/app-backup/btrbk/btrbk-0.32.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+mbuffer +doc +lsbtr" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh - mbuffer? ( >=sys-block/mbuffer-20180505 ) - >=sys-fs/btrfs-progs-4.12" - -src_compile() { - emake clean - use doc && emake -C doc -} -src_install() { - local targets="install-bin install-etc install-share install-systemd" - use doc && targets="${targets} install-man install-doc" - use lsbtr && targets="${targets} install-bin-links" - emake \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}" \ - SYSTEMDDIR="$(systemd_get_systemunitdir)" \ - ${targets} -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.32.1.ebuild b/app-backup/btrbk/btrbk-0.32.1.ebuild deleted file mode 100644 index 29b1c6d3fc78..000000000000 --- a/app-backup/btrbk/btrbk-0.32.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+mbuffer +doc +lsbtr" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh - mbuffer? ( >=sys-block/mbuffer-20180505 ) - >=sys-fs/btrfs-progs-4.12" - -src_compile() { - emake clean - use doc && emake -C doc -} -src_install() { - local targets="install-bin install-etc install-share install-systemd" - use doc && targets="${targets} install-man install-doc" - use lsbtr && targets="${targets} install-bin-links" - emake \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}" \ - SYSTEMDDIR="$(systemd_get_systemunitdir)" \ - ${targets} -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.32.3.ebuild b/app-backup/btrbk/btrbk-0.32.3.ebuild deleted file mode 100644 index f75978a45363..000000000000 --- a/app-backup/btrbk/btrbk-0.32.3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/digint/btrbk.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" -HOMEPAGE="https://digint.ch/btrbk/" -LICENSE="GPL-3+" -SLOT="0" -IUSE="+mbuffer +doc +lsbtr" - -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh - mbuffer? ( >=sys-block/mbuffer-20180505 ) - >=sys-fs/btrfs-progs-4.12" - -src_compile() { - emake clean - use doc && emake -C doc -} -src_install() { - local targets="install-bin install-etc install-share install-systemd" - use doc && targets="${targets} install-man install-doc" - use lsbtr && targets="${targets} install-bin-links" - emake \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}" \ - SYSTEMDDIR="$(systemd_get_systemunitdir)" \ - ${targets} -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.26.0" ; then - upgrade_0_26_0_warning="1" - fi - if has_version "<${CATEGORY}/${PN}-0.27.0" ; then - upgrade_0_27_0_warning="1" - fi -} -pkg_postinst() { - if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then - ewarn "If you are using raw targets, make sure to run the" - ewarn "\"raw_suffix2sidecar\" utility in each target directory." - fi - if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then - ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved' - ewarn 'monthly/yearly backups could get deleted when upgrading to' - ewarn 'btrbk-0.27.0.' - ewarn '' - ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs' - ewarn 'or systemd timers calling btrbk.' - ewarn '' - ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and' - ewarn 'check if any snapshots/backups would get deleted. If you want to' - ewarn 'forcibly preserve a snapshot/backup forever, rename it:' - ewarn '' - ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever' - ewarn '' - ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.' - ewarn '(".keep_forever" suffix in the example above).' - ewarn '' - ewarn ' [1] https://github.com/digint/btrbk/issues/217' - ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f' - fi -} diff --git a/app-backup/btrbk/btrbk-0.31.2.ebuild b/app-backup/btrbk/btrbk-0.32.6-r1.ebuild index 769c2a4aee99..03aa2217e2bf 100644 --- a/app-backup/btrbk/btrbk-0.31.2.ebuild +++ b/app-backup/btrbk/btrbk-0.32.6-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd @@ -23,7 +23,7 @@ IUSE="+mbuffer +doc +lsbtr" DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" RDEPEND="dev-lang/perl - net-misc/openssh + virtual/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12" @@ -31,6 +31,7 @@ src_compile() { emake clean use doc && emake -C doc } + src_install() { local targets="install-bin install-etc install-share install-systemd" use doc && targets="${targets} install-man install-doc" @@ -41,6 +42,7 @@ src_install() { SYSTEMDDIR="$(systemd_get_systemunitdir)" \ ${targets} } + pkg_preinst() { if has_version "<${CATEGORY}/${PN}-0.26.0" ; then upgrade_0_26_0_warning="1" @@ -49,6 +51,7 @@ pkg_preinst() { upgrade_0_27_0_warning="1" fi } + pkg_postinst() { if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then ewarn "If you are using raw targets, make sure to run the" diff --git a/app-backup/btrbk/btrbk-0.32.2.ebuild b/app-backup/btrbk/btrbk-0.32.6-r2.ebuild index f75978a45363..66e00dd28638 100644 --- a/app-backup/btrbk/btrbk-0.32.2.ebuild +++ b/app-backup/btrbk/btrbk-0.32.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,26 +11,40 @@ if [[ ${PV} == "9999" ]] ; then SRC_URI="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" fi DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" HOMEPAGE="https://digint.ch/btrbk/" + LICENSE="GPL-3+" SLOT="0" IUSE="+mbuffer +doc +lsbtr" -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh +RDEPEND=" + dev-lang/perl + >=sys-fs/btrfs-progs-4.12 + virtual/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) - >=sys-fs/btrfs-progs-4.12" +" +BDEPEND=" + doc? ( + || ( + app-text/asciidoc + >=dev-ruby/asciidoctor-1.5.7 + ) + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-support-asciidoc.patch +) src_compile() { emake clean use doc && emake -C doc } + src_install() { local targets="install-bin install-etc install-share install-systemd" use doc && targets="${targets} install-man install-doc" @@ -41,6 +55,7 @@ src_install() { SYSTEMDDIR="$(systemd_get_systemunitdir)" \ ${targets} } + pkg_preinst() { if has_version "<${CATEGORY}/${PN}-0.26.0" ; then upgrade_0_26_0_warning="1" @@ -49,6 +64,7 @@ pkg_preinst() { upgrade_0_27_0_warning="1" fi } + pkg_postinst() { if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then ewarn "If you are using raw targets, make sure to run the" diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild index f75978a45363..dfefb0fe16b4 100644 --- a/app-backup/btrbk/btrbk-9999.ebuild +++ b/app-backup/btrbk/btrbk-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,21 +16,31 @@ fi DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" HOMEPAGE="https://digint.ch/btrbk/" + LICENSE="GPL-3+" SLOT="0" IUSE="+mbuffer +doc +lsbtr" -DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )" - -RDEPEND="dev-lang/perl - net-misc/openssh +RDEPEND=" + dev-lang/perl + >=sys-fs/btrfs-progs-4.12 + virtual/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) - >=sys-fs/btrfs-progs-4.12" +" +BDEPEND=" + doc? ( + || ( + app-text/asciidoc + >=dev-ruby/asciidoctor-1.5.7 + ) + ) +" src_compile() { emake clean use doc && emake -C doc } + src_install() { local targets="install-bin install-etc install-share install-systemd" use doc && targets="${targets} install-man install-doc" @@ -41,6 +51,7 @@ src_install() { SYSTEMDDIR="$(systemd_get_systemunitdir)" \ ${targets} } + pkg_preinst() { if has_version "<${CATEGORY}/${PN}-0.26.0" ; then upgrade_0_26_0_warning="1" @@ -49,6 +60,7 @@ pkg_preinst() { upgrade_0_27_0_warning="1" fi } + pkg_postinst() { if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then ewarn "If you are using raw targets, make sure to run the" diff --git a/app-backup/btrbk/files/btrbk-0.32.6-support-asciidoc.patch b/app-backup/btrbk/files/btrbk-0.32.6-support-asciidoc.patch new file mode 100644 index 000000000000..5de2a1168d9e --- /dev/null +++ b/app-backup/btrbk/files/btrbk-0.32.6-support-asciidoc.patch @@ -0,0 +1,58 @@ +https://github.com/digint/btrbk/commit/9dfee7bc32f392a599164ae4c2a0c24d418751ef + +From 9dfee7bc32f392a599164ae4c2a0c24d418751ef Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 8 Jul 2023 23:44:53 +0100 +Subject: [PATCH] doc: allow asciidoc again + +This effectively reverts 0e63843195eb35c26386863d18a70a764a3efd04 and +173319e7e1599ef9d08b985740e55020ebc2ea85. + +asciidoc has been revived (for a while now) and doesn't require Python 2. We +still prefer asciidoctor and fallback to asciidoc/a2x if it's not available. + +Comparing the asciidoc and asciidoctor man pages, everything looks OK. + +Python tends to be available more readily in distribution build environments +rather than the Ruby stack. Also, the pregenerated man pages are gone as of +f132c94c655afa930a73423e6c1abf88d412f49d. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -18,8 +18,19 @@ ifeq ($(COMPRESS), yes) + endif + + # convert using "asciidoctor": <https://asciidoctor.org> +-ASCIIDOCTOR_MANPAGE = asciidoctor -d manpage -b manpage +-ASCIIDOCTOR_HTML = asciidoctor -b html5 -d article ++# fallback to "a2x" from asciidoc package: <http://asciidoc.org> ++ifneq (, $(shell command -v asciidoctor 2> /dev/null)) ++ ASCIIDOC_MANPAGE = asciidoctor -d manpage -b manpage ++ ASCIIDOC_HTML = asciidoctor -b html5 -d article ++else ifneq (, $(shell command -v a2x 2> /dev/null)) ++ # NOTE: using -L (--no-xmllint), as xmllint is a separate package on many distros. ++ ASCIIDOC_MANPAGE = a2x -L -d manpage -f manpage ++ ASCIIDOC_HTML = asciidoc -b html -d article ++else ++ ASCIIDOC_ERR = $(error "please install either asciidoc or asciidoctor") ++ ASCIIDOC_MANPAGE = $(ASCIIDOC_ERR) ++ ASCIIDOC_HTML = $(ASCIIDOC_ERR) ++endif + + # reproducible builds: reference date is ":date:" attribute from asciidoc source + date_attr = $(shell sed -rn 's/:date:\s*//p' $(1)) +@@ -50,10 +61,10 @@ clean: + gzip -9 -n -c $< > $@ + + %.1 : %.1.asciidoc +- SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOCTOR_MANPAGE) -o $@ $< ++ SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOC_MANPAGE) $< + + %.5 : %.5.asciidoc +- SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOCTOR_MANPAGE) -o $@ $< ++ SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOC_MANPAGE) $< + + %.html : %.asciidoc +- SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOCTOR_HTML) -o $@ $< ++ SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOC_HTML) -o $@ $< diff --git a/app-backup/btrbk/metadata.xml b/app-backup/btrbk/metadata.xml index f4cd2899510c..6a0e69059e4c 100644 --- a/app-backup/btrbk/metadata.xml +++ b/app-backup/btrbk/metadata.xml @@ -20,7 +20,7 @@ <remote-id type="github">digint/btrbk</remote-id> </upstream> <use> - <flag name="mbuffer">Use sys-block/mbuffer to enable progress bar and buffering/limiting functionality</flag> + <flag name="mbuffer">Use <pkg>sys-block/mbuffer</pkg> to enable progress bar and buffering/limiting functionality</flag> <flag name="lsbtr">Enable the lsbtr command-line tool</flag> </use> </pkgmetadata> |