gentoo resync : 31.01.2018

4 files changed, 20 insertions, 5 deletions

diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index dfa78763c32f..bf0740cb0e2f 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -15,6 +15,7 @@ AUX ganeti-2.15-dont-invert-return-values-for-man-warnings.patch 413 BLAKE2B 6b3
 AUX ganeti-2.15-kvmd-run-as-daemon-user.patch 1267 BLAKE2B ec993c7eefca32eea45151de9ccc03e4a3b19c7e9279be8c142243c7ee544132e8d4c4edf4e269b492b9c27e254655e636c10863bdcbf092d5481e9c7e80293a SHA512 f4b8e76698f92ab0e90e8c809fed575a07edae8f8af62e492cdde34cdd60c0f0a0b0ad74e63ab968f38ac7fb24b5f786a14184bfad2e0519805de09a095764fd
 AUX ganeti-2.15-noded-must-run-as-root.patch 1652 BLAKE2B ed019d793ede24eef2edf3e525bd1c859edfd71cb814b75b84565547e63df64bd21999f4c9a181209b98539b5c6c3aaad92a93b8ad10ace103480795a95758db SHA512 6c055cd56088762e143fdcc1903943f2bcd565b46d9669b8905128b9885db27819f65d0c80dfd2ff05776bb8e38f23fc055597343e5a7eeb41821653e08a0f3a
 AUX ganeti-2.15-python-mock.patch 869 BLAKE2B 0be8ccb3c193cb363a71175022f2c31554acd0383f1cf1ec2494aaf92c077a4d557ac1d9cb0e38b0368ae4a141e57552ff0260748698bbd763a055ee19e55c00 SHA512 7b375daba2ff0ebe866ff0640d4a96d3fc1257d581404781bb7b103f6d1c79ce35aa8fd4abc40d664763f5ea51881abe441630ec6337aaad0c1db7b8c683034b
+AUX ganeti-2.15-respect-HFLAGS.patch 332 BLAKE2B 360b7473870d9e803aa958f58ddad8e5de1e5c33f6d669014ebd71fc9e3b96608987ea3e7357e26782a3b9fcd62fb7b84b9024e8c68c1db0067fc92c8dc45c6a SHA512 f9d223a072ca7c842ca688b9d7ab6ab2d514647c9346d01fed4f8c5e1111e1531a0a16cfa2f6b1600a8e72cba06abc7d81f0789f1c68c48991c260b8d6a88f94
 AUX ganeti-2.15.2-remove-sandbox-failing-tests.patch 2641 BLAKE2B ecf41445e52160a754fb9a433fad59141ae0058ed5a86d9cd0981b7ee952015528b85467b77226d70f4cd1847dbc813efbd8198e6424b1405835ea256e983448 SHA512 51e8f10a8a20100dbe290023d3cfd9d585052f441d79daeb18188940977f19401ffe46924df88118b662a26b2423ca119968e8de9c8664cde531b9d7ea23af93
 AUX ganeti-2.16-kvmd-run-as-daemon-user.patch 1257 BLAKE2B 43766f2cf5fd18ca23ed4072258a3973c343dd92fbfcba51e62b3a7533b720092042a8bbc2f371cfab515085c54d349eecbd13f044cd18e3ee99c3869e848333 SHA512 c913ea0ba2af8d73342f105990234b4cfe4060a41cee1530d3dfe828a3e048d5c7cb473de22094330ab3efe9d2ade64bc15d98585a56d1d0f10e0b13b95485a5
 AUX ganeti-2.16-noded-must-run-as-root.patch 917 BLAKE2B 102d39e0483e71caef350ea2d56d709a23ac3092dba6e0dfc8972abb0b08080e7ffcb2001f42cd6e9c5277b8f225ab9e7c87b800f85e8eeee3a5159efc110d74 SHA512 69c51f88d3f5628fa17852425d8dc18e98a1a1d6b51ef7219c88efa29b01909bffec2df43dc40801bf7332d3252834b3034a8db56a2d9f283b62e2295c156746
