gentoo resync : 10.11.2017

11 files changed, 135 insertions, 145 deletions

diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index c3efdd5ce679..450fff3a98d7 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -2,14 +2,18 @@ AUX mbuffer-20121111-resolv-multi-order-issue.patch 780 SHA256 3d4c2e13eb35da307
 AUX mbuffer-20170515-sysconfdir.patch 934 SHA256 6c7e59bc123a7ccb0bf882d6750247ec2b14a443bbf1f65e37d3d85ce1f8043d SHA512 ab06b8930b95692c3985af476fb825483972c14ae45f2c212833770933ce99382628b0ddb1113089a2037856122b5a948f4db582bdba7275a568f96402384f66 WHIRLPOOL 41fa1815f09c72bd22c50cdd4473471ea6bdd56b943d3a71c120acdc64b1fc8c9a9a0ed06dcfea1bb0c8c1a93c31fca3aabf5248cf02a1a0104149ddc03583e8
 AUX mbuffer-20170921-resolv-multi-order-issue.patch 762 SHA256 0a4bb31e454d00955def7d6ed357202732f6d9cdf9dc7aa37799d6a41004d811 SHA512 3edc736965e9b3559d25e118ac293ae0c2e5f48701767c06f138c5867bc41b8d7a598c6344418c9326d9b709efd9c1a68891e7a7aee1b16c430833ef09e25c81 WHIRLPOOL 6b7d9cde47f6fc2ed116c164e79316f7324440fb5ee3e08f8017c583d6cdcf9ae6d3b5096482b4c8bbe645ed66f94a14d8743d663b92d2dabf743c65cc9f41b4
 AUX mbuffer-20170921-sysconfdir.patch 924 SHA256 cba53eb389a1c70db6e13831d1992cf5b8c212199fba41475600c9cc24dcf9fa SHA512 803dcacba327386430488aeef4d9137dddb49d067332abc36f4b9502e277124ec9fdbf6f50cb0656572c5af2c9b663127c3d368ed23ad124977adccdb8e4e18f WHIRLPOOL c890aecf2b1a43a38b07b1903ab50c6e4a988b99b3998ebabc5a5985b3e0086a67ebd819fc25fde6edb0806faf3a531d6ea5385f9bb6fc8830805de300ac2c99
