gentoo resync : 04.05.2019

7 files changed, 39 insertions, 214 deletions

diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 859a23a08936..c629742ecf80 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -14,10 +14,9 @@ AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a
 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
 DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
-EBUILD fltk-1.3.3-r3.ebuild 3764 BLAKE2B cce233125a8acb054628bd5010b042a01466e2ab6dc1e517e4a0a134d97b4651d189131c7defaee2854198217744c99f124475b3853b9ff33bc37fa4410af994 SHA512 af7ff591f510a0e8632d6068b04fc7ddfdc1250bdb75e5186964f5794dbccf53d04d67942a75659b4dd4619560304334e8bafe05f5c40477390924452c99c5b1
-EBUILD fltk-1.3.3-r5.ebuild 4394 BLAKE2B 6f8bd3caf45111057a3accf768c4309de717bccf01194bee88b5092c76e9e57fdd744c65f9e7d901a732b6c5eeb2d84752df537d9c93738f4778758f6053187e SHA512 8741f09384adad101f7989a561faa494e6a1c87e95747f34094d2ce14a90d6db09bfd26efe0704a854b62cfe672d5c13e30c10e1551e6e2ae504b4ead64cb36c
-EBUILD fltk-1.3.4.ebuild 4322 BLAKE2B 672541f7904f649927e3d42e1293f08bc6d9b1dc50b7c30407f77ccd052839b0bca9f5e493d6861c6ea34f91c07aacfacc57677d83fb4c27c2066554381b79a2 SHA512 de1a3d347ddebaaa835e6355b4c47136548e1a2853624f95cd1eeed0b868e08b0cf0b60863e715c7dd65cf8a57c92952a3a3b53399842164282da48c71ff3d60
-EBUILD fltk-1.3.5.ebuild 4426 BLAKE2B d98fe2e0530075e588dedad760ced0885ac9fd609f48054e8757fce4cc9443a84eed7db3feb01f5bf7e49d4357c16592ffd5721fd6ba2f978be10dde45f058ac SHA512 1b5fbc3a1885196564faf88d846af37af46624fd1c8d7a1148967151f87edcade526eef2e006a130b55cc332dd79ba68d9f8d59d4b6fd7c0374a92593d45ad39
-EBUILD fltk-1.3.9999.ebuild 4429 BLAKE2B a53e91a94d0e00c46083d2e19f7183fd181068d77d4d74625e229161427cbeeb51d263f11b55eb75989815ebbd4392a84109232f572919d0ada046b89b6492bf SHA512 fb9a084a0058229507823c4069e3228dc4d7191f398a37a9e3c5e52041784d31aa5b443eaf4845fda8726d540582c1ee806cabc861a751175cc09738f3d53842
-EBUILD fltk-1.4.9999.ebuild 4462 BLAKE2B 73e1dcf4ab86ce5d7b209ee6044fc07c6414f1e5095a5fae60cb183a805cd52161635dd34974b822aeafb17b8fae998b4f1e6c642c19ca3739eeee99c7c097df SHA512 fe67e96c4e82197b67e79288d2ca7528b929b22dc99f4177c7ac171346ccb1befba124827a41275911d1944a16a8521535c7b2086b6910f139610e222b12d908
+EBUILD fltk-1.3.3-r3.ebuild 3767 BLAKE2B 0d9bf5379a0ef12e54d89077d89dcae308ff5217d6fa345f71fe4da9e7e2a7c46897c68ecac427d596c289e15427e4ddb039e109fecd9a59963b26d686b3f785 SHA512 5c6058660979328aa1a1cf0b0b31b42123331faa7bdf8cf0f3239d0bdd9862cc0a51b94db984af5809b4d92e6c91834534e16e3881aa2daba01ccffbc1fcc185
+EBUILD fltk-1.3.4.ebuild 4325 BLAKE2B e0f6baeec8a670dd3ff9dba7d454d61de96c2b88fe160adf1baf0b15bc900c95a1cfb531ce0bfaffd42c467a7cab5d251ada155f4282038a339fb306c31407c4 SHA512 bfc2509e1cdef14292f267078f47a5346c9b9e2bbe4405e13520c096624bf983e4448a7ccdfee27b806e0ada9ad3f4cf798448a6d0cd16af99a3ba9fee46f325
+EBUILD fltk-1.3.5-r2.ebuild 4520 BLAKE2B 928734ae9eee59b85f822b7525e718a06aa0b74160498ab4ee433d387594c8202bcadbeefeee8d52a115c26c86067df9d7996eb57f85bb53c987f10575be991c SHA512 f50fa9afd9251c6dc8cc7d80bd627b04f1672f3243a9c449f1b5ecfec1af97451ffb691945fea4a52f648ec582b187f85c02cb8fc9c2103a62edca40aa922087
+EBUILD fltk-1.3.9999.ebuild 4518 BLAKE2B 719dbc412a4d3aa880146f7bda2d0859b41c03d17495d18e4a8226b3e103864dd8aba4d152a21c5fe139635913e8e18b65a0f24db1ac4201d4b4f90ab4f204d4 SHA512 07a58a821c8389207fe726d17663c06b777ae03efed187c2a8ff6dddae5da8ad8ea5f60e971819d13c6734646a27c61f1cfa3f338df7009d954b8ab20ce580ba
+EBUILD fltk-1.4.9999.ebuild 4551 BLAKE2B 2432478df1311381e0268b6abd710ee63494af57c5d6defefd323ce7a226aff9904d88b858e183a58032e06cabeb5a409a524c74a58ff88366078e33fae99a1a SHA512 a15b3a9955f01cc00745698b12a6df6a67f12cb56cccf4706b1e409bf3bccf11b3672a8f6bca3ca95caff526a49dd1bba5702a4060fe0842f73146552243318f
 MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 93aea9c564ef..e0631dc59cc9 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils fdo-mime flag-o-matic
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+HOMEPAGE="https://www.fltk.org/"
+SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
diff --git a/x11-libs/fltk/fltk-1.3.3-r5.ebuild b/x11-libs/fltk/fltk-1.3.3-r5.ebuild
deleted file mode 100644
index 596b790d9751..000000000000
--- a/x11-libs/fltk/fltk-1.3.3-r5.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools fdo-mime flag-o-matic multilib-minimal
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
-
-RDEPEND="
-	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	x11-libs/libICE[${MULTILIB_USEDEP}]
-	x11-libs/libSM[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXt[${MULTILIB_USEDEP}]
-	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(
-	ANNOUNCEMENT
-	CHANGES
-	CREDITS
-	README
-)
-FLTK_GAMES="
-	blocks
-	checkers
-	sudoku
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-share.patch
-	"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch
-	"${FILESDIR}"/${PN}-1.3.2-desktop.patch
-	"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch
-	"${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch
-	"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
-	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
-	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
-	"${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
-)
-
-pkg_setup() {
-	unset FLTK_LIBDIRS
-}
-
-src_prepare() {
-	default
-
-	rm -rf zlib jpeg png || die
-
-	sed -i \
-		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.in || die
-
-	# also in Makefile:config.guess config.sub:
-	cp misc/config.{guess,sub} . || die
-
-	eautoconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
-	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
-
-	multilib_is_native_abi && use prefix &&
-		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
-
-	econf \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama) \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xcursor \
-		--enable-xdbe \
-		--enable-xfixes \
-		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
-}
-
-multilib_src_compile() {
-	# Prevent reconfigure on non-native ABIs.
-	touch -r makeinclude config.{guess,sub} || die
-
-	default
-
-	if multilib_is_native_abi; then
-		emake -C fluid
-		use doc && emake -C documentation html
-		use games && emake -C test ${FLTK_GAMES}
-	fi
-}
-
-multilib_src_test() {
-	emake -C fluid
-	emake -C test
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		emake -C fluid DESTDIR="${D}" install-linux install
-
-		use doc && \
-			emake -C documentation DESTDIR="${D}" install
-
-		use games && \
-			emake -C test DESTDIR="${D}" install-linux
-	fi
-}
-
-multilib_src_install_all() {
-	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
-		dosym \
-			/usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
-	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
-	doenvd 99fltk
-
-	# FIXME: This is bad, but building only shared libraries is hardly supported
-	# FIXME: The executables in test/ are linking statically against libfltk
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/fltk/*.a || die
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index d06a2da1ff68..19245b16e228 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools fdo-mime flag-o-matic multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+HOMEPAGE="https://www.fltk.org/"
+SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
diff --git a/x11-libs/fltk/fltk-1.3.5.ebuild b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
index 008a5a20c956..5688e630c5ee 100644
--- a/x11-libs/fltk/fltk-1.3.5.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools fdo-mime flag-o-matic multilib-minimal
+inherit autotools flag-o-matic xdg-utils multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+HOMEPAGE="https://www.fltk.org/"
+SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
@@ -118,7 +118,9 @@ multilib_src_configure() {
 		--enable-xdbe \
 		--enable-xfixes \
 		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
+		--libdir=${FLTK_LIBDIR} \
+		DSOFLAGS="${LDFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 multilib_src_compile() {
@@ -182,9 +184,11 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index 4171029d334a..f5904db08e28 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
+inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
+HOMEPAGE="https://www.fltk.org/"
 EGIT_REPO_URI="https://github.com/fltk/fltk"
 EGIT_OVERRIDE_BRANCH_FLTK_FLTK="branch-1.3"
 
@@ -123,7 +123,9 @@ multilib_src_configure() {
 		--enable-xdbe \
 		--enable-xfixes \
 		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
+		--libdir=${FLTK_LIBDIR} \
+		DSOFLAGS="${LDFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 multilib_src_compile() {
@@ -190,9 +192,11 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index 708271c605b5..11e65454e793 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
+inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
+HOMEPAGE="https://www.fltk.org/"
 EGIT_REPO_URI="https://github.com/fltk/fltk"
 
 SLOT="1"
@@ -127,7 +127,9 @@ multilib_src_configure() {
 		--enable-xdbe \
 		--enable-xfixes \
 		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
+		--libdir=${FLTK_LIBDIR} \
+		DSOFLAGS="${LDFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 multilib_src_compile() {
@@ -194,9 +196,11 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }