[gentoo-commits] repo/gentoo:master commit in: profiles/base/, app-backup/bup/files/, app-backup/bup/, profiles/

[Michał Górny]

commit:     ea4ac42ea4f9f77410a783fdb46d630925955ecf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 09:52:36 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 23 09:53:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea4ac42e

app-backup/bup: Remove last-rited pkg

Closes: https://bugs.gentoo.org/713366
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-backup/bup/Manifest                       |  1 -
 app-backup/bup/bup-0.29.2.ebuild              | 58 ---------------------------
 app-backup/bup/files/bup-0.29.2-sitedir.patch | 38 ------------------
 app-backup/bup/metadata.xml                   | 11 -----
 profiles/base/package.use.mask                |  4 --
 profiles/package.mask                         |  5 ---
 6 files changed, 117 deletions(-)

diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest
deleted file mode 100644
index 687815efd8f..00000000000
--- a/app-backup/bup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bup-0.29.2.tar.gz 389145 BLAKE2B 1a54cb68b2c68ecf4902a7f1ee940711b62e413c69d17ba1515f24e115484bac1b4919947f2214ffff784389839f633fbb13dea69c186246426e57c33a148c4c SHA512 10c433d6779b1fd7e1935c587676492d96a330dc3280556332bb55b6e5c62de8631fd755d07d2eaf80cb9fa209dc25b241d5ecf3a6fe2b8210a3d0e1ce4fa4bf

diff --git a/app-backup/bup/bup-0.29.2.ebuild b/app-backup/bup/bup-0.29.2.ebuild
deleted file mode 100644
index e4d3a98673f..00000000000
--- a/app-backup/bup/bup-0.29.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A highly efficient backup system based on the git packfile format"
-HOMEPAGE="https://bup.github.io/ https://github.com/bup/bup"
-SRC_URI="https://github.com/bup/bup/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+doc test web"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-arch/par2cmdline
-	sys-libs/readline:0
-	dev-vcs/git
-	$(python_gen_cond_dep '
-		dev-python/fuse-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pylibacl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxattr[${PYTHON_MULTI_USEDEP}]
-		web? ( www-servers/tornado[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}
-	test? (
-		dev-lang/perl
-		net-misc/rsync
-	)
-	doc? ( app-text/pandoc )
-"
-
-# unresolved sandbox issues
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-sitedir.patch )
-
-src_configure() {
-	# only build/install docs if enabled
-	export PANDOC=$(usex doc pandoc "")
-
-	./configure || die
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr DOCDIR="/usr/share/${PF}" \
-		SITEDIR="$(python_get_sitedir)" install
-	python_fix_shebang "${ED}"
-	python_optimize "${ED}"
-}

diff --git a/app-backup/bup/files/bup-0.29.2-sitedir.patch b/app-backup/bup/files/bup-0.29.2-sitedir.patch
deleted file mode 100644
index 920b3dc2792..00000000000
--- a/app-backup/bup/files/bup-0.29.2-sitedir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- bup-0.29.2/Makefile
-+++ bup-0.29.2/Makefile
-@@ -25,7 +25,7 @@
- os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
- os := $(call shout,$(os),Unable to determine OS)
- 
--CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
-+CFLAGS := -Wall -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
- CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
- SOEXT:=.so
- 
-@@ -93,10 +93,11 @@
- dest_docdir := $(DESTDIR)$(DOCDIR)
- dest_bindir := $(DESTDIR)$(BINDIR)
- dest_libdir := $(DESTDIR)$(LIBDIR)
-+dest_sitedir := $(DESTDIR)$(SITEDIR)
- 
- install: all
--	$(INSTALL) -d $(dest_bindir) \
--		$(dest_libdir)/bup $(dest_libdir)/cmd \
-+	$(INSTALL) -d $(dest_bindir) $(dest_libdir) \
-+		$(dest_sitedir)/bup $(dest_libdir)/cmd \
- 		$(dest_libdir)/web $(dest_libdir)/web/static
- 	test -z "$(man_roff)" || install -d $(dest_mandir)/man1
- 	test -z "$(man_roff)" || $(INSTALL) -m 0644 $(man_roff) $(dest_mandir)/man1
-@@ -109,10 +110,10 @@
- 	done
- 	$(INSTALL) -pm 0644 \
- 		lib/bup/*.py \
--		$(dest_libdir)/bup
-+		$(dest_sitedir)/bup
- 	$(INSTALL) -pm 0755 \
- 		lib/bup/*$(SOEXT) \
--		$(dest_libdir)/bup
-+		$(dest_sitedir)/bup
- 	$(INSTALL) -pm 0644 \
- 		lib/web/static/* \
- 		$(dest_libdir)/web/static/

diff --git a/app-backup/bup/metadata.xml b/app-backup/bup/metadata.xml
deleted file mode 100644
index 1d0a6394f96..00000000000
--- a/app-backup/bup/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="web">Support browsing backups via a web interface</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">bup/bup</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index a626c92c479..a885706f6a9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -75,10 +75,6 @@ dev-util/buildbot doc
 # Requires deprecated python2 and pygtk
 mail-client/claws-mail python
 
-# Michał Górny <mgorny@g.o> (2020-03-25)
-# Requires www-servers/tornado with py2.
-app-backup/bup web
-
 # Michał Górny <mgorny@g.o> (2020-03-24)
 # Require dev-python/recommonmark with py2.
 <sys-devel/llvm-9 doc

diff --git a/profiles/package.mask b/profiles/package.mask
index 311af14d3cd..e883fe09484 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -417,11 +417,6 @@ dev-python/kivy-garden
 # Removal in 30 days.  Bug #718848.
 dev-python/PyDbLite
 
-# Michał Górny <mgorny@g.o> (2020-04-23)
-# Unmaintained.  Stuck on Python 2.
-# Removal in 30 days.  Bug #713366.
-app-backup/bup
-
 # Michał Górny <mgorny@g.o> (2020-04-22)
 # Effectively unmaintained and stuck on Python 3.6.
 #