gentoo resync : 02.11.2017

3 files changed, 5 insertions, 3 deletions

diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 1113b87e347c..3354bc632cb6 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -21,10 +21,10 @@ EBUILD libsrtp-1.5.2-r1.ebuild 2127 SHA256 1087729183941e36ebd563b5b0c292df16bc2
 EBUILD libsrtp-1.5.2.ebuild 2005 SHA256 472ed5f165d2c3b010da0d3d56605651011724a6b101a506a37c283cf6e33735 SHA512 481461a38a83e1cf8e98335cca602f488b09f4c3a235c7359522008c020f2e33686c0d8821813090a8f4942f8cfd755409b7b911c05d3b69966c38e9670e83de WHIRLPOOL 33734d1162c02e5670d0a38dab200b5b0e5e636e02ecee1f22de7fb0484d3d490e47a5a43459cb89193bcf7037e321a517d168cd2f55e6cbcdc08c249713b634
 EBUILD libsrtp-1.5.4-r1.ebuild 2184 SHA256 6ac294e94b98f47ad1558e0f2ba3f511a36dea2316e3cc4116425d90921a4271 SHA512 f0342c040eef97cb493ffc34ddc6b43a69ea8a2d464fc18db88e541eaaf4140322a56a59a129ee46bb55d8be51cee152e0561f1a8e64cfbefaae8426ccfb6323 WHIRLPOOL 4fe73348eb26a202870f4f2d5eb2f718addc20cc11eb4a204053ad892589a3fb20af8541379457e50c3b11fb1f6ed64f153da6531219f94739422f15e7b1f866
 EBUILD libsrtp-1.5.4.ebuild 1875 SHA256 c8a8ac9595cbc8ca898140e99ad040c29f13d9a2ac20a5906d0d826dccc4a4c4 SHA512 bd6823d4229558fbd9d0091646efa45b57b1366ed4bf59ad764139ccd8a0c34b024945e5db48790c91e2053f503cbae4cbcd628a89ac982a006bf4b12f4a414a WHIRLPOOL 6600657edd7f2869c2b2183753bc639c28e8fa8c36c5c18319c782d3777c13fc7352f7cb7aef35af4dde91add8bce11411133c5aa3398229af418a2263f7a20b
-EBUILD libsrtp-1.6.0.ebuild 2184 SHA256 6ac294e94b98f47ad1558e0f2ba3f511a36dea2316e3cc4116425d90921a4271 SHA512 f0342c040eef97cb493ffc34ddc6b43a69ea8a2d464fc18db88e541eaaf4140322a56a59a129ee46bb55d8be51cee152e0561f1a8e64cfbefaae8426ccfb6323 WHIRLPOOL 4fe73348eb26a202870f4f2d5eb2f718addc20cc11eb4a204053ad892589a3fb20af8541379457e50c3b11fb1f6ed64f153da6531219f94739422f15e7b1f866
+EBUILD libsrtp-1.6.0.ebuild 2219 SHA256 80e3c94bc9c3eeec5469b52d415e06d39d6c06af437b293c3ba7fa55b05dec5a SHA512 8bfcc885501a0e0d4c02af3fd272960db5d9000ece8569f357e9c1b3994434e643b9dcc23c861094e1e8b54b0db828578412a8c8d8702176c44ce6cf44db3535 WHIRLPOOL c3651ef5e07b49ff4059abbe64bb5bc00f679eab7d9d3eed22201d1baa456249900adb0ac304d3f4dd619cd1f2eb1d1b16f1f1126aee3b99048ba19dbdebb957
 EBUILD libsrtp-2.0.0-r1.ebuild 1911 SHA256 e17ac6ce6f8f9d7dc92a8a71dc058356ce8bbcc79281d90547c2587005ba746a SHA512 8ee91195f444de10b1fcce602943d099ecf7ef4b2e4cae9d92c41fb71842db6395ec572bd298669069138f4525ae4008480c36000525d02f16ce8fe7ff5e757f WHIRLPOOL 62f37083c3929ec651e75137eb5ff13781b0c81050c2036ffa89308e80d487bb228d979ae7857b8c3be118e2e7930200b3e125d4220c9aaa60207224e053a92b
 EBUILD libsrtp-2.0.0.ebuild 1711 SHA256 8eba43f461b8052efdbf050a29f2b474b1d359e60b2bce01da922deef01281c6 SHA512 68343d3a4f86f72f6881e885a89110360e7e342ae65fac94706c0e08fcd6af7a0d00bf3cdff91f11cb77482e86ddbe7b041df7c4a9a59b54caa79e2346fa9c62 WHIRLPOOL 4e0a2efee6b2cf749ef314a4e86b99fc4e77e3b59f5c123e884365bc39f9472e15d118f7543520a81ad23c284e463b40e6d610854a6c6b539d80fb69cb3bf4cd