+AUX mbuffer-20171011-resolv-multi-order-issue.patch 477 SHA256 0169dfb585341a98c863349752afccb9d942bd458a27ec7c043b42fe5f3270c2 SHA512 cea92010f1de5685077f80490726837dfc066abe5ab4c1f6c01372a238035df351624024099972e0e571093d856873b7bcc6899cf1a0c7c1063a1035ec8d5951 WHIRLPOOL 43e93f539c1e99606327a6d35e47718c28bb364b00e2ae83cc6757b10f952ad40d244b21719d6472d4e078887ec34a4111b6284d949bb278cbe223d8695748e5
+AUX mbuffer-20171011-sysconfdir.patch 916 SHA256 4052019957a3d094109cbb6adadc1c649d83176c553341204aee985f3134ef4d SHA512 88b19fb1dcd0156c04266f057196a5341896046d1e54ca70529452e72d544768b644d44d469255ecabf28e735ff3a8a41db9e4462bf3ebe079f97ae8520aeeb2 WHIRLPOOL c9d87eab3585ea5903adf9856dbb0c04829648aecbecfd8b67216ae8313cb1f10e827454743b47b01a31dea2ac9a12bb9840a76894d0bcaeeff302aff9d4fec1
 DIST mbuffer-20150412.tgz 122935 SHA256 0c78dcb194d1f0316c51f277ea09ec20efd175bbd45f0a3f81bf1202c33301e4 SHA512 cef64f1229872e2207e678aa77dc95e0c24f54e4a88a57a0e797d10b07a16d1f5fa96c8cfa3876ff65dd97c114eff87b683917fa1d39cdb4f08c864325e4223c WHIRLPOOL cdd82ef4d036438b36c4ecc0058e3757116e5f01897eee89870e08e73323dc135accf4d69fc57cac87082a2a78bfb1841af62bced56f93388870bc1c3b8590cd
 DIST mbuffer-20160228.tgz 123108 SHA256 f7769f729e9b26a22a5d91922a740a0d1df6004dbe2b7a1febb0d7e4c3ef9e62 SHA512 0706b8dd137f5f5b01885bcca4bf799cbd14b25895402f0c73f874d78fc160c7fae8c5a229c40efce9ba96288972a8e5846443ef5cd4d1ff02af92f703e33a2e WHIRLPOOL d1b356e5b7a8313f9fc1ef01392ee44969fedf2f3c33c8848b763d8cf5bd92ddfde8ddc881ef33b9dad849dfee51582c89c72869eb0d603b13a7ad3719d748a3
 DIST mbuffer-20170515.tgz 125736 SHA256 154fa0836777b21032b2e4f738fb0aa4dea218551b7cade93cf1b7245aca5e4f SHA512 991cb33b09e48f1177b7a05e5ab2c189aa2cb0f03e220d7e46996b3a3e3ba1e3f3ad4a68b8750ed73dc765c5874029715bba1d2f5a80a9601cd0a39e1f9fd447 WHIRLPOOL 015bc2a57b529d54bf5e4092c30585373003a3159fc66a528ae1ad9208134d1ba9c8e3cb44afa4ef246ea4babf96e6aed8b7166a350b4a2a7f82f91b74a85e52
 DIST mbuffer-20170921.tgz 136192 SHA256 8c38ec7cb7f63e1cd4100c6f8a15a2c335ad080760157fc44e88e3465cc47027 SHA512 f4b897e7649893cb02f9b3b806e956acf60692cd549f9cfe6cf164c703f369f0af251bfdabfbcdd76dacf5a4c3871ed7b98fbd6b5fcb97d184b7c317082bfaee WHIRLPOOL b789e0f5ac522edbb373cd3de377c78952b2d9bcc1a09a6731971695694134e36c8909f0c1aeb5ffbe9d44f5a2209c2c8b21592209d0b750b97ac4546fd90bed
+DIST mbuffer-20171011.tgz 136630 SHA256 eb2f979708bb5ba42a6c1f12c7502dff3b05df8e49b5686c308eda96cad0d1fc SHA512 398d7545388a94b4f8961193192cd5e1139b84f31c7699c2b7f66b84a40488a2e70c88a2a70578bd95375e11efc87978a5f6fec805dbbc5f1fea460b3a9c68c4 WHIRLPOOL 8a2357e2c133450749ca93c96488560f6f5e234acaba9c395da948658e2e796e8fe92a83932c5a6aab522b6efd4cd3511f822a65d950404887d8bd3a0bdf03ab
 EBUILD mbuffer-20150412.ebuild 795 SHA256 e8abc597fd52c0c61c53c54ebbd7cc06cda4ad28aa56d0837a09e90daec4b736 SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b WHIRLPOOL 69972bfd3b17dfdaa5988a5c07eae93dcee05eed2c8bc31d438314ce477aa0ad1e6ab3271ce2833a4469f500a155ead469670c577f9da35266e7e253d7a5dbd6
 EBUILD mbuffer-20160228.ebuild 798 SHA256 d9a6590ab4002a1a4865a1d72c5a5e4daf9e9e06f4f1f07e17bfe62db088c8c7 SHA512 4fc706486a433884a3b51bd17caee1c5f1a60ae10bd6309be9c6f79be6dcf1af9bab82ef2daae4eeefb1534785bffd6b055a6dea13b54f40695e251e991956a2 WHIRLPOOL 512417ef29656b184147c7a8e74e92a289c39b32eeccf74ef43c9abf8f1c4f1badcfb8c9523fc80ab91c8ed099d2e5f2fa269b067394c8b3a4a818a98c8f9ead
 EBUILD mbuffer-20170515.ebuild 885 SHA256 c37222b20cf1470b82f5a999fdc3de6d08172420d9da51d43dbcc5454cc5fd55 SHA512 b95e700f76352df3f46aaf2c60d90d4f618644f842cb31202dc433f03d1d858f112eb8b370568bac1fbb1a6c1502f5d6112a7ebf6735510bd51aa9812ba69503 WHIRLPOOL 7532d4bfb451dbd4f436b5e539a1f574deb2741993ce1cae842d034672b1dd6aba73fd93b35c353cf82621b061371a4b0c920c19332d60556407317f1c07cae4
