diff options
Diffstat (limited to 'app-backup/snapper')
| -rw-r--r-- | app-backup/snapper/Manifest | 7 | ||||
| -rw-r--r-- | app-backup/snapper/files/snapper-0.10.1-testsuite.patch (renamed from app-backup/snapper/files/snapper-0.9.0-testsuite.patch) | 21 | ||||
| -rw-r--r-- | app-backup/snapper/files/snapper-0.11.0-cron-confd.patch | 18 | ||||
| -rw-r--r-- | app-backup/snapper/files/snapper-0.8.15-testsuite.patch | 83 | ||||
| -rw-r--r-- | app-backup/snapper/files/snapper-0.9.1-testsuite.patch | 84 | ||||
| -rw-r--r-- | app-backup/snapper/files/snapper.bash | 200 | ||||
| -rw-r--r-- | app-backup/snapper/snapper-0.10.6.ebuild (renamed from app-backup/snapper/snapper-0.8.15-r2.ebuild) | 31 | ||||
| -rw-r--r-- | app-backup/snapper/snapper-0.10.7.ebuild (renamed from app-backup/snapper/snapper-0.9.0-r1.ebuild) | 31 | ||||
| -rw-r--r-- | app-backup/snapper/snapper-0.11.0.ebuild (renamed from app-backup/snapper/snapper-0.9.1.ebuild) | 33 | ||||
| -rw-r--r-- | app-backup/snapper/snapper-0.8.16-r1.ebuild | 89 |
10 files changed, 81 insertions, 516 deletions
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 2bdc33b55a9c..dd6d2ce24c65 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,4 +1,3 @@ -DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c -DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae -DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a5cf1453849158f963604fe34fed0f3f99325449f9805779e845fc6a105008890ed2d2c63d3e0dde33d1d77350 SHA512 0861621764b65365ea7e7cf48baa0c7a64351fed7fca439c91ebf8023dbad6d05c709a5c49b3755d1edbd1b98617b8c202239a63608c11aee808ac21d6a2b412 -DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293 +DIST snapper-0.10.6.tar.gz 423867 BLAKE2B a7d0f8c62c60c0d03bf108a8c0692dd209f170cf8227512cbc3b80eb9f58ecca845aa585859032bc6582d67e4c6ff15b75443a9ee9291d1b970efec15513571f SHA512 6eedfb9408260331f042f0a429a1104136cb88dac450f320641b0941cd06faf52f67cad2397cf4122f919876bb994455da0cfd3bb099f82217050e07b4c77d2e +DIST snapper-0.10.7.tar.gz 428482 BLAKE2B 43c48d978296901f6584cef258ec3723de97b1d6b4b4a5b6bc39649f28b3300919616c65b8fcdb97b3ebcab08d04e4583713eef146721367de24513e80113b45 SHA512 bf098c941735b60554ff0711fa43b30ef3634e01178f5ee8ad44c65b757c3366bd5bf568cef3a787b2ddcc2fc63090056109250480e6bd360ebf27a8343373b8 +DIST snapper-0.11.0.tar.gz 445685 BLAKE2B 301e6d745d8d6d7acc6ca0c9fc431a0e46700aabd9882785bb2be38152693f9dbe897f85f6ad724c9529a0754b6146b53dda0a24141b386e59e7737855bc5da2 SHA512 fe86be4ceb1439b5be3fa61f5bc037bc51a5fe47451d0698851f83e2783d6c245ef8d40a33f79b03e8d1d8b63433743c35938ad7dca0747e0e1f650a5a766c40 diff --git a/app-backup/snapper/files/snapper-0.9.0-testsuite.patch b/app-backup/snapper/files/snapper-0.10.1-testsuite.patch index 7aa089569b4a..84ff2ce1978a 100644 --- a/app-backup/snapper/files/snapper-0.9.0-testsuite.patch +++ b/app-backup/snapper/files/snapper-0.10.1-testsuite.patch @@ -1,10 +1,10 @@ diff --git a/configure.ac b/configure.ac -index 06e4721..c89d0aa 100644 +index 39def82..9b96a32 100644 --- a/configure.ac +++ b/configure.ac -@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"]) - - CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'" +@@ -174,6 +174,13 @@ if test "x$enable_coverage" = "xyes"; then + LDFLAGS="${LDFLAGS} --coverage" + fi +AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]), + [with_tests=$enableval],[with_tests=yes]) @@ -12,9 +12,10 @@ index 06e4721..c89d0aa 100644 +if test "x$with_tests" = "xyes"; then + AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support]) +fi - - AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]), - [with_btrfs=$enableval],[with_btrfs=yes]) ++ + PKG_CHECK_MODULES(DBUS, dbus-1) + PKG_CHECK_MODULES(XML2, libxml-2.0) + PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])]) diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am index 81104bf..9c29477 100644 --- a/testsuite-cmp/Makefile.am @@ -33,7 +34,7 @@ index 81104bf..9c29477 100644 +endif diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am -index 717313a..527843d 100644 +index a3bb2e3..c4e88f4 100644 --- a/testsuite-real/Makefile.am +++ b/testsuite-real/Makefile.am @@ -2,6 +2,7 @@ @@ -41,10 +42,10 @@ index 717313a..527843d 100644 # +if ENABLE_TESTS - CXXFLAGS += -std=gnu++0x + CXXFLAGS += -std=gnu++11 AM_CPPFLAGS = -I$(top_srcdir) -@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc +@@ -56,3 +57,4 @@ ascii_file_SOURCES = ascii-file.cc EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) diff --git a/app-backup/snapper/files/snapper-0.11.0-cron-confd.patch b/app-backup/snapper/files/snapper-0.11.0-cron-confd.patch new file mode 100644 index 000000000000..c1fc5c692c71 --- /dev/null +++ b/app-backup/snapper/files/snapper-0.11.0-cron-confd.patch @@ -0,0 +1,18 @@ +diff --git a/scripts/snapper-hourly b/scripts/snapper-hourly +index 36a41f5..f36d8ec 100755 +--- a/scripts/snapper-hourly ++++ b/scripts/snapper-hourly +@@ -9,10 +9,10 @@ export PATH + + + # +-# get information from /etc/sysconfig/snapper ++# get information from /etc/conf.d/snapper + # +-if [ -f /etc/sysconfig/snapper ] ; then +- . /etc/sysconfig/snapper ++if [ -f /etc/conf.d/snapper ] ; then ++ . /etc/conf.d/snapper + fi + + diff --git a/app-backup/snapper/files/snapper-0.8.15-testsuite.patch b/app-backup/snapper/files/snapper-0.8.15-testsuite.patch deleted file mode 100644 index 237e0705c98d..000000000000 --- a/app-backup/snapper/files/snapper-0.8.15-testsuite.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 839d012..ceac54d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"]) - - CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'" - -+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]), -+ [with_tests=$enableval],[with_tests=yes]) -+AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"]) -+if test "x$with_tests" = "xyes"; then -+ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support]) -+fi - - AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]), - [with_btrfs=$enableval],[with_btrfs=yes]) -diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am -index 81104bf..9c29477 100644 ---- a/testsuite-cmp/Makefile.am -+++ b/testsuite-cmp/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite-cmp - # - -+if ENABLE_TESTS - AM_CPPFLAGS = -I$(top_srcdir) - AM_LDFLAGS = -lboost_system - -@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc - - EXTRA_DIST = $(noinst_SCRIPTS) - -+endif -diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am -index 717313a..527843d 100644 ---- a/testsuite-real/Makefile.am -+++ b/testsuite-real/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite-real - # - -+if ENABLE_TESTS - CXXFLAGS += -std=gnu++0x - - AM_CPPFLAGS = -I$(top_srcdir) -@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc - - EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) - -+endif -diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am -index d7e30b8..72ef5ee 100644 ---- a/testsuite/Makefile.am -+++ b/testsuite/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite - # - -+if ENABLE_TESTS - AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) - - LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework -@@ -40,3 +41,4 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils - getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la - - lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la -+endif -diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am -index 7b52e13..71cb545 100644 ---- a/zypp-plugin/testsuite/Makefile.am -+++ b/zypp-plugin/testsuite/Makefile.am -@@ -1,3 +1,5 @@ -+ -+if ENABLE_TESTS - if HAVE_ZYPP - TEST_LOG_DRIVER = $(SHELL) tap-driver.sh - -@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS) - - EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh - endif -+endif diff --git a/app-backup/snapper/files/snapper-0.9.1-testsuite.patch b/app-backup/snapper/files/snapper-0.9.1-testsuite.patch deleted file mode 100644 index 0bd3fd3189fc..000000000000 --- a/app-backup/snapper/files/snapper-0.9.1-testsuite.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 3f5c911..a8c9c95 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -84,6 +84,13 @@ CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'" - - PAM_SECURITY=${libdir}/security - -+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]), -+ [with_tests=$enableval],[with_tests=yes]) -+AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"]) -+if test "x$with_tests" = "xyes"; then -+ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support]) -+fi -+ - AC_ARG_WITH([pam-security], AC_HELP_STRING([--pam-security], [Use a custom pam security directory (default is $libdir/security)]), - [with_pam_security=$withval], [with_pam_security=no]) - AS_IF([test "x$with_pam_security" != xno], [PAM_SECURITY="${with_pam_security}"]) -diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am -index 81104bf..9c29477 100644 ---- a/testsuite-cmp/Makefile.am -+++ b/testsuite-cmp/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite-cmp - # - -+if ENABLE_TESTS - AM_CPPFLAGS = -I$(top_srcdir) - AM_LDFLAGS = -lboost_system - -@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc - - EXTRA_DIST = $(noinst_SCRIPTS) - -+endif -diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am -index 717313a..527843d 100644 ---- a/testsuite-real/Makefile.am -+++ b/testsuite-real/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite-real - # - -+if ENABLE_TESTS - CXXFLAGS += -std=gnu++0x - - AM_CPPFLAGS = -I$(top_srcdir) -@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc - - EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) - -+endif -diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am -index ccb84d3..409e265 100644 ---- a/testsuite/Makefile.am -+++ b/testsuite/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite - # - -+if ENABLE_TESTS - AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) - - LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework -@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la - range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la - - limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la -+endif -diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am -index 7b52e13..71cb545 100644 ---- a/zypp-plugin/testsuite/Makefile.am -+++ b/zypp-plugin/testsuite/Makefile.am -@@ -1,3 +1,5 @@ -+ -+if ENABLE_TESTS - if HAVE_ZYPP - TEST_LOG_DRIVER = $(SHELL) tap-driver.sh - -@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS) - - EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh - endif -+endif diff --git a/app-backup/snapper/files/snapper.bash b/app-backup/snapper/files/snapper.bash deleted file mode 100644 index e5ca4134342a..000000000000 --- a/app-backup/snapper/files/snapper.bash +++ /dev/null @@ -1,200 +0,0 @@ -_snapper() -{ - local configdir="/etc/snapper/configs" - local cur prev words cword - _init_completion || return - - local GLOGAL_SNAPPER_OPTIONS=' - -q --quiet - -v --verbose - --utc - --iso - -t --table-style - -c --config - -r --root - --no-dbus - --version - --help - ' - - # see if the user selected a command already - local COMMANDS=( - "list-configs" "create-config" "delete-config" "set-config" - "list" "ls" - "create" "modify" "delete" "remove" "rm" - "mount" "umount" - "status" "diff" "xadiff" - "undochange" "rollback" - "setup-quota" - "cleanup") - - local command i - for (( i=0; i < ${#words[@]}-1; i++ )); do - if [[ ${COMMANDS[@]} =~ ${words[i]} ]]; then - command=${words[i]} - break - fi - done - - case $prev in - --version|--help) - return 0 - ;; - esac - - # supported options per command - if [[ "$cur" == -* ]]; then - case $command in - create-config) - COMPREPLY=( $( compgen -W '--fstype -f - --templete -t' -- "$cur" ) ) - return 0 - ;; - list|ls) - COMPREPLY=( $( compgen -W '--type -t - --all-configs -a' -- "$cur" ) ) - return 0 - ;; - create) - COMPREPLY=( $( compgen -W '--type -t - --pre-number - --print-number -p - --description -d - --cleanup-algorithm -c - --userdata -u - --command' -- "$cur" ) ) - return 0 - ;; - modify) - COMPREPLY=( $( compgen -W '--description -d - --cleanup-algorithm -c - --userdata -u' -- "$cur" ) ) - return 0 - ;; - delete|remove|rm) - COMPREPLY=( $( compgen -W '--sync -s - ' -- "$cur" ) ) - return 0 - ;; - status) - COMPREPLY=( $( compgen -W '--output -o - ' -- "$cur" ) ) - return 0 - ;; - diff) - COMPREPLY=( $( compgen -W '--input -i - --diff-cmd - --extensions -x' -- "$cur" ) ) - return 0 - ;; - undochange) - COMPREPLY=( $( compgen -W '--input -i - ' -- "$cur" ) ) - return 0 - ;; - rollback) - COMPREPLY=( $( compgen -W '--print-number -p - --description -d - --cleanup-algorithm -c - --userdata -u' -- "$cur" ) ) - return 0 - ;; - *) - COMPREPLY=( $( compgen -W "$GLOGAL_SNAPPER_OPTIONS" -- "$cur" ) ) - return 0 - ;; - esac - fi - - # specific command arguments - if [[ -n $command ]]; then - case $command in - create-config) - case "$prev" in - --fstype|-f) - COMPREPLY=( $( compgen -W 'btrfs ext4 lvm(xfs) lvm(ext4) - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - list) - case "$prev" in - --type|-t) - COMPREPLY=( $( compgen -W 'all single pre-post - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - create) - case "$prev" in - --type|-t) - COMPREPLY=( $( compgen -W 'single pre post - ' -- "$cur" ) ) - ;; - --pre-number) - COMPREPLY=( $( compgen -W ' - ' -- "$cur" ) ) - ;; - --cleanup-algorithm|-c) - COMPREPLY=( $( compgen -W 'empty-pre-post timeline number - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - modify) - case "$prev" in - --cleanup-algorithm|-c) - COMPREPLY=( $( compgen -W 'empty-pre-post timeline number - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - status) - case "$prev" in - --output|-o) - COMPREPLY=( $( compgen -f -- "$cur" ) ) - ;; - esac - return 0 - ;; - cleanup) - case "$prev" in - empty-pre-post|timeline|number) - ;; - *) - COMPREPLY=( $( compgen -W 'empty-pre-post timeline number - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - diff) - return 0 - ;; - undochange) - return 0 - ;; - rollback) - case "$prev" in - --cleanup-algorithm|-c) - COMPREPLY=( $( compgen -W 'empty-pre-post timeline number - ' -- "$cur" ) ) - ;; - esac - return 0 - ;; - esac - fi - - # no command yet, show what commands we have - if [ "$command" = "" ]; then - COMPREPLY=( $( compgen -W '${COMMANDS[@]} ${GLOGAL_SNAPPER_OPTIONS[@]}' -- "$cur" ) ) - fi - - return 0 -} && -complete -F _snapper snapper diff --git a/app-backup/snapper/snapper-0.8.15-r2.ebuild b/app-backup/snapper/snapper-0.10.6.ebuild index 04ec37fa6255..2adf8bcfcde5 100644 --- a/app-backup/snapper/snapper-0.8.15-r2.ebuild +++ b/app-backup/snapper/snapper-0.10.6.ebuild @@ -1,9 +1,9 @@ -# 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 autotools systemd bash-completion-r1 +inherit autotools systemd DESCRIPTION="Command-line program for btrfs and lvm snapshot management" HOMEPAGE="http://snapper.io/" @@ -11,11 +11,16 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc lvm pam test systemd xattr" +KEYWORDS="amd64 ~arm64 ~riscv x86" +IUSE="lvm pam test systemd xattr" RESTRICT="test" -RDEPEND="dev-libs/boost:=[threads(+)] +BDEPEND="app-text/docbook-xsl-stylesheets + dev-libs/libxslt + sys-devel/gettext + virtual/pkgconfig" + +RDEPEND="dev-libs/boost:= dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= @@ -29,15 +34,11 @@ RDEPEND="dev-libs/boost:=[threads(+)] pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - sys-devel/gettext - virtual/pkgconfig" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/cron-confd.patch - "${FILESDIR}"/${P}-testsuite.patch + "${FILESDIR}"/${PN}-0.10.1-testsuite.patch ) src_prepare() { @@ -60,7 +61,7 @@ src_configure() { --enable-btrfs-quota --disable-ext4 --enable-btrfs - $(use_enable doc) + --enable-doc $(use_enable lvm) $(use_enable pam) $(use_enable test tests) @@ -77,7 +78,6 @@ src_install() { keepdir /etc/snapper/configs newconfd data/sysconfig.snapper snapper find "${D}" -name '*.la' -delete || die - newbashcomp "${FILESDIR}"/${PN}.bash ${PN} } pkg_postinst() { @@ -85,5 +85,6 @@ pkg_postinst() { elog "at least one config first. To do this, run:" elog "snapper create-config <subvolume>" elog "For more information, see man (8) snapper or" - elog "http://snapper.io/documentation.html" + elog "http://snapper.io/documentation.html and" + elog "https://wiki.gentoo.org/wiki/Snapper" } diff --git a/app-backup/snapper/snapper-0.9.0-r1.ebuild b/app-backup/snapper/snapper-0.10.7.ebuild index e08297c0ff3a..9d04eeeb2e14 100644 --- a/app-backup/snapper/snapper-0.9.0-r1.ebuild +++ b/app-backup/snapper/snapper-0.10.7.ebuild @@ -1,9 +1,9 @@ -# 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 autotools systemd bash-completion-r1 +inherit autotools systemd DESCRIPTION="Command-line program for btrfs and lvm snapshot management" HOMEPAGE="http://snapper.io/" @@ -11,11 +11,16 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="doc lvm pam test systemd xattr" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="lvm pam test systemd xattr" RESTRICT="test" -RDEPEND="dev-libs/boost:=[threads(+)] +BDEPEND="app-text/docbook-xsl-stylesheets + dev-libs/libxslt + sys-devel/gettext + virtual/pkgconfig" + +RDEPEND="dev-libs/boost:= dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= @@ -29,15 +34,11 @@ RDEPEND="dev-libs/boost:=[threads(+)] pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - sys-devel/gettext - virtual/pkgconfig" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/cron-confd.patch - "${FILESDIR}"/${P}-testsuite.patch + "${FILESDIR}"/${PN}-0.10.1-testsuite.patch ) src_prepare() { @@ -60,7 +61,7 @@ src_configure() { --enable-btrfs-quota --disable-ext4 --enable-btrfs - $(use_enable doc) + --enable-doc $(use_enable lvm) $(use_enable pam) $(use_enable test tests) @@ -77,7 +78,6 @@ src_install() { keepdir /etc/snapper/configs newconfd data/sysconfig.snapper snapper find "${D}" -name '*.la' -delete || die - newbashcomp "${FILESDIR}"/${PN}.bash ${PN} } pkg_postinst() { @@ -85,5 +85,6 @@ pkg_postinst() { elog "at least one config first. To do this, run:" elog "snapper create-config <subvolume>" elog "For more information, see man (8) snapper or" - elog "http://snapper.io/documentation.html" + elog "http://snapper.io/documentation.html and" + elog "https://wiki.gentoo.org/wiki/Snapper" } diff --git a/app-backup/snapper/snapper-0.9.1.ebuild b/app-backup/snapper/snapper-0.11.0.ebuild index 3f1b02d77735..0e9331554272 100644 --- a/app-backup/snapper/snapper-0.9.1.ebuild +++ b/app-backup/snapper/snapper-0.11.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools systemd bash-completion-r1 +inherit autotools systemd DESCRIPTION="Command-line program for btrfs and lvm snapshot management" HOMEPAGE="http://snapper.io/" @@ -11,11 +11,16 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" -IUSE="doc lvm pam test systemd xattr" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="lvm pam test systemd xattr" RESTRICT="test" -RDEPEND="dev-libs/boost:=[threads(+)] +BDEPEND="app-text/docbook-xsl-stylesheets + dev-libs/libxslt + sys-devel/gettext + virtual/pkgconfig" + +RDEPEND="dev-libs/boost:= dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= @@ -29,15 +34,11 @@ RDEPEND="dev-libs/boost:=[threads(+)] pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - sys-devel/gettext - virtual/pkgconfig" +DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/cron-confd.patch - "${FILESDIR}"/${P}-testsuite.patch + "${FILESDIR}"/${P}-cron-confd.patch + "${FILESDIR}"/${PN}-0.10.1-testsuite.patch ) src_prepare() { @@ -60,7 +61,7 @@ src_configure() { --enable-btrfs-quota --disable-ext4 --enable-btrfs - $(use_enable doc) + --enable-doc $(use_enable lvm) $(use_enable pam) $(use_enable test tests) @@ -77,7 +78,6 @@ src_install() { keepdir /etc/snapper/configs newconfd data/sysconfig.snapper snapper find "${D}" -name '*.la' -delete || die - newbashcomp "${FILESDIR}"/${PN}.bash ${PN} } pkg_postinst() { @@ -85,5 +85,6 @@ pkg_postinst() { elog "at least one config first. To do this, run:" elog "snapper create-config <subvolume>" elog "For more information, see man (8) snapper or" - elog "http://snapper.io/documentation.html" + elog "http://snapper.io/documentation.html and" + elog "https://wiki.gentoo.org/wiki/Snapper" } diff --git a/app-backup/snapper/snapper-0.8.16-r1.ebuild b/app-backup/snapper/snapper-0.8.16-r1.ebuild deleted file mode 100644 index 2115112952cc..000000000000 --- a/app-backup/snapper/snapper-0.8.16-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd bash-completion-r1 - -DESCRIPTION="Command-line program for btrfs and lvm snapshot management" -HOMEPAGE="http://snapper.io/" -SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc lvm pam test systemd xattr" -RESTRICT="test" - -RDEPEND="dev-libs/boost:=[threads(+)] - dev-libs/json-c:= - dev-libs/libxml2 - dev-libs/icu:= - sys-apps/acl - sys-apps/dbus - sys-apps/util-linux - >=sys-fs/btrfs-progs-3.17.1 - sys-libs/zlib - virtual/libintl - lvm? ( sys-fs/lvm2 ) - pam? ( sys-libs/pam ) - xattr? ( sys-apps/attr )" - -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/cron-confd.patch - "${FILESDIR}"/${PN}-0.8.15-testsuite.patch -) - -src_prepare() { - default - - sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \ - -i data/Makefile.* \ - || die "Failed to fix systemd services and timers installation path" - eautoreconf -} - -src_configure() { - # ext4 code does not work anymore - # snapper does not build without btrfs - local myeconfargs=( - --disable-silent-rules - --with-conf="/etc/conf.d" - --enable-zypp - --enable-rollback - --enable-btrfs-quota - --disable-ext4 - --enable-btrfs - $(use_enable doc) - $(use_enable lvm) - $(use_enable pam) - $(use_enable test tests) - $(use_enable systemd) - $(use_enable xattr xattrs) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - # Existing configuration file required to function - keepdir /etc/snapper/configs - newconfd data/sysconfig.snapper snapper - find "${D}" -name '*.la' -delete || die - newbashcomp "${FILESDIR}"/${PN}.bash ${PN} -} - -pkg_postinst() { - elog "In order to use Snapper, you need to set up" - elog "at least one config first. To do this, run:" - elog "snapper create-config <subvolume>" - elog "For more information, see man (8) snapper or" - elog "http://snapper.io/documentation.html" -} |