gentoo resync : 09.12.2017

4 files changed, 14 insertions, 10 deletions

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 12636d92b9c4..039bc46c91e3 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,6 +1,6 @@
 AUX firebird-2.5.1.26351.0-superclassic.patch 713 BLAKE2B 1b02ef542874e03a6f2e64b7fcd3ee8cf72facb889a09e704cca261138feeb02d34e746d45c1d39c3446a00ac393f836c0c6807a1141191780c8d82e20e5ef79 SHA512 b1c0e253f25616ae6522f693e4a1202bcf290eab3d3cfc06f29e6822f8e55d1d316f0e45b89ebca2b4cd5c97bba07997a7e3aa7e5870ffaca28295d1f3d449cb
 AUX firebird-2.5.3.26780.0-deps-flags.patch 3054 BLAKE2B 8df857b3a32d543bc6861fa16567965f4559afdbc324dc50d10a6043e98497e07bb79470b6b4cbfccc5c20e58fbe8a1a1af3cc402403de19fb55a038d52bc635 SHA512 c786daaec706223c67c74448a317b5dcebcabeba17c244ebbf474763fd3d61e9ee5613241b94194a14816c2bd90dfff8a649bee9ab59eb78e085cb9f812ec9e8
-AUX firebird-2.5.7.27050.0-gcc6.patch 997 BLAKE2B ec7b37a52a6aae1b642facfb0d750aa0b01d48b12b7dab6cdc85a8187b80884e1422c4866e5bf467b56b7f1959e961565e051a61cccf32172a724d0b3b4e5904 SHA512 73634cf7cc34497116591094bafd48e4959562d0b6ed91be4d35f6931af5ebaa566d3c5d3785135f75c3b78a19f7a149a1aa9617eccc6ea0c6ee794e46500fd6
+AUX firebird-2.5.7.27050.0-gcc6.patch 998 BLAKE2B 52cc8f328ac41a0f347ff93f30be7a65114ee44bc7f7006b58cae81d0784b0077daa0f0aaa4ed8cb45bc84075f82d37c8b59e19272cbeda5539ecb8a82118a43 SHA512 d4be93d50e0ae3e6529d04c624ac926592d4b848133b08aaf6ccea578c91809e9200862fbf9bb2cc1d709e79b5b08545109232cc9f90cb817cb2ef873b1b5f74
 AUX firebird-3.0.2.32703.0-cloop-compiler.patch 349 BLAKE2B 6906993819f5aa68c39522d82bb7fb57b910f8f311d173a326147a98e983d8cd95ca90dbb538a5caa696ce4337305ece744306bf88f608cc8639bdda198e4576 SHA512 1d57f26ada2023d8bd04d73dd0f55951cef6b373710c8cf73b6bea0b4d54f879d689644d26541b2366bd1071b08eda2e1b531f3779a88b8fb52d3c9312f0c091
 AUX firebird-3.0.2.32703.0-gcc6.patch 806 BLAKE2B 85109e33f130582110e37188ef99cec5e5f0f3f95c481580df3a8c8a97215cd8e070e3febe47e46659e025b8a0c138fd0b271a5fd4b4aa67ca52419cef88db04 SHA512 184f754c4c23b7917acfabf1a5024069b8f35f58e667112a203a02e906560f2f5fea711b12975dafb3adcbe5159999e40fa459898a41d88e6de9b3499d8eaa67
 AUX firebird-3.0.2.32703.0-unbundle.patch 1786 BLAKE2B 660af04975ecfdac0ae12a1ee89e0a4d97d321ac7de7e17ba53484a909962584828c18d1f119ecc1af63c1cb2b93f451b847c9363a25831630a807b89ad13bc8 SHA512 bb0f8cb283ee230f9128a9da16da21933a1709615b34bbfac117a0563e2451a07381b52ffc1fed665e74688ff8e2c2548f86c1413427665914cb3df8500543c5
@@ -10,9 +10,9 @@ AUX firebird.init.d.3.0 642 BLAKE2B 70f9b07a69c01e391ea8b1f1747a35eb303ff43a4923
 AUX firebird.logrotate 169 BLAKE2B e73e2ff85882cda144f969a9a20426f2e5bfbaf2ce894e4e7adf67a33eb4cb5f1bc2039385437dcc60436145b0d29bd1b9311d8328f68ad7870aea50b8e5402d SHA512 f99edc010272af28f18e2b89e420aabc204feda918a1181e477edb56612b6af97ca6bab2e39989db401eb8296e3233a64853f824af437329e117f09aa9868823
 AUX firebird.xinetd 199 BLAKE2B 8fa4d650fc506650ac574901e1900fef87d0d11f21d50538d75253b55f72fa8eda14291b5476c62abdb9dfbfe32c49e76a807df148152cdbc40ceedea361262b SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb
 AUX firebird.xinetd.3.0 193 BLAKE2B 34017b978344bc2b05cfe7b92eafd56ba20dd78d1fa21dfb5455d7972325cedae9a6ac25b4fa491899b19cb3bbe2949b8ca78626467100661767f6c944b01c20 SHA512 e02c011b55c1d6823b051d14dbfabef6d034db32ee8046adc796fdf393c837b995c270e0efdcb97950f6fead82cd73773099a247dc29961b0e8f6c4f6c0723ae
-DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 SHA256 0a3b68c94e9d4eab0e56c98312f0955a0ec69ec4e9e801e0a81be758f032171a SHA512 793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327 WHIRLPOOL d162deb478fcee737aa973c3d87498a8fc418cf8facabf72a4d4cbc00db213ba0f6d98a29dc9bfd00a545e55cdb702770a3e10b7db0d0211b4cb60286c63105a
-DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 SHA256 1eb4ca57538b03cf1f7504f19d10c86f5b0238604d72df7fbd7f24927a66ad2d SHA512 5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6 WHIRLPOOL 2cba1a0d395147b730d7d97e7226edcaf3b90f816a18cb9fe46fb6914771bf74d1339c956b91b8a7b5da25c354dc33899a430ae53775b941720c203010fc52dd
+DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 BLAKE2B fbe7af7b5cfa738459df7fd1dba0b897b04f2f6c8244d1f951e18c908c298e91e89b2300677c45834103e5215856341f673040b80b761921e68b1dc05381938b SHA512 793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
+DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6 SHA512 5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f
-EBUILD firebird-2.5.7.27050.0.ebuild 7973 BLAKE2B 47727bdbf40af153aab88945cf3a05dc1286debfcb338120917a26376a0846bb0ff39cd8f94e81e09b77ad5beead468a95259d8b0a47516e3901ee6d725ef1bd SHA512 fd067c67bcd747a7392cb28aceb50066dee54d22c349e93992305d91691167b14ea5cf3bc34d36451b6bc66c8d944026c6508664326206526bff84d29741f7be
-EBUILD firebird-3.0.2.32703.0-r2.ebuild 6157 BLAKE2B 6ed351c18ddf146d442a20aa019a09e6c6ce9c4369940fcbca5e956e8212fb71ebc903d2fd010ff1ef92f65617ae30234ca6f80ab705b0308920eb4dd017f89f SHA512 cf722eda8754fdf53bbb566c694f56107430bafc057ff10f86fba8ef17d15c7c02f693f29a9c0161a6c63aaa156ecdbf82fa59c18b122f9ae500128677ee2197
+EBUILD firebird-2.5.7.27050.0.ebuild 8144 BLAKE2B b7596149a4745fe32bf269ce15edf769c932de29d7abb51bff4614149b9904f08ac437c558495a1c87e58b80e60795e3103fb0b659706a789ed02da2b9dda417 SHA512 0347b1890b870e924c20d8e892a5265ea6e7cff432079aaea3b24e7a15deeba7e8afda2b9970542ed6a201e600a47a400fd3fe6ffece9fbc316175c6885e49dc
+EBUILD firebird-3.0.2.32703.0-r2.ebuild 6145 BLAKE2B b075b9a30669be1c9b6bfd1fe3bbf80ef935de98ca1b80adeb05704bf987808553127002e559c3c65f500c35f6db0c4f17c1e2cae18b673d21c5511d737d0477 SHA512 5cfec831ce2da2c3bbfc21b7911328c0ef79a43996c0b665d48dda213d9f85e9019ad0d9fc34495b33221f1008fe77b9861add6d22af07c447f3a0a481035739
 MISC metadata.xml 891 BLAKE2B 80d6dd7bc1ff34881f0f4afb087aa22f355967f7dcc6f09470990a4f3229c9db9bd518f2002405b5fcd76fdeaad6f857a4eef8a9df08ef747bf2958e694b5eab SHA512 57377261a4594289406adbe84618e011dcf338d25110501a8aa772d765cf4b0f0c892fbca0f032f49a13a869d5e9e9f99743e044ab4a6b687ca06033ed352ffa
diff --git a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
index f051ea02b4ce..312f3576bcc0 100644
--- a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
+++ b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
@@ -32,4 +32,4 @@ PR: https://github.com/FirebirdSQL/firebird/pull/104
 +		static_cast<SCHAR>(blr_end),
  		blr_eoc
  	};
- 	static FB_API_HANDLE req_handle;
\ No newline at end of file
+ 	static FB_API_HANDLE req_handle;
diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
index b6e56990fd82..68a0c71d850b 100644
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -79,8 +79,10 @@ src_prepare() {
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 
-	find "${S}" -name \*.sh -exec chmod +x {} + || die
-	rm -r "${S}"/extern/{btyacc,editline,icu} || die
+	find . -name \*.sh -exec chmod +x {} + || die
+	rm -r extern/{btyacc,editline,icu} || die
+
+	mv configure.in configure.ac || die "failed to mv configure.in configure.ac"
 
 	eautoreconf
 }
@@ -88,6 +90,8 @@ src_prepare() {
 src_configure() {
 	filter-flags -fprefetch-loop-arrays
 	filter-mfpmath sse
+	# bug 639614
+	append-cxxflags -flifetime-dse=1 -fno-sized-deallocation -fno-delete-null-pointer-checks
 
 	econf \
 		--prefix=/usr/$(get_libdir)/firebird \
diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
index 0ffc66ca5917..f502dbb7b2c4 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
@@ -88,8 +88,8 @@ src_prepare() {
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 
-	find "${S}" -name \*.sh -exec chmod +x {} + || die
-	rm -r "${S}"/extern/{btyacc,editline,icu} || die
+	find . -name \*.sh -exec chmod +x {} + || die
+	rm -r extern/{btyacc,editline,icu} || die
 
 	eautoreconf
 }