gentoo resync : 18.03.2018

4 files changed, 63 insertions, 7 deletions

diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 6036743d2c62..ec5b9881317f 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -9,11 +9,12 @@ AUX fltk-1.3.3-makefile-dirs.patch 230 BLAKE2B 517999f39b9de4f1f4f447e1d394ad562
 AUX fltk-1.3.3-visibility.patch 781 BLAKE2B 7e909b6ec4ac6d915ac7dbab69a86b63166d002f23c51b770f6342d02cc0ea6d6bf1574aa40c25ed6cb5b2bc97c141f0787c67fa283ca8ef5b0753473d977713 SHA512 b9bf0ba24d27210702a98da3e5dbd4db7a36301a163ed8214362aaaa218bcc184d708fe1e249b5be4fd35e481dc5b85b2bf11db3e005436e57ad4436da2819df
 AUX fltk-1.3.3-xutf8-visibility.patch 4557 BLAKE2B 963c2dbc5d5466d3b5c35b411d53a59d4c8f08b186e9f14b67c5945ea3356ca697c804587b291fdee57c432d738106134dc12158230cc6236f4836fb39dc7e2d SHA512 621cedd0cb4516169f1c87e3286cad3ca9d1685509c7e944e3077243fbee57809d61c734757994d104630cee658d9962dc934cda82932a05e8d80611a1d5ac4d
 AUX fltk-1.3.4-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
+AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
 DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
 DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
 EBUILD fltk-1.3.3-r3.ebuild 3803 BLAKE2B fd2812a49fbf0a161e05e9dfc6dd278222d966351547bf1f74ce8e947b9cf5546f5cd6d8873a046c5588c39001186e7dffb0dfbb0e64259ac9a9d60b051d48bb SHA512 ec258a6c44d4f791892c493f21ce315c57c7a55d2120c643c50de72d035c1d34e2c054d6d4384185d0575440b1d160e5035b3c3964fae8347b21b2a383ecb857
 EBUILD fltk-1.3.3-r5.ebuild 4433 BLAKE2B e97a841040f092da5d676cd25356961d78d7c433d30210d2c529ef7c5ce3752c6b46647b315169d501272285610277d793ba36e359905994a7ab47015fe71365 SHA512 c9b5ee046d515e15f6459570c9c730e31202bea50d5405ae39e1ba7cb9ea93b1674f1f919eea0047f20f4c1dcd448f3aefaac563411a8238dffa4a2143d29bb9
 EBUILD fltk-1.3.4.ebuild 4273 BLAKE2B 059897adb2e41c18e73e6f81b54e67278f0eb3cd2dcac67c0145d61a3a523e6e1b250c48d97fb0cbd615f8ac2b34dac64df3406f0a070e1616f9dee3583d7fe6 SHA512 9b5eadd348a133dff01cd0f8babe55e3084a880039286cd425203dbc8290310f91ed393ccfd540e742e70a13a09e0cf1e1e0e97cbf5b67ede5e65625289da434
-EBUILD fltk-1.3.9999.ebuild 4311 BLAKE2B db0a16d07a28380ec7f1ad5c78d781b256f794993249acb96d8d9f9b3ae01a1c3542341b5e5662e00843d1ef227cd9af475b31e77ab38afdc9bcd36c9e9ffb60 SHA512 3a4086c31ddd8d965f0f6b745a523c93a913afddbed8b6a2dd6b31b5188c42d87520288387042529d9f7bc675b48b3327bce63e823aae7492e28d46623818656
-EBUILD fltk-1.4.9999.ebuild 4267 BLAKE2B 5c06eae4e19c14b890994966904578179527c4b4038c82f35c213a05bec59458b6ab110ab7b5e76b3ea9d614b01a8394f5d6d80b26a5e9f6484a2604dfda118d SHA512 fcfc3465905b18cb65cd4a83ec0ffe67b4a5093877db48c8647b98a9cef512213a05b71ee0b8b0e8b8fc89cda928147ee9f23c97e9893b13e7facb21e09628b8
+EBUILD fltk-1.3.9999.ebuild 4314 BLAKE2B 9bcea612a9961f13de6e1fcc43e79426455abec9ec3bfeb3c1a790857e9ddc1de82a36719a8cad0bdd1422bbd8325e2b0a4e16ad98b4c74a2fd68c7af993c7ad SHA512 1dc8dbfdd3162fe85d64b52d3a02c330a74e175fad117b8650d6153c50dbd31699b48ae27b6cc1d87cca61b16d3bbc2cffd51581a21d3b80cb25ff01fb754b6d
+EBUILD fltk-1.4.9999.ebuild 4267 BLAKE2B fb010316bda38f47c2fc99334e95cd6e702a27e594cc5df0706dae8e6711df3186a1ed3a8b18679f7da37b36478a6bcc43d8034750bab6f39c0defbfa0f6ab21 SHA512 988a881087c14d3ce74ba95ac5fa6ada696cca7848d1321a12df98912521e274cb189d0ab0bb967bdda2c97a3388ee6ffba9fb0239a5a2a3d61a231747b38092
 MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch
new file mode 100644
index 000000000000..994df56ad361
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -100,9 +103,6 @@
+ 	touch config.h
+ 	chmod +x fltk-config
+ 
+-configure: configure.ac
+-	autoconf
+-
+ config.guess config.sub:
+ 	-automake --add-missing 2> /dev/null
+ 	if [ ! -e config.sub   ]; then echo NOTE: Using frozen copy of config.sub;   cp misc/config.sub   . ; fi
+--- a/documentation/Makefile
++++ b/documentation/Makefile
+@@ -84,11 +84,6 @@
+ 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
+ 	fi
+ 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
+@@ -96,10 +91,6 @@
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
+ 
+ install-linux install-osx:
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
+@@ -108,17 +99,11 @@
+ 
+ uninstall:
+ 	$(RMDIR) $(DESTDIR)$(docdir)
+-	$(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
+-	$(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
+-	$(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
+ 
+ uninstall-linux uninstall-osx:
+-	$(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
+-	$(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
+-	$(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
+ 	$(RM) $(DESTDIR)$(mandir)/man6/blocks.6
+ 	$(RM) $(DESTDIR)$(mandir)/man6/checkers.6
+ 	$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index f98e30fbf2cd..f85727938fd2 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,7 +55,7 @@ FLTK_GAMES="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-share.patch
-	"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch
+	"${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch
 	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
 	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
 )
@@ -85,7 +85,7 @@ src_prepare() {
 	sed -e "s/7/${PV}/" \
 		< "${FILESDIR}"/FLTKConfig.cmake \
 		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.in || die
+	sed -e 's:-Os::g' -i configure.ac || die
 
 	# also in Makefile:config.guess config.sub:
 	cp misc/config.{guess,sub} . || die
diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index 9eff8eea2f90..85a0f7d8365b 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.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
@@ -84,7 +84,7 @@ src_prepare() {
 	sed -e "s/7/${PV}/" \
 		< "${FILESDIR}"/FLTKConfig.cmake \
 		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.in || die
+	sed -e 's:-Os::g' -i configure.ac || die
 
 	# also in Makefile:config.guess config.sub:
 	cp misc/config.{guess,sub} . || die