x11-libs/fltk: Fix live ebuilds (bug #650700 by jospezial).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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 (file)
index 0000000..994df56
--- /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 f98e30fbf2cd4fd0b79d0fcb6584306c82421a2b..f85727938fd2abc454e58cff30f9ba0477c8d2b8 100644 (file)
--- 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 9eff8eea2f90d8f9280ff3aed25614e2171ae1d0..85a0f7d8365b01becbf7102972bd7a8e98344937 100644 (file)
--- 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