gentoo resync : 04.05.2019

18 files changed, 6 insertions, 593 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 864809878734..d4ec0cc1d2e9 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index a1c38ed29ff8..6742102f5ebb 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -41,7 +41,7 @@ DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa1
 DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8 SHA512 9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390
 EBUILD lvm2-2.02.116.ebuild 8431 BLAKE2B 5b17d1ff4ee12c1e8ed040711eb2501a42ff72c371901ca4b9e4ec24a7eab71c8b71bcf52b27e5aeb2548d4aa6cfcab4278d92f5259e22c98190038b019948f6 SHA512 5e8655e7d70566a2b06ef50baa62339b1f26d20385b8a9fc261188bc0012af8d4ed4ab451305e4df5289a44bafe3e2a1252f6264439d6539ab1ae54cda1373f7
 EBUILD lvm2-2.02.145-r2.ebuild 8627 BLAKE2B 63c09b396d802d131aaaa94442a26c4be8b75fc12f1bf097f07a0e52aeba28e4f3b406706ca0ef62a77d0557fc88d3f9d60963dc816026910ff6e90f2bd6439f SHA512 c4553842441409458c5bb339f5e22fa05f9b4bd34c865b907ed6b2396ff8c6fddbb78be1f480f7e189662e87141d7385a933e8f33850a7c6dcae7d611a7f37e9
-EBUILD lvm2-2.02.183.ebuild 8763 BLAKE2B 2885ee3d360cae58fc9dd6117a92209c26ffaa5305540496a476cfff7d129b2fc2c5a24a9858745a5abbee6e64c072bbbe62ded5410b90c63ad05cd5ed31792c SHA512 0e1682dad9834ea32a2351b9a4e71e8a27ce65cc0bfb1e0cb175d2098d8bfc4114f14a8eb8d3fba72fc7e5b87db4d0d1f12a35debec59f931ad256a1f0812d5c
+EBUILD lvm2-2.02.183.ebuild 8761 BLAKE2B cdc1958b9af3fae4f19813a18316ce6166a17f1bca1442a926d672ef38c281c470354574609723290d1d28dc800763b2a8d760a5e9b43d13464195e56c05c38a SHA512 2ee5704d440ab63721dc2c330181f36b7e17303dea829415e9465d6bd4ed4c24e0c6c4dc5c1deb639f65c15b0413238e1d10eeb604b723abfb88dd0177f52ee8
 EBUILD lvm2-2.02.184-r1.ebuild 8955 BLAKE2B caa7021e7703bf50529b42425a36c1662943504dff7fe8d857996f226a02119db2f6bad377a80f1fb7fb808f82962fadbd52a5b561f571c5592ceb4524efa825 SHA512 4b337fac136367fe009993e65b84f66e26c3fc6c5517ef6415734843b793ece2dd8411c639771e11a680a092965dc30b589fb26350b490fff28b190559b7e836
 EBUILD lvm2-2.02.184-r2.ebuild 9014 BLAKE2B e016e38f56610bff72529ea22e7ad9de1c71cef034c028efe0d8641255d802c504c756899a1c319050cf780656f87e509fb50614adca39c3e14468d3ce503e55 SHA512 15567897f0448bb34980833b107b2e93d416b67df33c57d77269fa52b8fc0d2d6ffbeb19f7c9dccaa2845857dc8a9778d733f22792112fca74720df3f42e5f03
 EBUILD lvm2-2.02.184.ebuild 8769 BLAKE2B 8ff55443aee773e87a78842021820822e8ba2283b61b510dee16423b1e3eb6f48a7ca0badd7776a266c14a8e3a458da889bd548685cc9adcc72a31bbbc25ddd1 SHA512 8fb5b8587580b59869b784434662d771e78378158233633c650e0a445f7c808fa06ab37f744182a25c1fd293f6e9fcf24653a160f59f56b6696249c22d8f2ea0
diff --git a/sys-fs/lvm2/lvm2-2.02.183.ebuild b/sys-fs/lvm2/lvm2-2.02.183.ebuild
index eab4e163331f..a42fa720445f 100644
--- a/sys-fs/lvm2/lvm2-2.02.183.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.183.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
 	systemd? ( udev )"
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index c35f9fc6f0d4..6121d8dc60a6 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -9,5 +9,5 @@ DIST ntfs-3g_ntfsprogs-2016.2.22.tgz 1264364 BLAKE2B 6028048d676372c062cda1cf9ee
 DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 BLAKE2B 4f12a6061ef0c116f26225eb3fb5cb84e469b63710115fbfb54fa3802ea94192afa973a553742818ff6849b72919069ec92aca2d4d6f58d8cabca1b0fefa3abe SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef
 EBUILD ntfs3g-2016.2.22-r2.ebuild 2450 BLAKE2B 8178b192162c011703272b7876b6b0b56a13698f2c673862789998b09f316c4cb06370a63a9cff9ab367562220284dfc38e614e80e27085a3e26615f4913cb14 SHA512 7a06505e8ca1d54b78bbe6da8975a69fcea297c36a74092bcd3259eacf3fd4cbaedceec5184c0b0e560f13141d6ca62692dc4a7a4e454090c844454a74adca0a
 EBUILD ntfs3g-2017.3.23-r1.ebuild 2360 BLAKE2B 4929f0847741acef18f7078d0f62246aada50f35312398e068ceb2438751aa34245dc0af5ddd1d06a85da8e8f084fd35c7beaf1380efd24fe6ce3f9b94d0a85d SHA512 3760806c53d47b38cd1b5416d76c1bdeb2854b1b831139ca86ef1de64de0933c8804e78a333f55751812c4a8bb1cc8c8757f002b3aa36181fba5ee43db7a5041
-EBUILD ntfs3g-2017.3.23-r2.ebuild 2789 BLAKE2B 90c1cd72ba461cd6fddd11cd67e944d7eacd4c7ab58c27bc14496daad9df8a8a25695f46c03c03a762f66006500f70cecf658b92f0a416a3eebc4de60bbcf829 SHA512 32d146befbe410645e0aff2ad23746e2b1a5dea6e124c67186b438b662eeb82041fea424fea22bb4e3be0a2e1862131b348c9d2a112ad9dc859afffab0b2ec50
+EBUILD ntfs3g-2017.3.23-r2.ebuild 2787 BLAKE2B 089194c852c928a6f07e1bb5afdaceadb33627ecabebd018c9866d26832cd0b1df3fd7cd57b8a2a08465de0f5a837146549fc682968824ed0bad9ca84aa8c1fb SHA512 c0d1552999b6f78d986ff70dd9c5bda0a01955fba85ae01fb6f48367b0be58ec6defe260c11cb573d31906d3953309b4e5c3ff312e2030a1e69d88cdbbd7f67e
 MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
index de551002bf0d..60587e720fec 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/88"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="!<sys-apps/util-linux-2.20.1-r2
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 8359420297bc..d2638e3d68d7 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -3,25 +3,13 @@ AUX ldap-scripts/edquota_editor 1243 BLAKE2B fbaf521aeda741ce3d2aabaa60609d914b6
 AUX ldap-scripts/quota.schema 552 BLAKE2B d9becd7bd0f66ba8a603e3b442bdd36748c059da8da9da0f8065e0bdd2dfa8c624787f860843d07e38caf301ccfc9b9d2dac2e978a68304abc037f375b4c647c SHA512 9e08e51834458885a046395002bb19a463533bc0e1fc23f1fda98c41ee48c0f122e284f4a520d6f6ef44d66142395c10f91e18076e0a54e57dd198f7da268748
 AUX ldap-scripts/setSystemQuotas.pl 3930 BLAKE2B 728956edd5f3e35939a068c92c5d94606d9b62943a6131502f235647a5251c3737a5307555dcaf98114946b8e9318a8f7c683d7bd066195d24c6542b95462fbd SHA512 8ecdd09500a849c4572411e904dc78ff967ed71f819969e0a27e697ca6607ca17906318784ccf1aca4fe066666dd2a21d800ce6f224478d0751db1a5c276a6ad
 AUX ldap-scripts/setquota-ldap.pl 6039 BLAKE2B 9603c6f7aaf842563af9c1b9a5680be126ead114e0e0bc19d123c9440604b4941e6d9353e62408155180edd39076d634c5150334f3fbffb649af7dc04eeb9bef SHA512 f046c45b09b8afa88d11b4d55e35877c1c7e6c8e87f41f4c2dfcb063a2bd972cf584f88fdea2b42442cb44e460a48f3c9b12c3f5f3a99f759bbdb4ca95ab8e5b
