summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2018-03-17 13:47:58 +0100
committerJeroen Roovers <jer@gentoo.org>2018-03-17 13:48:11 +0100
commit8b9156eb02b9d6811ec208dd14729d2428be09b2 (patch)
tree4dd04433c55afd08c56dba3670f8178468ad0cd9 /x11-libs
parentmedia-libs/glew: stable 2.1.0 for sparc, bug #649078 (diff)
downloadgentoo-8b9156eb02b9d6811ec208dd14729d2428be09b2.tar.gz
gentoo-8b9156eb02b9d6811ec208dd14729d2428be09b2.tar.bz2
gentoo-8b9156eb02b9d6811ec208dd14729d2428be09b2.zip
x11-libs/fltk: Fix live ebuilds (bug #650700 by jospezial).
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch55
-rw-r--r--x11-libs/fltk/fltk-1.3.9999.ebuild6
-rw-r--r--x11-libs/fltk/fltk-1.4.9999.ebuild4
3 files changed, 60 insertions, 5 deletions
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 00000000000..994df56ad36
--- /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 f98e30fbf2c..f85727938fd 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 9eff8eea2f9..85a0f7d8365 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