gentoo resync : 24.12.2018

5 files changed, 45 insertions, 130 deletions

diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest
index e85fda0a00b6..2e7813694ead 100644
--- a/app-backup/bup/Manifest
+++ b/app-backup/bup/Manifest
@@ -1,8 +1,6 @@
+AUX bup-0.29.2-sitedir.patch 1186 BLAKE2B ae56baf75e32994afc6dfad386f19edfeed6d02918c572dfef2f4ecbe6c13c9e4e9a78819dbeae21c32fba1f7914b1ea43f41f52c2770c738e724ebe52031ff8 SHA512 1d1848bc24cc1216fde35ed3eabef52a0cef0a6c7c0be7d51d3829f413e0a26abd3441fc958e3461bbc5faad8b97e903e6f86f1de418b4d211996f213db5e37e
 DIST bup-0.28.1.tar.gz 377712 BLAKE2B b469af7b40807e1462c603c03078fc4e048fc300f74dccba9db4ee9d5b1cd385b3092c2bcc08b60ba798e4f401953ccb3217275c6afb3ebf8040e6e507fde9fd SHA512 b27a94eeee86366f9f97081611d8e0443686ed8c4070d45729ad4efe1d48ee9f528d3257bfd5d37d6243927f5b63d6b613bf5ae2c39117012979ccd5ccecf9d2
-DIST bup-0.29.1.tar.gz 388654 BLAKE2B e0a1bd6606f0b2fa7fc50f7df46d2f1704b2bec7e9ac7ff8b97f0bc46081fd4c506f2f12af73e952854746bdf0de5b713d0d5519d99bebafb8c4b62f782ebd09 SHA512 2ad142214cf5ee61e2113b49d02761cdf8fdd5928eb4f885230af71f149ba33ee748e1d96e240903f54d3264dc2ad1614e6ece66027b4c7ed1e97b6147a9685e
-DIST bup-0.29.tar.gz 388173 BLAKE2B 4d844aa616daa56e457a6164a8a00521c3cc2fe56a4f7b3e73b3cdfa4d42977652b203756198e3b8222de5e49b6d0cadd340f70f79e0a1878f4af80dd2b4d2d7 SHA512 3a70d747c6bae2640809d48141b726fa7897f33af9f19047c8d4cfba88abe04ac907980f0ce572847b900e2c8d02a3303e886c8ad7af9a97a7804540c7da1705
+DIST bup-0.29.2.tar.gz 389145 BLAKE2B 1a54cb68b2c68ecf4902a7f1ee940711b62e413c69d17ba1515f24e115484bac1b4919947f2214ffff784389839f633fbb13dea69c186246426e57c33a148c4c SHA512 10c433d6779b1fd7e1935c587676492d96a330dc3280556332bb55b6e5c62de8631fd755d07d2eaf80cb9fa209dc25b241d5ecf3a6fe2b8210a3d0e1ce4fa4bf
 EBUILD bup-0.28.1.ebuild 1196 BLAKE2B 10a8e8e74be17ab9fa5cf7b1274065729c1372429092e53b7864b945413b83b70362fffcb7ab0043f265861e066e7ebf689e5b0516f86e71a455d57a01f85db7 SHA512 43b4b54ebf455d2c8604cb734af209586102e6f28041fe98b303087a2a128fc376ee88558536eb38db6ed5e7ce412aef0ebb0297fe5cf01345e969606c0f472e