@@ -32,7 +33,7 @@ DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d
 DIST ganeti_2.15.2-4.debian.tar.xz 42440 BLAKE2B 5c329baa90bd801a3e4b550da0a4c8bb59f3d17801ff0d66a35ae0383f34a5c1cc7f3d6d67a5e07157085290019b22c6b5349224ed43b5ec40fbdc37ded77e88 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403
 DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af
 EBUILD ganeti-2.15.2-r5.ebuild 9797 BLAKE2B 01b892f3363735639abb0a56af713db430ed625ec4a44d395528528435295d49d6b248b773d87ef9cabd60d83eca84e062b6e26c495386fb165d6f621beaadb8 SHA512 a62058c0a7dcb218eab8881690c3a1cc560d4f244ee6d40344b06e2864f60ade56f15f52b1510cc62b08f23ce81bf004575fcb774eb67100c92df35d74f88711
-EBUILD ganeti-2.15.2-r6.ebuild 10210 BLAKE2B 54059cd23b9b9532dcc0c01e91ccace9218ede2331f988efc68ff483b56877b1c2fe872eb21f4e6795593c0459a82a46d24453fb4fecc031562687f550d0d41f SHA512 406fd1bd443514b9c0875e0b11d6b66cbbb553fc1713a7d4e2e558edff5cb9e465ef303e356ba2f439d8c182734a0ee13a91e88209befed158babbffaec6cbc8
-EBUILD ganeti-2.16.0_rc1.ebuild 10456 BLAKE2B 15679fa94bb655a3f25cac0d6826f671cce5d81aec544410a356605ec82a1aca519285605d43f6fa542af56ead84c0f60908088be9c55cbd43e0b165745735a0 SHA512 2c1f9579e275f587dece7471bd48ebf88faae241238bc20d3504711b976e5d0a8be6b0a36426a315733c0068994ba1487ee2ac5eaab63a683bb282e7e1aa55c9
+EBUILD ganeti-2.15.2-r6.ebuild 10249 BLAKE2B 90db253679828a1b31d9936524f268c7f2997f021573e6244096a3e589f561f9a2aa11dd790c8d82e7f8b224f36c6dfc59f1f3771bc6f1f8ed1daad45fe907da SHA512 cca4bf742ce5bf279eb0e44aabcc718d34945237ce14afb1d5651dcda9065e824c4e46844fb5f9d36ea47204339ad43e367045662d05721ccdc0f15f92cff337
+EBUILD ganeti-2.16.0_rc1.ebuild 10495 BLAKE2B 5f8f4bfeb74adc10623e57fc649e72f9decd672d31a12f0405939a5ba83a92202acb5d19d46a27736e186da737be9daef58f3955374e9e23da8f34400b6da6e7 SHA512 0608feee816184e5c5403e923ef3f062c717d5c38889aaf5dad349192fe0ad9d16da2005c34f38b038aa68cda33dd9826829ae47cd89bee38f6b102d89df871e
 EBUILD ganeti-2.17.0_beta1.ebuild 10522 BLAKE2B a3534952889687a0c61cbb6575742c5117b03c911d2abdfd6784a50abb2fea8237e368213686919637ad014b66147cc430e61fe4179007f2a3c21b631c46673c SHA512 3ad4e6c3994bd3d7d3c325f344099a6f073ca830c94fac2ede314ef5a067a334ba3fe21b97456ddcefdc20815f1906f29b2153a75e72e8ef21739558a04aeb66
 MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896
diff --git a/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch b/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch
new file mode 100644
index 000000000000..ffab1838bf1c
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.am b/Makefile.am
+index a04b95ae3..e26508ad9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -803,6 +803,7 @@ HFLAGS = \
+ 	-fwarn-tabs \
+ 	-optP-include -optP$(HASKELL_PACKAGE_VERSIONS_FILE) \
+ 	-hide-all-packages \
++	$(HCFLAGS) \
+ 	`cat $(HASKELL_PACKAGE_IDS_FILE)` \
+ 	$(GHC_BYVERSION_FLAGS)
+ if DEVELOPER_MODE
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index 739b9186e2de..39a61a1f54f7 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -136,7 +136,7 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
@@ -177,6 +177,7 @@ PATCHES+=(
 	"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
 	"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
 	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+	"${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index 5aee625621fc..1ae893ae5ef9 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.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
@@ -141,7 +141,7 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
@@ -183,6 +183,7 @@ PATCHES+=(
 	"${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"
 	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
 	"${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
+	"${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
 )
 
 S="${WORKDIR}/${MY_P}"