From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0EF201382C5 for ; Sun, 6 Jun 2021 06:35:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3031AE08D3; Sun, 6 Jun 2021 06:35:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02C31E08D3 for ; Sun, 6 Jun 2021 06:35:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9AB4335CA0 for ; Sun, 6 Jun 2021 06:35:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EAB67A1 for ; Sun, 6 Jun 2021 06:35:03 +0000 (UTC) From: "Yixun Lan" 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" Message-ID: <1622961252.168e12d457e434c0f36cacf784bdf01f8c80a6ec.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.5.6-swap.patch app-backup/snapper/snapper-0.5.6-r1.ebuild app-backup/snapper/snapper-0.8.9-r1.ebuild X-VCS-Directories: app-backup/snapper/files/ app-backup/snapper/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 168e12d457e434c0f36cacf784bdf01f8c80a6ec X-VCS-Branch: master Date: Sun, 6 Jun 2021 06:35:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 09cc7492-9ca6-44dc-b24b-5a9fcfdfe1c0 X-Archives-Hash: ec10b4e9ee826a63a96293bb5d664cc4 commit: 168e12d457e434c0f36cacf784bdf01f8c80a6ec Author: Yixun Lan gentoo org> AuthorDate: Sun Jun 6 06:34:12 2021 +0000 Commit: Yixun Lan gentoo org> CommitDate: Sun Jun 6 06:34:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168e12d4 app-backup/snapper: drop old Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest | 2 - app-backup/snapper/files/snapper-0.5.6-swap.patch | 36 ---------- app-backup/snapper/snapper-0.5.6-r1.ebuild | 77 --------------------- app-backup/snapper/snapper-0.8.9-r1.ebuild | 81 ----------------------- 4 files changed, 196 deletions(-) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 79ab289556a..28f2896b3d4 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,4 +1,2 @@ -DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e 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.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228274ef7c54164a7024e382a45bfa5b40687fd5e3d770fc87019d8e93af5c681013a023cd89dcb1f16863a77421 SHA512 5a3e45839cd4b5e621425df2e1214ca5014a391d17b489fdf7d315e8ac9959741c1f6fcf7adf644276ed11488bc0f88fcfa563198bd78824867d267df204659d diff --git a/app-backup/snapper/files/snapper-0.5.6-swap.patch b/app-backup/snapper/files/snapper-0.5.6-swap.patch deleted file mode 100644 index aa24330d730..00000000000 --- a/app-backup/snapper/files/snapper-0.5.6-swap.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 22bc1d808ebb6c3958e8231a36b73cd45a7f2c30 -Author: Spencer Janssen -Date: Mon Dec 3 17:33:49 2018 -0600 - - Work around btrfs v4.19 - - Addresses #459 - -diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc -index cb9f7b3..c05557b 100644 ---- a/snapper/Btrfs.cc -+++ b/snapper/Btrfs.cc -@@ -41,6 +41,9 @@ - #include - #include - #include -+#ifdef swap -+#undef swap -+#endif - #include - #include - #endif -diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc -index bada3f8..9edc325 100644 ---- a/snapper/BtrfsUtils.cc -+++ b/snapper/BtrfsUtils.cc -@@ -34,6 +34,9 @@ - #ifdef HAVE_LIBBTRFS - #include - #include -+#ifdef swap -+#undef swap -+#endif - #endif - #include - #include diff --git a/app-backup/snapper/snapper-0.5.6-r1.ebuild b/app-backup/snapper/snapper-0.5.6-r1.ebuild deleted file mode 100644 index c6f5ffca2a5..00000000000 --- a/app-backup/snapper/snapper-0.5.6-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd - -DESCRIPTION="Command-line program for btrfs and lvm snapshot management" -HOMEPAGE="http://snapper.io/" -SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="lvm pam xattr" - -RDEPEND="dev-libs/boost:=[threads] - 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} - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/cron-confd.patch - "${FILESDIR}"/${P}-swap.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" -} - -src_configure() { - # ext4 code does not work anymore - # snapper does not build without btrfs - local myeconfargs=( - --with-conf="/etc/conf.d" - --disable-zypp - --enable-rollback - --disable-ext4 - --enable-btrfs - $(use_enable lvm) - $(use_enable pam) - $(use_enable xattr xattrs) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - # Existing configuration file required to function - 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 " - elog "For more information, see man (8) snapper or" - elog "http://snapper.io/documentation.html" -} diff --git a/app-backup/snapper/snapper-0.8.9-r1.ebuild b/app-backup/snapper/snapper-0.8.9-r1.ebuild deleted file mode 100644 index 5a5593c2846..00000000000 --- a/app-backup/snapper/snapper-0.8.9-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 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="lvm pam xattr" - -RDEPEND="dev-libs/boost:=[threads] - 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 -) - -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=( - --with-conf="/etc/conf.d" - --disable-zypp - --enable-rollback - --disable-ext4 - --enable-btrfs - $(use_enable lvm) - $(use_enable pam) - $(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 " - elog "For more information, see man (8) snapper or" - elog "http://snapper.io/documentation.html" -}