15 files changed, 25 insertions, 252 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index d94b91226fd5..7313b73591f1 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 6ef9f824416a..6e75fdb0ccb9 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -6,7 +6,6 @@ DIST cryptsetup-1.7.4.tar.xz 1232068 BLAKE2B a65295d023f611ac57abf25fe21b4b6b6f6
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
 DIST cryptsetup-2.0.0.tar.xz 10079936 BLAKE2B 6e5f1bb20571cf7a66f988e50b2cc88d152a2cd414a9b760ad845cafac3d0aa5b5a1fbd871117b91a78b7cbf1d8a849608221f8a35d1faf26f901518c2d00c6e SHA512 195e9c0b6429d21ec0cc7c5faddfde85cb71eee09d348fa50df6779693a2dc05fce04bada4c835150964e08b2e8af30e4194155e0f6366b24c7812f48477a249
 EBUILD cryptsetup-1.7.4.ebuild 4025 BLAKE2B ba5aec9f19bc046e4269baa7d4b73f0e1e0da13253a5ee700fb62cdfaf05de0cb71b86229379d7ce3176e9075e1d063d0f9f488df97da6a8c77e098ef4754f4f SHA512 9b46af09764085af0f6de8e99629839f45b9567110dde94db040e875805ad753f111136da06ffc0a65f3ebd8fa705e0a7509961a24c08032e501967e081f8928
-EBUILD cryptsetup-1.7.5.ebuild 4045 BLAKE2B 14036d9f2c6a1eb5b245ff66edd50629b517b632b11bd3303fd47e4ba7b830fec10c6eecf18b7109801e8f5e84ae0104303a9c4adbdcb5de22ce623b527ba82d SHA512 838908ef46db7d9710e9071ec21af4c0243a5b1c5220107522b0145cdb38eb1bc0fde392d276c988cf1b3e14880d4db73b1992e849d416113f01ed05dc0581fd
-EBUILD cryptsetup-2.0.0-r1.ebuild 4094 BLAKE2B f378ffe253c54e73164e734d1073ca61e5cbb6163c66b9b1946dc6665b62bf50cc8077b64a94b155108a565e7bbd11c2750e0d82fd4d945488ac6cd4bfb49fc9 SHA512 0732276395cd54332e39982b6157dc7cb176f9880037048b108aab1e26606e3e7d9291bbb4724186e33eba3161038853e214652a7f9123d972b607703801ced0
-EBUILD cryptsetup-2.0.0.ebuild 4316 BLAKE2B fa99d5c813a225b3b2a0fcc53694641c6c61178880c652cef8d81f5a63b2145a9dceb60f0f7249b7e4d511cfb0813c7e71553d95ffd03fcdf3d1f532985679ee SHA512 182a0b657627467b0d4d6be85fe0c9ac48232e68c05a42aabee2a1c17bec28eda9bbc082645a6ed8d5a1a1217ca040b62b2d411d0a16a5f9067cdd0fcd638ce0
+EBUILD cryptsetup-1.7.5.ebuild 4044 BLAKE2B 2d69a4aa2e98c80eba9594bf76ee830bc5f69b806ab24b655d1a251ce810e3bbbf39d48376938fc363f6f80f7166605fc01f57f77ecb76282f3c1977eea86e43 SHA512 964135b16ea6cc9d400e61fc6c68f9df39d224f67dee7cfcb271cc412790222a43b659f1fcbaad7bfdee6e8b2415288ff1460af25405de7df9e3b3633fdf167a
+EBUILD cryptsetup-2.0.0-r1.ebuild 4096 BLAKE2B 5cfb91b42cb68f07b553d9d82b6df59e991722b9f2b0211dd292635de8bd8a3790763c8520787157a408e27ef9dcf725525efb125139c401832015ec4ed9100e SHA512 3b10d1e987d5a6b3c47b11cabca48062e0d3b6c08ecfe24c535235ad0acb328e776e729f31564543082b19b3b2d1306003d1b7f26b1d18edf797d72a8d315e74
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.5.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.5.ebuild
index d4e5a41d31a8..1857a1d19547 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.7.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/$
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
index 66f994df07b9..503a03a2634e 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
 	static? ( !gcrypt )" #496612
 
 LIB_DEPEND="