-EBUILD libsrtp-2.1.0.ebuild 1850 SHA256 523060ce5fbdb0f0816ae96adc92fb5638882fb1587f9e1c3f683518104ec22a SHA512 801ca4e6cc10549d56ecd6395d1a2e66f2a73624fc5502b9fc07bcf19f50f8f1c9bdea2d1463637d07c163b2ce2c598593925163aad10eaa9a76956b53442128 WHIRLPOOL c02ca82756b0f53ba49b555020811eae2b6c3d84142282c5a20b7e9b3ec8e68a50e85ea623ac1e8ae506075ad88c6ad878e672574b8b0f86cb6e6315102f6dd1
+EBUILD libsrtp-2.1.0.ebuild 1887 SHA256 ed518447f0607a97aa0d615797ca9212afae2d9659c525b7402f6d20160f977b SHA512 887d4478b069be03722d42ec370095a20e7087d1894b377237480ca1cc834af479fe7235915f4afb657b32242970e37086e7a908a8bb4b8088bac65bce245036 WHIRLPOOL 6de95baab6b43fa4a80fa433cdf65f6bc90d6452cb302bf233ceb205c78966472b0a825915e3d7195cc8117907e9665648b5ae83598a4fde08defd73924445c6
 MISC ChangeLog 4155 SHA256 c16fdf6c36cb4f618eced337c931b4b464eb897d33c6433ab1a24afad1b08c2c SHA512 0f2f8dcceb21edb8da9c86dab6d36cef79c732755d39241ab6684ba7041204797b18ebf67c11f06965218c2b2491bcfffd62d96ae63fc3122f42eebd41dec391 WHIRLPOOL 07bd8f6189abd30619b6bd5c6d0cc2ee938b04f1ee90abf39205de4e8c14a3ad8bbdf317fed75ef3f07de4b8184ec0e146363a94c640ca0741dfcb297fe6def6
 MISC ChangeLog-2015 5629 SHA256 f6250e0193dbdb9278677d602dccea797527d684477f5d9167a2508aeba7417e SHA512 433bb7ad601fed0ae84d5ae710322062263a5dec396c4267532cb869e1fbba69b77d7851dbe3eed42e5171681add453354b90be640e31ff9fedffaea9c39436b WHIRLPOOL 17093fd648972758ced3b0cf678a6d48cbd5067a1b88070353bf025cda50433693af16e5d226c208b49303c5b686aea0953970cc6b24ba7df42334cede2f31e2
 MISC metadata.xml 785 SHA256 40ae66bca7a05ddd83c0bd492b8146cf1a0cd5e95534b83698c21fe35a4d021f SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d WHIRLPOOL 28ad2e7cec31ca8e870a5f64a3bd08bc272c9c2785fcf363832d61e95477cfe99ece961a866d0d276b3cb3b74e9171a71d4c907632ae36943fb5f5784f5e66af
diff --git a/net-libs/libsrtp/libsrtp-1.6.0.ebuild b/net-libs/libsrtp/libsrtp-1.6.0.ebuild
index 01c124760188..6a0e05b78a6b 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="
@@ -36,6 +36,7 @@ src_prepare() {
 	# using test/rtpw.c guaratees the file exists in any case
 	sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c || die
 
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
diff --git a/net-libs/libsrtp/libsrtp-2.1.0.ebuild b/net-libs/libsrtp/libsrtp-2.1.0.ebuild
index 2321a7cd5f48..791ef4e55633 100644
--- a/net-libs/libsrtp/libsrtp-2.1.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.1.0.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
 	# using test/rtpw.c guaratees the file exists in any case
 	sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c || die
 
+	mv configure.in configure.ac || die
 	eautoreconf
 
 	# sadly, tests are too broken to even consider using work-arounds