-EBUILD mbuffer-20170921.ebuild 1376 SHA256 aea37ca115b77a40c7687aebbfc03421e3f996adc981dc1c4ec73f3084eff157 SHA512 f88a722c6e0a0201d8436b7c41356d5ab748524290f221dcafc43a76ca0bff558b1d43bed43e152f681d90e11893d9b384639d6b05b1e0227206b05dd5d2c0e9 WHIRLPOOL dd548316a80c00587d46c0b3d6a9e9cc1a4f239345dbc26eb9ae65e8074e76e499e4ab3c4908c095376d2610e1c13e93337f4735c0469c69894bd1cfbf1ca34f
+EBUILD mbuffer-20170921.ebuild 1386 SHA256 f8c9d516df3c9a2020f9bdb3a8af7dfad71422ee0eb86ae31194237754297898 SHA512 4a91da34f0fe0f6b76b152d5c3a1b8961cb99ac5c61250356d6007c21218c4bb57f1959384d2c06a3c74b92ea105ba2a39b6d14f9c4533e0fdf7da45566e4304 WHIRLPOOL e7a8b9aeda555277ce65af040eaf15b7d21656718dfb16aab6b3566938f96ccbf1a3ab220020bbaa96ded1c893b3387433da4710e1f0a378c5198b289b4ec4ca
+EBUILD mbuffer-20171011.ebuild 1422 SHA256 0b8b7a0fc8f5e2ec1041917211911e77b103eadeef431f81df8a0a60fdb44b18 SHA512 82e27724e3d22cd0f93477c81e754f0f57b3f4f91323bf35c3c4c4d47ab92ffba6d09b1ae3709df514ad5714a5b2f7774c803ee884cd2368530e530974eeb77e WHIRLPOOL f0ba98f56934bb755b6cc575a6eb38548942752aeb7018273cf9dbc7f678be114697e29a7766533799ea528c43cb59e00cc49e93ccbaf9e3cdbfbe857048e293
 MISC ChangeLog 3787 SHA256 1d67b8de5c4cb9dc795fd01ff7fa86c9f5d2b621940226cac551cf3931d48573 SHA512 0e9d232e670037875a2785fbca1a3ba3c1b900c7a7575104b37db5905cf007733ec56669b4179a168e99c38f0bf3838cb4113abcc8e13befb6df6f0c13e9789f WHIRLPOOL a3b839687095fd68bea29221056923a18bf0d7af0adcaa1a406ebe464f745fc1fbc01b119e0a254bb4340141e20ca6c6e28374e6268662009e4eff47c03376f8
 MISC ChangeLog-2015 5749 SHA256 e3aa6a14e43fb06adecb46e9fd97347f5b775d39031dc25d353f6468ce4e6d55 SHA512 e5b8f65a92ad8bad4ecb16d7d79ac4485a6eee281127de8d9bc0cabc333b722d2005ceaf401962cff1721f22b6ebb02b9ded96576bde92c0fff8e45e7a87b8bb WHIRLPOOL d66f4b404cb4b306cbbb690e41b42798d7c9678a6cb54676501cbc759c722782156d4d9ac87017e203be7241ff2f01f8ddd603fc1516b36e4c6c8559ca39f1ff
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch
new file mode 100644
index 000000000000..4702ca0c1a12
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch
@@ -0,0 +1,14 @@
+work around "multi off" in /etc/host.conf and "::1 localhost"
+*not* being the *first* "localhost" entry in /etc/hosts
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -86,7 +86,7 @@ test2: test.md5
+ 	./mbuffer --pid -q -4 -I :7001 -o $@.tar -o - | openssl md5 > $@.md5 & \
+ 		sleep 1; \
+ 		rm -f $@.tar; \
+-		./mbuffer --pid -i test.tar -o /dev/null -4 -O localhost:7001 -H; \
++		./mbuffer --pid -i test.tar -o /dev/null -4 -O 127.0.0.1:7001 -H; \
+ 		wait
+ 	sync
+ 	diff $@.md5 test.md5
diff --git a/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch
new file mode 100644
index 000000000000..ced095366939
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,6 +10,7 @@ CP		= @CP@
+ VPATH		= @srcdir@
+ prefix		= @prefix@
+ exec_prefix     = @exec_prefix@
++sysconfdir      = @sysconfdir@
+ datarootdir	= @datarootdir@
+ bindir          = @bindir@
+ mandir		= @mandir@/man1
+@@ -40,13 +41,13 @@ distclean: clean
+ 	-$(RM) $(TARGET) config.h config.log \
+ 	config.status Makefile mbuffer.1 core
+ 
+-$(DESTDIR)$(etcdir):
++$(DESTDIR)$(sysconfdir):
+ 	-$(INSTALL) -d -m 755 $@
+ 
+-$(DESTDIR)$(etcdir)/mbuffer.rc:
+-	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(etcdir)
++$(DESTDIR)$(sysconfdir)/mbuffer.rc:
++	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/
+ 
+-install: $(TARGET) $(DESTDIR)$(etcdir) $(DESTDIR)$(etcdir)/mbuffer.rc
++install: $(TARGET) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/mbuffer.rc
+ 	-$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+ 	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
+ 	-$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
diff --git a/sys-block/mbuffer/mbuffer-20170921.ebuild b/sys-block/mbuffer/mbuffer-20170921.ebuild
index 3baf4645d8fa..2870b2b50535 100644
--- a/sys-block/mbuffer/mbuffer-20170921.ebuild
+++ b/sys-block/mbuffer/mbuffer-20170921.ebuild
@@ -45,6 +45,8 @@ src_test() {
 		ewarn "test suite would hang forever in such environments!"
 		return 0;
 	fi
+
+	default
 }
 
 pkg_postinst() {
diff --git a/sys-block/mbuffer/mbuffer-20171011.ebuild b/sys-block/mbuffer/mbuffer-20171011.ebuild
new file mode 100644
index 000000000000..b7d5ef07646a
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20171011.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
+SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ssl test"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/openssl:0 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20171011-resolv-multi-order-issue.patch"
+	"${FILESDIR}/${PN}-20171011-sysconfdir.patch"
+)
+
+src_prepare() {
+	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+	# using same port and src_install may have problems (with /etc folder)
+	export MAKEOPTS=-j1
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ssl md5)
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+		ewarn "Some tests may fail with FEATURES=usersandbox or"
+		ewarn "FEATURES=network-sandbox; Skipping tests because"
+		ewarn "test suite would hang forever in such environments!"
+		return 0;
+	fi
+
+	default
+}
+
+pkg_postinst() {
+	if ! has_version "app-arch/mt-st"; then
+		elog ""
+		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+	fi
+}
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index c2890012c4fb..654bc8c5b6c4 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,7 +1,7 @@
 DIST partitionmanager-3.1.2.tar.xz 1298688 SHA256 2ca9e541bcba758181217a9edc1f76814cabad9cf691040c1b9bc7c737c794e9 SHA512 a1be9bf9bbe03842c6cbfcae70e7a909c3e1bb30f3d226b8a47933228c7d6e358d2c6b038100dc647420b8498ca19878a15c100a61370f455a4033ca198e785f WHIRLPOOL 310571d77ad598107b5d8e89c07a5ad93f2c0f03ba73fe87ccd85bcec8f19d2d5ac69f5e4a366ffb801466dafeaf3165d41fe00b69ed4bec8b78a0f50a4744c4
 DIST partitionmanager-3.2.1.tar.xz 1331440 SHA256 7dc089243ce49058c7c16cea17bc6302dbfe409c099adc04dad5e9d5098300ad SHA512 799518ac78d906959512bebf63d3e8277f5fcbc7f13efd6b6ad5f3342f0e08da98340dc778a6e89923af99b03d099fb0e4d11abb2751ac4defa38060bb511df3 WHIRLPOOL 659c96ff57f0d1a391ee8f47b36447f6da1e3b04d1cd15b32fb5368dc719494afa328482c217c5f3bd87a39d029c81e27a258433b7080303ee44f0ae8b81eaa4
 EBUILD partitionmanager-3.1.2.ebuild 997 SHA256 d98cd48e311443f75c020c1adf200376278c36cc1e1004d4054e25ee998c694b SHA512 41747162468769b72314a67985db6eb3916dbf884f0e5ed11adc026c584797e40e6f8b3a0f233803d27f343d10eb655284b6128e438cdca94084092afc7e44c2 WHIRLPOOL cbf05b1e86adbd1bb0c86f761111c876905480cb40666ce9198d85e77ab50eacc865b5c766d5ca2473e2518b687274bcd705ab2b319d51668c2d8d1b5c6bd0e4