-	dev-libs/json-c[static-libs(+)]
+	dev-libs/json-c:=[static-libs(+)]
 	dev-libs/libgpg-error[static-libs(+)]
 	dev-libs/popt[static-libs(+)]
 	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.0.ebuild
deleted file mode 100644
index 3d7adacf8e2b..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.0.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit autotools distutils-r1 linux-info libtool ltprune versionator
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	sys-apps/util-linux[static-libs(+)]
-	argon2? ( app-crypt/argon2[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${P/_/-}"
-
-#PATCHES=( )
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-
-	if use python ; then
-		cd python
-		cp "${FILESDIR}"/setup-1.7.0.py setup.py || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	# We disable autotool python integration so we can use eclasses
-	# for proper integration with multiple python versions.
-	local myeconfargs=(
-		--disable-python
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-	)
-	econf "${myeconfargs[@]}"
-
-	use python && cd python && distutils-r1_src_configure
-}
-
-src_compile() {
-	default
-	use python && cd python && distutils-r1_src_compile
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-	default
-}
-
-src_install() {
-	default
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	prune_libtool_files --modules
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-
-	insinto /etc/tmpfiles.d
-	doins scripts/${PN}.conf
-
-	use python && cd python && distutils-r1_src_install
-}
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 0c72d67293c4..18391e6a1004 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -14,8 +14,8 @@ DIST multipath-tools-0.7.3.tar.gz 344030 BLAKE2B f2153a86afc79ff11bd1fad8a20c8bb
 DIST multipath-tools-0.7.4.tar.gz 350361 BLAKE2B a55a5912f040913b2db8a6fe28727dd52fd4be9ceb8544f1b45384e12112775caa6159da3ce774dd529377796a2b9033490ee655f3caac864919708bdc5070ec SHA512 0a00b79920251b685265ab731e5418538f32d6392b101082c71a6c7345ef7d008bcdcf466ee1317e8bf658d0fb01fc9a2e4ec6658fc565129c1bb5949ac91254
 EBUILD multipath-tools-0.5.0-r1.ebuild 1728 BLAKE2B dd525f001463684fe5cb6ccbb112a658bcf02fcf94d672c44b3a9330bd275809486bbd3bd10e35a19185837b1bff349cfe037054e8e4d9fab5f87e7677e1a98c SHA512 e1de58801f4e2b71b44a4d60d385bd2067aa172841a90c078a5f6dc608999bfcd23059cbc730e18c910a7606bc44bfd9524a2e466b49ff38b90cfaac143def86
 EBUILD multipath-tools-0.6.4-r1.ebuild 2534 BLAKE2B 2ff046ece2d09bfc1831baa309ea8a22b81cf414277225f3aa4b2e4ba8dc951abf844e5c509232ff2ecacf357340690452ea6a4c01f06eb9c76aa13290337dd7 SHA512 9c1df2d0a038cf8baf51a84265dc22e2b80d598fee9b6e7b737c623dfc776ecd7bc309ae52cb5a492a7bb8b13aaebf00de2df9881532304f567ee1a50a61079f
-EBUILD multipath-tools-0.7.1.ebuild 2189 BLAKE2B a8092349480cbb7308163052debe2afff761aca490d3cf7251cb51b00ac9ca7f857c84bd6335c87287b59f1579aeb8bf4d754e3c7b81baa3e9475b9912f3dca7 SHA512 cc1fc9548eec536691d4357d920a2920afee52729d74b662549dc9c70569f68ff02ee8b55facab6cbec5400880d0514b0696e0eea22e6be3682baa06d09a417c
-EBUILD multipath-tools-0.7.2.ebuild 2189 BLAKE2B a8092349480cbb7308163052debe2afff761aca490d3cf7251cb51b00ac9ca7f857c84bd6335c87287b59f1579aeb8bf4d754e3c7b81baa3e9475b9912f3dca7 SHA512 cc1fc9548eec536691d4357d920a2920afee52729d74b662549dc9c70569f68ff02ee8b55facab6cbec5400880d0514b0696e0eea22e6be3682baa06d09a417c
-EBUILD multipath-tools-0.7.3.ebuild 2260 BLAKE2B 4018fde65f5d3799619643770881bb22bbe99c6df0d7ca9ad59830022b14bbf05b20793f2db153fa18c3ac4061bdbd7eac13c8a018e21efbe985f096e0b2a640 SHA512 7eeed0784be1ffa31fc153715c2137c32d2fc0d96102ae57818b926502c6978394875a0901066fc16ad7c45744eb1f4c4e837972b52f015160cd296e6d753cfc
-EBUILD multipath-tools-0.7.4.ebuild 2251 BLAKE2B 6653990605cfda1bae25a2900e5f576c34a7e9e59223c0d47ab6c98ce7b338356d8aa21750be8a6ef79e6895f13be0e2ddd17b476f75e45e95d6484cca2c091b SHA512 b3c0bce622c431c37668a2d170ea6151ea9db51b05a116f58f0245a5f19816a92ad9db2c5c041f0ed76a7f1415fde6f3d0e86d74c87f868c592468679df5f278
+EBUILD multipath-tools-0.7.1.ebuild 2191 BLAKE2B 6a4e07013d19792f330749221d48eb517b7094d2a4fcd3c12f20512f031aa7ed7724ebf4e57e46447331203753689d28fe3410457006f6ad36e16759f1dae6b7 SHA512 c072c5e86c3fbf1688a27ee27b6c344a04581300329b863c1e461a2eddd534c4790342a2a0ef416094de40e03a02146443b67d47b144d4950eed93ff383791ae
+EBUILD multipath-tools-0.7.2.ebuild 2191 BLAKE2B 6a4e07013d19792f330749221d48eb517b7094d2a4fcd3c12f20512f031aa7ed7724ebf4e57e46447331203753689d28fe3410457006f6ad36e16759f1dae6b7 SHA512 c072c5e86c3fbf1688a27ee27b6c344a04581300329b863c1e461a2eddd534c4790342a2a0ef416094de40e03a02146443b67d47b144d4950eed93ff383791ae
+EBUILD multipath-tools-0.7.3.ebuild 2262 BLAKE2B e761090475b8665ea450d7a42b458f420e7940e5edfde0666d107ae8b64381a61a465a1ebb648c7de8b02aeb75784d9a33685ad892bf0ee8378e3b5d32581c52 SHA512 cf34545cacf9131e0d626664b0d3b9cd29f1e0991dd11232c25e0b5e1c1a75e86745cdea98f64e585742d3c46246b96c3448eddfd5de17170b421cd8b074c044
+EBUILD multipath-tools-0.7.4.ebuild 2253 BLAKE2B 0cf74d33ac951fbf2f906d35d9ab707320141d33977207a12f264a779011ea9c3b20bee7a02d4a43af42b6f87d228ffd2166f02fa99fd88cc2f563d33fff096d SHA512 72e5403c0c3869074b50d5d00d956b2582fcc297c1bc02cd61f3a2bc9ca57d228cd993499537d0b28d48ec712a43075bfb5e2033058ba71c3ed312572b08f0ab
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild
index fdc2ed3abb66..6b87ca18b13c 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="systemd rbd"
 
 RDEPEND="
-	dev-libs/json-c
+	dev-libs/json-c:=
 	dev-libs/libaio
 	dev-libs/userspace-rcu
 	>=sys-fs/lvm2-2.02.45
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild
index fdc2ed3abb66..6b87ca18b13c 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="systemd rbd"
 
 RDEPEND="
-	dev-libs/json-c
+	dev-libs/json-c:=
 	dev-libs/libaio
 	dev-libs/userspace-rcu
 	>=sys-fs/lvm2-2.02.45
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
index 577cbe8db1b2..99506a248340 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="systemd rbd"
 
 RDEPEND="
-	dev-libs/json-c
+	dev-libs/json-c:=
 	dev-libs/libaio
 	dev-libs/userspace-rcu
 	>=sys-fs/lvm2-2.02.45
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild
index b114189a868b..2a9e296b4f4f 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="systemd rbd"
 
 RDEPEND="
-	dev-libs/json-c
+	dev-libs/json-c:=
 	dev-libs/libaio
 	dev-libs/userspace-rcu
 	>=sys-fs/lvm2-2.02.45
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 7bbea695e7a3..2b2c8a7436c8 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -19,6 +19,5 @@ AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7
 DIST quota-4.03.tar.gz 564352 BLAKE2B b474be79576fd2db7ad5f7c4e93d665fca19004727f4ff12e960da3251091b026c1458adecc0ed3a803da3bfcef6c857f612c44c7800ecc53c9ae53450d10338 SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8
 DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad
 EBUILD quota-4.03.ebuild 1960 BLAKE2B 54a4dcb04e8a241a3506be2aef8029763ec79fe0aa76fa05d810561100aca0c0b3c2c6d81808566a6ddb240f20bf8f51b2976da09902f5b934d54574bf9cbab7 SHA512 fd2a5affaecc2046a5517b4e96ac46f190c6505f0166cfd52046308cb69846ee154b5c3f7a18f6d70b2507d0253c69b569a255afc91b630f59fa694dd9a81f6f
-EBUILD quota-4.04-r1.ebuild 1581 BLAKE2B ca3a4f62c1f69588d2012bbbe9684c0f60c53e6787800b89a8a1ae81a35c04464768b0549a4558e5ee0b39fc0ae70e91a1c6fa77e4ceae729c62154913bb8f73 SHA512 6e3249ea0b5fe951708f57dde5c3f8bd1345d62965bcb310b94a5aade3b3509a403008ed83182c18a57214462a81dfd7a9b10006f502ad25c2accd9c45271064
-EBUILD quota-4.04.ebuild 1533 BLAKE2B f742098340b086804db45a5c6181547a60aec38f9bfce4f504034f288c7f0cc8beaff91402497670c1a516ee7f68e6249299e5465fa53a7d0d4452d8d2cef240 SHA512 8c19891cac8d58458688541553bb60824324044106fcef0d842ff1c60b739bf36d9affc770617e33ff0e573d98cd2ee0ca09a9ec52a1640398a7a103ae411f67
+EBUILD quota-4.04-r1.ebuild 1598 BLAKE2B a5b0ab8e41a64d2f3ced607e67e23fa429c48fa9b363bb2e37e9a743fb191b8cef61a5c71b9f7a0b96e70609f7b6d00f828ce7208951304efc826daca3dfb9ad SHA512 427e412c071d530c7a08cfab88d293b4eb7e42c0b05632f88e06063028918b9853f0910e2f97aae8ce81bdfc6e269a8603730116762b32188fd54203bd40f10f
 MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e
diff --git a/sys-fs/quota/quota-4.04-r1.ebuild b/sys-fs/quota/quota-4.04-r1.ebuild
index 0fccc223e077..b4b4a726d94b 100644
--- a/sys-fs/quota/quota-4.04-r1.ebuild
+++ b/sys-fs/quota/quota-4.04-r1.ebuild
@@ -22,11 +22,9 @@ RDEPEND="
 	)
 	rpc? (
 		net-nds/rpcbind
-		|| (	sys-libs/glibc[rpc(-)]
-			(
-				net-libs/rpcsvc-proto
-			)
-		)
+		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
+		net-libs/libtirpc
+		net-libs/rpcsvc-proto
 	)
 	tcpd? ( sys-apps/tcp-wrappers )
 "
