gentoo resync : 08.01.2021

3 files changed, 98 insertions, 2 deletions

diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index 90ff6c4ccd41..ce756e8afb86 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1,4 +1,6 @@
 AUX dump-0.4.46-openssl11.patch 3324 BLAKE2B 5cc60ef04e7f53e96e900bc78e41f4c4bcf46f3000663ac7bb1995856b5cf067c69d84331b5dfd52da4ef2649e61f6e410e59f9a99bff3be44f9e46df1b75b4f SHA512 ae7c2549683a4cf33760685fe5b07ca88b158e81f5e3b866e58f618dced4c5909dec231d07a1df590a5ebbbc9f0eee575e63f4ffae719afe01315d53d63a76b0
 DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d
-EBUILD dump-0.4.46-r1.ebuild 2158 BLAKE2B 8c5cdda5ec805dd9fa7ef6b06ca0cc127f7cedef8c85d9c745fe06e978376050f31439c2699a7eb8c08bb7cc08fa3cdb34fc87ba1a8aa80ed462c8e2a5d27b0b SHA512 12b8a4af5901751d728df14e8d631b97f9565d4104b8172cdf05879355304d0275a160eada6c510127070defb0ee5a5a900a7435078654c88581ca9c85332162
+DIST dump-0.4b47.tar.gz 583380 BLAKE2B a5a6c507fc67451e6ce5117b28b9e97e45783059358c357e1f6d4b268437c8340f13e0d77e97631112824eca8205c49d206a8a7904bc3e00b1f0d5abb31418f7 SHA512 e9c567fe2ffad196b9657c551d83f7607758f3704cad6cb407514bbe2bc765c16968997dc3a5bc92b9eb5900fa5bd6e7cebc92c81afff53339fca92891a5259d
+EBUILD dump-0.4.46-r1.ebuild 2204 BLAKE2B 4b3c3330641d1b450dc4b074902a20cd042ae2ca7974d07fe041ef3504daa7c9c598b1a572c238d0637be1168adbaa6f1d726e9f7a8337bb84e1a1b14de221e5 SHA512 9231cca4d70a776f1aeea7bd8fb3864af52b191fba5afd0ee76c0914971d9887c810189d7e6b3a55cdbcf6159a218638db4a17a2e30d0ea8163dccf714afb092
+EBUILD dump-0.4.47.ebuild 2245 BLAKE2B 43dff68f38c2943a34534d8cc2f65e43adde048ab74dc32712abc25e3618c8beecae5a86a592988a6f6ab6ccec106646f5d1120ba40a91738c1dd16248e3e455 SHA512 443456b1f6c6cda14f25c8e7e02221c96e1ab459890768c5dc059b7008bcfefcfbc3f56281e8e4aba2bf00741358850263524e432c3670d68614fc8a3e55d8e7
 MISC metadata.xml 442 BLAKE2B 2538d02cfc5053f384863f9b9eb06d0d143d5e53e6e5155d1b242b943fa9255afbb244cac5f79de78ac9bfe38197b1fe86d1c67602d7d2bbf63fa29424e56333 SHA512 37d2ba01ab35909dab9b0f96ea9f8de02ab9999d7da7724d04b4e5430a4d133ccec1cbd007fe9a6cbba619d39dcd66b48dc93b61cc1afa030b541574b7a75957
diff --git a/app-arch/dump/dump-0.4.46-r1.ebuild b/app-arch/dump/dump-0.4.46-r1.ebuild
index c768fa8534d8..1ebc6f993745 100644
--- a/app-arch/dump/dump-0.4.46-r1.ebuild
+++ b/app-arch/dump/dump-0.4.46-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit flag-o-matic
+
 MY_P="${PN}-$(ver_rs 2 b)"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Dump/restore ext2fs backup utilities"
@@ -53,6 +55,8 @@ PATCHES=(
 )
 
 src_configure() {
+	append-flags -fcommon
+
 	local myeconfargs=(
 		--with-dumpdatespath=/etc/dumpdates
 		--with-rmtpath='$(sbindir)/rmt'
diff --git a/app-arch/dump/dump-0.4.47.ebuild b/app-arch/dump/dump-0.4.47.ebuild
new file mode 100644
index 000000000000..48981e19d4d5
--- /dev/null
+++ b/app-arch/dump/dump-0.4.47.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-$(ver_rs 2 b)"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Dump/restore ext2fs backup utilities"
+HOMEPAGE="http://dump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# We keep uuid USE flag default dsiabled for this version. Don't forget
+# to default enable it for later versions as this is the upstream default.
+IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	ermt? ( ssl )
+	ssl? ( zlib )
+	test? ( sqlite? ( uuid ) )
+"
+
+RDEPEND=">=sys-fs/e2fsprogs-1.27:=
+	>=sys-libs/e2fsprogs-libs-1.27:=
+	sys-apps/util-linux
+	bzip2? ( >=app-arch/bzip2-1.0.2:= )
+	zlib? ( >=sys-libs/zlib-1.1.4:= )
+	lzo? ( dev-libs/lzo:2= )
+	sqlite? ( dev-db/sqlite:3= )
+	ermt? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	readline? (
+		sys-libs/readline:0=
+		sys-libs/ncurses:=
+		static? ( sys-libs/ncurses:=[static-libs] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myeconfargs=(
+		--with-dumpdatespath=/etc/dumpdates
+		--with-rmtpath='$(sbindir)/rmt'
+		--enable-blkid
+		$(use_enable bzip2)
+		$(use_enable debug)
+		$(use_enable ermt)
+		$(use_enable lzo)
+		$(use_enable readline)
+		$(use_enable selinux)
+		$(use_enable sqlite)
+		$(use_enable ssl)
+		$(use_enable static static-progs)
+		$(use_enable uuid)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/sbin/{,dump-}rmt || die
+	mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die
+	use ermt && newsbin rmt/ermt dump-ermt
+
+	dodoc KNOWNBUGS MAINTAINERS REPORTING-BUGS
+	dodoc -r examples
+
+	# Don't install pre-compressed files
+	gunzip "${ED}"/usr/share/doc/${PF}/examples/cron_dump_to_disk/backupskel.tar.gz \
+		|| die
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
+		ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
+	fi
+}