-AUX quota-4.03-default_fpic_fpie.patch 1065 BLAKE2B db7db91299becbb08b144a7c721b790af3c23d25cb843c59d749be083ebcc181806bd2bc1b4a87e9dc821c2814183a7042ddc9516bfac52344a88fe940960eeb SHA512 0d62dcf9261a768b471a2f3f9f1e191911a4579f920521739d8bcc70fc8e51e8dbafcd9e8798f0e894b19acaa0bfd7c5a378ee392c64ba8c91f4dc7940774862
-AUX quota-4.03-distribute_ldap-scripts.patch 547 BLAKE2B ca8d38d6d987afcd25137fc286c03646020f8c02d21565914e0a0e84ae25344cc93ff1f1171791b1e08848e014f4ab585c129bb4ec4f6a137a4b96b0cb891e20 SHA512 0ac9aecf4749a74af0ae17b045463c7afe8cd46ca3b395ccd1bc46112eb793c593ba875fdd9882e4afb8e3962c0e8dc7a9a9872edd99f52d31bcc159b22ddb2a
-AUX quota-4.03-dont_override_cflags.patch 838 BLAKE2B 046fb2d92967ab8424ba4c40054eed969c9cdda11915e6c57f08a9f7d87f9887dc100ddf65f4d30a5df1047c16d74de47d77850a5a88604e7a7ef0090829c627 SHA512 64e7dbd966e8e5cf2938367542a292e5538526e01950241fd9d98f378a364acb0fd16928e35151cfdfabe4ac7e3c971def44f7ab085c441c77c3124bbf93603e
-AUX quota-4.03-explicitely_print_disabled_options.patch 2210 BLAKE2B 1bd7da2c4c8aafef745fa3de3eaf86d88e7f7ad58f61a03786be46ef61688c2dfe5ad8baf959e3a57758d18666cfe4f8f63b67c6bd0d868e1afc6d4ac7d300f1 SHA512 9e3080c47ef46a3d4d16c266ec739091d0278c4c9cbda61337c55db1461b97129045c65f51d9d72a5855040cb67942cdf10f728865ded04fb3d865dd36695018
-AUX quota-4.03-fix_build_without_ldap.patch 2731 BLAKE2B 3f5d95a1e08ca26379aeccb3eb197c00f3852f1fb67dc012d431867359881f942b2ca37fbd537c7ae846bfa689e52f1310281a55024bc5577afcb241224967bc SHA512 f43b0701e3545a70f248a749dd99f1da1ecfd317e9ba4333b1496f5a3086bd89b12f31207946c36a872ab98034ae7260b3e403ddffb38a6e2f2128ee86fbc0d0
-AUX quota-4.03-no_rpc.patch 2338 BLAKE2B fed1a0cc6864921a26b1d70cb73dc1162a49a16f84ad15fdca3ebe9ea6e5170054f75f29ebfc816f086da9a8005f80290c80c7ebc483de611a8ddd7663af7c13 SHA512 3569d31e2bee3e817a48f579153367bf4306b2df2c074df7928e95cb80533d493b48651fe3498f66982c5918e97db8a89ceb669e25e0010eb77e87a648552353
-AUX quota-4.03-noldap_linking.patch 2714 BLAKE2B 8fa02b091086b79719cf4e864f348e4ef3757205fcd975ae610849c51939cf69797f472f8eabbe2d56a9cc596641d6f6adf4b65464ed81166be72192adf9741f SHA512 93617ac00731e9a1e29807c386fb86d5a7c3c646698f7d4faa7837fe363d08a31c96ccb37564b210f8d15e9f331dc6495feac189b2f834c3aff85c0e6e811735
-AUX quota-4.03-repqouta_F_option_arg.patch 947 BLAKE2B 22e9811eaaf02816cf61375967c4332f9cb4f4019a051a50166bbc3c96f7737a62ab3d23b5fb5556175b727b9302f6c8f86ed4bace4cc0929dbdc975ac8341f6 SHA512 14bf1dd782861640c4beef0621166006c083266ca0dccfa51d0ee889553b809c6652de82e75710ac961eef3e6fb47d2c528b7111bdefabcbac7967951ec62ac9
-AUX quota-4.03-respect_docdir.patch 586 BLAKE2B 83f5d5010ba8a43f07a465b2398ae7db0a2f69af06c95cad9bec368b923c727c03a5d5eda18967a74a06f10b101d874608bc4a351ba47462082dab596441905b SHA512 16feff00e236ac6b652b095fe84fa2fa357c849a85124c92ec32c9a22ae487b2a6f49ea4118f0a665cad27756aeec7e775a42014d2e2408ecefcacb1d60231de
 AUX quota-4.04-Listen-on-a-TCP-socket.patch 2432 BLAKE2B cfc2d9d3e8200e0974ee98cf35600185e7331d659117fc4bc0c4f141523475af9c7625dd6b9754199357af212043591089727e7bb9234808aad75c61c345cff6 SHA512 3f6a567a271333d01b4aa81e90fa0fd68a32c7888813c8bd86f5847ad7d8b8f8575370ede313b9e5c922bcb81e1cca3211c18b4ac97a2dcbfca00e282f9fab11
 AUX quota-4.04-glibc226.patch 983 BLAKE2B 7d4dd586fb6731d62e8c442d849b33b537e3e93719261ac42889d8de04199286a1ac2a0a0ba32acc174573883288821797d291e33b2b4b57c7fb66e6cab07c90 SHA512 90bcfb9fbb881602cb01000cea691016e6c7c99a5d2fc22b114615fec9ef4752c07253eaeaf80023e6f0768ab95429aac10772f6d12547c43eba4300877f89b9
 AUX quota.confd 359 BLAKE2B 37d0cf75f96ca4ccd2d9be1ac3def62a3ac409873cfad33e1fafc515875e587a3ab3f869fd078994bef3174e70c10ce0311a307a808b3469cac73c7f3e8f1883 SHA512 3253b69932332eff2944753f687d780d651dc2b21b524b7055164b91292c13c346cd46443bd58267b239f72fd8918a7e113eec62871573ee94e33df5eb3c82f8
 AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b77d2b16adb36dcdd9e510cb7bd15444b1ae8b606d607cc1ebaa10afb064b052d31ed780afbd SHA512 6a0536285bb340779cf4989060ed5a10c9c4a24a48d334174cd84cd54938d042f7a4047f837f96fc7a3c88a1d20317f662c984bd88c00b32cbf48302ba82a529
 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954