diff --git a/sys-fs/quota/quota-4.04.ebuild b/sys-fs/quota/quota-4.04.ebuild
deleted file mode 100644
index d077fb35d664..000000000000
--- a/sys-fs/quota/quota-4.04.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Linux quota tools"
-HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
-SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap netlink nls rpc tcpd"
-
-RDEPEND="
-	ldap? ( >=net-nds/openldap-2.3.35 )
-	netlink? (
-		sys-apps/dbus
-		dev-libs/libnl:3
-	)
-	rpc? (
-		net-nds/rpcbind
-		|| (	sys-libs/glibc[rpc(-)]
-			(
-				net-libs/rpcsvc-proto
-			)
-		)
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX%/}/usr/share/doc/${PF}"
-		$(use_enable nls)
-		$(use_enable ldap ldapmail)
-		$(use_enable netlink)
-		$(use_enable rpc)
-		$(use_enable rpc rpcsetquota)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/* README.* Changelog
-
-	insinto /etc
-	insopts -m0644
-	doins warnquota.conf quotatab
-
-	newinitd "${FILESDIR}"/quota.rc7 quota
-	newconfd "${FILESDIR}"/quota.confd quota
-
-	if use rpc ; then
-		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		insopts -m0644
-		doins "${FILESDIR}"/ldap-scripts/quota.schema
-
-		exeinto /usr/share/quota/ldap-scripts
-		doexe "${FILESDIR}"/ldap-scripts/*.pl
-		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
-	fi
-}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 76e3473ec093..78f161d2e1e6 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -6,10 +6,10 @@ DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a146
 DIST udisks-2.1.8.tar.bz2 931110 BLAKE2B f4aae539f3e4cd9548558eaeb417bf9c5ffd83df3cdce632d6269ebd1543e11be8e0e70143c82883e503fa6d5ce88e815e8a7e8d508a06e967868b4e3987d926 SHA512 4f8adc0ebd5e8f34801722cacef09fe176a0e301889b98ecddad1bfbc61b008b2035518cdaf270258a80e087b0a5cb685ddba1373ba332a8d7967656a08156cb
 DIST udisks-2.6.5.tar.gz 1251008 BLAKE2B 0d94b35ba7bb4cf6f07951d46679da52f6510a5ddf8c070a9da67915637ab4fa13a898b561670fecda37fcf3db540faa85df3b611467d455b9cfe5d8b746a984 SHA512 57ac878c981af1b91a2e93af154c81471853969a1c951ce11c83f39e4450354da58d447c7644f477e39b602e673d76ecafe34fc7ba1346abf1f71707bcc324a7
 DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
-DIST udisks-2.7.5.tar.gz 1299487 BLAKE2B bb8be1686c2b26b42b51810ef198017a154c33f0b41b38bbb627607a79fd73ef48ed4c62fe80ed6b3c7a09266aa2d9c2d365f5e3b9aba4694dea42e75126b8d2 SHA512 fd49fd719d3d11ceb6349e856996f8f6f9ee58a2cc35e6622ce662096fa2e746d01958c81e464c4be6071578f4f3e39c5af81669b83582be47b191703c93e71c
+DIST udisks-2.7.5.tar.bz2 1270965 BLAKE2B 42044f00b09764bb15c665e5a301c39fb9d14e2b28e825c55e8da2263f1f7f09845403a2f3434a060ff2d7fefe7d0277c22eaa25650c71393016a620edc0d041 SHA512 3af72b87acb8e540b229e58e2176ac87de831ef402f4825b6e9ee163a8d34e921a38909f45e685cd2a9931d08aaa22285ba2f6a811cb8265237201f0b5e36310
 EBUILD udisks-1.0.5-r1.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee
 EBUILD udisks-2.1.8.ebuild 2997 BLAKE2B 3339216fdb9ab778f5601ab798be81ffe76ecf9c50d4e493cd86c80a2a6e150fb174d5ba0127e6b8cde3f81e9bf114ad6529bc1d45876dc02555d36e5f61b90e SHA512 b035b304e9585c5cfced81a4700eede5de731f850e06eb76bd391ba7ab333c3acba8775c493ca83bde42679877e9ad8ce436fc202486c04db2a34cfca7485c25
 EBUILD udisks-2.6.5.ebuild 3348 BLAKE2B f227e1c664937ff73880f50d4847f61a7f42d681d7320d580863578abf4d2d6b41b5c38513cfdfb76311b6baf107b7b32ecbe9826213828c3936454d27d57736 SHA512 ed5146d860532c61b6cda0f4dcffd8ad3ce4907b671369f4032b58070a3252f65959f5fe33bc44914b3f872d0f40d5bc1f7b9fe2e1345fb7ef04019fb3554cbc
 EBUILD udisks-2.7.4.ebuild 3418 BLAKE2B a6e9d6eb4ea995c905c831314b63c8ac391e57c8fc5718d7a14e387ff019e2bf85a8fcf10345bb80898b9499eef171648fe1947bb2c5bf9c2602141aed775feb SHA512 269e5c1c8a254477db26120b65c0c7e9aa29509714d95ff3f7e70704f384868b6a284ec1f991ba386c42c6a233fdfdae1e9d08d78c191d632d847628e3127433
-EBUILD udisks-2.7.5.ebuild 3420 BLAKE2B 71c4db8cb1d437d217413dfa3d7b06a1e56ee91325fbe90eb29ec70288cbfff7ae7c5d18720932234621467db6edc8d46deb75c37e6af4d5961d04514dbf93f8 SHA512 18f4b8b687d7176a4be364c10f93e3f870415c03533e28e9f2505516f78c0fb20ba68eede99152baeb36ce0e267c11f5802b72eae3e65133aba35dcb0f7e3e75
+EBUILD udisks-2.7.5.ebuild 3471 BLAKE2B 383253b2111981284549f7eabb3be4c735a0962e69c48c31dec6f21d78f38a3375f94b293c6e81e78628d45b6c47316434dad61f66f7e6413385d7f4ba275491 SHA512 0669189f452ebc2908440bb423ba547776f7efcaea02a83cc3257aeb262b4d6001a5d3edfc5c49183d3abea1c1cacdd3132cfcd7b5088a3ec73e06de05c41028
 MISC metadata.xml 803 BLAKE2B d703b430613a9e0527eb00c5b8b78ebcd04a76d28c5029980e818624aa2acbb486d9076ccb7636ce1df285d98ad64ffe45aa06989ff6d9df4a313b7d8b365c3f SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e
diff --git a/sys-fs/udisks/udisks-2.7.5.ebuild b/sys-fs/udisks/udisks-2.7.5.ebuild
index 14f5c533ed98..5cdec6e58dd6 100644
--- a/sys-fs/udisks/udisks-2.7.5.ebuild
+++ b/sys-fs/udisks/udisks-2.7.5.ebuild
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools bash-completion-r1 eutils linux-info systemd udev xdg-utils
+inherit bash-completion-r1 eutils linux-info systemd udev xdg-utils
 
 DESCRIPTION="Daemon providing interfaces to work with storage devices"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd"
 
 REQUIRED_USE="?? ( elogind systemd )"
@@ -45,15 +45,14 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	>=dev-util/gdbus-codegen-2.32
-	>=dev-util/gtk-doc-1.3
-	gnome-base/gnome-common:3
-	sys-devel/autoconf-archive
+	>=dev-util/gtk-doc-am-1.3
 	>=sys-kernel/linux-headers-3.1
 	virtual/pkgconfig
 	nls? ( dev-util/intltool )
 "
-
-S="${WORKDIR}/${PN}-${P}"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# gnome-base/gnome-common:3
+# sys-devel/autoconf-archive
 
 QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
 
@@ -76,8 +75,6 @@ src_prepare() {
 
 	default
 
-	eautoreconf
-
 	if ! use systemd ; then
 		sed -i -e 's:libsystemd-login:&disable:' configure || die
 	fi