-EBUILD partitionmanager-3.2.1.ebuild 980 SHA256 72f642899a8a25364dc0e1e5665eafce668b1b4f23559b8a8aaf79a97773ce57 SHA512 bf59aae4be51cbdb7cc44458a5b0ecf951d46dfff796e56c076c76bc613ef23cabbb9f24ab61f2720ae523ea3b25a7e177e64b7163deaa70b6206886af4c8664 WHIRLPOOL 4e246e605f61bdad5d479891b50298a32fec3cf60ddba9c173f41cc87f710df86473ce15978db8594893b8824f46cb648687d6d8d16b2f9326c0997744a80e80
+EBUILD partitionmanager-3.2.1.ebuild 979 SHA256 2790bf341215a8bf7948b20b7426fcbb379086e475f7ae349f4a6f02e20c0e1a SHA512 aa547ddbb3856c5816cd24f0090238222abe980fc66c3b4070a6d8a032aebfb2b22f104a4dee08cb11d9a7ad9621eb9573511a921fcff4ed1f92ce66bbf42a08 WHIRLPOOL 4642118dfb1043a8f2988d6a598a4a12a08790b893b9a0dae036811931fab6a428ea36cd858e090abe906ecef6356cf3a69ed25270adbc778f65bb02f563d8db
 MISC ChangeLog 5564 SHA256 28343ebd86b522382cf0a49e6b1ab84c842d4fdef97e852d9e806bdb519d9509 SHA512 40ab5b39036570d0046b5ef55ac61fe916858493f229249a1baf407f00b9b1d98ec089b0779ec58fcd6a154e374772394c17ee0b40b42d6b2d363ec1b2a389d4 WHIRLPOOL d3cadc8de7f9e1a4d5aac507081339069b466a4b20cfbc2d78ade5fea7f0bcf59f85aa269be16db3f5dc7b6895a6cadd82623d6440b0a56dcb0ebaa076f7d399
 MISC ChangeLog-2015 4746 SHA256 6fb788b3365f7ccea5f2ba0781c069000e4c8d8205c05246bf66aaf453c5ccad SHA512 eef220765a7c5720579c0ed6101a7687561bb8c037e498af9d01bd59f49b514b97695d511a88c42f0dabe06116dd2567709aa6172a79fad7cd2b76dd5a11ee9e WHIRLPOOL 383e7c962d34ef6692b761b0dd9c9da9ddb285a21d4ccedc4558f10f225cc078077f7be274ad6d7bbf120c1e7fe5997b6cc2d0a1e97a79c9303a870e007137b6
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/sys-block/partitionmanager/partitionmanager-3.2.1.ebuild b/sys-block/partitionmanager/partitionmanager-3.2.1.ebuild
index e4b703a848d0..f2a2cdfb3f6f 100644
--- a/sys-block/partitionmanager/partitionmanager-3.2.1.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-3.2.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
 [[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-block/sedutil/Manifest b/sys-block/sedutil/Manifest
index b8c2dcbf9048..3b82c5ad8a8f 100644
--- a/sys-block/sedutil/Manifest
+++ b/sys-block/sedutil/Manifest
@@ -1,7 +1,6 @@
-AUX nvme.h 1818 SHA256 debcb267f4190e9fcd4e096c03ca73ffab9a53254fb258e83df4132c5a5a9093 SHA512 a968f9843caedabe2a049180c4ee7aa68690e447b11d89641f917ab3d623d0030b0ed926642a5539d19ddd355fb754403f9bfbf4ea952d844cafa524c50f675e WHIRLPOOL b479ae1706ddfb0887adafc10b8a08dda774dffc8bd8f33d206bf1aaf210e7852834d295cf8d4de28a3c0fb9674c19eb00ecf9adce9fdd9ebd9f11f89ff3521d
-DIST sedutil-1.12.tar.gz 214066 SHA256 5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1 SHA512 f17fbb5a6d71d5bdd59d0fc85eed11036a8e365545133bc1374a733ce1975d6c8dd2cdc500bd46cffbec1f2bef621a98ca392e0dd314734c1ef12c073d70b0de WHIRLPOOL 299e35256de3c49a717fff727f45a1aaeeb2f65e1e3fb8afc4ba0af1626101e0f95618f182a32d90fee6278d980670df2c444219346fb6783fbe630d11209970
+DIST sedutil-1.15.1.tar.gz 297551 SHA256 9259466b4f73af276153c5245834a56f48f8721ea7263611b5d5e8326bc43d9e SHA512 9708ef307b457fad2f45735b044685ac6731c353af428c49ff0e312190f3bdc521bcfa71a9e1239d9ffe637d18293a99b09b7e001df96494cdce53f5442750f1 WHIRLPOOL 03152fc3440a8dfdc59c3bd3c679b38bc583e77984b38d3cbbece80f86ebd933adb0c5ee6f4ab510a0769143bb1e4578faf3132f88f984f5cda4a58f42ae56e4
 DIST sedutil-1.15.tar.gz 295399 SHA256 6711fa34c95a96066570e2b1bca05fc7ecd825e817fd675683db76a58fa4d797 SHA512 f4071d510db8227c7a4e37e1055993436cd8469e584cdb9d2bf507e006570c103b9e19353733f4ba6631226856c9d2aa8817c134febf96750318cffc935707da WHIRLPOOL 4e417269dbea3f7e971240fedc627a80fc1ccc80bc1a664d472fd2bdc13ba774adb46d49b8ac9ff83cad2141c84858038d7e150edc035414c9414faab53eb2db
-EBUILD sedutil-1.12.ebuild 1211 SHA256 1289b07ec9cc3a658810f2cbe26124e069b5735dd1d4a1e06ad26cfa22ad25ee SHA512 b337a199bc8f2901764173f48a80643389a2f30b28985c916fc343d05d099464fca1820bb5e2add91763c0abbaad6b7c5ce9bae2cda1a69d6e36c1faf3497975 WHIRLPOOL da323957af3426b3ca7d6dc51eb2cd1f1ccc225caefdc0cdfabd896badab37a796d21ce864516f043d637db6b4b1bb523906c1465767e2c28cfa410719427438
+EBUILD sedutil-1.15.1.ebuild 597 SHA256 226d1f92d6a9f370f8bc94d55e814e5079b9a45935420d328fe67e74f39826ca SHA512 42df20da9c2e29098c07c0528da1b37c9848253a165a282fe5b76f82d9679e3f1e6670f483e2c867f41efb27775f294e5c19ef500caae1da710b0c7658b5d89f WHIRLPOOL 95ae9a4c02c41a2b50436cfb41722d5cb597ff05bdd2dd2194a524d320759a6ef37c947059426efac24b112e1d27b7a00114079b2237e294f9c168cff85df4d2
 EBUILD sedutil-1.15.ebuild 1027 SHA256 fc667ffd4b54d89bc0479825e0f84880f40e80da572449d3bb6cc34c70960c57 SHA512 4811618ec7ec75894dd67767d162ee5898c67112818ee94f1cc64d1e1b37f1784e6a783a7e88809911ade4a6f6b2cbce49eeebe5378b4fa7597ea7040643eb8a WHIRLPOOL fa3f380cef26ce5ee4def22394ae6762c881e1e4109ddd3287d0ac24723273d4089ac6b890113e8cbb2ae4d7be38b0e60449925ec4d1f83ebd00dd54421934a8
 MISC ChangeLog 529 SHA256 2311547f952b839f77a92cb9da494fafee9a2ed35f4a3912a565e6d553556ce2 SHA512 202d0211a428aac888d26b9b8b4ba350e2b8dd5d873cdec05986f4084ec30621516297eb39a14347a852b73b24707015245bb852e8a5294cb5522017e25ee6d3 WHIRLPOOL f2c3521e8b882ac2761ab5891d4b29c189240c2208dbcb6f3594e32208c2a0392263f0ff34071a37b7dd60874aabc0fb15b3f4ba6daec522dd5945357dd3d7ac
 MISC metadata.xml 310 SHA256 0cd99229a86711d910a7cfa4a0372b87c230103119fd15ed3daaf48ef1b12f01 SHA512 d060f20a44ba11ff4bfcf99aba392a09b7959bab38477f5c1a0f1deaef43c8d69e719c6464d0592943fe4d4f6ec1df883736c822b890bc17973468f8d3efa59f WHIRLPOOL 26781d26d2f5a659d5a155b450acb2689e01590ee1fdbb6e929bc40c2d367d6d78dac5e16c135e2c3c0704de6db440a60f61c5e9f2814ec354b9627cf60e86f3
diff --git a/sys-block/sedutil/files/nvme.h b/sys-block/sedutil/files/nvme.h
deleted file mode 100644
index 448aca0279ff..000000000000
--- a/sys-block/sedutil/files/nvme.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* stub to deal with renamed/neutered nvme.h header */
-
-#include <linux/types.h>
-#include <linux/nvme_ioctl.h>
-
-struct nvme_id_power_state {
-	__le16			max_power;	/* centiwatts */
-	__u8			rsvd2;
-	__u8			flags;
-	__le32			entry_lat;	/* microseconds */
-	__le32			exit_lat;	/* microseconds */
-	__u8			read_tput;
-	__u8			read_lat;
-	__u8			write_tput;
-	__u8			write_lat;
-	__le16			idle_power;
-	__u8			idle_scale;
-	__u8			rsvd19;
-	__le16			active_power;
-	__u8			active_work_scale;
-	__u8			rsvd23[9];
-};
-
-enum {
-	NVME_PS_FLAGS_MAX_POWER_SCALE	= 1 << 0,
-	NVME_PS_FLAGS_NON_OP_STATE	= 1 << 1,
-};
-
-struct nvme_id_ctrl {
-	__le16			vid;
-	__le16			ssvid;
-	char			sn[20];
-	char			mn[40];
-	char			fr[8];
-	__u8			rab;
-	__u8			ieee[3];
-	__u8			mic;
-	__u8			mdts;
-	__le16			cntlid;
-	__le32			ver;
-	__u8			rsvd84[172];
-	__le16			oacs;
-	__u8			acl;
-	__u8			aerl;
-	__u8			frmw;
-	__u8			lpa;
-	__u8			elpe;
-	__u8			npss;
-	__u8			avscc;
-	__u8			apsta;
-	__le16			wctemp;
-	__le16			cctemp;
-	__u8			rsvd270[242];
-	__u8			sqes;
-	__u8			cqes;
-	__u8			rsvd514[2];
-	__le32			nn;
-	__le16			oncs;
-	__le16			fuses;
-	__u8			fna;
-	__u8			vwc;
-	__le16			awun;
-	__le16			awupf;
-	__u8			nvscc;
-	__u8			rsvd531;
-	__le16			acwu;
-	__u8			rsvd534[2];
-	__le32			sgls;
-	__u8			rsvd540[1508];
-	struct nvme_id_power_state	psd[32];
-	__u8			vs[1024];
-};
-
-enum nvme_admin_opcode {
-	nvme_admin_delete_sq		= 0x00,
-	nvme_admin_create_sq		= 0x01,
-	nvme_admin_get_log_page		= 0x02,
-	nvme_admin_delete_cq		= 0x04,
-	nvme_admin_create_cq		= 0x05,
-	nvme_admin_identify		= 0x06,
-	nvme_admin_abort_cmd		= 0x08,
-	nvme_admin_set_features		= 0x09,
-	nvme_admin_get_features		= 0x0a,
-	nvme_admin_async_event		= 0x0c,
-	nvme_admin_activate_fw		= 0x10,
-	nvme_admin_download_fw		= 0x11,
-	nvme_admin_format_nvm		= 0x80,
-	nvme_admin_security_send	= 0x81,
-	nvme_admin_security_recv	= 0x82,
-};
diff --git a/sys-block/sedutil/sedutil-1.12.ebuild b/sys-block/sedutil/sedutil-1.12.ebuild
deleted file mode 100644
index 4f808a65ebe1..000000000000
--- a/sys-block/sedutil/sedutil-1.12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="The Drive Trust Alliance Self Encrypting Drive Utility"
-HOMEPAGE="https://github.com/Drive-Trust-Alliance/sedutil"
-SRC_URI="https://github.com/Drive-Trust-Alliance/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	# https://github.com/Drive-Trust-Alliance/sedutil/pull/49
-	find -name '*.mk' -exec sed -E -i 's: -(Werror|g|O[0-9]?) : :g' {} + || die
-	# https://github.com/Drive-Trust-Alliance/sedutil/issues/52
-	if has_version '>=sys-kernel/linux-headers-4.4' ; then
-		mkdir linux/linux || die
-		cp "${FILESDIR}"/nvme.h linux/linux/ || die
-	fi
-}
-
-src_configure() {
-	case $(tc-arch) in
-	x86)   sedutil_arch="Release_i686" ;;
-	amd64) sedutil_arch="Release_x86_64" ;;
-	*)     die "unsupported architecture" ;;
-	esac
-}
-
-src_compile() {
-	emake \
-		-C "linux/CLI" \
-		V=1 \
-		CONF="${sedutil_arch}" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	dobin "linux/CLI/dist/${sedutil_arch}/GNU-Linux/sedutil-cli"
-	dodoc README.md
-}
diff --git a/sys-block/sedutil/sedutil-1.15.1.ebuild b/sys-block/sedutil/sedutil-1.15.1.ebuild
new file mode 100644
index 000000000000..49da0065b212
--- /dev/null
+++ b/sys-block/sedutil/sedutil-1.15.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="The Drive Trust Alliance Self Encrypting Drive Utility"
+HOMEPAGE="https://github.com/Drive-Trust-Alliance/sedutil"
+SRC_URI="https://github.com/Drive-Trust-Alliance/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	default
+	# https://github.com/Drive-Trust-Alliance/sedutil/pull/49
+	sed 's: -Werror: :g' \
+		-i configure.ac \
+		-i Makefile.am || die
+	eautoreconf
+}