-EBUILD bup-0.29-r1.ebuild 1286 BLAKE2B e6b96198a10844d613c683709a80d47ed26f9f4397ca88c0514d463d599f2b2622ea7479a0c6c60f14c588c71064df261a0436d1056f72abf7cb69d0bc9a3a20 SHA512 ad13428549e878f5854639b8a06fab3b0f5dd2142ef68e14a5f018a01bd446f2efb0e643459e061f6fb1b5a096ed730490806ca8c93d475c2c7b418559eb0096
-EBUILD bup-0.29.1.ebuild 1286 BLAKE2B e6b96198a10844d613c683709a80d47ed26f9f4397ca88c0514d463d599f2b2622ea7479a0c6c60f14c588c71064df261a0436d1056f72abf7cb69d0bc9a3a20 SHA512 ad13428549e878f5854639b8a06fab3b0f5dd2142ef68e14a5f018a01bd446f2efb0e643459e061f6fb1b5a096ed730490806ca8c93d475c2c7b418559eb0096
-EBUILD bup-0.29.ebuild 1196 BLAKE2B 10a8e8e74be17ab9fa5cf7b1274065729c1372429092e53b7864b945413b83b70362fffcb7ab0043f265861e066e7ebf689e5b0516f86e71a455d57a01f85db7 SHA512 43b4b54ebf455d2c8604cb734af209586102e6f28041fe98b303087a2a128fc376ee88558536eb38db6ed5e7ce412aef0ebb0297fe5cf01345e969606c0f472e
+EBUILD bup-0.29.2.ebuild 1243 BLAKE2B d291de78398bde7d4884a9d125d157db092f4ca5d21fdfedfc7a6278f20fc9ea39b6fcb04184214a735129b146257eb90db0d1065c87dddb983ce74971b51806 SHA512 cdee0ec7fbffc2a4bcccc6de0456a361eb6c9c189da936678b50cfbaa198638419fcf0d240494afc2ce29f04ed905e48cc953753fbd47e75015d70a0f2581af1
 MISC metadata.xml 404 BLAKE2B be0a8a5d858a23520e0927be152c1defea7c2df55d7f7d83a28652eeee7d0c0762f6b0d0671b0ec684cee2b1efdea864ca5a20167fb1d4396d427a9ae75f1185 SHA512 62266b2c5b320859e4283c23aac6c325036f1a83b51a314078ccad2b0e9b9360690e34d87f387bea86e8b98ecf1b9851744a57744c478bd7040b42adea517b81
diff --git a/app-backup/bup/bup-0.29.1.ebuild b/app-backup/bup/bup-0.29.1.ebuild
deleted file mode 100644
index 86ff4f87983b..000000000000
--- a/app-backup/bup/bup-0.29.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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
-	dev-python/fuse-python[${PYTHON_USEDEP}]
-	dev-python/pylibacl[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	web? ( www-servers/tornado[${PYTHON_USEDEP}] )
-	sys-libs/readline:0
-	dev-vcs/git"
-DEPEND="${RDEPEND}
-	test? (
-		dev-lang/perl
-		net-misc/rsync
-	)
-	doc? ( app-text/pandoc )
-"
-
-# unresolved sandbox issues
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -e "/^CFLAGS :=/s/-O2 -Werror//" \
-		-i Makefile || die
-}
-
-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 LIBDIR="/usr/$(get_libdir)/bup" DOCDIR="/usr/share/${PF}" install
-	python_fix_shebang "${ED}"
-	python_optimize "${ED}"
-}
diff --git a/app-backup/bup/bup-0.29-r1.ebuild b/app-backup/bup/bup-0.29.2.ebuild
index 86ff4f87983b..e42e7328e08f 100644
--- a/app-backup/bup/bup-0.29-r1.ebuild
+++ b/app-backup/bup/bup-0.29.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,12 +35,7 @@ DEPEND="${RDEPEND}
 # unresolved sandbox issues
 RESTRICT="test"
 
-src_prepare() {
-	default
-
-	sed -e "/^CFLAGS :=/s/-O2 -Werror//" \
-		-i Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-sitedir.patch )
 
 src_configure() {
 	# only build/install docs if enabled
@@ -54,7 +49,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr LIBDIR="/usr/$(get_libdir)/bup" DOCDIR="/usr/share/${PF}" 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/bup-0.29.ebuild b/app-backup/bup/bup-0.29.ebuild
deleted file mode 100644
index f1071883fb22..000000000000
--- a/app-backup/bup/bup-0.29.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="test web"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-arch/par2cmdline
-	dev-python/fuse-python[${PYTHON_USEDEP}]
-	dev-python/pylibacl[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	web? ( www-servers/tornado[${PYTHON_USEDEP}] )
-	sys-libs/readline:0
-	dev-vcs/git"
-DEPEND="${RDEPEND}
-	test? (
-		dev-lang/perl
-		net-misc/rsync
-	)
-	app-text/pandoc
-"
-
-# unresolved sandbox issues
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -e "/^CFLAGS :=/s/-O2 -Werror//" \
-		-i Makefile || die
-}
-
-src_configure() {
-	./configure || die
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr LIBDIR="/usr/$(get_libdir)/bup" DOCDIR="/usr/share/${PF}" 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
new file mode 100644
index 000000000000..920b3dc27921
--- /dev/null
+++ b/app-backup/bup/files/bup-0.29.2-sitedir.patch
@@ -0,0 +1,38 @@
+--- 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/