gentoo resync : 03.01.2018

22 files changed, 50 insertions, 905 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2c66a1d046a3..78d31b42d113 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 6a3f3e3a7a54..c0707cda208b 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -7,5 +7,5 @@ DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2
 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 4038 BLAKE2B b8b56f6f27cab1741c836db5161b03162510edbccba6be3499abbcf3872441f4645ddfadb2d4d01050a4127d411f2e2819af34898fef80f7ed62ea251119c2c2 SHA512 28561ab9c658dbde06bf340073b958844a6f24c3279a8635814dcf48ddb9ce57bb3769a9ce81357ebd1e135a5c27ec0c75323d6a99eb5cd3dc9b4087a19d2139
-EBUILD cryptsetup-2.0.0-r1.ebuild 4096 BLAKE2B 5cfb91b42cb68f07b553d9d82b6df59e991722b9f2b0211dd292635de8bd8a3790763c8520787157a408e27ef9dcf725525efb125139c401832015ec4ed9100e SHA512 3b10d1e987d5a6b3c47b11cabca48062e0d3b6c08ecfe24c535235ad0acb328e776e729f31564543082b19b3b2d1306003d1b7f26b1d18edf797d72a8d315e74
+EBUILD cryptsetup-2.0.0-r1.ebuild 4098 BLAKE2B 26ec10dfc4d31c972dc655a7ab4dbecfdf63dc587df5cb1c772604c8cd61cf9a7f6d05cee9c2c7f20d46876ff6749c469ca78840152b843d8a31c08ad54954e3 SHA512 f1f7a6bc99c865687e6fe58822feb19165e5de8bd132b681ab38a2ce5e658a83cf448c7b6e9bdec7bd9d059465efb681ffeb68f155db8f2cfc4d6fc0cdcf246c
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
index 503a03a2634e..14e340bb4009 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ LIB_DEPEND="
 	dev-libs/libgpg-error[static-libs(+)]
 	dev-libs/popt[static-libs(+)]
 	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2[static-libs(+)] )
