[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
commit: e67e2dfb1c97c5a13d23faf243e5c9c0e2a23c4d
Author: Eli Schwartz gmail com>
AuthorDate: Mon Mar 18 04:47:33 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 18 05:30:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e67e2dfb
x11-libs/fltk: try to re-sync the live ebuild for 1.4
Some DOCS files disappeared, some patches needed to be rerolled.
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
x11-libs/fltk/files/fltk-1.4.-cmake.patch | 19 ++
x11-libs/fltk/files/fltk-1.4.-conf-tests.patch | 42 ++
.../fltk/files/fltk-1.4.-makefile-dirs.patch | 14
x11-libs/fltk/files/fltk-1.4.-optim.patch | 13 +++
x11-libs/fltk/fltk-1.4..ebuild | 14 +++-
5 files changed, 92 insertions(+), 10 deletions(-)
diff --git a/x11-libs/fltk/files/fltk-1.4.-cmake.patch
b/x11-libs/fltk/files/fltk-1.4.-cmake.patch
new file mode 100644
index ..3f576d501ece
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.-cmake.patch
@@ -0,0 +1,19 @@
+diff --git a/configure.ac b/configure.ac
+index 6b64110b0..1330d3f27 100644
+--- a/configure.ac
b/configure.ac
+@@ -1878,10 +1878,13 @@ dnl Set empty BINARY_DIR variable for fltk-config.in
(CMake compatibility)
+ BINARY_DIR=
+ AC_SUBST([BINARY_DIR])
+
++INCLUDE_DIRS="${includedir}"
++AC_SUBST(INCLUDE_DIRS)
++
+ dnl Write all of the files...
+ AC_CONFIG_HEADERS([config.h:configh.in])
+ AC_CONFIG_HEADERS([FL/fl_config.h:fl_config.in])
+-AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])
++AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile
CMake/FLTKConfig.cmake])
+ AC_OUTPUT
+
+ dnl Make sure the fltk-config script is executable...
diff --git a/x11-libs/fltk/files/fltk-1.4.-conf-tests.patch
b/x11-libs/fltk/files/fltk-1.4.-conf-tests.patch
new file mode 100644
index ..47db8d03c8d2
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.-conf-tests.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index 2d99808d9..283f825dd 100644
+--- a/Makefile
b/Makefile
+@@ -103,9 +103,6 @@ makeinclude: configure configh.in makeinclude.in
+ touch config.h
+ chmod +x fltk-config
+
+-configure: configure.ac
+- autoconf
+-
+ portable-dist:
+ epm -v -s fltk.xpm fltk
+
+diff --git a/documentation/Makefile b/documentation/Makefile
+index 0b176246b..882fbf8a4 100644
+--- a/documentation/Makefile
b/documentation/Makefile
+@@ -91,12 +91,6 @@ install: $(MANPAGES)
+ $(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_MAN) $(SRC_DOCDIR)/fltk-options.$(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
+@@ -105,10 +99,6 @@ install: $(MANPAGES)
+ $(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
diff --git a/x11-libs/fltk/files/fltk-1.4.-makefile-dirs.patch
b/x11-libs/fltk/files/fltk-1.4.-makefile-dirs.patch
new file mode 100644
index ..e49aa7408cca
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.-makefile-dirs.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index c02de0972..2d99808d9 100644
+--- a/Makefile
b/Makefile
+@@ -16,8 +16,7 @@
+
+ include makeinclude
+
+-DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options
test \
+- documentation
++DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fltk-options
+
+ all: makeinclude fltk-config
+ for dir in $(DIRS); do\
diff --git a/x11-libs/fltk/files/fltk-1.4.-optim.patch
b/x11-libs/fltk/files/fltk-1.4.-optim.patch
new file mode 100644
index ..a1e18bbb74b2
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.-optim.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: d79f8adf86c5f218fe84de0afcd09fe6a0089532 Author: Eli Schwartz gmail com> AuthorDate: Mon Mar 18 04:03:13 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 18 05:30:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79f8adf x11-libs/fltk: add github upstream metadata Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> x11-libs/fltk/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml index c232dc3b2e1f..cc385decf7fd 100644 --- a/x11-libs/fltk/metadata.xml +++ b/x11-libs/fltk/metadata.xml @@ -9,6 +9,9 @@ GLUT emulation. FLTK also includes a UI builder called FLUID that can be used to create applications. + + fltk/fltk + Builds and installs some extra games
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 317780bee16c2aa9a60faac3e6df911ee3d2a5f9
Author: Eli Schwartz gmail com>
AuthorDate: Mon Mar 18 05:00:43 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 18 05:30:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317780be
x11-libs/fltk: mark as LTO-unsafe
It works in 1.4. so just marking unsafe for existing versions and
assuming it will shake out eventually whenever 1.4 is finally released.
Closes: https://bugs.gentoo.org/881107
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 5 +
x11-libs/fltk/fltk-1.3.8.ebuild| 5 +
x11-libs/fltk/fltk-1.3..ebuild | 5 +
3 files changed, 15 insertions(+)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index e21dcd6f8914..ad957e104713 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -93,6 +93,11 @@ src_prepare() {
}
multilib_src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/881107
+ # Seems to be fixed in git (1.4.)
+ filter-lto
+
unset FLTK_LIBDIRS
local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
diff --git a/x11-libs/fltk/fltk-1.3.8.ebuild b/x11-libs/fltk/fltk-1.3.8.ebuild
index b287bf5fb251..710e3997f2a9 100644
--- a/x11-libs/fltk/fltk-1.3.8.ebuild
+++ b/x11-libs/fltk/fltk-1.3.8.ebuild
@@ -98,6 +98,11 @@ src_prepare() {
}
multilib_src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/881107
+ # Seems to be fixed in git (1.4.)
+ filter-lto
+
unset FLTK_LIBDIRS
local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index ddbc8c24006c..8362de128971 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -99,6 +99,11 @@ src_prepare() {
}
multilib_src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/881107
+ # Seems to be fixed in git (1.4.)
+ filter-lto
+
local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 4ff724295a9606c50a6017bb67c28f0760dc01a4
Author: Huang Rui gmail com>
AuthorDate: Fri Sep 1 01:48:48 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Oct 6 16:55:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff72429
x11-libs/fltk: add 1.3.8
Closes: https://bugs.gentoo.org/847607
Signed-off-by: Huang Rui gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32543
Signed-off-by: Joonas Niilola gentoo.org>
x11-libs/fltk/Manifest | 1 +
x11-libs/fltk/fltk-1.3.8.ebuild | 191
2 files changed, 192 insertions(+)
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index e624e9ce136e..3864bc146832 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1 +1,2 @@
DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B
df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e
SHA512
db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
+DIST fltk-1.3.8-source.tar.gz 5335306 BLAKE2B
8c2d2fca4243c0e7c5a8aa46083940f99c8b3e7873d39d6e590a4b66587876393f209e5e7e5eaf4a4cc13f0f97cb03671d97129853b0146eeab409aaf687935e
SHA512
5c1cbfc156c49888e25b90dcb9b1ab86a03447e08e00864c3c7ae8a0e32cfbd9154ee630054235c9edfd29fd1d0371ae77eff7b78094fb660dbbdec5cecfc8fb
diff --git a/x11-libs/fltk/fltk-1.3.8.ebuild b/x11-libs/fltk/fltk-1.3.8.ebuild
new file mode 100644
index ..a6c783843bb9
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.8.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal xdg
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="https://www.fltk.org/";
+SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
+
+RDEPEND="
+ media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${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}
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ doc? ( app-doc/doxygen )
+"
+DOCS=(
+ ANNOUNCEMENT
+ CHANGES
+ CHANGES_1.0
+ CHANGES_1.1
+ CREDITS
+ README
+ README.abi-version.txt
+ README.Cairo.txt
+ README.CMake.txt
+ README.MSWindows.txt
+ README.OSX.txt
+ README.Unix.txt
+)
+FLTK_GAMES="
+ blocks
+ checkers
+ sudoku
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.0-share.patch
+ "${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+ "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+ "${FILESDIR}"/${PN}-1.3.3-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
+ sed -i \
+ -e '/x-fluid/d' fluid/Makefile || die
+ sed -i \
+ -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
+ -e '/^LDFLAGS=/d' \
+ "${S}/fltk-config.in" || die
+ # docs in proper docdir
+ sed -i \
+ -e "/^docdir/s:fltk:${PF}/html:" \
+ -e "/SILENT:/d" \
+ makeinclude.in || die
+
+ # also in Makefile:config.guess config.sub:
+ cp misc/config.{guess,sub} . || die
+
+ cp fluid/{,x-}fluid.desktop || die
+
+ eaclocal
+ 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)
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 1b76156a47c17141a361a2f5b2d78c22cebd1ae7
Author: WANG Xuerui gentoo org>
AuthorDate: Sun Aug 14 01:16:48 2022 +
Commit: WANG Xuerui gentoo org>
CommitDate: Sun Aug 14 03:19:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b76156a
x11-libs/fltk: keyword 1.3.5-r4 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 1a6451f842ff..d9f3a1e15b87 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
sparc x86 ~amd64-linux ~x86-linux"
IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 9350ee0c61b324e2328f1efe72b2a8af41153efc Author: Jonas Stein gentoo org> AuthorDate: Sun Mar 28 00:33:43 2021 + Commit: Jonas Stein gentoo org> CommitDate: Sun Mar 28 00:33:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9350ee0c x11-libs/fltk: drop project desktop-misc Drop project desktop-misc from the list of maintainers. Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Jonas Stein gentoo.org> x11-libs/fltk/metadata.xml | 17 +++-- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml index 19be30c1abe..4fef3c8a856 100644 --- a/x11-libs/fltk/metadata.xml +++ b/x11-libs/fltk/metadata.xml @@ -1,18 +1,15 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - desktop-m...@gentoo.org - Gentoo Desktop Miscellaneous Project - + - The Fast Light ToolKit is a cross-platform C++ user interface - toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI - functionality and supports 3D graphics via OpenGL and its built-in - GLUT emulation. FLTK also includes a UI builder called FLUID that - can be used to create applications. + The Fast Light ToolKit is a cross-platform C++ user interface + toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI + functionality and supports 3D graphics via OpenGL and its built-in + GLUT emulation. FLTK also includes a UI builder called FLUID that + can be used to create applications. - Builds and installs some extra games + Builds and installs some extra games
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 36732667fb7607a34b84e3174b722feced7ad53b
Author: Sam James gentoo org>
AuthorDate: Fri Nov 6 15:19:46 2020 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 6 15:19:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36732667
x11-libs/fltk: Stabilize 1.3.5-r4 arm64, #709830
Signed-off-by: Sam James gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index bcc3ab8584a..63067421100 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux ~x86-macos"
IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
commit: c7a63e556e7cd4bf09b9e769dfc7ec5f974592d7
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Jul 13 08:02:39 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Jul 13 08:02:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a63e55
x11-libs/fltk: add AR autodetection with tuple prefix
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/fltk/files/fltk-1.3.5-AR.patch | 11 +++
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/x11-libs/fltk/files/fltk-1.3.5-AR.patch
b/x11-libs/fltk/files/fltk-1.3.5-AR.patch
new file mode 100644
index 000..34dbc8769f0
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.5-AR.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
b/configure.ac
+@@ -430,7 +430,7 @@ AC_PATH_PROG(DOXYDOC,doxygen)
+
+ dnl How do we make libraries?
+ AC_PROG_RANLIB
+-AC_PATH_TOOL(AR, ar)
++AC_CHECK_TOOL(AR, ar)
+
+ if test "x$AR" = "x:"; then
+ AC_MSG_ERROR([Configure could not find the library archiver, aborting.])
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 56edcb354e2..bcc3ab8584a 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
"${FILESDIR}"/${PN}-1.3.5-cmake.patch
"${FILESDIR}"/${PN}-1.3.5-optim.patch
+ "${FILESDIR}"/${PN}-1.3.5-AR.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/
commit: e925b88ca50798e00fecac29c0f0fb1c25870ec4
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Mar 13 08:15:18 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Mar 13 08:15:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e925b88c
x11-libs/fltk: Old
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/Manifest | 2 -
x11-libs/fltk/files/FLTKConfig.cmake | 37
x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch| 55 --
x11-libs/fltk/files/fltk-1.3.2-desktop.patch | 19 ---
x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch | 22 ---
.../fltk/files/fltk-1.3.3-fl_open_display.patch| 10 --
.../fltk/files/fltk-1.3.3-xutf8-visibility.patch | 165 --
.../fltk/files/fltk-1.3.4-freetype_pkgconfig.patch | 33
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 165 --
x11-libs/fltk/fltk-1.3.4.ebuild| 187 -
10 files changed, 695 deletions(-)
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index b00e46dfe50..e624e9ce136 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,3 +1 @@
-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
diff --git a/x11-libs/fltk/files/FLTKConfig.cmake
b/x11-libs/fltk/files/FLTKConfig.cmake
deleted file mode 100644
index 09427aac2aa..000
--- a/x11-libs/fltk/files/FLTKConfig.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-#-
-#
-# FLTKConfig.cmake - FLTK CMake configuration file for external projects.
-#
-# This file is configured by FLTK and used by the UseFLTK.cmake module
-# to load FLTK's settings for an external project.
-
-# The FLTK source tree.
-# SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
-
-# The FLTK include file directories.
-SET(FLUID_COMMAND "/usr/bin/fluid")
-SET(FLTK_EXECUTABLE_DIRS "/usr/bin")
-SET(FLTK_LIBRARY_DIRS "/usr/lib")
-SET(FLTK_LIBRARIES "fltk_images;fltk_gl;fltk_forms;fltk")
-SET(FLTK_INCLUDE_DIRS "/usr/include")
-
-# The C and C++ flags added by FLTK to the cmake-configured flags.
-SET(FLTK_REQUIRED_C_FLAGS "")
-SET(FLTK_REQUIRED_CXX_FLAGS "")
-
-# The FLTK version number
-SET(FLTK_VERSION_MAJOR "1")
-SET(FLTK_VERSION_MINOR "1")
-SET(FLTK_VERSION_PATCH "7")
-
-# Is FLTK using shared libraries?
-SET(FLTK_BUILD_SHARED_LIBS "ON")
-# SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
-
-# The location of the UseFLTK.cmake file.
-SET(FLTK11_USE_FILE "/usr/share/cmake/Modules/FLTKUse.cmake")
-
-# # The ExodusII library dependencies.
-# IF(NOT FLTK_NO_LIBRARY_DEPENDS)
-# INCLUDE("@FLTK_LIBRARY_DEPENDS_FILE@")
-# ENDIF(NOT FLTK_NO_LIBRARY_DEPENDS)
diff --git a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
deleted file mode 100644
index 74022a72ffb..000
--- a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
a/Makefile
-+++ b/Makefile
-@@ -100,9 +103,6 @@
- touch config.h
- chmod +x fltk-config
-
--configure: configure.in
-- 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
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 7b7f90105d850dea5530fe800e56abbc9a3a50d5
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Mar 13 08:11:24 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Mar 13 08:15:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7f9010
x11-libs/fltk: stable for hppa (bug #712216)
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 524f578813a..75d54f5bbf1 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux ~x86-macos"
IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: c7ae3952af6834c36c8cfd2d71663c2ea1a34fc3
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 12 16:26:16 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 12 16:26:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ae3952
x11-libs/fltk: x86 stable wrt bug #712216
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 7ea04bcdf2d..524f578813a 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux ~x86-macos"
IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 0272bf6a71ecd945c20cccdae55ea6b4db346cd2
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 12 16:25:36 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 12 16:25:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0272bf6a
x11-libs/fltk: sparc stable wrt bug #712216
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 8e148e6db5a..7ea04bcdf2d 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: d96d3f4765ec5e8ec703fc53419185af8ca0622b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 12 16:24:24 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 12 16:24:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96d3f47
x11-libs/fltk: ppc64 stable wrt bug #712216
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 30a605f73a3..8e148e6db5a 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 3513c6f2148457af9ce7a4b05b0a2b96bafce602
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 12 16:23:40 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 12 16:23:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3513c6f2
x11-libs/fltk: ppc stable wrt bug #712216
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 97f0c3a74f7..30a605f73a3 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: c4003bed8ef2742d346d2ae9d0f4076631843cd5
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 12 16:23:04 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 12 16:23:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4003bed
x11-libs/fltk: ia64 stable wrt bug #712216
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 65b1a20492e..97f0c3a74f7 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: eec816035508875e8081ce3a30293db0661d7029
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 12 16:22:28 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 12 16:22:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec81603
x11-libs/fltk: arm stable wrt bug #712216
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 56022d488d5..65b1a20492e 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: ded5594d1054d599d4a12cd14c3242e9c12cd99e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 12 16:21:26 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 12 16:21:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded5594d
x11-libs/fltk: amd64 stable wrt bug #712216
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 30f91c3198f..56022d488d5 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
SLOT="1"
LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x86-macos"
IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 745eefab326308df4f34fe19685b3737c155ee68 Author: David Seifert gentoo org> AuthorDate: Sat Feb 15 10:03:12 2020 + Commit: David Seifert gentoo org> CommitDate: Sat Feb 15 10:03:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=745eefab x11-libs/fltk: [QA] inherit ltprune.eclass directly Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> x11-libs/fltk/fltk-1.3.3-r3.ebuild | 2 +- x11-libs/fltk/fltk-1.3.4.ebuild| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild index 6edd643dcea..6fecfbecb1e 100644 --- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild +++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild @@ -3,7 +3,7 @@ EAPI=5 -inherit autotools eutils fdo-mime flag-o-matic +inherit autotools eutils fdo-mime flag-o-matic ltprune DESCRIPTION="C++ user interface toolkit for X and OpenGL" HOMEPAGE="https://www.fltk.org/"; diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild index a390fa4097e..b8168ff9699 100644 --- a/x11-libs/fltk/fltk-1.3.4.ebuild +++ b/x11-libs/fltk/fltk-1.3.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools fdo-mime flag-o-matic multilib-minimal +inherit autotools fdo-mime flag-o-matic ltprune multilib-minimal DESCRIPTION="C++ user interface toolkit for X and OpenGL" HOMEPAGE="https://www.fltk.org/";
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 4f8306eba2f75cb573153b1280a9d8c9bf890135
Author: Aaron Bauman gentoo org>
AuthorDate: Sat Nov 23 02:08:31 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sat Nov 23 02:08:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8306eb
x11-libs/fltk: fix BadInsIntoDir QA issue
Signed-off-by: Aaron Bauman gentoo.org>
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 6 --
x11-libs/fltk/fltk-1.3.4.ebuild| 5 +++--
x11-libs/fltk/fltk-1.3.5-r4.ebuild | 5 +++--
x11-libs/fltk/fltk-1.3..ebuild | 5 +++--
x11-libs/fltk/fltk-1.4..ebuild | 5 +++--
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 74e6007fed1..01db48d25b2 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -2,6 +2,7 @@
# 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"
@@ -112,6 +113,7 @@ src_install() {
emake -C fluid \
DESTDIR="${D}" install-linux
+
if use doc; then
emake -C documentation \
DESTDIR="${D}" install
@@ -134,8 +136,8 @@ src_install() {
dodoc CHANGES README CREDITS ANNOUNCEMENT
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins test/*.{h,cxx,fl} test/demo.menu
+ docinto examples
+ dodoc -r test/*.{h,cxx,fl} test/demo.menu
fi
insinto /usr/share/cmake/Modules
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index b1dbc2b941e..a390fa4097e 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -2,6 +2,7 @@
# 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"
@@ -157,8 +158,8 @@ multilib_src_install_all() {
done
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins test/*.{h,cxx,fl} test/demo.menu
+ docinto examples
+ dodoc -r test/*.{h,cxx,fl} test/demo.menu
fi
insinto /usr/share/cmake/Modules
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 7af2106929b..30f91c3198f 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools flag-o-matic xdg-utils multilib-minimal
DESCRIPTION="C++ user interface toolkit for X and OpenGL"
@@ -162,8 +163,8 @@ multilib_src_install_all() {
done
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins test/*.{h,cxx,fl} test/demo.menu
+ docinto examples
+ dodoc -r test/*.{h,cxx,fl} test/demo.menu
fi
insinto /usr/share/cmake/Modules
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index f8b095c4b45..de2c6eb095e 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal
DESCRIPTION="C++ user interface toolkit for X and OpenGL"
@@ -170,8 +171,8 @@ multilib_src_install_all() {
done
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins test/*.{h,cxx,fl} test/demo.menu
+ docinto examples
+ dodoc -r test/*.{h,cxx,fl} test/demo.menu
fi
insinto /usr/share/cmake/Modules
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index 7940dc7b3ef..4ab26198da7 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal
DESCRIPTION="C++ user interface toolkit for X and OpenGL"
@@ -174,8 +175,8 @@ multilib_src_install_all() {
done
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins test/*.{h,cxx,fl} test/demo.menu
+ docinto examples
+ dodoc -r test/*.{h,cxx,fl} test/demo.menu
fi
insinto /usr/share/cmake/Modules
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
commit: 2abc8d0bb878cfa6804571de88b8b0c28e79fb99
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Nov 15 22:20:37 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Nov 15 22:21:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2abc8d0b
x11-libs/fltk: Maybe fix FLTK_INCLUDE_DIRS in cmake files
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Bug: https://bugs.gentoo.org/show_bug.cgi?id=462776
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/files/fltk-1.3.5-cmake.patch | 33 ++
x11-libs/fltk/files/fltk-1.3.5-optim.patch | 11
.../{fltk-1.3.5-r3.ebuild => fltk-1.3.5-r4.ebuild} | 6 ++--
x11-libs/fltk/fltk-1.3..ebuild | 6 ++--
x11-libs/fltk/fltk-1.4..ebuild | 6 ++--
5 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
new file mode 100644
index 000..1eac250248d
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
@@ -0,0 +1,33 @@
+--- a/configure.ac
b/configure.ac
+@@ -57,6 +57,7 @@
+ FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
+ FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0
+ FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION}
++FLTK_VERSION_FULL=${FL_VERSION}
+
+ AC_SUBST(FL_MAJOR_VERSION)
+ AC_SUBST(FL_MINOR_VERSION)
+@@ -64,6 +65,7 @@
+ AC_SUBST(FL_DSO_VERSION)
+ AC_SUBST(FL_ABI_VERSION)
+ AC_SUBST(FL_VERSION)
++AC_SUBST(FLTK_VERSION_FULL)
+
+ AC_SUBST(ARCHFLAGS)
+ AC_SUBST(OPTIM)
+@@ -1576,10 +1578,13 @@
+ BINARY_DIR=
+ AC_SUBST(BINARY_DIR)
+
++INCLUDE_DIRS="${includedir}"
++AC_SUBST(INCLUDE_DIRS)
++
+ dnl Write all of the files...
+ AC_CONFIG_HEADER(config.h:configh.in)
+ AC_CONFIG_HEADER(FL/abi-version.h:abi-version.in)
+-AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])
++AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile
CMake/FLTKConfig.cmake])
+ AC_OUTPUT
+
+ dnl Make sure the fltk-config script is executable...
diff --git a/x11-libs/fltk/files/fltk-1.3.5-optim.patch
b/x11-libs/fltk/files/fltk-1.3.5-optim.patch
new file mode 100644
index 000..4d1512d749d
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.5-optim.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
b/configure.ac
+@@ -1265,7 +1265,7 @@
+ if test "x$with_optim" != x; then
+ OPTIM="$with_optim $OPTIM"
+ else
+- OPTIM="-Os $OPTIM"
++ OPTIM=" $OPTIM"
+ fi
+ fi
+
diff --git a/x11-libs/fltk/fltk-1.3.5-r3.ebuild
b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
similarity index 96%
rename from x11-libs/fltk/fltk-1.3.5-r3.ebuild
rename to x11-libs/fltk/fltk-1.3.5-r4.ebuild
index f7f98303c4b..7af2106929b 100644
--- a/x11-libs/fltk/fltk-1.3.5-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -63,6 +63,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
"${FILESDIR}"/${PN}-1.3.3-visibility.patch
"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+ "${FILESDIR}"/${PN}-1.3.5-cmake.patch
+ "${FILESDIR}"/${PN}-1.3.5-optim.patch
)
src_prepare() {
@@ -77,10 +79,6 @@ src_prepare() {
-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
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index 66dbf39fd1a..f8b095c4b45 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -63,6 +63,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.3.-conf-tests.patch
"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
"${FILESDIR}"/${PN}-1.3.3-visibility.patch
+ "${FILESDIR}"/${PN}-1.3.5-cmake.patch
+ "${FILESDIR}"/${PN}-1.3.5-optim.patch
)
pkg_setup() {
@@ -87,10 +89,6 @@ src_prepare() {
-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
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index d18d64075f1..7940dc7b3ef 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -67,6 +67,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.3.0-share.patch
"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+ "${FILESDIR}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 80ed111c898ffc301e03cf05e348a6be73725a67
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Nov 15 09:15:10 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Nov 15 10:05:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ed111c
x11-libs/fltk: Use relative symlinks in /usr/share/pixmaps
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/{fltk-1.3.5-r2.ebuild => fltk-1.3.5-r3.ebuild} | 2 +-
x11-libs/fltk/fltk-1.3..ebuild | 2 +-
x11-libs/fltk/fltk-1.4..ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r2.ebuild
b/x11-libs/fltk/fltk-1.3.5-r3.ebuild
similarity index 98%
rename from x11-libs/fltk/fltk-1.3.5-r2.ebuild
rename to x11-libs/fltk/fltk-1.3.5-r3.ebuild
index 0ceb2b0f579..f7f98303c4b 100644
--- a/x11-libs/fltk/fltk-1.3.5-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r3.ebuild
@@ -159,7 +159,7 @@ multilib_src_install() {
multilib_src_install_all() {
for app in fluid $(usex games "${FLTK_GAMES}" ''); do
dosym \
- /usr/share/icons/hicolor/32x32/apps/${app}.png \
+ ../icons/hicolor/32x32/apps/${app}.png \
/usr/share/pixmaps/${app}.png
done
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index 20084c2f9cf..66dbf39fd1a 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -167,7 +167,7 @@ multilib_src_install() {
multilib_src_install_all() {
for app in fluid $(usex games "${FLTK_GAMES}" ''); do
dosym \
- /usr/share/icons/hicolor/32x32/apps/${app}.png \
+ ../icons/hicolor/32x32/apps/${app}.png \
/usr/share/pixmaps/${app}.png
done
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index 7ceec40d327..d18d64075f1 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -171,7 +171,7 @@ multilib_src_install() {
multilib_src_install_all() {
for app in fluid $(usex games "${FLTK_GAMES}" ''); do
dosym \
- /usr/share/icons/hicolor/32x32/apps/${app}.png \
+ ../icons/hicolor/32x32/apps/${app}.png \
/usr/share/pixmaps/${app}.png
done
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: c409ac36fdb2bb4a88b72ef74ce551a56a2da2c1
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Nov 15 08:46:34 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Nov 15 10:05:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c409ac36
x11-libs/fltk: Install /usr/bin/fluid
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Fixes: https://bugs.gentoo.org/700144
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/fltk-1.3..ebuild | 2 +-
x11-libs/fltk/fltk-1.4..ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index f5904db08e2..b7c72acd443 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -151,7 +151,7 @@ multilib_src_install() {
if multilib_is_native_abi; then
emake -C fluid \
- DESTDIR="${D}" install-linux
+ DESTDIR="${D}" install-linux install
use doc &&
emake -C documentation \
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index 11e65454e79..40a661a0e69 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -155,7 +155,7 @@ multilib_src_install() {
if multilib_is_native_abi; then
emake -C fluid \
- DESTDIR="${D}" install-linux
+ DESTDIR="${D}" install-linux install
use doc &&
emake -C documentation \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 8fb1a5665e05725f0ab3ed37be50e952017a2b56
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Nov 15 08:52:31 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Nov 15 10:05:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb1a566
x11-libs/fltk: Block sys-block/blocks when USE=games
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Bug: https://bugs.gentoo.org/661136
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 1 +
x11-libs/fltk/fltk-1.3.4.ebuild| 1 +
x11-libs/fltk/fltk-1.3.5-r2.ebuild | 1 +
x11-libs/fltk/fltk-1.3..ebuild | 1 +
x11-libs/fltk/fltk-1.4..ebuild | 1 +
5 files changed, 5 insertions(+)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index aaa5aa2bbd5..74e6007fed1 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
cairo? ( x11-libs/cairo[X] )
+ games? ( !sys-block/blocks )
opengl? ( virtual/glu virtual/opengl )
xft? ( x11-libs/libXft )
xinerama? ( x11-libs/libXinerama )
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index 14c0aafdc53..b1dbc2b941e 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXt[${MULTILIB_USEDEP}]
cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+ games? ( !sys-block/blocks )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
diff --git a/x11-libs/fltk/fltk-1.3.5-r2.ebuild
b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
index 1a7a9638b19..0ceb2b0f579 100644
--- a/x11-libs/fltk/fltk-1.3.5-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXt[${MULTILIB_USEDEP}]
cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+ games? ( !sys-block/blocks )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index b7c72acd443..20084c2f9cf 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -25,6 +25,7 @@ RDEPEND="
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXt[${MULTILIB_USEDEP}]
cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+ games? ( !sys-block/blocks )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index 40a661a0e69..7ceec40d327 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -24,6 +24,7 @@ RDEPEND="
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXt[${MULTILIB_USEDEP}]
cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+ games? ( !sys-block/blocks )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 145837bdd3fdde45c5f513f6892ced9c4d51feb5
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Apr 30 14:11:20 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Apr 30 14:11:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145837bd
x11-libs/fltk: Use HTTPS
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 6 +++---
x11-libs/fltk/fltk-1.3.4.ebuild| 6 +++---
x11-libs/fltk/fltk-1.3.5-r2.ebuild | 4 ++--
x11-libs/fltk/fltk-1.3..ebuild | 2 +-
x11-libs/fltk/fltk-1.4..ebuild | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 93aea9c564e..e0631dc59cc 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.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index d06a2da1ff6..19245b16e22 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-r2.ebuild
b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
index 298567464eb..5688e630c5e 100644
--- a/x11-libs/fltk/fltk-1.3.5-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
@@ -5,8 +5,8 @@ EAPI=7
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"
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index a04dd6d8003..f5904db08e2 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -5,7 +5,7 @@ EAPI=7
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"
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index de3f947155d..11e65454e79 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -5,7 +5,7 @@ EAPI=7
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"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: b25676040ffc145791d68d52762bf5363c9b4e94
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Apr 30 14:01:29 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Apr 30 14:02:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2567604
x11-libs/fltk: Define DSOFLAGS
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Closes: https://bugs.gentoo.org/655246
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/{fltk-1.3.5-r1.ebuild => fltk-1.3.5-r2.ebuild} | 1 +
x11-libs/fltk/fltk-1.3..ebuild | 1 +
x11-libs/fltk/fltk-1.4..ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/x11-libs/fltk/fltk-1.3.5-r1.ebuild
b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
similarity index 99%
rename from x11-libs/fltk/fltk-1.3.5-r1.ebuild
rename to x11-libs/fltk/fltk-1.3.5-r2.ebuild
index ff8415f61c3..298567464eb 100644
--- a/x11-libs/fltk/fltk-1.3.5-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
@@ -119,6 +119,7 @@ multilib_src_configure() {
--enable-xfixes \
--includedir=${FLTK_INCDIR} \
--libdir=${FLTK_LIBDIR} \
+ DSOFLAGS="${LDFLAGS}" \
LDFLAGS="${LDFLAGS}"
}
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index a345644078c..a04dd6d8003 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -124,6 +124,7 @@ multilib_src_configure() {
--enable-xfixes \
--includedir=${FLTK_INCDIR} \
--libdir=${FLTK_LIBDIR} \
+ DSOFLAGS="${LDFLAGS}" \
LDFLAGS="${LDFLAGS}"
}
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index cd5e2392070..de3f947155d 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -128,6 +128,7 @@ multilib_src_configure() {
--enable-xfixes \
--includedir=${FLTK_INCDIR} \
--libdir=${FLTK_LIBDIR} \
+ DSOFLAGS="${LDFLAGS}" \
LDFLAGS="${LDFLAGS}"
}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: a3ca32c4eeec1346b530084f1d02161865dc761f
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Apr 30 11:27:21 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Apr 30 11:28:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ca32c4
x11-libs/fltk: fdo-mime => xdg-utils
Closes: https://bugs.gentoo.org/show_bug.cgi?id=655248
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/fltk-1.3.5-r1.ebuild | 6 +++---
x11-libs/fltk/fltk-1.3..ebuild | 6 +++---
x11-libs/fltk/fltk-1.4..ebuild | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r1.ebuild
b/x11-libs/fltk/fltk-1.3.5-r1.ebuild
index f5bad150013..ff8415f61c3 100644
--- a/x11-libs/fltk/fltk-1.3.5-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools fdo-mime flag-o-matic xdg-utils 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/";
@@ -183,11 +183,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..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index 5750e09a02c..a345644078c 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools fdo-mime flag-o-matic git-r3 xdg-utils 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/";
@@ -191,11 +191,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..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index 6084621d31c..cd5e2392070 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools fdo-mime flag-o-matic git-r3 xdg-utils 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/";
@@ -195,11 +195,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
}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 35f7ee65a78a5d2b92336fde482fc47578f72937
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Apr 30 11:13:17 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Apr 30 11:22:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f7ee65
x11-libs/fltk: Old
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/fltk-1.3.3-r5.ebuild | 186 -
1 file changed, 186 deletions(-)
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 596b790d975..000
--- 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
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 106a4fee21c85fb39dfe0c12249ae69a44dc0b47
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Apr 30 11:21:53 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Apr 30 11:22:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106a4fee
x11-libs/fltk: Inject LDFLAGS
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=655246
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/fltk-1.3.5-r1.ebuild | 3 ++-
x11-libs/fltk/fltk-1.3..ebuild | 3 ++-
x11-libs/fltk/fltk-1.4..ebuild | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3.5-r1.ebuild
b/x11-libs/fltk/fltk-1.3.5-r1.ebuild
index edc10f24870..f5bad150013 100644
--- a/x11-libs/fltk/fltk-1.3.5-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r1.ebuild
@@ -118,7 +118,8 @@ multilib_src_configure() {
--enable-xdbe \
--enable-xfixes \
--includedir=${FLTK_INCDIR} \
- --libdir=${FLTK_LIBDIR}
+ --libdir=${FLTK_LIBDIR} \
+ LDFLAGS="${LDFLAGS}"
}
multilib_src_compile() {
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index 68c25259dd9..5750e09a02c 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -123,7 +123,8 @@ multilib_src_configure() {
--enable-xdbe \
--enable-xfixes \
--includedir=${FLTK_INCDIR} \
- --libdir=${FLTK_LIBDIR}
+ --libdir=${FLTK_LIBDIR} \
+ LDFLAGS="${LDFLAGS}"
}
multilib_src_compile() {
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index f184108a5c5..6084621d31c 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -127,7 +127,8 @@ multilib_src_configure() {
--enable-xdbe \
--enable-xfixes \
--includedir=${FLTK_INCDIR} \
- --libdir=${FLTK_LIBDIR}
+ --libdir=${FLTK_LIBDIR} \
+ LDFLAGS="${LDFLAGS}"
}
multilib_src_compile() {
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 606295350db997c08b4ed6db1ca8ff78647bc739
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Apr 30 11:12:11 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Apr 30 11:12:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60629535
x11-libs/fltk: Call xdg_icon_cache_update
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Closes: https://bugs.gentoo.org/655248
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/{fltk-1.3.5.ebuild => fltk-1.3.5-r1.ebuild} | 4 +++-
x11-libs/fltk/fltk-1.3..ebuild| 4 +++-
x11-libs/fltk/fltk-1.4..ebuild| 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3.5.ebuild
b/x11-libs/fltk/fltk-1.3.5-r1.ebuild
similarity index 97%
rename from x11-libs/fltk/fltk-1.3.5.ebuild
rename to x11-libs/fltk/fltk-1.3.5-r1.ebuild
index 008a5a20c95..edc10f24870 100644
--- a/x11-libs/fltk/fltk-1.3.5.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools fdo-mime flag-o-matic multilib-minimal
+inherit autotools fdo-mime flag-o-matic xdg-utils multilib-minimal
DESCRIPTION="C++ user interface toolkit for X and OpenGL"
HOMEPAGE="http://www.fltk.org/";
@@ -183,8 +183,10 @@ multilib_src_install_all() {
pkg_postinst() {
fdo-mime_desktop_database_update
+ xdg_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
+ xdg_icon_cache_update
}
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index 4171029d334..68c25259dd9 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -2,7 +2,7 @@
# 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 fdo-mime flag-o-matic git-r3 xdg-utils multilib-minimal
DESCRIPTION="C++ user interface toolkit for X and OpenGL"
HOMEPAGE="http://www.fltk.org/";
@@ -191,8 +191,10 @@ multilib_src_install_all() {
pkg_postinst() {
fdo-mime_desktop_database_update
+ xdg_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
+ xdg_icon_cache_update
}
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index 708271c605b..f184108a5c5 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -2,7 +2,7 @@
# 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 fdo-mime flag-o-matic git-r3 xdg-utils multilib-minimal
DESCRIPTION="C++ user interface toolkit for X and OpenGL"
HOMEPAGE="http://www.fltk.org/";
@@ -195,8 +195,10 @@ multilib_src_install_all() {
pkg_postinst() {
fdo-mime_desktop_database_update
+ xdg_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
+ xdg_icon_cache_update
}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: d45d5260416bd71ef3b08dde2f4905be0b9ea243
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Apr 8 19:10:44 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Apr 8 19:23:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45d5260
x11-libs/fltk: Update live ebuilds
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/fltk-1.3..ebuild | 36 +
x11-libs/fltk/fltk-1.4..ebuild | 47 +++---
2 files changed, 50 insertions(+), 33 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index cf4958abf3d..4171029d334 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -1,14 +1,13 @@
-# 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 subversion
+EAPI=7
+inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
DESCRIPTION="C++ user interface toolkit for X and OpenGL"
HOMEPAGE="http://www.fltk.org/";
-ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.3/";
-ESVN_USER=""
-ESVN_PASSWORD=""
+EGIT_REPO_URI="https://github.com/fltk/fltk";
+EGIT_OVERRIDE_BRANCH_FLTK_FLTK="branch-1.3"
SLOT="1"
LICENSE="FLTK LGPL-2"
@@ -35,23 +34,29 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
+ virtual/pkgconfig
x11-base/xorg-proto
doc? ( app-doc/doxygen )
"
-
DOCS=(
ANNOUNCEMENT
CHANGES
+ CHANGES_1.0
+ CHANGES_1.1
CREDITS
README
+ README.abi-version.txt
+ README.Cairo.txt
+ README.CMake.txt
+ README.MSWindows.txt
+ README.OSX.txt
+ README.Unix.txt
)
-
FLTK_GAMES="
blocks
checkers
sudoku
"
-
PATCHES=(
"${FILESDIR}"/${PN}-1.3.0-share.patch
"${FILESDIR}"/${PN}-1.3.-conf-tests.patch
@@ -144,22 +149,23 @@ multilib_src_install() {
if multilib_is_native_abi; then
emake -C fluid \
- DESTDIR="${D}" install-linux
+ DESTDIR="${D}" install-linux
use doc &&
emake -C documentation \
- DESTDIR="${D}" install
+ DESTDIR="${D}" install
use games &&
emake -C test \
- DESTDIR="${D}" install-linux
+ 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
+ dosym \
+ /usr/share/icons/hicolor/32x32/apps/${app}.png \
+ /usr/share/pixmaps/${app}.png
done
if use examples; then
@@ -180,7 +186,7 @@ multilib_src_install_all() {
rm "${ED}"/usr/lib*/fltk/*.a || die
fi
- prune_libtool_files
+ find "${D}" -name '*.la' -delete || die
}
pkg_postinst() {
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index 97500930d11..708271c605b 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -1,14 +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 subversion
+EAPI=7
+inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
DESCRIPTION="C++ user interface toolkit for X and OpenGL"
HOMEPAGE="http://www.fltk.org/";
-ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.4/";
-ESVN_USER=""
-ESVN_PASSWORD=""
+EGIT_REPO_URI="https://github.com/fltk/fltk";
SLOT="1"
LICENSE="FLTK LGPL-2"
@@ -35,23 +33,35 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
+ virtual/pkgconfig
x11-base/xorg-proto
doc? ( app-doc/doxygen )
"
-
DOCS=(
ANNOUNCEMENT
- CHANGES
- CREDITS
- README
+ CHANGES.txt
+ CHANGES_1.0.txt
+ CHANGES_1.1.txt
+ CHANGES_1.3.txt
+ CREDITS.txt
+ README.Android.md
+ README.CMake.txt
+ README.Cairo.txt
+ README.IDE.txt
+ README.Pico.txt
+ README.Unix.txt
+ README.Windows.txt
+ README.abi-version.txt
+ README.bundled-libs.txt
+ README.macOS.md
+ README.md
+ README.txt
)
-
FLTK_GAMES="
blocks
checkers
sudoku
"
-
PATCHES=(
"${FILESDIR}"/${PN}-1.3.0-share.patch
"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
@@ -143,22 +153,23 @@ m
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/
commit: a6a1ae491a9781d61625d79104d91558978683d2 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Apr 8 18:44:53 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Apr 8 19:23:04 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a1ae49 x11-libs/fltk: Clean up patch Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Jeroen Roovers gentoo.org> x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch index 70183412229..32dcd301634 100644 --- a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch +++ b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch @@ -1,5 +1,5 @@ fltk-1.3.4/configure.ac -+++ fltk-1.3.4/configure.ac +--- a/configure.ac b/configure.ac @@ -1005,13 +1005,13 @@ AC_ARG_ENABLE(xft, [ --enable-xftturn on Xft support [[default=yes]]])
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: ff5d95a9972275e1c45b676e4dd4f8fd425077ea
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Apr 8 19:22:28 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Apr 8 19:23:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5d95a9
x11-libs/fltk: Version 1.3.5
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers gentoo.org>
x11-libs/fltk/Manifest | 1 +
x11-libs/fltk/fltk-1.3.5.ebuild | 190
2 files changed, 191 insertions(+)
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index e99aaaf51d5..b00e46dfe50 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/x11-libs/fltk/fltk-1.3.5.ebuild b/x11-libs/fltk/fltk-1.3.5.ebuild
new file mode 100644
index 000..008a5a20c95
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.5.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~arm64 ~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}
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ doc? ( app-doc/doxygen )
+"
+DOCS=(
+ ANNOUNCEMENT
+ CHANGES
+ CHANGES_1.0
+ CHANGES_1.1
+ CREDITS
+ README
+ README.abi-version.txt
+ README.Cairo.txt
+ README.CMake.txt
+ README.MSWindows.txt
+ README.OSX.txt
+ README.Unix.txt
+)
+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
+
+ eaclocal
+ 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}"
+
+
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 63dc4f0de94dbcc20daac582c5b85e3471416fc7
Author: Lars Wendler gentoo org>
AuthorDate: Tue May 8 06:28:35 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue May 8 06:28:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63dc4f0d
x11-libs/fltk: Run eaclocal before eautoconf.
Thanks to Arfrever Frehtes Taifersar Arahesis for the analysis and the
suggested fix.
Closes: https://bugs.gentoo.org/655238
Package-Manager: Portage-2.3.36, Repoman-2.3.9
x11-libs/fltk/fltk-1.3.4.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index 4c20b2501ec..d8b4321dcc1 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -82,6 +82,7 @@ src_prepare() {
cp fluid/{,x-}fluid.desktop || die
+ eaclocal
eautoconf
multilib_copy_sources
}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/
commit: 42938eb5ccb07d39b4dcce0b6e04e30899e9925c
Author: Lars Wendler gentoo org>
AuthorDate: Mon May 7 21:01:12 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon May 7 21:01:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42938eb5
x11-libs/fltk: Use pkg-config to find freetype
Bug: https://bugs.gentoo.org/654752
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../fltk/files/fltk-1.3.4-freetype_pkgconfig.patch | 33 ++
x11-libs/fltk/fltk-1.3.4.ebuild| 2 ++
2 files changed, 35 insertions(+)
diff --git a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
new file mode 100644
index 000..70183412229
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
@@ -0,0 +1,33 @@
+--- fltk-1.3.4/configure.ac
fltk-1.3.4/configure.ac
+@@ -1005,13 +1005,13 @@
+ AC_ARG_ENABLE(xft, [ --enable-xftturn on Xft support
[[default=yes]]])
+
+ xft_found=no
+- if test x$enable_xft != xno; then
+- AC_PATH_PROG(FTCONFIG, freetype-config)
+-
+- if test "x$FTCONFIG" != x; then
+- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
+- CFLAGS="`$FTCONFIG --cflags` $CFLAGS"
+- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
++ AS_IF([test x$enable_xft != xno], [
++ PKG_PROG_PKG_CONFIG
++ PKG_CHECK_MODULES(FREETYPE, freetype2, [
++ CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
++ CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
++ CXXFLAGS="$FREETYPE_CFLAGS $CXXFLAGS"
++ ],AC_MSG_ERROR([No freetype found]))
+
+ AC_CHECK_LIB(fontconfig, FcPatternCreate)
+ AC_CHECK_HEADER(X11/Xft/Xft.h,
+@@ -1019,8 +1019,7 @@
+ [AC_DEFINE(USE_XFT)
+LIBS="-lXft $LIBS"
+xft_found=yes] ))
+- fi
+- fi
++ ])
+
+ dnl Issue a warning message if Xft was not found, abort configure
+ dnl if Xft was requested explicitly (but not found)
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index b1786d70018..4c20b2501ec 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
+ virtual/pkgconfig
x11-proto/xextproto
doc? ( app-doc/doxygen )
xinerama? ( x11-proto/xineramaproto )
@@ -56,6 +57,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
"${FILESDIR}"/${PN}-1.3.3-visibility.patch
"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+ "${FILESDIR}"/${PN}-1.3.4-freetype_pkgconfig.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: ab74f70750c42abf8539a913bc0c61f4e18c053c
Author: Alexey Korepanov yandex ru>
AuthorDate: Sat Mar 31 17:44:44 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Mar 31 19:00:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab74f707
x11-libs/fltk: keyword ~arm64
x11-libs/fltk/fltk-1.3.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index c31768f6fb4..b1786d70018 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.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
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/
commit: 8b9156eb02b9d6811ec208dd14729d2428be09b2
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Mar 17 12:47:58 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Mar 17 12:48:11 2018 +
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.-conf-tests.patch | 55 ++
x11-libs/fltk/fltk-1.3..ebuild | 6 +--
x11-libs/fltk/fltk-1.4..ebuild | 4 +-
3 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/x11-libs/fltk/files/fltk-1.3.-conf-tests.patch
b/x11-libs/fltk/files/fltk-1.3.-conf-tests.patch
new file mode 100644
index 000..994df56ad36
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.-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..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index f98e30fbf2c..f85727938fd 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..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.-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..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
index 9eff8eea2f9..85a0f7d8365 100644
--- a/x11-libs/fltk/fltk-1.4..ebuild
+++ b/x11-libs/fltk/fltk-1.4..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.
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: e4fc5583f9ffad29bf97ae5543c5b1866261cd6e
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun May 21 22:33:30 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun May 21 22:34:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4fc5583
x11-libs/fltk: Add live ebuild for new branch.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
x11-libs/fltk/fltk-1.4..ebuild | 192 +
1 file changed, 192 insertions(+)
diff --git a/x11-libs/fltk/fltk-1.4..ebuild
b/x11-libs/fltk/fltk-1.4..ebuild
new file mode 100644
index 000..9eff8eea2f9
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.4..ebuild
@@ -0,0 +1,192 @@
+# 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 subversion
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/";
+ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.4/";
+ESVN_USER=""
+ESVN_PASSWORD=""
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS=""
+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-makefile-dirs.patch
+ "${FILESDIR}"/${PN}-1.3.4-conf-tests.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
+ sed -i \
+ -e '/x-fluid/d' fluid/Makefile || die
+ sed -i \
+ -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
+ -e '/^LDFLAGS=/d' \
+ "${S}/fltk-config.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
+
+ use doc &&
+ e
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/
commit: 754159be072dc660d83025a14b708508a16ec49c
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun May 21 21:35:58 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun May 21 21:39:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754159be
x11-libs/fltk: Version bump (bug #602262 by Hanno Boeck).
Package-Manager: Portage-2.3.6, Repoman-2.3.2
x11-libs/fltk/Manifest | 1 +
x11-libs/fltk/files/fltk-1.3.4-conf-tests.patch | 55 +++
x11-libs/fltk/fltk-1.3.4.ebuild | 183
3 files changed, 239 insertions(+)
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index f7d69a4cf0e..6b91ec427f3 100644
--- 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
index 000..994df56ad36
--- /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
index 000..c31768f6fb4
--- /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-fb
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 814c4539fe80cc37d01c6506f585b3cadf29aa96
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Oct 6 09:33:50 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Oct 6 09:33:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=814c4539
x11-libs/fltk: install fluid executable; bug #595246
Package-Manager: portage-2.3.1
x11-libs/fltk/{fltk-1.3.3-r4.ebuild => fltk-1.3.3-r5.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r4.ebuild
b/x11-libs/fltk/fltk-1.3.3-r5.ebuild
similarity index 98%
rename from x11-libs/fltk/fltk-1.3.3-r4.ebuild
rename to x11-libs/fltk/fltk-1.3.3-r5.ebuild
index de7dc98..a6079f1 100644
--- a/x11-libs/fltk/fltk-1.3.3-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r5.ebuild
@@ -141,7 +141,7 @@ multilib_src_install() {
default
if multilib_is_native_abi; then
- emake -C fluid DESTDIR="${D}" install-linux
+ emake -C fluid DESTDIR="${D}" install-linux install
use doc && \
emake -C documentation DESTDIR="${D}" install
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/files/, x11-libs/fltk/
commit: 90be2edd265129a81dfccbc30288095d93f3d61e
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Sep 2 04:22:25 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Sep 2 04:27:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90be2edd
x11-libs/fltk: Add multilib support by James Le Cuirot (bug #592434).
Package-Manager: portage-2.3.0
x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch | 11 ++
x11-libs/fltk/fltk-1.3.3-r4.ebuild | 188 +
x11-libs/fltk/fltk-1.3..ebuild | 137 +--
3 files changed, 282 insertions(+), 54 deletions(-)
diff --git a/x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch
b/x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch
new file mode 100644
index ..089855c
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-makefile-dirs.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
b/Makefile
+@@ -18,7 +18,7 @@
+
+ include makeinclude
+
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR)
+
+ all: makeinclude fltk-config
+ for dir in $(DIRS); do\
diff --git a/x11-libs/fltk/fltk-1.3.3-r4.ebuild
b/x11-libs/fltk/fltk-1.3.3-r4.ebuild
new file mode 100644
index ..de7dc98
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.3-r4.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.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 \
+
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
commit: 0fad2b329f67ec94d2373e9d10bd2fd155aa9e6e
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Sep 2 03:34:06 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Sep 2 03:34:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fad2b32
x11-libs/fltk: Clean up patches.
Package-Manager: portage-2.3.0
x11-libs/fltk/files/fltk-1.3.0-share.patch | 5 -
x11-libs/fltk/files/fltk-1.3.2-desktop.patch | 8
x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch | 4 ++--
x11-libs/fltk/fltk-1.3..ebuild | 2 --
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/x11-libs/fltk/files/fltk-1.3.0-share.patch
b/x11-libs/fltk/files/fltk-1.3.0-share.patch
index 4b4267a..af2092a 100644
--- a/x11-libs/fltk/files/fltk-1.3.0-share.patch
+++ b/x11-libs/fltk/files/fltk-1.3.0-share.patch
@@ -1,8 +1,3 @@
- fluid/Makefile | 20 ++--
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/fluid/Makefile b/fluid/Makefile
-index 1cb3210..9d438a5 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -82,16 +82,16 @@ install: all
diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
index abec41a..ef72ba9 100644
--- a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
+++ b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
@@ -1,5 +1,5 @@
fltk-1.3.2/fluid/fluid.desktop
-+++ fltk-1.3.2/fluid/fluid.desktop
+--- a/fluid/fluid.desktop
b/fluid/fluid.desktop
@@ -6,5 +6,5 @@
Icon=fluid
Terminal=false
@@ -7,8 +7,8 @@
-MimeType=application/x-fluid
+MimeType=application/x-fluid;
Categories=Development;GUIDesigner;
fltk-1.3.2/fluid/x-fluid.desktop
-+++ fltk-1.3.2/fluid/x-fluid.desktop
+--- a/fluid/x-fluid.desktop
b/fluid/x-fluid.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=MimeType
diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
index 701f04c..ed487e7 100644
--- a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
+++ b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/479774
src/Fl_JPEG_Image.cxx
-+++ src/Fl_JPEG_Image.cxx
+--- a/src/Fl_JPEG_Image.cxx
b/src/Fl_JPEG_Image.cxx
@@ -155,7 +155,7 @@
jpeg_create_decompress(&dinfo);
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index 259d66e..7e769f7 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -39,10 +39,8 @@ DEPEND="
src_prepare() {
rm -rf zlib jpeg png || die
epatch \
- "${FILESDIR}"/${PN}-1.3.2-desktop.patch \
"${FILESDIR}"/${PN}-1.3.0-share.patch \
"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
- "${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
"${FILESDIR}"/${PN}-1.3.3-visibility.patch
sed -i \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: b1f9a64ddf0ec0def1ad373aafa46b62ed6512a2 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Aug 24 09:53:47 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Aug 24 09:53:47 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f9a64d x11-libs/fltk: Depend on x11-libs/cairo[X] (bug #591928). Package-Manager: portage-2.3.0 x11-libs/fltk/fltk-1.3.3-r3.ebuild | 3 +-- x11-libs/fltk/fltk-1.3..ebuild | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild index a40c233..3cf3eb8 100644 --- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild +++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild @@ -3,7 +3,6 @@ # $Id$ EAPI=5 - inherit autotools eutils fdo-mime flag-o-matic DESCRIPTION="C++ user interface toolkit for X and OpenGL" @@ -23,7 +22,7 @@ RDEPEND=" x11-libs/libSM x11-libs/libXext x11-libs/libXt - cairo? ( x11-libs/cairo ) + cairo? ( x11-libs/cairo[X] ) opengl? ( virtual/glu virtual/opengl ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) diff --git a/x11-libs/fltk/fltk-1.3..ebuild b/x11-libs/fltk/fltk-1.3..ebuild index 3f16aff..259d66e 100644 --- a/x11-libs/fltk/fltk-1.3..ebuild +++ b/x11-libs/fltk/fltk-1.3..ebuild @@ -24,7 +24,7 @@ RDEPEND=" x11-libs/libSM x11-libs/libXext x11-libs/libXt - cairo? ( x11-libs/cairo ) + cairo? ( x11-libs/cairo[X] ) opengl? ( virtual/glu virtual/opengl ) xinerama? ( x11-libs/libXinerama ) xft? ( x11-libs/libXft )
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
commit: 4632a04c6cad48622eb126c34839b8ae0fa9644c Author: Jeroen Roovers gentoo org> AuthorDate: Fri Aug 19 07:02:27 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Aug 19 07:02:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4632a04c x11-libs/fltk: Depend on virtual/glu by Robert Pearce (bug #591634). Package-Manager: portage-2.3.0 x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch | 79 x11-libs/fltk/files/fltk-1.3.1-as-needed.patch | 154 x11-libs/fltk/fltk-1.3.3-r3.ebuild | 43 --- x11-libs/fltk/fltk-1.3..ebuild | 42 --- 4 files changed, 45 insertions(+), 273 deletions(-) diff --git a/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch deleted file mode 100644 index f5e2a1f..000 --- a/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/Makefile b/Makefile -index ccec15c..747625e 100644 a/Makefile -+++ b/Makefile -@@ -27,7 +27,7 @@ - - include makeinclude - --DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation -+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid - - all: makeinclude fltk-config - for dir in $(DIRS); do\ -@@ -35,6 +35,10 @@ all: makeinclude fltk-config - (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ - done - -+check: all -+ $(MAKE) $(MFLAGS) -C test || exit 1 -+ -+ - install: makeinclude - -mkdir -p $(DESTDIR)$(bindir) - $(RM) $(DESTDIR)$(bindir)/fltk-config -@@ -109,9 +113,6 @@ makeinclude: configure configh.in makeinclude.in - touch config.h - chmod +x fltk-config - --configure: configure.in -- autoconf -- - portable-dist: - epm -v -s fltk.xpm fltk - -diff --git a/documentation/Makefile b/documentation/Makefile -index 1742cfa..8102c43 100644 a/documentation/Makefile -+++ b/documentation/Makefile -@@ -92,11 +92,6 @@ install: $(MANPAGES) - $(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 -@@ -104,10 +99,6 @@ install: $(MANPAGES) - $(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 -@@ -116,17 +107,11 @@ install-linux install-osx: - - 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/files/fltk-1.3.1-as-needed.patch b/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch deleted file mode 100644 index c6539fc..000 --- a/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch +++ /dev/null @@ -1,154 +0,0 @@ - cairo/Makefile |4 ++-- - configure.in |9 +++-- - src/Makefile | 24 - 3 files changed, 17 insertions(+), 20 deletions(-) - -diff --git a/cairo/Makefile b/cairo/Makefile -index 3cefc9f..445cd9c 100644 a/cairo/Makefile -+++ b/cairo/Makefile -@@ -48,13 +48,13 @@ $(CAIROLIBNAME): $(CAIROOBJECTS) - - libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk -+ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) - $(RM) libfltk_cairo.so - $(LN) $(CAI
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 30a59ebb6b5977514dec8097989690c001036b4b
Author: Manuel Rüger gentoo org>
AuthorDate: Tue Dec 22 16:42:04 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Tue Dec 22 16:42:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30a59ebb
x11-libs/fltk: Remove old
Package-Manager: portage-2.2.26
x11-libs/fltk/Manifest | 1 -
x11-libs/fltk/fltk-1.3.2.ebuild | 153
2 files changed, 154 deletions(-)
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 66b6807..f7d69a4 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,2 +1 @@
-DIST fltk-1.3.2-source.tar.gz 4260874 SHA256
176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4 SHA512
9372a34d8dfc4b4ece7632683c1c92f9ea9e538ba6eec08bec69615e2b2c885957d229a5ec495830f673b6a059f55a94b61727e8eb1fb7b3bd37005dc0b8312e
WHIRLPOOL
10c85d1ae50ccd3d9f66285483d39bc0e61b9f3306f87412841ceed9a45fd45f0476b28f7e7652658f6fcc48533d1ec4974a9eb98ca0f535b662a70209c1f781
DIST fltk-1.3.3-source.tar.gz 4986376 SHA256
f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 SHA512
277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
WHIRLPOOL
876a92e44dac20e6a2d86e4339a87185e708718d4cc59983bd81d5c3f0100d52230ef34d9c92800a2a07f6e7ed26e2ba9212c01ce898e7a184a7a35c40837761
diff --git a/x11-libs/fltk/fltk-1.3.2.ebuild b/x11-libs/fltk/fltk-1.3.2.ebuild
deleted file mode 100644
index 19d8ac5..000
--- a/x11-libs/fltk/fltk-1.3.2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils fdo-mime flag-o-matic versionator
-
-MY_P=${P/_}
-
-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 ~x86-fbsd
~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft
+xinerama"
-
-RDEPEND="
- >=media-libs/libpng-1.2:0
- virtual/jpeg:0
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- cairo? ( x11-libs/cairo )
- opengl? ( virtual/opengl )
- xinerama? ( x11-libs/libXinerama )
- xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
- x11-proto/xextproto
- doc? (
- app-doc/doxygen
- pdf? ( dev-texlive/texlive-latex )
- )
- xinerama? ( x11-proto/xineramaproto )"
-
-INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
-LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- rm -rf zlib jpeg png || die
- epatch \
- "${FILESDIR}"/${PN}-1.3.1-as-needed.patch \
- "${FILESDIR}"/${PN}-1.3.2-desktop.patch \
- "${FILESDIR}"/${PN}-1.3.0-share.patch \
- "${FILESDIR}"/${PN}-1.3.0-conf-tests.patch
- sed \
- -e 's:@HLINKS@::g' -i FL/Makefile.in || die
- sed -i \
- -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
- -e '/^LDFLAGS=/d' \
- "${S}/fltk-config.in" || die
- # some fixes introduced because slotting
- sed -i \
- -e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename
\1`:g' \
- src/Makefile || die
- # docs in proper docdir
- sed -i \
- -e "/^docdir/s:fltk:${PF}/html:" \
- -e "/SILENT:/d" \
- makeinclude.in || die
- sed -e "s/7/$(get_version_component_range 3)/" \
- "${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake
- sed -e 's:-Os::g' -i configure.in || die
- use prefix && append-ldflags -Wl,-rpath -Wl,"${LIBDIR}"
- eautoconf
-}
-
-src_configure() {
- econf \
- --includedir=${INCDIR}\
- --libdir=${LIBDIR} \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --enable-largefile \
- --enable-shared \
- --enable-xdbe \
- --disable-localjpeg \
- --disable-localpng \
- --disable-localzlib \
- $(use_enable debug) \
- $(use_enable cairo) \
- $(use_enable opengl gl) \
- $(use_enable threads) \
- $(use_enable xft) \
- $(use_enable xinerama)
-}
-
-src_compile() {
- default
- if use doc; then
- cd "${S}"/documentation
- emake html
- if use pdf; then
- emake pdf
- fi
- fi
- if use games; then
- cd "${S}"/test
- emake
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 80b2a963b4ee7c55147bf07a6fd619e065a1a13b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Nov 23 09:23:44 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Nov 23 09:23:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b2a963
x11-libs/fltk: alpha stable wrt bug #562450
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="alpha"
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 3d980e4..bdef642 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 5d154943b4b6d5993d797155f84994f08cee15df
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Nov 8 18:52:14 2015 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Nov 8 18:52:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d154943
x11-libs/fltk: ia64 stable wrt bug #562450
Package-Manager: portage-2.2.20.1
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index d24f007..3d980e4 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: e2305e9c92b1daf22a4f788e67eea2d7e7391eb9
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Nov 5 11:20:02 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Nov 5 11:20:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2305e9c
x11-libs/fltk: sparc stable wrt bug #562450
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="sparc"
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 513c1b9..d24f007 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: dafccb2b837ce73f0b259580ee90ca36ba7dc428
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Oct 30 10:13:58 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Oct 30 10:15:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dafccb2b
x11-libs/fltk: ppc stable wrt bug #562450
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 4258795..513c1b9 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: ad898b40ebe93aad297e9d50e76f9bc4561aea38
Author: Markus Meier gentoo org>
AuthorDate: Sun Oct 25 19:11:13 2015 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Oct 25 19:11:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad898b40
x11-libs/fltk: arm stable, bug #562450
Package-Manager: portage-2.2.23
RepoMan-Options: --include-arches="arm"
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index f59eee8..4258795 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 654fe344eb4078bfa66a94f0699dc1fe1e40165a
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Oct 25 12:53:50 2015 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Oct 25 12:53:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654fe344
x11-libs/fltk: x86 stable wrt bug #562450
Package-Manager: portage-2.2.20.1
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 76810ec..f59eee8 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 070daf854df17f1d2c324681026b742e9e508fe6
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Oct 9 05:16:37 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Oct 9 05:16:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=070daf85
x11-libs/fltk: Stable for HPPA PPC64 (bug #562450).
Package-Manager: portage-2.2.22
RepoMan-Options: --ignore-arches
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index e4d4ae6..a376532 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 1491ec62e35fec5f91d173a69a5b2694fff6fa29
Author: Jeroen Roovers gentoo org>
AuthorDate: Wed Oct 7 04:56:05 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Wed Oct 7 04:56:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1491ec62
x11-libs/fltk: Drop USE=pdf (bug #536566).
Package-Manager: portage-2.2.22
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 16
x11-libs/fltk/fltk-1.3..ebuild | 16
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index b55bc94..e4d4ae6 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -13,7 +13,7 @@ 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 pdf static-libs +threads +xft
+xinerama"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
>=media-libs/libpng-1.2:0
@@ -29,14 +29,7 @@ RDEPEND="
xft? ( x11-libs/libXft )"
DEPEND="${RDEPEND}
x11-proto/xextproto
- doc? (
- app-doc/doxygen
- pdf? (
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- )
+ doc? ( app-doc/doxygen )
xinerama? ( x11-proto/xineramaproto )"
FLTK_INCDIR=${EPREFIX}/usr/include/fltk
@@ -99,12 +92,11 @@ src_configure() {
src_compile() {
default
+
if use doc; then
emake -C documentation html
- if use pdf; then
- emake -C documentation pdf
- fi
fi
+
if use games; then
emake -C test blocks checkers sudoku
fi
diff --git a/x11-libs/fltk/fltk-1.3..ebuild
b/x11-libs/fltk/fltk-1.3..ebuild
index ba25ae8..3c620a6 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -15,7 +15,7 @@ ESVN_PASSWORD=""
SLOT="1"
LICENSE="FLTK LGPL-2"
KEYWORDS=""
-IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft
+xinerama"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft
+xinerama"
RDEPEND="
>=media-libs/libpng-1.2:0
@@ -31,14 +31,7 @@ RDEPEND="
xft? ( x11-libs/libXft )"
DEPEND="${RDEPEND}
x11-proto/xextproto
- doc? (
- app-doc/doxygen
- pdf? (
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- )
+ doc? ( app-doc/doxygen )
xinerama? ( x11-proto/xineramaproto )"
FLTK_INCDIR=${EPREFIX}/usr/include/fltk
@@ -102,12 +95,11 @@ src_configure() {
src_compile() {
default
+
if use doc; then
emake -C documentation html
- if use pdf; then
- emake -C documentation pdf
- fi
fi
+
if use games; then
emake -C test blocks checkers sudoku
fi
[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
commit: 5019bde91c5044b4e1f5044955bc0c7259e12d5a
Author: Chí-Thanh Christopher Nguyễn gentoo org>
AuthorDate: Fri Oct 2 17:19:30 2015 +
Commit: Chí-Thanh Christopher Nguyễn gentoo org>
CommitDate: Fri Oct 2 17:19:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5019bde9
x11-libs/fltk: keyword ~amd64-fbsd
Package-Manager: portage-2.2.20.1
x11-libs/fltk/fltk-1.3.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index a046f82..b55bc94 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -12,7 +12,7 @@ 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
~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 pdf static-libs +threads +xft
+xinerama"
RDEPEND="
