From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1389971-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 880A215808E for <garchives@archives.gentoo.org>; Tue, 26 Apr 2022 08:46:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4B55E07C7; Tue, 26 Apr 2022 08:46:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3273AE07C7 for <gentoo-commits@lists.gentoo.org>; Tue, 26 Apr 2022 08:46:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBFA734140F for <gentoo-commits@lists.gentoo.org>; Tue, 26 Apr 2022 08:46:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 296763BF for <gentoo-commits@lists.gentoo.org>; Tue, 26 Apr 2022 08:46:27 +0000 (UTC) From: "Yixun Lan" <dlan@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" <dlan@gentoo.org> Message-ID: <1650962503.5166dee47eaff100e9c4ca4660e15c427ea64164.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/snapper/Manifest app-backup/snapper/files/snapper-0.10.0-testsuite.patch app-backup/snapper/snapper-0.10.0.ebuild X-VCS-Directories: app-backup/snapper/files/ app-backup/snapper/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 5166dee47eaff100e9c4ca4660e15c427ea64164 X-VCS-Branch: master Date: Tue, 26 Apr 2022 08:46:27 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 17e4bcba-3153-4070-89a3-7543498113fc X-Archives-Hash: 910547df6ed74a6c55332f7be10fd6e6 commit: 5166dee47eaff100e9c4ca4660e15c427ea64164 Author: Yixun Lan <dlan <AT> gentoo <DOT> org> AuthorDate: Tue Apr 26 08:37:36 2022 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Tue Apr 26 08:41:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5166dee4 app-backup/snapper: drop 0.10.0 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> app-backup/snapper/Manifest | 1 - .../snapper/files/snapper-0.10.0-testsuite.patch | 84 --------------------- app-backup/snapper/snapper-0.10.0.ebuild | 88 ---------------------- 3 files changed, 173 deletions(-) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 901f27a4c64b..9218501d7501 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,3 +1,2 @@ -DIST snapper-0.10.0.tar.gz 404564 BLAKE2B 2dd3f889cf445e06975b5a6f1088d07445510c6905dacecd5b75c0b92c155d399b9b6ed07e466303e4ea3e4b3e6aa72f57b9a34fc2b3aa97c328d886732a375c SHA512 eb0b8568f90907a84dd6f6e135f26cddbafbb8a420f2e4c3ad657d4d782ff35517da93c375d9796dbac1a03983e8b88084280347b51eadf869294dcc080dbfeb DIST snapper-0.10.1.tar.gz 407628 BLAKE2B 84b4c027762a11cbf5f49af3e94bc0e494e83e61aa35c3873d0ab98b0c232897b6d002ef28181ad3b2567cc88b84424f570e7b24278c546fb39452e399ad7333 SHA512 39f4d95e98b736510b6bea56eebc8275618a0ad3221d7fae9cd0f46f8a4af574700a6123a438918d522d65758ad50020f80c925395ae3ab84b7ad3eb924592c0 DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293 diff --git a/app-backup/snapper/files/snapper-0.10.0-testsuite.patch b/app-backup/snapper/files/snapper-0.10.0-testsuite.patch deleted file mode 100644 index 643c98bf1a70..000000000000 --- a/app-backup/snapper/files/snapper-0.10.0-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 ceb0862..9a72775 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++11 - - 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/snapper-0.10.0.ebuild b/app-backup/snapper/snapper-0.10.0.ebuild deleted file mode 100644 index 11fe4ff862dd..000000000000 --- a/app-backup/snapper/snapper-0.10.0.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd - -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 ~arm64 ~riscv ~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}"/${P}-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 -} - -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" -}