+	argon2? ( app-crypt/argon2:=[static-libs(+)] )
 	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
 	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
 	openssl? (
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 2b78ecd7d77a..acd8426a35bf 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,24 +1,9 @@
-AUX cdrwtool-linux2.6-fix-v2.patch 876 BLAKE2B 4dda034219f8ae567ba26613e74d64b7fe6c4826694441122d18e204c835d7746f31c51ef3ba9cd9011c28f7612f15726ba8180d778cda1029496a32d55e322c SHA512 97a9c9bf655bb5b8996cca6b3011b8cb862aa07eb8adac027207d07e2f92dcf04ef637093d8239b04b083a2bf5fd6dede6fa34f85ffc46834253a75049baf74c
 AUX pktcdvd.init 1307 BLAKE2B 983127f7c28a0820ce579b42792864f5466d46c19ffc81057489c3024023e42dc1eb69bd91f289431cbc3453e2d0d3cd87f7280dee7954946a487df9e0aacf9b SHA512 6c5c7a8b39067924c5be31a951043a1c44ff53d951fa9307fde2393aaf9c2b5f8960a042aae238d71a09696a3077d72ed41acdf261739c2829ab25130f3b795b
-AUX udftools-1.0.0b-bigendian.patch 985 BLAKE2B 957d7d9e6c1dcdcfce2dc7480c356082d991306feb6b90c24722726c78d97fbbd0afd59ea344993865cac39a850b0f09cba01a0f4c1436a39562b0e93c16d5c3 SHA512 f16ce73f58b51291ad54fcf7e065df1f971a14033110627bab77f35ee95d4cbe772accca52d1db9e1897830bcc55f9358e99cebc0633c3be1ce37bfda1affa72
-AUX udftools-1.0.0b-gcc4.patch 354 BLAKE2B 6c8469928fadf249712e733a5cd404a79ea590b6396d72a0558fc8e7eeb81b0244458687569cdcbd6594cc06ff210cf657c0dc31a9ba5403e1c605732fdb3b9f SHA512 4c92997faf8e4e090bc2fd2297cf87328e26cb06d113a067a7ea90167e2c39af4183046cbc1f86c73bf0bc6bf6357e6627423739409d614d153d628123166233
-AUX udftools-1.0.0b-limits_h.patch 451 BLAKE2B 3f04fba55234e85cc1b4ae57ad02f2f3885709064a6c97cc5f4204bbdcc2d3cc8746a140cf15f7870f39e581a6b5b84f29b8ac146814f12b541825c121c5cf2f SHA512 b3bc5304a095428e69b39863823daf459c43b26172d3cc58a219c513f1c37265ed4fcf53d0fe2833196d043807cda1a73651bcaaa246cc2fcac52230ebdb9d41
-AUX udftools-1.0.0b-openflags.patch 432 BLAKE2B e01c938088957214c83063978eabb2623ff0908bd573237c0a8426ced631fcc4c8e625220f976de83bd076d4ce52bb2ca75f3f2f639ec7757dffaa7776e929c0 SHA512 c192ad5f83dc71fbda7564b877b861d86bb568cb9e82562c64ec7be7cd3e1bbe2ec371b1b36626a5bb196446ce68a18e07c7bfdc1e79528706cbe9577a6c9943
-AUX udftools-1.0.0b3-extsize.patch 1573 BLAKE2B 94d56d9aaf064502ad9f9c64d4c4ad4be9b50ea7ed62f5dcf416db5cfc9bd5405fd24ad4ebd533cb6043df8732dbf0bd327a88ef6935378c90562c210f84689c SHA512 81093ef7c3fe8d1d357a5d315439ecf9314c7771749c2fa294fcee2526021137c4364ad21e6c16ec602709a2251d28374b84cff19929617e51d8a9151a35559a
-AUX udftools-1.0.0b3-man-missing-options.patch 1512 BLAKE2B cf12960757876f2667864d73698d1e63a186dbdddf3e7f5952fef37cef250e6aa5870f99a485943776007b9d1028fa0e9f1cbdd65037157a82e0cd16de107907 SHA512 caceabf810bb2cdf8c306b126edf19501326a4dbbe5b04028ec80029dc7becd44a27682970562327aa8e88b872e9e9cb7e3d4c3db217e1650629df1a19becac3
-AUX udftools-1.0.0b3-mkudffs-bigendian.patch 4480 BLAKE2B 1919feb96b56d4ab41b92b0c7a20cb64e0c188bede5905aabea0e4410e8405fb23090a5080c300d080239d3bc2000ca850ff94b8cce97ba1ddcf95c192eee074 SHA512 8350c44749dfb10260d599f17b1a5a64c3d911410cd85802b3efeca2a3730e0da417ab41c6c4b5a74b58515969c8ec10bee48e2b0f5205e211203282ac21a180
-AUX udftools-1.0.0b3-staticanal.patch 8035 BLAKE2B 2e2522948043673b850f27419043433df7e253d272d730fe5e5097320e1ec9f8e85b871d6e2b068815f4225967439703159d8563ad9d05ea0c1ede9cae854cf8 SHA512 47d049f16ba607fdc2373ef7647e8409db5224172a3ddf5fa587649bae1804bc08b2480692a962576a4a748768aac99e27f35730d6ffba23dfd8cbe1c9a9aad6
-AUX udftools-1.0.0b3-warningfixes.patch 4287 BLAKE2B e2a68430e281eae7d985fbb60deecf2d58b7b609d22cb8ef90b593094614e2a00e93f167ee5e38e5addc25ba027d262a2b72152d8767f19ca0009c1d40b9c584 SHA512 daefbeca08bfdb2435d36b5335aec8e4da4e547843bb6fe7d607949071844304b89e1051dc155733baa5854b52452868b0b4eb2a76111c24d58746ecab7e0802
-AUX udftools-1.0.0b3-warningfixes2.patch 5520 BLAKE2B 4d0a52aa90bb4ce860a31150a286bea62ce7a50a2bed6a56ed182ea06b8ad585963be54a12b46173d59136848094e81e04b30965bc9018db9cfba44d9b29a982 SHA512 d050cfd745a36050f26f2aa8a86a6d60a3007c9d84c2e6f224816887c41c06d81d8404cc3c817e54815705ec3cbe5aa02786b3d2e9e8aa782aaafa7b7c14af18
-AUX udftools-1.0.0b3-wrudf_help.patch 1241 BLAKE2B 3b56f3da6ee54129805739a0179dd002a11674580c7c0bfb41571892adb1f62440809a5882c93970ae8da7ef7b42267f1f49de366f52fae9cac278e7061329fe SHA512 9077691cb5aae00e777f4f3bd5d2d09c71e52b2584d60f2c975a64b1e5ecc9ff3675d2394d52d3f688f24894bfa84f3b7350a4d82eb421ec95a15929ea14fa61
-DIST udftools-1.0.0b3.patch.bz2 3372 BLAKE2B 8e919e381e18700943beb89401f36de9199e2274f2e231f36e84a93c9f84043fe9a8013adc189af9d80d9ad88aa9e99e1c232c4c03365f6b58dc2048f47de8b6 SHA512 2b30741ffb7bab0139f6a3fb55911517c7f0489b76bc3453c3e0c519356689a8a9ad9c2b7e954267e8e14a6840498cd3c93641c5eb69f373f7bb19d35ffe9f19
-DIST udftools-1.0.0b3.tar.gz 293257 BLAKE2B c4bb1433d5ecd7dd382aad06cb192d2fbef2438b45eadf095f7cade2d94c3ee8eabb09a2c1efd20a9d899523af23a0da3c223fa7f70fd600fc8967fa799d7715 SHA512 4b45ff2e389ce93c3ac372f74daa3e2a43e02434c1e3d9df8cf050e137799491ac88d7aedd2b61c6d79a7ab8878042689c948c0b2aeb4be0a172c64844f07068
+AUX udftools-2.0-sysmacros.patch 1203 BLAKE2B 87e9d5ce829584ff0dae366bc3c2b52bcce7115668cc0ed9387a49744a2f558103e58980f038da141ae250135278a89578d4c7b3295a73ba7d3cd7a8ebd37aa5 SHA512 2108fb8e6d2e35922a47a6c7d82d218770ac1294cf0d2c88f9e3794ff2d91112eca850f8cda14ce019cc4c7e1653c173c9a6b3fffdf117ac58bfebb351c3b880
 DIST udftools-1.1.tar.gz 656865 BLAKE2B 6e76251368c121ab07e02071bfddde5c4f4523cc858a7ffcc86063b48adbc03233fab18a3ff50b840fc603e7f48f386e15b4ca556046116d4b42f43c06927dc5 SHA512 9c415d1cae1d79d49b4f9e3e6881f0b44b31d59f6d722571badd78ee68c422899ee8b95caed0ac50e76c13d8ed118f58f79efe5cbf775438a163d68160a30742
-DIST udftools-1.2.tar.gz 657310 BLAKE2B 269cb4a45f5eb61f780c81821fc0942c23650bda221f031199bde2b08c221d08f57559742d03c5d0217cb6a4f1cb0273ee969352d48fc34431f00ddfff608584 SHA512 b36e08b7adc0246f2a8024f6ee95117f5cba03566103a501acd1fb1ab31152da6345584ad36156a94ce5a29818e38333d81e3307ba73cef08355c300b79af199
 DIST udftools-1.3.tar.gz 447063 BLAKE2B ff23f23dd5b9753d9e4cba6e326d302346233ed0a836ccf35372e61ca1d7a5c14ff8f1d1505f2f9fba779f4379adf472b64ce60aa4ca0d3e51679ea863db2f0f SHA512 d67f74640cc600fbdf3d7a67caee1342c15507357e155c5e1066aa6f6b3e2667483107edd663eaed5ebb690c13337598a75c1955e69cbc782bd481af783837e7
-EBUILD udftools-1.0.0b-r10.ebuild 1481 BLAKE2B 90bca6617abba60fffa8fe765a4530096cf8e916fd3c2aadcbd56045d66601139c56f21c06d41f5ba9a925f26e3857ad275950c7c0b698a21901e022676a991e SHA512 6d503c710f96cbf4dc087604361137025cf7e3029d0a43777151528bc448c0b46d9edf5265cded42c4c747b084eb0bbfb8defb3685467abc933d815aacf943a1
-EBUILD udftools-1.0.0b-r9.ebuild 1190 BLAKE2B 5c4f225a3eb5c036d42c4c9c1be1eaa897fa08ff77ec4e1d6da9d7f0b0e339dc0b963ffa1fd161f810891b7a84d633e5d41beabb47fac4e5449d1cdd2dacd97d SHA512 c3122ea4c0554713bd94bacb7eafe24bfc1edbcd92181a79926e05d4d956214e3e4bd28ada2f2696552b8cd0b8c9572cb4545c4271f5c82529e5068bc8ed331e
+DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
 EBUILD udftools-1.1.ebuild 664 BLAKE2B b127bbd656e4cfcf6d3c4a929f1dd709fd843eb0e1edcedab2a0f4428c4c08fd92c677f846da641877be52e21040be2bb4bed4117754e47aa04bd13b8aac1508 SHA512 829b847f094d1c8146c76312febedf72abca1a29def30410c00d509bae9b4da16ff6b9afbafe62ba54f6c97f174b51ff76b455a35f4ce19498f76e1f8fd974c4
-EBUILD udftools-1.2.ebuild 668 BLAKE2B 454c0fef087bbf5519c4306988dd2eb532474cec91a37bc7eda2c140b182ec8f5e9673d15e786a3abfd65d4cab89e4d79e70caa42c472f57bfb115cb25ec5654 SHA512 f3a6c5f4567f166e4d65639f3393f414c3879c3b9a968c73e93a4d2a4aab16f985d341bcef3319701126a5e656f95e4cafac89b58bec76f0aa27ab8c4f2fc07a
 EBUILD udftools-1.3.ebuild 668 BLAKE2B 792c3c992300fbbe75dc8dcaa81a0a52aacf42dcc8e730e4475a31968843164c989aeb4941f6a52729e6f0d946082e03c3ef8cc984ec48689c41bf2e924fad43 SHA512 c7358d1dfb3e6fd253543d07798ceb43ada57f5917f674f471d38c6bc7d9251f4547a98b260e6d73766eca109b5e2ed8fa0d83dba6b05cae217969cce84eae4b
+EBUILD udftools-2.0.ebuild 707 BLAKE2B f3e673a67284445436156633d9fcba73a07a2690574c3746ea483caad28d7645d5f646fec82ae9923b1799e90b09c12db11ae76d99eea916c8344e8debcf5b3c SHA512 3385545b56fed68c7c3730d81c9ef2be41f4f85dc319d667895a7730f02c30a16c816798fa7146880fb1776262556d569cc0d44c9c31f78becbe1f5a0a3e3d58
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/files/cdrwtool-linux2.6-fix-v2.patch b/sys-fs/udftools/files/cdrwtool-linux2.6-fix-v2.patch
deleted file mode 100644
index 602c808a1b0b..000000000000
--- a/sys-fs/udftools/files/cdrwtool-linux2.6-fix-v2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix CD blanking for kernels 2.6.8 and newer
-(write access is required to perform blanking commands)
-
-The original version broke support on Linux 2.4, thanks to Ben Peddell for pointing
-this out to me, and for the updated patch.
-
- - Daniel Drake <dsd@gentoo.org>
- - Ben Peddell <klightspeed@klightspeed.is-a-geek.net>
-
---- udftools-1.0.0b3/cdrwtool/main.c.orig	2004-12-30 22:53:52.000000000 +0000
-+++ udftools-1.0.0b3/cdrwtool/main.c	2004-12-30 22:54:36.000000000 +0000
-@@ -242,7 +242,9 @@ int main(int argc, char *argv[])
- 	udf_init_disc(&disc.udf_disc);
- 	strcpy(filename, CDROM_DEVICE);
- 	parse_args(argc, argv, &disc, filename);
--	if ((fd = open(filename, O_RDONLY | O_NONBLOCK)) < 0)
-+	if (((fd = open(filename, O_RDWR | O_NONBLOCK)) < 0) &&
-+		((errno != EROFS) ||
-+		((fd = open(filename, O_RDONLY | O_NONBLOCK)) < 0)))
- 	{
- 		perror("open cdrom device");
- 		return fd;
diff --git a/sys-fs/udftools/files/udftools-1.0.0b-bigendian.patch b/sys-fs/udftools/files/udftools-1.0.0b-bigendian.patch
deleted file mode 100644
index d49b2561e4e9..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b-bigendian.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://bugs.gentoo.org/120245
-
-BE fix
-
-===================================================================
-RCS file: /cvsroot/linux-udf/udftools/mkudffs/mkudffs.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- linux-udf/udftools/mkudffs/mkudffs.c	2004/02/23 03:35:33	1.3
-+++ linux-udf/udftools/mkudffs/mkudffs.c	2004/03/02 02:09:39	1.4
-@@ -250,14 +250,14 @@
- 	if (size % offsets[PSPACE_SIZE])
- 		size -= (size % offsets[PSPACE_SIZE]);
- 	set_extent(disc, PSPACE, start, size);
--	for (i=0; i<disc->udf_lvd[0]->numPartitionMaps; i++)
-+	for (i=0; i<le32_to_cpu(disc->udf_lvd[0]->numPartitionMaps); i++)
- 	{
- 		if (i == 1)
- 			disc->udf_lvid->freeSpaceTable[i] = cpu_to_le32(0xFFFFFFFF);
- 		else
- 			disc->udf_lvid->freeSpaceTable[i] = cpu_to_le32(size);
- 	}
--	for (j=0; j<disc->udf_lvd[0]->numPartitionMaps; j++)
-+	for (j=0; j<le32_to_cpu(disc->udf_lvd[0]->numPartitionMaps); j++)
- 	{
- 		if (j == 1)
- 			disc->udf_lvid->sizeTable[i+j] = cpu_to_le32(0xFFFFFFFF);
diff --git a/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch b/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch
deleted file mode 100644
index 3b58f20f0173..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/112122
-
-gcc4 compat
-
---- a/wrudf/wrudf.c
-+++ b/wrudf/wrudf.c
-@@ -245,7 +245,7 @@
- 	    } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 )
- 		virtualPartitionNum = i;
- 	}
--	(char*)spm += spm->partitionMapLength;
-+	spm = (char*)spm + spm->partitionMapLength;
-     }
- 
-     if( medium == CDR ) {
diff --git a/sys-fs/udftools/files/udftools-1.0.0b-limits_h.patch b/sys-fs/udftools/files/udftools-1.0.0b-limits_h.patch
deleted file mode 100644
index 74dddf9e012c..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b-limits_h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/335511
-
---- cdrwtool/cdrwtool.c
-+++ cdrwtool/cdrwtool.c
-@@ -31,6 +31,7 @@
- #include <sys/ioctl.h>
- #include <asm/param.h>
- 
-+#include <limits.h> /* INT_MAX */
- #include <linux/cdrom.h>
- 
- #include "cdrwtool.h"
---- pktsetup/pktsetup.c
-+++ pktsetup/pktsetup.c
-@@ -26,6 +26,8 @@
- #include <bits/types.h>
- #include <sys/types.h>
- 
-+#include <limits.h> /* INT_MAX */
-+#include <stdlib.h> /* system */
- #include <linux/cdrom.h>
- 
- /*
diff --git a/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch b/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch
deleted file mode 100644
index 88803e43d6fb..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Magnus Granberg <zorry@ume.nu>
-https://bugs.gentoo.org/232100
-Remove nonsense O_CREAT flag
-
---- pktsetup/pktsetup.c	2008-06-19 00:27:08.000000000 +0200
-+++ pktsetup/pktsetup.c	2008-06-19 00:20:31.000000000 +0200
-@@ -85,7 +85,7 @@
- {
- 	int pkt_fd, dev_fd, cmd;
- 
--	if ((pkt_fd = open(pkt_device, O_RDONLY | O_CREAT)) == -1) {
-+	if ((pkt_fd = open(pkt_device, O_RDONLY)) == -1) {
- 		perror("open packet device");
- 		return;
- 	}
diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-extsize.patch b/sys-fs/udftools/files/udftools-1.0.0b3-extsize.patch
deleted file mode 100644
index 8e7e0d13a7f2..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b3-extsize.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-taken from Fedora, but with minor return type fixes: changed NULL to 0
-
-http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-extsize.patch?h=f22
-
-diff -up udftools-1.0.0b3/libudffs/extent.c.extsize udftools-1.0.0b3/libudffs/extent.c
---- udftools-1.0.0b3/libudffs/extent.c.extsize	2012-01-26 09:45:22.217856499 +0100
-+++ udftools-1.0.0b3/libudffs/extent.c	2012-01-26 09:45:43.142855067 +0100
-@@ -50,7 +50,7 @@ cont:
- 	while (start_ext != NULL && start_ext->blocks < blocks)
- 		start_ext = next_extent(start_ext->next, type);
- 
--	if (start_ext->start % offset)
-+	if (start_ext != NULL && start_ext->start % offset)
- 	{
- 		inc = offset - (start_ext->start % offset);
- 		if (start_ext->blocks - inc < blocks)
-@@ -62,7 +62,7 @@ cont:
- 	else
- 		inc = 0;
- 
--	return start_ext->start + inc;
-+	return start_ext ? start_ext->start + inc : 0;
- }
- 
- struct udf_extent *prev_extent(struct udf_extent *start_ext, enum udf_space_type type)
-@@ -81,7 +81,7 @@ cont:
- 	while (start_ext != NULL && start_ext->blocks < blocks)
- 		start_ext = prev_extent(start_ext->prev, type);
- 
--	if ((start_ext->start + start_ext->blocks) % offset)
-+	if (start_ext != NULL && (start_ext->start + start_ext->blocks) % offset)
- 	{
- 		dec = (start_ext->start + start_ext->blocks) % offset;
- 		if (start_ext->blocks - dec < blocks)
-@@ -93,7 +93,7 @@ cont:
- 	else
- 		dec = 0;
- 
--	return start_ext->start + start_ext->blocks - dec - blocks;
-+	return start_ext ? start_ext->start + start_ext->blocks - dec - blocks : 0;
- }
- 
- struct udf_extent *find_extent(struct udf_disc *disc, uint32_t start)
-
diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-man-missing-options.patch b/sys-fs/udftools/files/udftools-1.0.0b3-man-missing-options.patch
deleted file mode 100644
index afda3bd00d3a..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b3-man-missing-options.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-taken from Fedora
-
-http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-man-missing-options.patch?h=f22
-
-diff -up wrk/doc/cdrwtool.1.wrk wrk/doc/cdrwtool.1
---- wrk/doc/cdrwtool.1.wrk	2014-01-29 15:23:18.623940293 +0100
-+++ wrk/doc/cdrwtool.1	2014-01-29 15:24:27.027471222 +0100
-@@ -97,6 +97,10 @@ Close track.
- .IP "\fB\-r \fItrack\fP"
- Reserve track.
- 
-+.IP "\fB\-z \fIlength\fP"
-+Fixed packet length.
-+
-+
- .IP \fB\-s\fP
- Set write parameters determined by
- .BR "\-l" , " \-w" ", and" " \-p"
-diff -up wrk/doc/mkudffs.8.wrk wrk/doc/mkudffs.8
---- wrk/doc/mkudffs.8.wrk	2014-01-29 15:47:54.095408327 +0100
-+++ wrk/doc/mkudffs.8	2014-01-29 15:51:18.115200882 +0100
-@@ -151,6 +151,13 @@ Use 16-bit unicode for file names
- .TP
- .B \-\-utf8
- Use UTF-8 for file names
-+.TP
-+.B \-\-closed
-+.TP
-+.B \-\-bridge
-+.TP
-+.BI \-\-packetlen= " length "
-+
- 
- .SH "EXIT STATUS"
- .B mkudffs
-diff -up wrk/doc/pktsetup.8.wrk wrk/doc/pktsetup.8
---- wrk/doc/pktsetup.8.wrk	2002-11-26 08:18:51.000000000 +0100
-+++ wrk/doc/pktsetup.8	2014-01-29 15:36:29.509665177 +0100
-@@ -37,6 +37,9 @@ pktsetup \- set up and tear down packet
- .B pktsetup
- .B \-d
- .I packet_device
-+.br
-+.B pktsetup
-+.B \-s
- .ad b
- .SH DESCRIPTION
- .B Pktsetup
-@@ -58,6 +61,8 @@ returns 0 on success, nonzero on failure
- .IP "\fB\-d \fIpacket-device\fP"
- Delete the association between the specified \fIpacket-device\fP
- and its block device.
-+.IP "\fB\-s"
-+Show device mappings.
- 
- .SH EXAMPLE
- The following commands provide an example of using the
diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-mkudffs-bigendian.patch b/sys-fs/udftools/files/udftools-1.0.0b3-mkudffs-bigendian.patch
deleted file mode 100644
index 68c637cd89f4..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b3-mkudffs-bigendian.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-taken from Fedora, but parts removed due to conflicts w/udftools-1.0.0b-bigendian.patch
-
-http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-mkudffs-bigendian.patch?h=f22
-
-diff -up udftools-1.0.0b3/mkudffs/defaults.c.mkudffs-bigendian udftools-1.0.0b3/mkudffs/defaults.c
---- udftools-1.0.0b3/mkudffs/defaults.c.mkudffs-bigendian	2007-08-23 13:41:29.000000000 +0200
-+++ udftools-1.0.0b3/mkudffs/defaults.c	2007-08-23 13:42:16.000000000 +0200
-@@ -69,7 +69,7 @@ struct primaryVolDesc default_pvd =
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_PVD),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct primaryVolDesc) - sizeof(tag)),
- 	},
- 	volDescSeqNum : constant_cpu_to_le32(1),
-@@ -119,7 +119,7 @@ struct logicalVolDesc default_lvd =
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_LVD),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct logicalVolDesc) - sizeof(tag)),
- 	},
- 	volDescSeqNum : constant_cpu_to_le32(2),
-@@ -157,7 +157,7 @@ struct volDescPtr default_vdp =
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_VDP),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct volDescPtr) - sizeof(tag)),
- 	},
- 	volDescSeqNum : constant_cpu_to_le32(3),
-@@ -192,7 +192,7 @@ struct impUseVolDesc default_iuvd =
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_IUVD),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct impUseVolDesc) - sizeof(tag)),
- 	},
- 	volDescSeqNum : constant_cpu_to_le32(4),
-@@ -215,7 +215,7 @@ struct partitionDesc default_pd =
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_PD),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct partitionDesc) - sizeof(tag)),
- 	},
- 	volDescSeqNum : constant_cpu_to_le32(5),
-@@ -242,7 +242,7 @@ struct unallocSpaceDesc default_usd =
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_USD),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct unallocSpaceDesc) - sizeof(tag)),
- 	},
- 	volDescSeqNum : constant_cpu_to_le32(6),
-@@ -254,7 +254,7 @@ struct terminatingDesc default_td =
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_TD),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct terminatingDesc) - sizeof(tag)),
- 	},
- };
-@@ -265,7 +265,7 @@ struct logicalVolIntegrityDesc default_l
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_LVID),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct logicalVolIntegrityDesc) - sizeof(tag)),
- 	},
- 	integrityType : constant_cpu_to_le32(LVID_INTEGRITY_TYPE_CLOSE),
-@@ -295,7 +295,7 @@ struct sparingTable default_stable =
- 	{
- 		tagIdent : constant_cpu_to_le16(0),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct sparingTable) - sizeof(tag)),
- 	},
- 	sparingIdent :
-@@ -387,7 +387,7 @@ struct fileSetDesc default_fsd =
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_FSD),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct fileSetDesc) - sizeof(tag)),
- 	},
- 	interchangeLvl : constant_cpu_to_le16(2),
-@@ -426,7 +426,7 @@ struct fileEntry default_fe =
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_LVID),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct primaryVolDesc) - sizeof(tag)),
- 	},
- 	icbTag :
-@@ -458,7 +458,7 @@ struct extendedFileEntry default_efe =
- 	{
- 		tagIdent : constant_cpu_to_le16(TAG_IDENT_LVID),
- 		descVersion : constant_cpu_to_le16(3),
--		tagSerialNum : 1,
-+		tagSerialNum : constant_cpu_to_le16(1),
- 		descCRC : constant_cpu_to_le16(sizeof(struct primaryVolDesc) - sizeof(tag)),
- 	},
- 	icbTag :
diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-staticanal.patch b/sys-fs/udftools/files/udftools-1.0.0b3-staticanal.patch
deleted file mode 100644
index 9ff411b24528..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b3-staticanal.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-taken from Fedora
-
-http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-staticanal.patch?h=f22
-
-Error: CONSTANT_EXPRESSION_RESULT:
-/builddir/build/BUILD/udftools-1.0.0b3/cdrwtool/cdrwtool.c:626: result_independent_of_operands: (ret == ioctl(fd, 21289, 1)) < 0 is always false regardless of the values of its operands. This occurs as the logical operand of if.
-
-Possible buffer overflow of static allocated variable "device".
-
-diff -up udftools-1.0.0b3/cdrwtool/cdrwtool.c.staticanal udftools-1.0.0b3/cdrwtool/cdrwtool.c
---- udftools-1.0.0b3/cdrwtool/cdrwtool.c.staticanal	2012-01-26 16:20:44.518234366 +0100
-+++ udftools-1.0.0b3/cdrwtool/cdrwtool.c	2012-01-26 16:20:44.537234366 +0100
-@@ -623,7 +623,7 @@ int cdrom_open_check(int fd)
- 	if ((ret = ioctl(fd, CDROM_CLEAR_OPTIONS, CDO_LOCK)) < 0)
- 		return ret;
- 
--	if ((ret == ioctl(fd, CDROM_LOCKDOOR, 1)) < 0) {
-+	if ((ret = ioctl(fd, CDROM_LOCKDOOR, 1)) < 0) {
- 		fprintf(stderr, "CD-ROM appears to already be opened\n");
- 		return 1;
- 	}
-diff -up udftools-1.0.0b3/cdrwtool/options.c.staticanal udftools-1.0.0b3/cdrwtool/options.c
---- udftools-1.0.0b3/cdrwtool/options.c.staticanal	2012-01-26 16:26:11.288212023 +0100
-+++ udftools-1.0.0b3/cdrwtool/options.c	2012-01-26 16:27:24.125207040 +0100
-@@ -135,7 +135,8 @@ void parse_args(int argc, char *argv[],
- 			}
- 			case 'd':
- 			{
--				strcpy(device, optarg);
-+				strncpy(device, optarg, NAME_MAX-1);
-+				device[NAME_MAX-1] = '\0';
- 				printf("using device %s\n", device);
- 				break;
- 			}
-
-
-==========================================================================
-Error: NEGATIVE_RETURNS:
-/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:161: negative_return_fn: Function "open64(filename, 66, 432)" returns a negative number.
-/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:161: var_assign: Assigning: signed variable "fd" = "open64".
-/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:165: negative_returns: "fd" is passed to a parameter that cannot be negative.
-/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:85: neg_sink_parm_call: Passing "fd" to "valid_offset", which cannot accept a negative.
-/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:55: neg_sink_parm_call: Passing "fd" to "udf_lseek64", which cannot accept a negative.
-/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:43: neg_sink_parm_call: Passing "fd" to "lseek64", which cannot accept a negative.
-
-diff -up udftools-1.0.0b3/mkudffs/main.c.staticanal udftools-1.0.0b3/mkudffs/main.c
---- udftools-1.0.0b3/mkudffs/main.c.staticanal	2004-02-23 04:33:11.000000000 +0100
-+++ udftools-1.0.0b3/mkudffs/main.c	2012-01-26 16:29:17.605199282 +0100
-@@ -162,6 +162,10 @@ int main(int argc, char *argv[])
- #else
- 	fd = open(filename, O_RDWR | O_CREAT | O_LARGEFILE, 0660);
- #endif
-+	if (fd == NULL) {
-+		fprintf(stderr, "mkudffs: cannot open '%s' for writing\n", filename);
-+		exit(1);
-+	}
- 	disc.head->blocks = get_blocks(fd, disc.blocksize, disc.head->blocks);
- 	disc.write = write_func;
- 	disc.write_data = &fd;
-
-
-==========================================================================
-Error: BAD_SIZEOF:
-/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/mkudffs.c:45: bad_sizeof: Taking the size of pointer parameter "disc" is suspicious.
-
-Possible buffer overflow of static allocated variable "device".
-
-diff -up udftools-1.0.0b3/mkudffs/mkudffs.c.staticanal udftools-1.0.0b3/mkudffs/mkudffs.c
---- udftools-1.0.0b3/mkudffs/mkudffs.c.staticanal	2012-01-26 16:20:44.526234367 +0100
-+++ udftools-1.0.0b3/mkudffs/mkudffs.c	2012-01-26 16:20:44.539234366 +0100
-@@ -42,7 +42,7 @@ void udf_init_disc(struct udf_disc *disc
- 	struct tm 	*tm;
- 	int		altzone;
- 
--	memset(disc, 0x00, sizeof(disc));
-+	memset(disc, 0x00, sizeof(*disc));
- 
- 	disc->blocksize = 2048;
- 	disc->blocksize_bits = 11;
-diff -up udftools-1.0.0b3/mkudffs/options.c.staticanal udftools-1.0.0b3/mkudffs/options.c
---- udftools-1.0.0b3/mkudffs/options.c.staticanal	2012-01-26 16:24:14.082220036 +0100
-+++ udftools-1.0.0b3/mkudffs/options.c	2012-01-26 16:27:29.086206703 +0100
-@@ -320,7 +320,8 @@ void parse_args(int argc, char *argv[],
- 	}
- 	if (optind == argc)
- 		usage();
--	strcpy(device, argv[optind]);
-+	strncpy(device, argv[optind], NAME_MAX-1);
-+	device[NAME_MAX-1] = '\0';
- 	optind ++;
- 	if (optind < argc)
- 		disc->head->blocks = strtoul(argv[optind++], NULL, 0);
- 		
- 		
-==========================================================================
-Error: OVERRUN_STATIC:
-/builddir/build/BUILD/udftools-1.0.0b3/wrudf/wrudf-cdrw.c:378: overrun-local: Overrunning static array "spm->locSparingTable", with 4 elements, at position 4 with index variable "i".
-
-Error: NEGATIVE_RETURNS:
-/builddir/build/BUILD/udftools-1.0.0b3/wrudf/wrudf-cdrw.c:769: negative_return_fn: Function "open(filename, 2)" returns a negative number.
-/builddir/build/BUILD/udftools-1.0.0b3/wrudf/wrudf-cdrw.c:769: var_assign: Assigning: signed variable "device" = "open".
-/builddir/build/BUILD/udftools-1.0.0b3/wrudf/wrudf-cdrw.c:773: negative_returns: "device" is passed to a parameter that cannot be negative.
- 		
-diff -up udftools-1.0.0b3/wrudf/wrudf-cdrw.c.staticanal udftools-1.0.0b3/wrudf/wrudf-cdrw.c
---- udftools-1.0.0b3/wrudf/wrudf-cdrw.c.staticanal	2012-01-26 16:20:44.529234367 +0100
-+++ udftools-1.0.0b3/wrudf/wrudf-cdrw.c	2012-01-26 16:35:29.729173836 +0100
-@@ -374,7 +374,7 @@ void updateSparingTable() {
-     struct packetbuf	*pb;
-     struct sparablePartitionMap *spm = (struct sparablePartitionMap*)lvd->partitionMaps;
- 
--    for( i = 0; i <= 4; i++ ) {
-+    for( i = 0; i < sizeof(spm->locSparingTable); i++ ) {
- 	pbn = spm->locSparingTable[i];
- 	if( pbn == 0 )
- 	    return;
-@@ -682,6 +682,8 @@ readExtents(char* dest, int usesShort, v
- 	dest += 2048;
- 	if( len < 2048 )
- 	    break;
-+        /* dead code, len couldn't be 0 at this point 
-+           (break was called in this case) */
- 	if( len == 0 ) {
- 	    if( usesShort ) {
- 		sh++;
-@@ -766,8 +768,10 @@ initIO(char *filename)
- 
-     if( S_ISREG(filestat.st_mode) ) {		/* disk image of a UDF volume */
- 	devicetype = DISK_IMAGE;
--	if( !(device = open(filename, O_RDWR)) )
-+	if( !(device = open(filename, O_RDWR)) ) {
- 	    fail("initIO: open %s failed\n", filename);
-+	    return 0;
-+	}
- 
- 	/* heuristically determine medium imitated on disk image based on VAT FileEntry in block 512 */
- 	rv = lseek(device, 2048 * 512, SEEK_SET);
-
-==========================================================================
-Error: CONSTANT_EXPRESSION_RESULT:
-/builddir/build/BUILD/udftools-1.0.0b3/wrudf/wrudf-cmnd.c:699: missing_parentheses: !(*fid)->fileCharacteristics & 2 is always 0 regardless of the values of its operands. This occurs as the logical operand of if. Did you intend to apply '&' to (*fid)->fileCharacteristics and 2? If so, parentheses would be required to force this interpretation.
-
-diff -up udftools-1.0.0b3/wrudf/wrudf-cmnd.c.staticanal udftools-1.0.0b3/wrudf/wrudf-cmnd.c
---- udftools-1.0.0b3/wrudf/wrudf-cmnd.c.staticanal	2012-01-26 16:20:44.530234366 +0100
-+++ udftools-1.0.0b3/wrudf/wrudf-cmnd.c	2012-01-26 16:20:44.543234366 +0100
-@@ -696,7 +696,7 @@ analyzeDest(char* arg, struct fileIdentD
- 	*fid = findFileIdentDesc(curDir, comp);
- 	if( *fid == NULL )
- 	    return DIR_INVALID;
--	if( ! (*fid)->fileCharacteristics & FID_FILE_CHAR_DIRECTORY )
-+	if( ! ((*fid)->fileCharacteristics & FID_FILE_CHAR_DIRECTORY ))
- 	    return DIR_INVALID;
- 	if( (*fid)->fileCharacteristics & FID_FILE_CHAR_DELETED )
- 	    return DIR_INVALID;
-diff -up udftools-1.0.0b3/wrudf/wrudf.c.staticanal udftools-1.0.0b3/wrudf/wrudf.c
---- udftools-1.0.0b3/wrudf/wrudf.c.staticanal	2012-01-26 16:20:44.528234367 +0100
-+++ udftools-1.0.0b3/wrudf/wrudf.c	2012-01-26 16:20:44.545234365 +0100
-@@ -158,6 +158,7 @@ initialise(char *devicename)
- 
- 	if( (p = readTaggedBlock(blkno, ABSOLUTE)) == NULL ) {
- 	    if( !inMainSeq ) 
-+		/* dead code - the condition "inMainSeq" cannot be false */
- 		fail("Volume Descriptor Sequences read failure\n");
- 	    blkno = extentRsrvVolDescSeq.extLocation;
- 	    len = extentRsrvVolDescSeq.extLength;
diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes.patch b/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes.patch
deleted file mode 100644
index 5b530c6041e1..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-taken from Fedora
-
-http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-warningfixes.patch?h=f22
-
-diff -Naupr udftools-1.0.0b3.orig/cdrwtool/cdrwtool.h udftools-1.0.0b3/cdrwtool/cdrwtool.h
---- udftools-1.0.0b3.orig/cdrwtool/cdrwtool.h	2002-11-26 08:18:50.000000000 +0100
-+++ udftools-1.0.0b3/cdrwtool/cdrwtool.h	2006-07-27 14:16:06.000000000 +0200
-@@ -226,6 +226,7 @@ int read_disc_info(int, disc_info_t *);
- int read_track_info(int, track_info_t *, int);
- int reserve_track(int, struct cdrw_disc *);
- int close_track(int, unsigned int);
-+int close_session(int, unsigned int);
- int read_buffer_cap(int, struct cdrw_disc *);
- int set_cd_speed(int, int);
- void cdrom_close(int);
-@@ -236,5 +237,6 @@ int print_disc_track_info(int);
- void make_write_page(write_params_t *, struct cdrw_disc *);
- void print_params(write_params_t *);
- void cdrw_init_disc(struct cdrw_disc *);
-+int udf_set_version(struct udf_disc *, int);
- 
- #endif /* _CDRWTOOL_H */
-diff -Naupr udftools-1.0.0b3.orig/include/udf_endian.h udftools-1.0.0b3/include/udf_endian.h
---- udftools-1.0.0b3.orig/include/udf_endian.h	2002-11-26 08:18:51.000000000 +0100
-+++ udftools-1.0.0b3/include/udf_endian.h	2006-07-27 14:09:30.000000000 +0200
-@@ -23,6 +23,8 @@
- #ifndef __UDF_ENDIAN_H
- #define __UDF_ENDIAN_H
- 
-+#include <string.h>
-+
- #include "bswap.h"
- 
- static inline lb_addr lelb_to_cpu(lb_addr in)
-diff -Naupr udftools-1.0.0b3.orig/libudffs/unicode.c udftools-1.0.0b3/libudffs/unicode.c
---- udftools-1.0.0b3.orig/libudffs/unicode.c	2002-11-26 08:18:51.000000000 +0100
-+++ udftools-1.0.0b3/libudffs/unicode.c	2006-07-27 14:11:17.000000000 +0200
-@@ -169,8 +169,6 @@ error_out:
- 
- int decode_string(struct udf_disc *disc, char *in, char *out, int inlen)
- {
--	int i;
--
- 	if (disc->flags & FLAG_UTF8)
- 		return decode_utf8(in, out, inlen);
- 	else if (disc->flags & (FLAG_UNICODE8 | FLAG_UNICODE16))
-diff -Naupr udftools-1.0.0b3.orig/pktsetup/pktsetup.c udftools-1.0.0b3/pktsetup/pktsetup.c
---- udftools-1.0.0b3.orig/pktsetup/pktsetup.c	2002-11-26 08:18:51.000000000 +0100
-+++ udftools-1.0.0b3/pktsetup/pktsetup.c	2006-07-27 14:18:24.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <getopt.h>
- #include <bits/types.h>
- #include <sys/types.h>
-+#include <string.h>
- 
- #include <linux/cdrom.h>
- 
-diff -Naupr udftools-1.0.0b3.orig/wrudf/Makefile.am udftools-1.0.0b3/wrudf/Makefile.am
---- udftools-1.0.0b3.orig/wrudf/Makefile.am	2002-11-26 08:18:51.000000000 +0100
-+++ udftools-1.0.0b3/wrudf/Makefile.am	2006-07-27 14:21:24.000000000 +0200
-@@ -1,5 +1,5 @@
- bin_PROGRAMS = wrudf
- wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses
--wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
-+wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h ../include/libudffs.h
- 
- AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG
-diff -Naupr udftools-1.0.0b3.orig/wrudf/Makefile.in udftools-1.0.0b3/wrudf/Makefile.in
---- udftools-1.0.0b3.orig/wrudf/Makefile.in	2004-02-23 10:33:48.000000000 +0100
-+++ udftools-1.0.0b3/wrudf/Makefile.in	2006-07-27 14:21:44.000000000 +0200
-@@ -85,7 +85,7 @@ am__quote = @am__quote@
- install_sh = @install_sh@
- bin_PROGRAMS = wrudf
- wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses
--wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
-+wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h ../include/libudffs.h
- 
- AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG
- subdir = wrudf
-diff -Naupr udftools-1.0.0b3.orig/wrudf/wrudf.h udftools-1.0.0b3/wrudf/wrudf.h
---- udftools-1.0.0b3.orig/wrudf/wrudf.h	2002-11-26 08:18:51.000000000 +0100
-+++ udftools-1.0.0b3/wrudf/wrudf.h	2006-07-27 14:22:33.000000000 +0200
-@@ -23,9 +23,11 @@
- #include <sys/time.h>
- #include <time.h>
- #include <stdint.h>
-+#include <string.h>
- 
- #include "ecma_167.h"
- #include "osta_udf.h"
-+#include "libudffs.h"
- 
- struct generic_desc
- {
diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes2.patch b/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes2.patch
deleted file mode 100644
index 1593eb600fae..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes2.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-taken from Fedora
-
-http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-warningfixes2.patch?h=f22
-
-diff -ur udftools-1.0.0b3/libudffs/file.c udftools-1.0.0b3-new/libudffs/file.c
---- udftools-1.0.0b3/libudffs/file.c	2002-11-26 08:18:51.000000000 +0100
-+++ udftools-1.0.0b3-new/libudffs/file.c	2007-08-23 14:02:07.000000000 +0200
-@@ -576,7 +576,7 @@
- 	tmp = leBPL_to_cpup(p);
- found_first:
- 	tmp |= (~0UL << size);
--	if (tmp == ~0UL)	/* Are any bits zero? */
-+	if (tmp == (uintBPL)~0UL)	/* Are any bits zero? */
- 		return result + size; /* Nope. */
- found_middle:
- 	return result + ffz(tmp);
-diff -ur udftools-1.0.0b3/mkudffs/mkudffs.c udftools-1.0.0b3-new/mkudffs/mkudffs.c
---- udftools-1.0.0b3/mkudffs/mkudffs.c	2007-08-23 14:32:38.000000000 +0200
-+++ udftools-1.0.0b3-new/mkudffs/mkudffs.c	2007-08-23 14:14:42.000000000 +0200
-@@ -72,7 +72,7 @@
- 	disc->udf_pvd[0] = malloc(sizeof(struct primaryVolDesc));
- 	memcpy(disc->udf_pvd[0], &default_pvd, sizeof(struct primaryVolDesc));
- 	memcpy(&disc->udf_pvd[0]->recordingDateAndTime, &ts, sizeof(timestamp));
--	sprintf(&disc->udf_pvd[0]->volSetIdent[1], "%08lx%s",
-+	sprintf((char *)&disc->udf_pvd[0]->volSetIdent[1], "%08lx%s",
- 		mktime(tm), &disc->udf_pvd[0]->volSetIdent[9]);
- 	disc->udf_pvd[0]->volIdent[31] = strlen(disc->udf_pvd[0]->volIdent);
- 	disc->udf_pvd[0]->volSetIdent[127] = strlen(disc->udf_pvd[0]->volSetIdent);
-@@ -289,7 +289,7 @@
- int write_disc(struct udf_disc *disc)
- {
- 	struct udf_extent *start_ext;
--	int ret;
-+	int ret=0;
- 
- 	start_ext = disc->head;
- 
-@@ -299,6 +299,7 @@
- 			return ret;
- 		start_ext = start_ext->next;
- 	}
-+	return ret;
- }
- 
- void setup_vrs(struct udf_disc *disc)
-@@ -450,7 +451,7 @@
- 		struct unallocSpaceEntry *use;
- 		short_ad *sad;
- 		int max = (0x3FFFFFFF / disc->blocksize) * disc->blocksize;
--		int pos;
-+		int pos=0;
- 		long long rem;
- 
- 		if (disc->flags & FLAG_STRATEGY4096)
-diff -ur udftools-1.0.0b3/wrudf/ide-pc.c udftools-1.0.0b3-new/wrudf/ide-pc.c
---- udftools-1.0.0b3/wrudf/ide-pc.c	2002-11-26 08:18:51.000000000 +0100
-+++ udftools-1.0.0b3-new/wrudf/ide-pc.c	2007-08-23 14:32:09.000000000 +0200
-@@ -31,6 +31,7 @@
- #include <sys/types.h>		/* for u_char etc. */
- #include <linux/cdrom.h>
- #include <unistd.h>		/* sleep() */
-+#include <stdlib.h>
- 
- #include "bswap.h"
- #include "ide-pc.h"
-diff -ur udftools-1.0.0b3/wrudf/wrudf.c udftools-1.0.0b3-new/wrudf/wrudf.c
---- udftools-1.0.0b3/wrudf/wrudf.c	2007-08-23 14:32:38.000000000 +0200
-+++ udftools-1.0.0b3-new/wrudf/wrudf.c	2007-08-23 14:26:41.000000000 +0200
-@@ -245,7 +245,7 @@
- 	    } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 )
- 		virtualPartitionNum = i;
- 	}
--	spm = (char*)spm + spm->partitionMapLength;
-+	spm = (struct sparablePartitionMap*)((char*)spm + spm->partitionMapLength);
-     }
- 
-     if( medium == CDR ) {
-@@ -300,7 +300,7 @@
- 	    fail("SpaceBitmap not found\n");
-     }
- 
--    if (fsdLen = decode_utf8(fsd->fileSetIdent, fsdOut, fsd->fileSetIdent[31]))
-+    if ((fsdLen = decode_utf8(fsd->fileSetIdent, fsdOut, fsd->fileSetIdent[31]))>=0)
-         fsdOut[fsdLen] = '\0';
- 
-     printf("You are going to update fileset '%s'\nProceed (y/N) : ", &fsdOut[1]);
-@@ -605,7 +605,7 @@
- int
- main(int argc, char** argv) 
- { 
--    int	 	rv;
-+    int	 	rv=0;
-     int		cmnd;
-     char	prompt[256];
-     Directory	*d;
-diff -ur udftools-1.0.0b3/wrudf/wrudf-cdrw.c udftools-1.0.0b3-new/wrudf/wrudf-cdrw.c
---- udftools-1.0.0b3/wrudf/wrudf-cdrw.c	2002-11-26 08:18:51.000000000 +0100
-+++ udftools-1.0.0b3-new/wrudf/wrudf-cdrw.c	2007-08-23 14:30:14.000000000 +0200
-@@ -614,7 +614,6 @@
- readTaggedBlock(uint32_t lbn, uint16_t partition) 
- {
-     int		i;
--    uint32_t	blkno;
-     uint8_t	sum, *p;
-     struct generic_desc *block;
- 
-@@ -634,7 +633,7 @@
- 	if( strncmp(((struct sparingTable*)block)->sparingIdent.ident, UDF_ID_SPARING, strlen(UDF_ID_SPARING)) != 0 ) {
- 	    for( i = 0; i < 2048; i++ ) {
- 		if( ((uint8_t*)block)[i] != 0 ) {
--		    printf("readTaggedBlock: Empty block %d not all zeroes\n", blkno);
-+		    printf("readTaggedBlock: Empty block %d not all zeroes\n", lbn);
- 		    break;
- 		}
- 	    }
-@@ -647,10 +646,10 @@
- 	    sum += *(p + i);
- 
-     if( block->descTag.tagChecksum != sum )
--	fail("readTagged: Checksum error in block %d\n", blkno);
-+	fail("readTagged: Checksum error in block %d\n", lbn);
- 
-     if( block->descTag.descCRC != udf_crc((uint8_t*)block + sizeof(tag), ((tag*)block)->descCRCLength, 0) )
--	fail("readTagged: CRC error in block %d\n", blkno);
-+	fail("readTagged: CRC error in block %d\n", lbn);
- 
-     return block;
- }
-@@ -709,8 +708,8 @@
- writeExtents(char* src, int usesShort, void* extents) 
- {
-     uint	len, blkno, partitionNumber;
--    long_ad	*lo;
--    short_ad	*sh;
-+    long_ad	*lo=NULL;
-+    short_ad	*sh=NULL;
- 
-     if( usesShort ) {
- 	sh = (short_ad*) extents;
-diff -ur udftools-1.0.0b3/wrudf/wrudf-cmnd.c udftools-1.0.0b3-new/wrudf/wrudf-cmnd.c
---- udftools-1.0.0b3/wrudf/wrudf-cmnd.c	2002-11-26 08:18:51.000000000 +0100
-+++ udftools-1.0.0b3-new/wrudf/wrudf-cmnd.c	2007-08-23 14:22:41.000000000 +0200
-@@ -45,7 +45,7 @@
- int
- copyFile(Directory *dir, char* inName, char*newName, struct stat *fileStat) 
- {
--    int		fd, i, blkno;
-+    int		fd, i=0, blkno;
-     uint32_t	nBytes, blkInPkt;
-     uint32_t	maxVarPktSize;		// in bytes
-     struct fileIdentDesc *fid;
-@@ -54,7 +54,7 @@
- 
-     fd = open(inName, O_RDONLY);
-     if( fd == 0 ) {
--	printf("'%s' does not exist\n", cmndv[i]);
-+	printf("'%s' does not exist\n", inName);
- 	return CMND_FAILED;
-     }
- 
diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-wrudf_help.patch b/sys-fs/udftools/files/udftools-1.0.0b3-wrudf_help.patch
deleted file mode 100644
index 06d9c3f616f4..000000000000
--- a/sys-fs/udftools/files/udftools-1.0.0b3-wrudf_help.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-taken from Fedora
-
-http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-wrudf_help.patch?h=f22
-
-diff -up wrk/wrudf/wrudf.c.wrk wrk/wrudf/wrudf.c
---- wrk/wrudf/wrudf.c.wrk	2013-04-15 15:32:03.395528452 +0200
-+++ wrk/wrudf/wrudf.c	2013-04-15 16:06:37.535546730 +0200
-@@ -603,6 +603,28 @@ parseCmnd(char* line)
-     return cmnd;
- }
- 
-+int show_help()
-+{
-+	char *msg = 
-+	"Interactive tool to maintain an UDF filesystem.\n"
-+	"Usage:\n"
-+	"\twrudf [device]\n"
-+	"Available commands:\n"
-+	"\tcp\n"
-+	"\trm\n"
-+	"\tmkdir\n"
-+	"\trmdir\n"
-+	"\tlsc\n"
-+	"\tlsh\n"
-+	"\tcdc\n"
-+	"\tcdh\n"
-+	"Specify cdh/lsh or cdc/lsc to do cd or ls for Harddisk or CompactDisc.\n"
-+	"\tquit\n"
-+	"\texit\n";
-+	printf("%s", msg);
-+	return 0;
-+}
-+
- int
- main(int argc, char** argv) 
- { 
-@@ -614,8 +636,14 @@ main(int argc, char** argv)
-     printf("wrudf " WRUDF_VERSION "\n");
-     devicename= "/dev/cdrom";
- 
--    if(argc > 1 )
-+    if(argc > 1 ) {
-+	if (strcmp(argv[1], "-h")==0 || strcmp(argv[1], "-help")==0 || strcmp(argv[1], "--help")==0) {
-+	    return show_help();
-+	}
-+    }
-+    else {
- 	devicename = argv[1];			/* can specify disk image filename */
-+    }
- 
-     if( setpriority(PRIO_PROCESS, 0, -10) ) {
- 	printf("setpriority(): %m\n");
diff --git a/sys-fs/udftools/files/udftools-2.0-sysmacros.patch b/sys-fs/udftools/files/udftools-2.0-sysmacros.patch
new file mode 100644
index 000000000000..9df9de6d3fd9
--- /dev/null
+++ b/sys-fs/udftools/files/udftools-2.0-sysmacros.patch
@@ -0,0 +1,37 @@
+From cca194f17fe2892c929acab2f1d5016ad38aa305 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 2 Jan 2018 15:10:34 +0100
+Subject: [PATCH] Include <sys/sysmacros.h> to prevent build breakage with
+ >=glibc-2.25
+
+libtool: link: x86_64-pc-linux-gnu-gcc -march=native -mtune=native -O2
+-pipe -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Wl,--as-needed -o
+mkudffs main.o mkudffs.o defaults.o file.o options.o
+../libudffs/.libs/libudffs.a
+main.o: In function `is_whole_disk':
+main.c:(.text+0x2ce): undefined reference to `major'
+main.c:(.text+0x2dd): undefined reference to `minor'
+main.o: In function `main':
+main.c:(.text.startup+0x72f): undefined reference to `minor'
+main.c:(.text.startup+0x741): undefined reference to `major'
+collect2: error: ld returned 1 exit status
+make[1]: *** [Makefile:378: mkudffs] Error 1
+---
+ mkudffs/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mkudffs/main.c b/mkudffs/main.c
+index 066afac..3e306ac 100644
+--- a/mkudffs/main.c
++++ b/mkudffs/main.c
+@@ -43,6 +43,7 @@
+ #include <sys/ioctl.h>
+ #include <linux/fs.h>
+ #include <linux/fd.h>
++#include <sys/sysmacros.h>
+ 
+ #include "mkudffs.h"
+ #include "defaults.h"
+-- 
+2.16.0.rc0
+
diff --git a/sys-fs/udftools/udftools-1.0.0b-r10.ebuild b/sys-fs/udftools/udftools-1.0.0b-r10.ebuild
deleted file mode 100644
index 871fc46344f9..000000000000
--- a/sys-fs/udftools/udftools-1.0.0b-r10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic
-
-MY_P=${P}3
-
-DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
-HOMEPAGE="https://sourceforge.net/projects/linux-udf/"
-SRC_URI="mirror://sourceforge/linux-udf/${MY_P}.tar.gz
-	http://w1.894.telia.com/~u89404340/patches/packet/${MY_P}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-libs/readline"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# For new kernel packet writing driver
-	epatch "${WORKDIR}"/${MY_P}.patch
-	epatch "${FILESDIR}"/cdrwtool-linux2.6-fix-v2.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch #112122
-	epatch "${FILESDIR}"/${P}-bigendian.patch #120245
-	epatch "${FILESDIR}"/${P}-openflags.patch #232100
-	epatch "${FILESDIR}"/${P}-limits_h.patch
-	epatch "${FILESDIR}"/${P}3-extsize.patch
-	epatch "${FILESDIR}"/${P}3-man-missing-options.patch
-	epatch "${FILESDIR}"/${P}3-mkudffs-bigendian.patch
-	epatch "${FILESDIR}"/${P}3-staticanal.patch
-	epatch "${FILESDIR}"/${P}3-warningfixes.patch
-	epatch "${FILESDIR}"/${P}3-warningfixes2.patch
-	epatch "${FILESDIR}"/${P}3-wrudf_help.patch
-	# Force older C standard as the code relies on static inline behavior. #548324
-	append-flags -std=gnu89
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/pktcdvd.init pktcdvd
-	dosym /usr/bin/udffsck /usr/sbin/fsck.udf
-}
diff --git a/sys-fs/udftools/udftools-1.0.0b-r9.ebuild b/sys-fs/udftools/udftools-1.0.0b-r9.ebuild
deleted file mode 100644
index af812aa19e16..000000000000
--- a/sys-fs/udftools/udftools-1.0.0b-r9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic
-
-MY_P=${P}3
-
-DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
-HOMEPAGE="https://sourceforge.net/projects/linux-udf/"
-SRC_URI="mirror://sourceforge/linux-udf/${MY_P}.tar.gz
-	http://w1.894.telia.com/~u89404340/patches/packet/${MY_P}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-libs/readline"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# For new kernel packet writing driver
-	epatch "${WORKDIR}"/${MY_P}.patch
-	epatch "${FILESDIR}"/cdrwtool-linux2.6-fix-v2.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch #112122
-	epatch "${FILESDIR}"/${P}-bigendian.patch #120245
-	epatch "${FILESDIR}"/${P}-openflags.patch #232100
-	epatch "${FILESDIR}"/${P}-limits_h.patch
-	# Force older C standard as the code relies on static inline behavior. #548324
-	append-flags -std=gnu89
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog
-	newinitd "${FILESDIR}"/pktcdvd.init pktcdvd
-	dosym /usr/bin/udffsck /usr/sbin/fsck.udf
-}
diff --git a/sys-fs/udftools/udftools-1.2.ebuild b/sys-fs/udftools/udftools-2.0.ebuild
index 85ccd12101c5..c5a2970d94c8 100644
--- a/sys-fs/udftools/udftools-1.2.ebuild
+++ b/sys-fs/udftools/udftools-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
 HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/"
@@ -17,6 +17,8 @@ IUSE=""
 RDEPEND="sys-libs/readline:0="
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-sysmacros.patch" )
+
 src_install() {
 	default
 	newinitd "${FILESDIR}"/pktcdvd.init pktcdvd
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index cad52a7156e2..55319c2c966b 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -14,7 +14,7 @@ DIST xfsprogs-4.5.0.tar.gz 1524382 BLAKE2B 7ff26e6c61081db37c4fb4a15abdeb3ece2c6
 DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62 SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7
 EBUILD xfsprogs-4.12.0.ebuild 2733 BLAKE2B 91254ce021009746a40486f0e2d4697b4b5ee8440b25cb9b0f4ee7166acc9a6a110211268b7485cbfa77bcf8e9f214eb2dad26bb5bd51294ff2ae324109068d2 SHA512 b163f664b954fd6ace1e3ce1ad352deab0a10050c8b0b96dba8446cd4d9cbddb31c6c043ce7bffe86975606682e6e268f0efedda544c107284c92e7b4014d63d
 EBUILD xfsprogs-4.13.1.ebuild 2670 BLAKE2B 12442b0cc0c254617ab5870ff5b4079fdca4b9510a2c43e1bace5128766f983e1a4a3183ffafffc348739f04d2156afe58888718ed8ac7c646c5796857cba129 SHA512 ab45b35a6805c8b55437ae5606f99dcae5edae90c2957c15653095d5efe16a13350d99b9117e13e55df9ea95b94119adb6d24b35e6f12635f2a17189f402f35c
-EBUILD xfsprogs-4.14.0.ebuild 2666 BLAKE2B c12465cdf122aaa34eda17dd083807822d5bfca92f9f8ced8050b91321da735f49ccdb6c8f4e2201cded486eb5910ffcb6cffe10dde8b1b181b4bd2bc8faecca SHA512 1dc68589942943c0138c966e9d01c9abd4586c8f96d945c31ed6af6c1e93441bc56857d9229d85d3c9abb407c9461e70e2af2406dbe5a7cda9c3824f5237e07d
+EBUILD xfsprogs-4.14.0.ebuild 2665 BLAKE2B 145e12f6d6f3542074e117ae084d98458afe5074254c1bad80f2ada1cf5bf69e0dd14e346e12c1ac9edcb08ddc1581023c2f0f296ccf906e77182a4f1004b085 SHA512 3bc97ade8dcf924b6b1ac6a0e60865595d23fa23d49625e3ba2bb4e54ece8131f2ea209bdfd10a5f8488a35fe041703a6015859a1f2e964cd99c0dae3092f40d
 EBUILD xfsprogs-4.5.0.ebuild 2876 BLAKE2B dc897627ade02ec497d20fd761c102737b1fce4cbd62b252ca1a4fd06ae393b87d67c78584c4af8d4c5f3f958e84ee69e808bf46fa7ac29fbe08db0cd03b6af5 SHA512 2b40573bc0cb60c3b2d6e77c1b1b064856cee0e394b371622da66e12c11792b1b48e6ab8615679b18afef3f17a7264680c9787d1fbb243c012ea837c3463a946
 EBUILD xfsprogs-4.9.0.ebuild 2715 BLAKE2B 11f3355289c0801b61a914527182d3488d5d5eb9aef53ce1433db3f3ea7c379b960d1fe7ffea06694dc18bc68ee1b87905b34a3efaf79d41432a7a590818bc2a SHA512 ca6f97b41217d7d1e238d366811c77b2fbf5a43e99c79805999ba25f955e6a76290dedd95a93242777e44410ed07d0ebc1810f40771a43fdffbe90f283e90bf2
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
index 07b9803cbf8d..53efa349b658 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 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"
 IUSE="libedit nls readline static static-libs"
 REQUIRED_USE="static? ( static-libs )"