x11-libs/fltk: Version bump (bug #602262 by Hanno Boeck).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index f7d69a4cf0ed6d4df69bb14256b499d783c142ca..6b91ec427f3f594e75e52f3c8411fcd1d784b6de 100644 (file)
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1 +1,2 @@
 DIST fltk-1.3.3-source.tar.gz 4986376 SHA256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d WHIRLPOOL 876a92e44dac20e6a2d86e4339a87185e708718d4cc59983bd81d5c3f0100d52230ef34d9c92800a2a07f6e7ed26e2ba9212c01ce898e7a184a7a35c40837761
+DIST fltk-1.3.4-source.tar.gz 5284217 SHA256 c8ab01c4e860d53e11d40dc28f98d2fe9c85aaf6dbb5af50fd6e66afec3dc58f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2 WHIRLPOOL 6824c69615cd268d5f75cf65ee7f789d3e42ebda18cfe40b7d6444f4c4b1d8706dece616fbdb43341b492f2dd8019483e82677e9efe8828391532687994a945a

diff --git a/x11-libs/fltk/files/fltk-1.3.4-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.4-conf-tests.patch
new file mode 100644 (file)
index 0000000..994df56
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.4-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.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
new file mode 100644 (file)
index 0000000..c31768f
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2017 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-proto/xextproto
+       doc? ( app-doc/doxygen )
+       xinerama? ( x11-proto/xineramaproto )
+"
+
+DOCS=(
+       ANNOUNCEMENT
+       CHANGES
+       CREDITS
+       README
+)
+FLTK_GAMES="
+       blocks
+       checkers
+       sudoku
+"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.3.0-share.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.4-conf-tests.patch
+)
+
+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.ac || die
+
+       # also in Makefile:config.guess config.sub:
+       cp misc/config.{guess,sub} . || die
+
+       cp fluid/{,x-}fluid.desktop || die
+
+       eautoconf
+       multilib_copy_sources
+}
+
+multilib_src_configure() {
+       unset FLTK_LIBDIRS
+
+       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
+}