From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 890A81382C5 for ; Sat, 17 Mar 2018 12:48:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7018EE0801; Sat, 17 Mar 2018 12:48:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 334ABE0801 for ; Sat, 17 Mar 2018 12:48:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64064335C82 for ; Sat, 17 Mar 2018 12:48:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D2A8232 for ; Sat, 17 Mar 2018 12:48:13 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1521290891.8b9156eb02b9d6811ec208dd14729d2428be09b2.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch x11-libs/fltk/fltk-1.3.9999.ebuild x11-libs/fltk/fltk-1.4.9999.ebuild X-VCS-Directories: x11-libs/fltk/ x11-libs/fltk/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 8b9156eb02b9d6811ec208dd14729d2428be09b2 X-VCS-Branch: master Date: Sat, 17 Mar 2018 12:48:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a48c4520-969f-4aab-8acb-2c8522654b47 X-Archives-Hash: ba59ef48a89b7e09346780dda1dd8496 commit: 8b9156eb02b9d6811ec208dd14729d2428be09b2 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Mar 17 12:47:58 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Mar 17 12:48:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9156eb x11-libs/fltk: Fix live ebuilds (bug #650700 by jospezial). Package-Manager: Portage-2.3.24, Repoman-2.3.6 x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch | 55 ++++++++++++++++++++++ x11-libs/fltk/fltk-1.3.9999.ebuild | 6 +-- x11-libs/fltk/fltk-1.4.9999.ebuild | 4 +- 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