-DIST quota-4.03.tar.gz 564352 BLAKE2B b474be79576fd2db7ad5f7c4e93d665fca19004727f4ff12e960da3251091b026c1458adecc0ed3a803da3bfcef6c857f612c44c7800ecc53c9ae53450d10338 SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8
 DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad
 DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2
-EBUILD quota-4.03.ebuild 1961 BLAKE2B 306162b56dabbb3796c8e5f62c5f1bf675905a1c723a0d9ba34bc7c72b02880f8ab7aa87b9be271b86b19f9396b95514f5f627bec97641599fd9f7e01a35ba85 SHA512 be1868451e07ecdc03dd204357d61a84851801d5426eee81a9c5590f998e54ebf5cb1f7ffee73260d43f82efdbfe439942f633397c70ae4ca83b6b082ef174a8
-EBUILD quota-4.04-r1.ebuild 1597 BLAKE2B 1bf5b4269b3fb2a7dfef5407dd2d0be2ad7f1cf730b0b59f6bdc6eddf5a5d9c595013cd4b98c90711da2aa4fb8f04319922d1a37eb4cc7b283728b3ff027f116 SHA512 72dab78bee71c09181e85855d38f79318b952b48aaca910edaf27b018c827b7ab106631662e67616c13ed8de8427d9730f515305d3479e6fbb07712463702784
-EBUILD quota-4.04-r2.ebuild 1638 BLAKE2B f404f119082dd4a36747e105fc83fdc765c439518601ba636a5d569d6ea78dcd139c07dfa8167eb1c81d84bd3d2b0f6c9a40541dde55ba2d18cc7078c1fc334c SHA512 9f5747db1f00fcd0458324ed5a53e562876733aebfc839c690af4b67ee32e93816badcaeb50f398310e74e10e6576a2fada3ca7c54b32e30eec11d374cf64742
+EBUILD quota-4.04-r2.ebuild 1637 BLAKE2B 5e0fc49e04ae121ad313611e14a267cf2b37749c6080c3e569ea8f28c1d213a1068a6d1a42ccb04942adf1b4d9a81cf5c935211bb0c72d45003707093acd3081 SHA512 fd31874034f0b45c73d405122c802ef43a8ed0edabf5d17edcb72693d3a87fb070ec6be1704bd0ff647ad32e5e6f36c8feb0ec484bbda9ef720fd71eaec1c365
 EBUILD quota-4.05.ebuild 1548 BLAKE2B 4d62b492ee718f0b2ce05c84706f5ea634f23676f7d24f05451b5f98e363fc74146aba045524be0c85ef7c9de82b4326cc1914c87fdbfc36712ce04547634bea SHA512 9ed6d2fd53401b74d27614d0060957554d7909b1cc2e1ed2f4f91cfbed8d9dacb78612290be33ac59dac1ce4f0882c13e20580d25f593d6fd8676f716db5d9d4
 MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e
diff --git a/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch b/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch
deleted file mode 100644
index 2ff519f2b846..000000000000
--- a/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit cd9dff0b5b53279442458360003831b6c14adc22
-Author: Tomáš Chvátal <tchvatal@suse.com>
-Date:   Tue Jan 5 11:20:52 2016 +0100
-
-    Set -fPIC and -pie as default params when building
-    
-    Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/Makefile.am b/Makefile.am
-index 7c7a866..77f8400 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,5 @@
- ACLOCAL_AMFLAGS = -I m4
-+AM_LDFLAGS = -pie
- 
- BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c
- 
-diff --git a/configure.ac b/configure.ac
-index 1552c15..68d5924 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
- # ================
- # Check for cflags
- # ================
--CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC"
- AC_ARG_ENABLE([werror],
-     [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
-     [enable_werror="$enableval"],
diff --git a/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch b/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch
deleted file mode 100644
index 83339159e0fb..000000000000
--- a/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 861154efb90ed049e0473cc36935b8d03c78a869
-Author: Tomáš Chvátal <tchvatal@suse.com>
-Date:   Mon Jan 4 13:01:36 2016 +0100
-
-    Distribute ldap-scripts directory too
-    
-    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/Makefile.am b/Makefile.am
-index eb62617..a880ebe 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -52,7 +52,8 @@ EXTRA_DIST = \
- 	$(man_MANS) \
- 	$(rpcsvc_DATA) \
- 	autogen.sh \
--	Changelog
-+	Changelog \
-+	ldap-scripts
- 
- noinst_LIBRARIES = \
- 	libquota.a \
diff --git a/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch b/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch
deleted file mode 100644
index e59341a702ac..000000000000
--- a/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 776757a23e9930588950c7fcbc7827ec7a3e51c4
-Author: Tomáš Chvátal <tchvatal@suse.com>
-Date:   Mon Jan 4 15:48:19 2016 +0100
-
-    Do not accidentaly override commandline passed CFLAGS.
-    
-    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/configure.ac b/configure.ac
-index 3ba1386..1552c15 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
- # ================
- # Check for cflags
- # ================
--CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
- AC_ARG_ENABLE([werror],
-     [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
-     [enable_werror="$enableval"],
diff --git a/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch b/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch
deleted file mode 100644
index 29627c03ab32..000000000000
--- a/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 6ccb66159a9eee6ca114b11b70eb06f4ac6900d7
-Author: Jan Kara <jack@suse.cz>
-Date:   Mon Jan 4 15:36:27 2016 +0100
-
-    Print explicitely disabled options properly
-    
-    Currently we printed only an empty string when some build option was
-    disabled explicitely via --disable-foo. Print 'no' in that case as well.
-    
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/configure.ac b/configure.ac
-index 39631c4..3ba1386 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,7 +74,7 @@ AC_ARG_ENABLE([ldapmail],
- AS_IF([test "x$enable_ldapmail" != "xno"], [
-     build_ldap="yes"
-     AC_CHECK_LIB([ldap], [ldap_initialize], [], [
--        build_ldap=no
-+        build_ldap="no"
-         AS_IF([test "x$enable_ldapmail" = "xyes"], [
-             AC_MSG_ERROR([LDAP support required but library not found.]);
-         ])
-@@ -84,6 +84,8 @@ AS_IF([test "x$enable_ldapmail" != "xno"], [
-         AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
-         COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
-     ])
-+], [
-+    build_ldap="no"
- ])
- AC_SUBST(LDAP_LIBS)
- 
-@@ -113,6 +115,8 @@ AS_IF([test "x$enable_ext2direct" != "xno"], [
-         AC_DEFINE([EXT2_DIRECT], 1, [Scanning of ext? filesystems using e2fslib])
-         COMPILE_OPTS="$COMPILE_OPTS EXT2_DIRECT"
-     ])
-+], [
-+   build_ext2direct="no"
- ])
- AC_SUBST(EXT2FS_CFLAGS)
- AC_SUBST(EXT2FS_LIBS)
-@@ -141,6 +145,8 @@ AS_IF([test "x$enable_netlink" != "xno"], [
-             AC_MSG_ERROR([Required libnl3 libraries for quota netlink daemon not found.])
-         ])
-     ])
-+], [
-+    build_netlink="no"
- ])
- AM_CONDITIONAL([WITH_NETLINK], [test "x$build_netlink" != "xno"])
- AC_SUBST(DBUS_CFLAGS)
-@@ -171,6 +177,8 @@ AS_IF([test "x$enable_libwrap" != "xno"], [
-         AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
-         COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
-     ])
-+], [
-+    build_libwrap="no"
- ])
- AC_SUBST(WRAP_LIBS)
- 
-@@ -199,6 +207,8 @@ AS_IF([test x"$enable_rpc" != "xno"], [
- 	AC_DEFINE([RPC], 1, [Support for RPC])
- 	COMPILE_OPTS="$COMPILE_OPTS RPC"
-     ])
-+], [
-+    build_rpc="no"
- ])
- AM_CONDITIONAL([WITH_RPC], [test x"$build_rpc" != "xno"])
- 
diff --git a/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch b/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch
deleted file mode 100644
index ba838bfe2838..000000000000
--- a/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-commit 39fd30ce57e3c34c3649866bf9345a71f0b78667
-Author: Jan Kara <jack@suse.cz>
-Date:   Mon Jan 4 15:10:53 2016 +0100
-
-    Fix build with disabled ldap
-    
-    Reported-by: Tomas Chvatal <tchvatal@suse.com>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/warnquota.c b/warnquota.c
-index 3734f0e..e9868c1 100644
---- a/warnquota.c
-+++ b/warnquota.c
-@@ -109,13 +109,13 @@ struct configparams {
- 	char *user_signature;
- 	char *group_message;
- 	char *group_signature;
-+	time_t cc_before;
-+#ifdef USE_LDAP_MAIL_LOOKUP
- 	int use_ldap_mail; /* 0 */
-+	int ldap_is_setup; /* 0 */
- 	int ldap_starttls; /* 0 */
- 	int ldap_tls; /* LDAP_OPT_X_TLS_NEVER */
- 	int ldap_vers; /* LDAP_VERSION3 */
--	time_t cc_before;
--#ifdef USE_LDAP_MAIL_LOOKUP
--	int ldap_is_setup; /* 0 */
- 	char ldap_host[CNF_BUFFER];
- 	int ldap_port;
- 	char ldap_uri[CNF_BUFFER];
-@@ -729,13 +729,13 @@ static int readconfigfile(const char *filename, struct configparams *config)
- 	}
- 	maildev[0] = 0;
- 	config->user_signature = config->user_message = config->group_signature = config->group_message = NULL;
-+	config->cc_before = -1;
-+
-+#ifdef USE_LDAP_MAIL_LOOKUP
- 	config->use_ldap_mail = 0;
- 	config->ldap_starttls = 0;
- 	config->ldap_tls = LDAP_OPT_X_TLS_NEVER;
- 	config->ldap_vers = LDAP_VERSION3;
--	config->cc_before = -1;
--
--#ifdef USE_LDAP_MAIL_LOOKUP
- 	config->ldap_port = config->ldap_is_setup = 0;
- 	config->ldap_host[0] = 0;
- 	config->ldap_uri[0] = 0;
-@@ -820,6 +820,18 @@ static int readconfigfile(const char *filename, struct configparams *config)
- 				create_eoln(config->group_signature);
- 				verify_format(config->group_signature, "GROUP_SIGNATURE");
- 			}
-+			else if (!strcmp(var, "CC_BEFORE")) {
-+				int num;
-+				char unit[10];
-+
-+				if (sscanf(value, "%d%s", &num, unit) != 2)
-+					goto cc_parse_err;
-+				if (str2timeunits(num, unit, &config->cc_before) < 0) {
-+cc_parse_err:
-+					die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
-+				}
-+			}
-+#ifdef USE_LDAP_MAIL_LOOKUP
- 			else if (!strcmp(var, "LDAP_MAIL")) {
- 				if(strcasecmp(value, "true") == 0) 
- 					config->use_ldap_mail = 1;
-@@ -846,18 +858,6 @@ static int readconfigfile(const char *filename, struct configparams *config)
- 				else
- 					config->ldap_starttls = 0;
- 			}
--			else if (!strcmp(var, "CC_BEFORE")) {
--				int num;
--				char unit[10];
--
--				if (sscanf(value, "%d%s", &num, unit) != 2)
--					goto cc_parse_err;
--				if (str2timeunits(num, unit, &config->cc_before) < 0) {
--cc_parse_err:
--					die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line);
--				}
--			}
--#ifdef USE_LDAP_MAIL_LOOKUP
- 			else if (!strcmp(var, "LDAP_HOST"))
- 				sstrncpy(config->ldap_host, value, CNF_BUFFER);
- 			else if (!strcmp(var, "LDAP_PORT"))
diff --git a/sys-fs/quota/files/quota-4.03-no_rpc.patch b/sys-fs/quota/files/quota-4.03-no_rpc.patch
deleted file mode 100644
index c4f5007fca5d..000000000000
--- a/sys-fs/quota/files/quota-4.03-no_rpc.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 07ec5c783ac16ed20735d6cb8ab167833f5877ee Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 15 Feb 2016 14:36:28 +0100
-Subject: [PATCH] Don't build rpc.rquotad when --disable-rpc was requested.
-
-This fixes a buch of undefined references:
-
-x86_64-pc-linux-gnu-gcc  -march=native -mtune=native -O2 -pipe -D_GNU_SOURCE -Wa
-ll -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -pie -Wl,-O1 -Wl,--hash-st
-yle=gnu -Wl,--sort-common -Wl,--as-needed -o rpc.rquotad rquota_server.o rquota_
-svc.o svc_socket.o libquota.a
-rquota_svc.o: In function `rquotaprog_2':
-rquota_svc.c:(.text+0x1d3): undefined reference to `xdr_setquota_rslt'
-rquota_svc.c:(.text+0x1da): undefined reference to `xdr_ext_setquota_args'
-rquota_svc.c:(.text+0x2b2): undefined reference to `xdr_setquota_rslt'
-rquota_svc.c:(.text+0x2b9): undefined reference to `xdr_ext_setquota_args'
-rquota_svc.c:(.text+0x2ff): undefined reference to `xdr_getquota_rslt'
-rquota_svc.c:(.text+0x306): undefined reference to `xdr_ext_getquota_args'
-rquota_svc.c:(.text+0x31a): undefined reference to `xdr_getquota_rslt'
-rquota_svc.c:(.text+0x321): undefined reference to `xdr_ext_getquota_args'
-rquota_svc.o: In function `rquotaprog_1':
-rquota_svc.c:(.text+0x3f3): undefined reference to `xdr_setquota_rslt'
-rquota_svc.c:(.text+0x3fa): undefined reference to `xdr_setquota_args'
-rquota_svc.c:(.text+0x4d2): undefined reference to `xdr_setquota_rslt'
-rquota_svc.c:(.text+0x4d9): undefined reference to `xdr_setquota_args'
-rquota_svc.c:(.text+0x51f): undefined reference to `xdr_getquota_rslt'
-rquota_svc.c:(.text+0x526): undefined reference to `xdr_getquota_args'
-rquota_svc.c:(.text+0x53a): undefined reference to `xdr_getquota_rslt'
-rquota_svc.c:(.text+0x541): undefined reference to `xdr_getquota_args'
-collect2: error: ld returned 1 exit status
-Makefile:901: recipe for target 'rpc.rquotad' failed
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- Makefile.am | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 77f8400..6d7ea0e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -116,8 +116,11 @@ sbin_PROGRAMS = \
- 	xqmstats \
- 	edquota \
- 	setquota \
--	convertquota \
-+	convertquota
-+if WITH_RPC
-+sbin_PROGRAMS += \
- 	rpc.rquotad
-+endif
- if WITH_NETLINK
- sbin_PROGRAMS += \
- 	quota_nld
--- 
-2.7.1
-
diff --git a/sys-fs/quota/files/quota-4.03-noldap_linking.patch b/sys-fs/quota/files/quota-4.03-noldap_linking.patch
deleted file mode 100644
index dbaca69bb7d3..000000000000
--- a/sys-fs/quota/files/quota-4.03-noldap_linking.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-commit 1d9542df5d2ae5c21a1e96d100f899b3d7b2f27c
-Author: Jan Kara <jack@suse.cz>
-Date:   Tue Jan 19 11:40:15 2016 +0100
-
-    Don't link all binaries with ldap library
-    
-    The default action-if-found of AC_CHECK_LIB() is to append checked
-    library to LIBS. Thus check for ldap library resulted in unwanted
-    addition of -lldap to LIBS as [] is an empty string in M4 and the
-    default action is used.
-    
-    Fix the problem by providing proper action-if-found which was currently
-    just hidden behind the check. Also do similar cleanup for
-    AC_CHECK_HEADER check although there it didn't have any undesired
-    side-effect.
-    
-    Reported-by: Petr Písař <petrp@users.sf.net>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/configure.ac b/configure.ac
-index 68d5924..d17b18c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,18 +72,17 @@ AC_ARG_ENABLE([ldapmail],
-     [enable_ldapmail=auto]
- )
- AS_IF([test "x$enable_ldapmail" != "xno"], [
--    build_ldap="yes"
--    AC_CHECK_LIB([ldap], [ldap_initialize], [], [
-+    AC_CHECK_LIB([ldap], [ldap_initialize], [
-+	build_ldap="yes"
-+        LDAP_LIBS="-lldap -llber"
-+        AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
-+        COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
-+    ], [
-         build_ldap="no"
-         AS_IF([test "x$enable_ldapmail" = "xyes"], [
-             AC_MSG_ERROR([LDAP support required but library not found.]);
-         ])
-     ])
--    AS_IF([test "x$build_ldap" = "xyes"], [
--        LDAP_LIBS="-lldap -llber"
--        AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP])
--        COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
--    ])
- ], [
-     build_ldap="no"
- ])
-@@ -163,8 +162,12 @@ AC_ARG_ENABLE([libwrap],
-     [enable_libwrap=auto]
- )
- AS_IF([test "x$enable_libwrap" != "xno"], [
--    build_libwrap="yes"
--    AC_CHECK_HEADER([tcpd.h],[], [
-+    AC_CHECK_HEADER([tcpd.h], [
-+    	build_libwrap="yes"
-+        WRAP_LIBS="-lwrap"
-+        AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
-+        COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
-+    ], [
-         build_libwrap="no"
-         AS_IF([test "x$enable_libwrap" = "xyes"] , [
-             AC_MSG_ERROR([tcpd.h not found and requested])
-@@ -172,11 +175,6 @@ AS_IF([test "x$enable_libwrap" != "xno"], [
-             AC_MSG_WARN([tcpd.h not found])
-         ])
-     ])
--    AS_IF([test "x$build_libwrap" != "xno"], [
--        WRAP_LIBS="-lwrap"
--        AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad])
--        COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS"
--    ])
- ], [
-     build_libwrap="no"
- ])
diff --git a/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch b/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch
deleted file mode 100644
index d4fffd4f03fa..000000000000
--- a/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit ab2bf5b51a1ca14cef63e8a7a88b039f173a210a
-Author: Eric Sandeen <sandeen@redhat.com>
-Date:   Mon Jan 18 20:11:01 2016 -0600
-
-    repquota: -F option takes an arg
-    
-    Commit a5876145 added a new -O option which takes an
-    argument, but in the process lost the argument specifier
-    for "F".  As a result, the use of "-F" segfaults when NULL
-    is sent to name2fmt() instead of the provided argument.
-    
-    Signed-off-by: Eric Sandeen <sandeen@redhat.com>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/repquota.c b/repquota.c
-index 744af70..6fe9f0c 100644
---- a/repquota.c
-+++ b/repquota.c
-@@ -90,7 +90,7 @@ static void parse_options(int argcnt, char **argstr)
- 		{ NULL, 0, NULL, 0 }
- 	};
- 
--	while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiFO:", long_opts, NULL)) != -1) {
-+	while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiF:O:", long_opts, NULL)) != -1) {
- 		switch (ret) {
- 			case '?':
- 			case 'h':
diff --git a/sys-fs/quota/files/quota-4.03-respect_docdir.patch b/sys-fs/quota/files/quota-4.03-respect_docdir.patch
deleted file mode 100644
index 214b3ad1f17a..000000000000
--- a/sys-fs/quota/files/quota-4.03-respect_docdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit cac9a60c29106763cc6abd6f372f25f97d4122a3
-Author: Tomáš Chvátal <tchvatal@suse.com>
-Date:   Mon Jan 4 15:26:36 2016 +0100
-
-    Respect the docdir declaration and do not override.
-    
-    Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
-    Signed-off-by: Jan Kara <jack@suse.cz>
-
-diff --git a/Makefile.am b/Makefile.am
-index a880ebe..7c7a866 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@ ACLOCAL_AMFLAGS = -I m4
- 
- BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c
- 
--docdir = $(datadir)/doc/@PACKAGE@
- doc_DATA = \
- 	README.mailserver \
- 	README.ldap-support \
diff --git a/sys-fs/quota/quota-4.03.ebuild b/sys-fs/quota/quota-4.03.ebuild
deleted file mode 100644
index 2bab377c69b7..000000000000
--- a/sys-fs/quota/quota-4.03.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-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 )
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	# Patches from upstream
-	"${FILESDIR}/${P}-fix_build_without_ldap.patch"
-	"${FILESDIR}/${P}-distribute_ldap-scripts.patch"
-	"${FILESDIR}/${P}-explicitely_print_disabled_options.patch"
-	"${FILESDIR}/${P}-respect_docdir.patch"
-	"${FILESDIR}/${P}-dont_override_cflags.patch"
-	"${FILESDIR}/${P}-default_fpic_fpie.patch"
-	"${FILESDIR}/${P}-repqouta_F_option_arg.patch"
-	"${FILESDIR}/${P}-noldap_linking.patch"
-
-	# Patches not (yet) upstreamed
-	"${FILESDIR}/${P}-no_rpc.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable nls) \
-		$(use_enable ldap ldapmail) \
-		$(use_enable netlink) \
-		$(use_enable rpc) \
-		$(use_enable rpc rpcsetquota)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/* README.* Changelog
-	rm -r "${ED}"/usr/include || die #70938
-
-	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/quota/quota-4.04-r1.ebuild b/sys-fs/quota/quota-4.04-r1.ebuild
deleted file mode 100644
index 9b5fdbca4429..000000000000
--- a/sys-fs/quota/quota-4.04-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 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 ~arm64 ~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
-		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
-		net-libs/libtirpc
-		net-libs/rpcsvc-proto
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glibc226.patch"
-)
-
-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/quota/quota-4.04-r2.ebuild b/sys-fs/quota/quota-4.04-r2.ebuild
index a7dc2fb0040d..1d128be85e60 100644
--- a/sys-fs/quota/quota-4.04-r2.ebuild
+++ b/sys-fs/quota/quota-4.04-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="